From bf4232974f5cca96063f14090e996c8a4050397b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 26 Apr 2012 16:17:55 -0700
Subject: [PATCH] CS-14272: cloudstack 3.0 UI - Add Zone Wizard - physical
 networks step - add Isolation Method dropdown.

---
 ui/css/cloudstack3.css             |  2 +-
 ui/scripts/ui-custom/zoneWizard.js | 24 +++++++++++++++++++++---
 ui/scripts/zoneWizard.js           | 23 +++++++++++++++++++----
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 85958492bdf..40246a0c1a7 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -5695,7 +5695,7 @@ label.error {
 }
 
 .multi-wizard.zone-wizard .select-container.multi .field {
-  width: 176px;
+  width: 425px;
   height: 46px;
   margin-top: -6px;
 }
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 9e09829656c..3a727149234 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -70,6 +70,7 @@
         return {
           id: $network.index(),
           name: $network.find('.field.name input[type=text]').val(),
+          isolationMethod: $network.find('.field.name select').val(),
 
           // Traffic type list
           trafficTypes: $.map(
@@ -561,10 +562,27 @@
       var $icon = $('<div>').addClass('physical-network-icon');
       var $nameField = $('<div>').addClass('field name').append(
         $('<div>').addClass('name').append(
-          $('<span>').html('Physical network name')
+          $('<label>').html('Physical network name')
+				),
+				$('<div>').addClass('value').append(
+					$('<input>').attr({ type: 'text' }).addClass('required')
         ),
-        $('<div>').addClass('value').append(
-          $('<input>').attr({ type: 'text' }).addClass('required')
+				$('<div>').append(
+          $('<span style=\"font-size:11px\;padding-right:5px;padding-left:50px">').html('Isolation method'),
+					$('<select>').append(						
+					  $('<option>').attr({
+							value: ''
+						}).html(''),					
+						$('<option>').attr({
+							value: 'VLAN'
+						}).html('VLAN'),						
+						$('<option>').attr({
+							value: 'L3'
+						}).html('L3'),						
+						$('<option>').attr({
+							value: 'GRE'
+						}).html('GRE')	
+					)
         )
       );
       var $dropContainer = $('<div>').addClass('drop-container').append(
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index a8cbbc79b26..c1fa5a33795 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1215,9 +1215,20 @@
             var requestedTrafficTypeCount = 2; //request guest traffic type, management traffic type
             if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true)
               requestedTrafficTypeCount++; //request public traffic type
-
+						      				
+						//Basic zone has only one physical network
+						var array1 = [];	            
+						if("physicalNetworks" in args.data) {	//from add-zone-wizard		
+							array1.push("&name=" + todb(args.data.physicalNetworks[0].name));
+							if(args.data.physicalNetworks[0].isolationMethod != null && args.data.physicalNetworks[0].isolationMethod.length > 0)
+								array1.push("&isolationmethods=" + todb(args.data.physicalNetworks[0].isolationMethod));	
+						}
+						else { //from quick-install-wizard
+						  array1.push("&name=PhysicalNetworkInBasicZone");
+						}
+							
             $.ajax({
-              url: createURL("createPhysicalNetwork&zoneid=" + args.data.returnedZone.id + "&name=PhysicalNetworkInBasicZone"),
+              url: createURL("createPhysicalNetwork&zoneid=" + args.data.returnedZone.id + array1.join("")),
               dataType: "json",
               success: function(json) {
                 var jobId = json.createphysicalnetworkresponse.jobid;
@@ -1440,9 +1451,13 @@
           }
           else if(args.data.zone.networkType == "Advanced") {
             $(args.data.physicalNetworks).each(function(index) {
-              var thisPhysicalNetwork = this;
+              var thisPhysicalNetwork = this;							
+							var array1 = [];
+							array1.push("&name=" + todb(thisPhysicalNetwork.name));
+							if(thisPhysicalNetwork.isolationMethod != null && thisPhysicalNetwork.isolationMethod.length > 0)
+							  array1.push("&isolationmethods=" + todb(thisPhysicalNetwork.isolationMethod));							
               $.ajax({
-                url: createURL("createPhysicalNetwork&zoneid=" + args.data.returnedZone.id + "&name=" + todb(thisPhysicalNetwork.name)),
+                url: createURL("createPhysicalNetwork&zoneid=" + args.data.returnedZone.id + array1.join("")),
                 dataType: "json",
                 success: function(json) {
                   var jobId = json.createphysicalnetworkresponse.jobid;