From c4e7c5f0e9bd6710dfb13d6dfa724181db5a2ea9 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 4 Jan 2011 14:29:33 -0800
Subject: [PATCH] bug 7267: Add Zone Wizard - basic mode - step 2 - hide Guest
 CIDR on UI and not pass "guestcidraddress" parameter to createZone API.

---
 ui/jsp/resource.jsp               |  2 +-
 ui/scripts/cloud.core.resource.js | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index d1da40abb16..944ea5ffc70 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -259,7 +259,7 @@
                                     <div id="add_zone_startvlan_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                     <div id="add_zone_endvlan_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
                                 </li>
-                                <li>
+                                <li id="add_zone_guestcidraddress_container" style="display:none">
                                     <label for="add_zone_guestcidraddress">Guest CIDR:</label>
                                     <input class="text" type="text" id="add_zone_guestcidraddress" value="10.1.1.0/24"/>
                                     <div id="add_zone_guestcidraddress_errormsg" class="dialog_formcontent_errormsg" style="display:none; margin-left:0;" ></div>
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 652d6d846c4..7549939282f 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -1068,14 +1068,14 @@ function initAddZoneWizard() {
             
             case "Basic":  //create VLAN in pod-level      
                 //hide Zone VLAN Range in Add Zone(step 2), show Guest IP Range in Add Pod(step3)                 
-                $thisWizard.find("#step2").find("#add_zone_vlan_container").hide();
+                $thisWizard.find("#step2").find("#add_zone_vlan_container, #add_zone_guestcidraddress_container").hide();
                 $thisWizard.find("#step3").find("#guestip_container, #guestnetmask_container, #guestgateway_container").show();
                 return true;
                 break;
                 
             case "Advanced":  //create VLAN in zone-level 
                 //show Zone VLAN Range in Add Zone(step 2), hide Guest IP Range in Add Pod(step3) 
-                $thisWizard.find("#step2").find("#add_zone_vlan_container").show();  
+                $thisWizard.find("#step2").find("#add_zone_vlan_container, #add_zone_guestcidraddress_container").show();  
                 $thisWizard.find("#step3").find("#guestip_container, #guestnetmask_container, #guestgateway_container").hide();   
                 return true;
                 break;
@@ -1131,8 +1131,10 @@ function addZoneWizardValidateZond($thisWizard) {
 	if($thisWizard.find("#step2").find("#add_zone_vlan_container").css("display") != "none") {
 		isValid &= validateString("VLAN Range", $thisWizard.find("#add_zone_startvlan"), $thisWizard.find("#add_zone_startvlan_errormsg"), true);    //optional
 		isValid &= validateString("VLAN Range", $thisWizard.find("#add_zone_endvlan"), $thisWizard.find("#add_zone_endvlan_errormsg"), true);        //optional
-	}	
-	isValid &= validateCIDR("Guest CIDR", $thisWizard.find("#add_zone_guestcidraddress"), $thisWizard.find("#add_zone_guestcidraddress_errormsg"), false); //required
+	}		
+	if($thisWizard.find("#add_zone_guestcidraddress_container").css("display") != "none") {
+	    isValid &= validateCIDR("Guest CIDR", $thisWizard.find("#add_zone_guestcidraddress"), $thisWizard.find("#add_zone_guestcidraddress_errormsg"), false); //required
+	}
 	return isValid;
 }
 
@@ -1191,8 +1193,10 @@ function addZoneWizardSubmit($thisWizard) {
         }
 	}	
 	
-	var guestcidraddress = trim($thisWizard.find("#add_zone_guestcidraddress").val());
-	moreCriteria.push("&guestcidraddress="+todb(guestcidraddress));	
+	if($thisWizard.find("#add_zone_guestcidraddress_container").css("display") != "none") {
+	    var guestcidraddress = trim($thisWizard.find("#add_zone_guestcidraddress").val());
+	    moreCriteria.push("&guestcidraddress="+todb(guestcidraddress));	
+	}
 					
 	if($thisWizard.find("#domain_dropdown_container").css("display") != "none") {
 	    var domainId = trim($thisWizard.find("#domain_dropdown").val());