From ff74234fe342eb2a6d7a2d0860baeeb0325a5923 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 18 Jun 2012 16:35:18 -0700
Subject: [PATCH] CS-15311: cloudstack 3.0 UI - Add Zone Wizard - add physical
 network step - no isolation method dropdown if network type is Basic.

---
 ui/scripts/ui-custom/zoneWizard.js | 56 ++++++++++++++++++------------
 ui/scripts/zoneWizard.js           |  6 ++--
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index a009d5514ec..8f1a87297ab 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -560,34 +560,46 @@
             .attr({ title: 'Remove this physical network' })
             .append('<span>').addClass('icon').html('&nbsp;');
       var $icon = $('<div>').addClass('physical-network-icon');
-      var $nameField = $('<div>').addClass('field name').append(
+      
+			var $nameField = $('<div>').addClass('field name').append(
         $('<div>').addClass('name').append(
           $('<label>').html('Physical network name')
 				),
 				$('<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'),						
-						//User should not be given the option to create a physical network with "L3" isolation method. (CS-15312)
-						/*
-						$('<option>').attr({
-							value: 'L3'
-						}).html('L3'),		
-            */						
-						$('<option>').attr({
-							value: 'GRE'
-						}).html('GRE')	
+        )				
+      );			
+			if($wizard.find('.select-network-model input:radio[name=network-model]:checked').val() == 'Advanced') {
+				$nameField.append(
+					$('<div>').addClass('name').append(
+						$('<label>').html('Physical network name')
+					),
+					$('<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'),						
+							//User should not be given the option to create a physical network with "L3" isolation method. (CS-15312)
+							/*
+							$('<option>').attr({
+								value: 'L3'
+							}).html('L3'),		
+							*/						
+							$('<option>').attr({
+								value: 'GRE'
+							}).html('GRE')	
+						)
 					)
-        )
-      );
+				);
+			}
+			
       var $dropContainer = $('<div>').addClass('drop-container').append(
         $('<span>').addClass('empty-message').html(
           'Drag and drop traffic types you would like to add here.'
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 248b2d381b1..5843001dce4 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1292,7 +1292,7 @@
 
           var returnedPhysicalNetworks = [];
 
-          if(args.data.zone.networkType == "Basic") {
+          if(args.data.zone.networkType == "Basic") { //Basic zone ***
             var requestedTrafficTypeCount = 2; //request guest traffic type, management traffic type
             if(selectedNetworkOfferingHavingSG == true && selectedNetworkOfferingHavingEIP == true && selectedNetworkOfferingHavingELB == true)
               requestedTrafficTypeCount++; //request public traffic type
@@ -1300,9 +1300,7 @@
 						//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));	
+							array1.push("&name=" + todb(args.data.physicalNetworks[0].name));							
 						}
 						else { //from quick-install-wizard
 						  array1.push("&name=PhysicalNetworkInBasicZone");