For volumes created from template, do not log offering ID in VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface

kishankavala · kishankavala · commit 9eb8d538dd19 · 2015-01-07T12:31:41.000+05:30
diff --git a/api/src/com/cloud/offering/DiskOffering.java b/api/src/com/cloud/offering/DiskOffering.java
@@ -34,6 +34,10 @@ enum State {
         Inactive, Active,
     }
 
+    public enum Type {
+        Disk, Service
+    };
+
     State getState();
 
     public enum DiskCacheMode {
@@ -114,4 +118,6 @@ public String toString() {
     DiskCacheMode getCacheMode();
 
     void setCacheMode(DiskCacheMode cacheMode);
+
+    Type getType();
 }
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -712,7 +712,9 @@ public DiskProfile allocateTemplatedVolume(Type type, String name, DiskOffering
 
             Long offeringId = null;
 
-            offeringId = offering.getId();
+            if (offering.getType() == DiskOffering.Type.Disk) {
+                offeringId = offering.getId();
+            }
 
             UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offeringId, vol.getTemplateId(), size,
                     Volume.class.getName(), vol.getUuid(), vol.isDisplayVolume());
diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
@@ -44,9 +44,6 @@
 @Inheritance(strategy = InheritanceType.JOINED)
 @DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING, length = 32)
 public class DiskOfferingVO implements DiskOffering {
-    public enum Type {
-        Disk, Service
-    };
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
@@ -25,7 +25,7 @@
 import org.springframework.stereotype.Component;
 
 import com.cloud.storage.DiskOfferingVO;
-import com.cloud.storage.DiskOfferingVO.Type;
+import com.cloud.offering.DiskOffering.Type;
 import com.cloud.utils.db.Attribute;
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
diff --git a/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java b/server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java
@@ -27,7 +27,7 @@
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
-import com.cloud.storage.DiskOfferingVO.Type;
+import com.cloud.offering.DiskOffering.Type;
 import com.cloud.utils.db.GenericDao;
 
 @Entity

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@ enum State {`
`34`	`34`	`Inactive, Active,`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ public enum Type {`
	`38`	`+ Disk, Service`
	`39`	`+ };`
	`40`	`+`
`37`	`41`	`State getState();`
`38`	`42`
`39`	`43`	`public enum DiskCacheMode {`
`@@ -114,4 +118,6 @@ public String toString() {`
`114`	`118`	`DiskCacheMode getCacheMode();`
`115`	`119`
`116`	`120`	`void setCacheMode(DiskCacheMode cacheMode);`
	`121`	`+`
	`122`	`+ Type getType();`
`117`	`123`	`}`