CLOUDSTACK-3336 AWSAPI - createVolume API with custom size should prefer a non-tagged custom sized disk offering first over a tagged offering

Prachi Damle · Prachi Damle · commit 6c9383bd7650 · 2013-07-02T15:18:49.000-07:00
Changes:
For createVolume API with custom size the awsapi component chooses the custom size disk offering present on CloudStack, sice CS createVolume API needs an offering Id.

But if there are multiple custom size disk offerings, and some of the offerings have tags, awsapi should try to choose a non-tagged custom offering first. There is a reason for people to tag a disk offering and using that on every user API call may not be preferable.

If all disk offerings are tagged however, awsapi will choose one of them.
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -1184,14 +1184,23 @@ public EC2Volume createVolume( EC2CreateVolume request ) {
             String snapshotId = request.getSnapshotId();
             Long size = request.getSize();
             String diskOfferingId = null;
+            String taggedDiskOffering = null;
 
             if (snapshotId == null) {
                 List<CloudStackDiskOffering> disks = getApi().listDiskOfferings(null, null, null, null);
                 for (CloudStackDiskOffering offer : disks) {
                     if (offer.isCustomized()) {
-                        diskOfferingId = offer.getId();
+                        if (offer.getTags() == null) {
+                            diskOfferingId = offer.getId();
+                            break;
+                        } else {
+                            taggedDiskOffering = offer.getId();
+                        }
                     }
                 }
+                if (diskOfferingId == null) {
+                    diskOfferingId = taggedDiskOffering;
+                }
                 if (diskOfferingId == null) throw new EC2ServiceException(ServerError.InternalError, "No Customize Disk Offering Found");
             }
 
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java b/awsapi/src/com/cloud/stack/models/CloudStackDiskOffering.java
@@ -32,6 +32,8 @@ public class CloudStackDiskOffering {
 	private String created;
 	@SerializedName(ApiConstants.IS_CUSTOMIZED)
 	private boolean isCustomized;
+    @SerializedName(ApiConstants.TAGS)
+    private String tags;
 
 	/**
 	 * 
@@ -80,4 +82,11 @@ public String getCreated() {
 	public boolean isCustomized() {
 		return isCustomized;
 	}
+
+    /**
+     * @return the tags
+     */
+    public String getTags() {
+        return tags;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ public class CloudStackDiskOffering {`
`32`	`32`	`private String created;`
`33`	`33`	`@SerializedName(ApiConstants.IS_CUSTOMIZED)`
`34`	`34`	`private boolean isCustomized;`
	`35`	`+ @SerializedName(ApiConstants.TAGS)`
	`36`	`+ private String tags;`
`35`	`37`
`36`	`38`	`/**`
`37`	`39`	`*`
`@@ -80,4 +82,11 @@ public String getCreated() {`
`80`	`82`	`public boolean isCustomized() {`
`81`	`83`	`return isCustomized;`
`82`	`84`	`}`
	`85`	`+`
	`86`	`+ /**`
	`87`	`+ * @return the tags`
	`88`	`+ */`
	`89`	`+ public String getTags() {`
	`90`	`+ return tags;`
	`91`	`+ }`
`83`	`92`	`}`