From 410dff9d897a36e5b55a653efe444aa02ddb16b8 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Wed, 3 Jul 2013 17:05:00 -0700
Subject: [PATCH] CLOUDSTACK-1676: UI > zone wizard > basic zone > pass
 securitygroupenabled=true if selected network offering includes security
 group service; pass securitygroupenabled=false if selected network offering
 does not include security group service.

---
 ui/scripts/zoneWizard.js | 49 +++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index cb92c4e5329..08e9fe351fd 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -324,42 +324,28 @@
           var $form = args.$form;
 
           if (args.data['network-model'] == 'Basic') { //Basic zone
-            args.$form.find('[rel=networkOfferingId]').show();
+            args.$form.find('[rel=networkOfferingId]').show(); //will be used to create a guest network during zone creation 
             args.$form.find('[rel=guestcidraddress]').hide();						
 	    
             args.$form.find('[rel=ip6dns1]').hide();
-	    args.$form.find('[rel=ip6dns2]').hide();
+	          args.$form.find('[rel=ip6dns2]').hide();
           }
-          else { //Advanced zone
-            args.$form.find('[rel=networkOfferingId]').hide();
-						
-	    if(args.data["zone-advanced-sg-enabled"] !=	"on") { //Advanced SG-disabled zone
+          else { //Advanced zone 					
+	          if(args.data["zone-advanced-sg-enabled"] !=	"on") { //Advanced SG-disabled zone
+	            args.$form.find('[rel=networkOfferingId]').hide();
               args.$form.find('[rel=guestcidraddress]').show();
               					  
-	      args.$form.find('[rel=ip6dns1]').show();
-	      args.$form.find('[rel=ip6dns2]').show();
+	            args.$form.find('[rel=ip6dns1]').show();
+	            args.$form.find('[rel=ip6dns2]').show();
             }
-	    else { //Advanced SG-enabled zone
-	      args.$form.find('[rel=guestcidraddress]').hide();
+	          else { //Advanced SG-enabled zone
+	            args.$form.find('[rel=networkOfferingId]').show(); //will be used to create a guest network during zone creation 
+	            args.$form.find('[rel=guestcidraddress]').hide();
 
               args.$form.find('[rel=ip6dns1]').hide();
-	      args.$form.find('[rel=ip6dns2]').hide();
-            }
-          
-	  }													
-										
-      /*    setTimeout(function() {
-            if ($form.find('input[name=ispublic]').is(':checked')) {
-              $form.find('[rel=domain]').show();
-              $form.find('[rel=accountId]').show();
-            }
- 
-            else{
-
-              $form.find('[rel=domain]').hide();
-              $form.find('[rel=accountId]').hide();
-            }
-          });*/
+	            args.$form.find('[rel=ip6dns2]').hide();
+            }          
+	        }			
         },
         fields: {
           name: {
@@ -1723,7 +1709,14 @@
           var array1 = [];
           var networkType = args.data.zone.networkType;  //"Basic", "Advanced"
           array1.push("&networktype=" + todb(networkType));
-          if(networkType == "Advanced") {            
+          
+          if (networkType == "Basic") {        
+            if(selectedNetworkOfferingHavingSG == true)
+              array1.push("&securitygroupenabled=true");  
+            else
+              array1.push("&securitygroupenabled=false");             
+          }
+          else { // networkType == "Advanced"            
 						if(args.data.zone.sgEnabled	!= true) {
 							array1.push("&securitygroupenabled=false");