md-ova: implement diskoffering selections for data disks

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

api/src/org/apache/cloudstack/api/ApiConstants.java

@@ -71,7 +71,7 @@ public class ApiConstants {
     public static final String MIN_IOPS = "miniops";
     public static final String MAX_IOPS = "maxiops";
     public static final String HYPERVISOR_SNAPSHOT_RESERVE = "hypervisorsnapshotreserve";
-    public static final String DATADISKTEMPLATE_TO_DISKOFFERING_LIST = "datadisktemplatetodiskofferinglist";
+    public static final String DATADISK_OFFERING_LIST = "datadiskofferinglist";
     public static final String DESCRIPTION = "description";
     public static final String DESTINATION_ZONE_ID = "destzoneid";
     public static final String DETAILS = "details";

api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java

@@ -186,7 +186,7 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
     @Parameter(name = ApiConstants.DEPLOYMENT_PLANNER, type = CommandType.STRING, description = "Deployment planner to use for vm allocation. Available to ROOT admin only", since = "4.4", authorized = { RoleType.Admin })
     private String deploymentPlanner;
 
-    @Parameter(name = ApiConstants.DATADISKTEMPLATE_TO_DISKOFFERING_LIST, type = CommandType.MAP, since = "4.4", description = "datadisk template to disk-offering mapping;" +
+    @Parameter(name = ApiConstants.DATADISK_OFFERING_LIST, type = CommandType.MAP, since = "4.10", description = "datadisk template to disk-offering mapping;" +
             " an optional parameter used to create additional data disks from datadisk templates; can't be specified with diskOfferingId parameter")
     private Map dataDiskTemplateToDiskOfferingList;
 

api/src/org/apache/cloudstack/api/response/TemplateResponse.java

@@ -18,7 +18,6 @@
 
 import java.util.Date;
 import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -186,9 +185,9 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements
     @Param(description = "if Datadisk template, then id of the root disk template this template belongs to")
     private String parentTemplateId;
 
-    @SerializedName("childtemplateids")
+    @SerializedName("childtemplates")
     @Param(description = "if root disk template, then ids of the datas disk templates this template owns")
-    private  List<String> childTemplateIds;
+    private  Map<String, String> childTemplates;
 
     public TemplateResponse() {
         tags = new LinkedHashSet<ResourceTagResponse>();
@@ -368,8 +367,8 @@ public void setParentTemplateId(String parentTemplateId) {
         this.parentTemplateId = parentTemplateId;
     }
 
-    public void setChildTemplateIds(List<String> childTemplateIds) {
-        this.childTemplateIds = childTemplateIds;
+    public void setChildTemplates(Map<String, String> childTemplateIds) {
+        this.childTemplates = childTemplateIds;
     }
 
 }

engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java

@@ -138,7 +138,6 @@ public VMTemplateVO findByTemplateName(String templateName) {
 
     @Override
     public List<VMTemplateVO> listByParentTemplatetId(long parentTemplatetId) {
-        new Exception().printStackTrace();
         SearchCriteria<VMTemplateVO> sc = ParentTemplateIdSearch.create();
         sc.setParameters("parentTemplateId", parentTemplatetId);
         sc.setParameters("state", VirtualMachineTemplate.State.Active);

server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java

@@ -203,8 +203,8 @@ public TemplateResponse newTemplateResponse(ResponseView view, TemplateJoinVO te
         //set template children disks
         if (template.getHypervisorType() == HypervisorType.VMware) {
             List<VMTemplateVO> childTemplates = _vmTemplateDao.listByParentTemplatetId(template.getId());
-            List<String> childUuids  = childTemplates.stream().map(VMTemplateVO::getUuid).collect(Collectors.toList());
-            templateResponse.setChildTemplateIds(childUuids);
+            Map<String, String> childUuidNameMap  = childTemplates.stream().collect(Collectors.toMap(VMTemplateVO::getUuid, VMTemplateVO::getName));
+            templateResponse.setChildTemplates(childUuidNameMap);
         }
 
         templateResponse.setObjectName("template");

ui/scripts/instanceWizard.js

@@ -376,21 +376,46 @@
 
             // Step 4: Data disk offering
             function(args) {
-                var isRequred = (args.currentData["select-template"] == "select-iso" ? true : false);
+                var isRequired = (args.currentData["select-template"] == "select-iso" ? true : false);
                 $.ajax({
                     url: createURL("listDiskOfferings"),
                     dataType: "json",
                     async: true,
                     success: function(json) {
                         diskOfferingObjs = json.listdiskofferingsresponse.diskoffering;
+                        var multiDisks = false;
+                        if (!isRequired) {
+                            $.ajax({
+                                url: createURL("listTemplates"),
+                                data: {
+                                    id: args.currentData.templateid,
+                                    templatefilter: 'all'
+                                },
+                                dataType: "json",
+                                async: false,
+                                success: function(json) {
+                                    var templateDataDisks = json.listtemplatesresponse.template[0].childtemplates;
+                                    if (templateDataDisks && Object.keys(templateDataDisks).length > 0) {
+                                        multiDisks = [];
+                                        $.each(templateDataDisks, function(uuid, name) {
+                                            multiDisks.push({
+                                                id: uuid,
+                                                label: name
+                                            });
+                                        });
+                                    }
+                                }
+                            });
+                        }
+
                         args.response.success({
-                            required: isRequred,
+                            required: isRequired,
                             customFlag: 'iscustomized', // Field determines if custom slider is shown
                             customIopsDoFlag: 'iscustomizediops',
                             data: {
                                 diskOfferings: diskOfferingObjs
                             },
-                            multiDisk: false
+                            multiDisk: multiDisks
                         });
                     }
                 });
@@ -815,6 +840,15 @@
                 }
             }
 
+            if (args.data["disk-offerings-multi"] != null && args.data["disk-offerings-multi"].length > 0) {
+                $(args.data["disk-offerings-multi"]).each(function(index, disk) {
+                    var diskMap = {};
+                    diskMap['datadiskofferinglist[' + index + '].datadisktemplateid'] = disk.id;
+                    diskMap['datadiskofferinglist[' + index + '].diskofferingid'] = disk._diskOfferingId;
+                    $.extend(deployVmData, diskMap);
+                });
+            }
+
             //step 5: select an affinity group
             var checkedAffinityGroupIdArray;
             if (typeof(args.data["affinity-groups"]) == "object" && args.data["affinity-groups"].length != null) { //args.data["affinity-groups"] is an array of string, e.g. ["2375f8cc-8a73-4b8d-9b26-50885a25ffe0", "27c60d2a-de7f-4bb7-96e5-a602cec681df","c6301d77-99b5-4e8a-85e2-3ea2ab31c342"],