apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 8655: Add Zone Wizard - Advanced Mode - when security group is selected, create direct VLAN instead of virtual VLAN.

Browse Source
This commit is contained in:
Jessica Wang 2011-02-25 10:53:22 -08:00
parent 65d22a7a15
commit 0131edd628
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/scripts/cloud.core.resource.js
View File

@ -1155,34 +1155,37 @@ function initAddZoneWizard() {
case "Basic": //create VLAN in pod-level case "Basic": //create VLAN in pod-level
$thisWizard.find("#step1").find("input[name=isolation_mode]").removeAttr("checked"); //uncheck all radio buttons under Isolation Mode $thisWizard.find("#step1").find("input[name=isolation_mode]").removeAttr("checked"); //uncheck all radio buttons under Isolation Mode
//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, #add_zone_guestcidraddress_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(); //direct VLAN: createVlanIpRange&forVirtualNetwork=false //BasicZone's SecurityGroupsEnabled is true
$thisWizard.find("#step4").find("#guestip_list").show(); $thisWizard.find("#step4").find("#guestip_list").show();
$thisWizard.find("#step4").find("#publicip_list").hide(); $thisWizard.find("#step4").find("#publicip_list").hide();
return true; return true;
break; break;
case "Advanced": //create VLAN in zone-level case "Advanced": //create VLAN in zone-level
$thisWizard.find("#step1").find("input[name=isolation_mode]:eq(0)").attr("checked", true); //check the 1st radio button under Insolation Mode //$thisWizard.find("#step1").find("input[name=isolation_mode]:eq(0)").attr("checked", true); //check the 1st radio button under Insolation Mode
$thisWizard.find("#step1").find("input[name=isolation_mode]:eq(0)").click(); //check the 1st radio button under Insolation Mode
//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, #add_zone_guestcidraddress_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();
$thisWizard.find("#step4").find("#guestip_list").hide();
$thisWizard.find("#step4").find("#publicip_list").show();
$addZoneWizard.find("#step4").find("#add_publicip_vlan_scope").change();
return true; return true;
break; break;
case "isolation_mode_virtual": case "isolation_mode_virtual":
//virtual VLAN: createVlanIpRange&forVirtualNetwork=true //Advanced Zone - when securitygroup is NOT enabled
$thisWizard.find("#step4").find("#publicip_list").show();
$addZoneWizard.find("#step4").find("#publicip_list").find("#add_publicip_vlan_scope").change();
$thisWizard.find("#step4").find("#guestip_list").hide();
return true; return true;
break; break;
case "isolation_mode_securitygroup": case "isolation_mode_securitygroup":
//direct VLAN: createVlanIpRange&forVirtualNetwork=false //Advanced Zone - when securitygroup is enabled
$thisWizard.find("#step4").find("#guestip_list").show();
$thisWizard.find("#step4").find("#publicip_list").hide();
return true; return true;
break; break;
@ -1506,7 +1509,6 @@ function addZoneWizardSubmit($thisWizard) {
// add public IP range to basic zone (begin) // add public IP range to basic zone (begin)
if($thisWizard.find("#step4").find("#publicip_list").css("display") != "none") { if($thisWizard.find("#step4").find("#publicip_list").css("display") != "none") {
var isDirect = false;
var isTagged = $thisWizard.find("#step4").find("#add_publicip_vlan_tagged").val() == "tagged"; var isTagged = $thisWizard.find("#step4").find("#add_publicip_vlan_tagged").val() == "tagged";
var vlan = trim($thisWizard.find("#step4").find("#add_publicip_vlan_vlan").val()); var vlan = trim($thisWizard.find("#step4").find("#add_publicip_vlan_vlan").val());
@ -1519,8 +1521,6 @@ function addZoneWizardSubmit($thisWizard) {
var scopeParams = ""; var scopeParams = "";
if($thisWizard.find("#step4").find("#add_publicip_vlan_scope").val() == "account-specific") { if($thisWizard.find("#step4").find("#add_publicip_vlan_scope").val() == "account-specific") {
scopeParams = "&domainId="+trim($thisWizard.find("#step4").find("#add_publicip_vlan_domain").val())+"&account="+trim($thisWizard.find("#step4").find("#add_publicip_vlan_account").val()); scopeParams = "&domainId="+trim($thisWizard.find("#step4").find("#add_publicip_vlan_domain").val())+"&account="+trim($thisWizard.find("#step4").find("#add_publicip_vlan_account").val());
} else if (isDirect) {
scopeParams = "&isshared=true";
} }
var array1 = []; var array1 = [];