Merge branch '4.14'

api/src/main/java/org/apache/cloudstack/api/response/HostForMigrationResponse.java

@@ -128,10 +128,19 @@ public class HostForMigrationResponse extends BaseResponse {
     @Param(description = "the outgoing network traffic on the host")
     private Long networkKbsWrite;
 
+    @Deprecated
     @SerializedName("memoryallocated")
     @Param(description = "the amount of the host's memory currently allocated")
     private String memoryAllocated;
 
+    @SerializedName("memoryallocatedpercentage")
+    @Param(description = "the amount of the host's memory currently allocated in percentage")
+    private String memoryAllocatedPercentage;
+
+    @SerializedName("memoryallocatedbytes")
+    @Param(description = "the amount of the host's memory currently allocated in bytes")
+    private Long memoryAllocatedBytes;
+
     @SerializedName("memoryused")
     @Param(description = "the amount of the host's memory currently used")
     private Long memoryUsed;
@@ -314,6 +323,14 @@ public class HostForMigrationResponse extends BaseResponse {
         this.memoryAllocated = memoryAllocated;
     }
 
+    public void setMemoryAllocatedPercentage(String memoryAllocatedPercentage) {
+        this.memoryAllocatedPercentage = memoryAllocatedPercentage;
+    }
+
+    public void setMemoryAllocatedBytes(Long memoryAllocatedBytes) {
+        this.memoryAllocatedBytes = memoryAllocatedBytes;
+    }
+
     public void setMemoryUsed(Long memoryUsed) {
         this.memoryUsed = memoryUsed;
     }

api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java

@@ -136,10 +136,19 @@ public class HostResponse extends BaseResponse {
     @Param(description = "the amount of the host's memory after applying the mem.overprovisioning.factor")
     private String memWithOverprovisioning;
 
+    @Deprecated
     @SerializedName("memoryallocated")
     @Param(description = "the amount of the host's memory currently allocated")
     private long memoryAllocated;
 
+    @SerializedName("memoryallocatedpercentage")
+    @Param(description = "the amount of the host's memory currently allocated in percentage")
+    private String memoryAllocatedPercentage;
+
+    @SerializedName("memoryallocatedbytes")
+    @Param(description = "the amount of the host's memory currently allocated in bytes")
+    private Long memoryAllocatedBytes;
+
     @SerializedName("memoryused")
     @Param(description = "the amount of the host's memory currently used")
     private Long memoryUsed;
@@ -608,6 +617,14 @@ public class HostResponse extends BaseResponse {
         return memoryAllocated;
     }
 
+    public void setMemoryAllocatedPercentage(String memoryAllocatedPercentage) {
+        this.memoryAllocatedPercentage = memoryAllocatedPercentage;
+    }
+
+    public void setMemoryAllocatedBytes(Long memoryAllocatedBytes) {
+        this.memoryAllocatedBytes = memoryAllocatedBytes;
+    }
+
     public Long getMemoryUsed() {
         return memoryUsed;
     }

server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java

@@ -170,9 +170,12 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
                 Long cpu = host.getCpuReservedCapacity() + host.getCpuUsedCapacity();
 
                 hostResponse.setMemoryTotal(host.getTotalMemory());
-                Float totalMemorywithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId());
+                Float memWithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId());
-                hostResponse.setMemWithOverprovisioning(decimalFormat.format(totalMemorywithOverprovisioning));
+                hostResponse.setMemWithOverprovisioning(decimalFormat.format(memWithOverprovisioning));
                 hostResponse.setMemoryAllocated(mem);
+                hostResponse.setMemoryAllocatedBytes(mem);
+                String memoryAllocatedPercentage = decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%";
+                hostResponse.setMemoryAllocatedPercentage(memoryAllocatedPercentage);
 
                 String hostTags = host.getTag();
                 hostResponse.setHostTags(host.getTag());
@@ -321,7 +324,10 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
                 hostResponse.setMemoryTotal(host.getTotalMemory());
                 Float memWithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId());
                 hostResponse.setMemWithOverprovisioning(decimalFormat.format(memWithOverprovisioning));
-                hostResponse.setMemoryAllocated(decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%");
+                String memoryAllocatedPercentage = decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%";
+                hostResponse.setMemoryAllocated(memoryAllocatedPercentage);
+                hostResponse.setMemoryAllocatedPercentage(memoryAllocatedPercentage);
+                hostResponse.setMemoryAllocatedBytes(mem);
 
                 String hostTags = host.getTag();
                 hostResponse.setHostTags(host.getTag());

systemvm/debian/opt/cloud/bin/configure.py

@@ -1019,10 +1019,6 @@ def main(argv):
     # The "GLOBAL" Configuration object
     config = CsConfig()
 
-    logging.basicConfig(filename=config.get_logger(),
-                        level=config.get_level(),
-                        format=config.get_format())
-
     # Load stored ip addresses from disk to CsConfig()
     config.set_address()
 

systemvm/debian/opt/cloud/bin/cs/__init__.py

@@ -14,3 +14,12 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+
+import logging
+from cs.CsConfig import CsConfig
+
+config = CsConfig()
+
+logging.basicConfig(filename=config.get_logger(),
+                    level=config.get_level(),
+                    format=config.get_format())

systemvm/debian/opt/cloud/bin/update_config.py

@@ -26,8 +26,6 @@ import os.path
 import configure
 import json
 
-logging.basicConfig(filename='/var/log/cloud.log', level=logging.INFO, format='%(asctime)s  %(filename)s %(funcName)s:%(lineno)d %(message)s')
-
 # first commandline argument should be the file to process
 argc = len(sys.argv)
 if argc != 2 and argc != 3: