From 856703cc1cd29ea8bfef770a02a448c68a718c52 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Thu, 31 Oct 2013 13:50:20 -0700
Subject: [PATCH] CLOUDSTACK-4758: UI > Instance Wizard > (1) pass cpuNumber,
 cpuSpeed, memory to API when custom area is shown (i.e. when selected compute
 offering is dynamic). (2) pass rootDiskSize to API when custom area is shown
 (i.e. when selected item in step 2 is a template).

---
 ui/scripts/instanceWizard.js           | 38 ++++++++++++++++++++------
 ui/scripts/ui-custom/instanceWizard.js |  1 +
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index d2cde2f270c..5f08218c638 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -18,6 +18,7 @@
 (function($, cloudStack) {
     var zoneObjs, hypervisorObjs, featuredTemplateObjs, communityTemplateObjs, myTemplateObjs, featuredIsoObjs, community, networkObjs;
     var selectedZoneObj, selectedTemplateObj, selectedHypervisor, selectedDiskOfferingObj;
+    var selectedTemplateOrIso; //'select-template', 'select-iso'
     var step6ContainerType = 'nothing-to-select'; //'nothing-to-select', 'select-network', 'select-security-group', 'select-advanced-sg'(advanced sg-enabled zone)
 
     cloudStack.instanceWizard = {
@@ -122,8 +123,8 @@
                 });
 
                 //***** get templates/ISOs (begin) *****
-                var selectedTemplate = args.currentData['select-template'];
-                if (selectedTemplate == 'select-template') {
+                selectedTemplateOrIso = args.currentData['select-template'];
+                if (selectedTemplateOrIso == 'select-template') {
                     var hypervisorArray = [];
                     $(hypervisorObjs).each(function(index, item) {
                         hypervisorArray.push(item.name);
@@ -174,7 +175,7 @@
                             }
                         }
                     });
-                } else if (selectedTemplate == 'select-iso') {
+                } else if (selectedTemplateOrIso == 'select-iso') {
                     $.ajax({
                         url: createURL("listIsos&isofilter=featured&zoneid=" + args.currentData.zoneid + "&bootable=true"),
                         dataType: "json",
@@ -216,13 +217,13 @@
 
 
                 var templatesObj = {};
-                if (selectedTemplate == 'select-template') {
+                if (selectedTemplateOrIso == 'select-template') {
                     templatesObj = {
                         featuredtemplates: featuredTemplateObjs,
                         communitytemplates: communityTemplateObjs,
                         mytemplates: myTemplateObjs
                     }
-                } else if (selectedTemplate == 'select-iso') {
+                } else if (selectedTemplateOrIso == 'select-iso') {
                     templatesObj = {
                         featuredisos: featuredIsoObjs,
                         communityisos: communityIsoObjs,
@@ -239,9 +240,9 @@
                         hypervisors: hypervisorObjs
                     },
                     customHidden: function(args) {                        
-                        if (selectedTemplate == 'select-template') {
+                        if (selectedTemplateOrIso == 'select-template') {
                             return false; //show Root Disk Size field
-                        } else { //selectedTemplate == 'select-iso'
+                        } else { //selectedTemplateOrIso == 'select-iso'
                         	return true;  //hide Root Disk Size field
                         }                       
                     }
@@ -295,6 +296,7 @@
                         serviceOfferingObjs = json.listserviceofferingsresponse.serviceoffering;
                         args.response.success({
                             customFlag: 'iscustomized',
+                        	//customFlag: 'offerha', //for testing only
                             data: {
                                 serviceOfferings: serviceOfferingObjs
                             }
@@ -587,10 +589,28 @@
             //step 2: select template
             array1.push("&templateId=" + args.data.templateid);
             array1.push("&hypervisor=" + selectedHypervisor);
-
+           
+            if (args.$wizard.find('input[name=rootDiskSize]').parent().css('display') != 'none')  {
+            	if (args.$wizard.find('input[name=rootDiskSize]').val().length > 0) {
+            	    array1.push("&rootdisksize=" + args.$wizard.find('input[name=rootDiskSize]').val());     
+            	}
+            }
+            
             //step 3: select service offering
             array1.push("&serviceOfferingId=" + args.data.serviceofferingid);
-
+            
+            if (args.$wizard.find('input[name=compute-cpu-cores]').parent().parent().css('display') != 'none') {
+	            if (args.$wizard.find('input[name=compute-cpu-cores]').val().length > 0)  {   
+	            	array1.push("&cpunumber=" + args.$wizard.find('input[name=compute-cpu-cores]').val());
+	            }            
+	            if (args.$wizard.find('input[name=compute-cpu]').val().length > 0)  {          
+	            	array1.push("&cpuspeed=" + args.$wizard.find('input[name=compute-cpu]').val());
+	            }            
+	            if (args.$wizard.find('input[name=compute-memory]').val().length > 0)  {        
+	            	array1.push("&memory=" + args.$wizard.find('input[name=compute-memory]').val());
+	            }               
+            }
+            
             //step 4: select disk offering
             if (args.data.diskofferingid != null && args.data.diskofferingid != "0") {
                 array1.push("&diskOfferingId=" + args.data.diskofferingid);
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index 4368ec47ac3..d5203c84d9c 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -49,6 +49,7 @@
                         // Populate data
                         context: context,
                         data: data,
+                        $wizard: $wizard,
                         response: {
                             success: function(args) {
                                 var $listView = $('.list-view.instances');