CLOUDSTACK-5162 Usage details are not getting populated when using dynamic offerings.

bvbharat · koushik-das · commit ef40e156ed37 · 2013-11-26T14:32:30.000+05:30
Signed-off-by: Koushik Das &lt;koushik@apache.org&gt;
diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
@@ -83,6 +83,11 @@ public enum DynamicParameters {
     @Transient
     Map<String, String> details;
 
+    // This flag is required to tell if the offering is dynamic once the cpu, memory and speed are set.
+    // In some cases cpu, memory and speed are set to non-null values even if the offering is dynamic.
+    @Transient
+    boolean isDynamic;
+
     protected ServiceOfferingVO() {
         super();
     }
@@ -297,7 +302,10 @@ public void setDetails(Map<String, String> details) {
 
     @Override
     public boolean isDynamic() {
-        return cpu == null || speed == null || ramSize == null;
+        return cpu == null || speed == null || ramSize == null || isDynamic;
     }
 
+    public void setDynamicFlag(boolean isdynamic) {
+        this.isDynamic = isdynamic;
+    }
 }
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2593,6 +2593,7 @@ protected UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOf
             details.add(new UserVmDetailVO(id, ServiceOfferingVO.DynamicParameters.cpuSpeed.toString(), cpuSpeed.toString()));
             details.add(new UserVmDetailVO(id, ServiceOfferingVO.DynamicParameters.memory.toString(), memory.toString()));
             offering = _serviceOfferingDao.getcomputeOffering(serviceOffering.getId(), cpuNumber, cpuSpeed, memory);
+            offering.setDynamicFlag(true);
         }
         if (hostName != null) {
             // Check is hostName is RFC compliant

Original file line number	Diff line number	Diff line change
`@@ -2593,6 +2593,7 @@ protected UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOf`
`2593`	`2593`	`details.add(new UserVmDetailVO(id, ServiceOfferingVO.DynamicParameters.cpuSpeed.toString(), cpuSpeed.toString()));`
`2594`	`2594`	`details.add(new UserVmDetailVO(id, ServiceOfferingVO.DynamicParameters.memory.toString(), memory.toString()));`
`2595`	`2595`	`offering = _serviceOfferingDao.getcomputeOffering(serviceOffering.getId(), cpuNumber, cpuSpeed, memory);`
	`2596`	`+ offering.setDynamicFlag(true);`
`2596`	`2597`	`}`
`2597`	`2598`	`if (hostName != null) {`
`2598`	`2599`	`// Check is hostName is RFC compliant`