etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-485: cloudstack UI - zone wizard - Hide Guest Traffic Step(VLAN Range field) when Advanced/SecurityGroup is selected. Show it when Advanced/VLAN is selected.

This commit is contained in:
Jessica Wang 2012-11-14 14:43:04 -08:00
parent 60cec46333
commit 9d7f48c40d
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ui/scripts/zoneWizard.js
View File

@ -249,31 +249,36 @@
$('.setup-guest-traffic').removeClass('advanced');
skipGuestTrafficStep = false; //set value
}
else {
else { //args.data['network-model'] == 'Advanced'
$('.setup-guest-traffic').removeClass('basic');
$('.setup-guest-traffic').addClass('advanced');
//skip the step if OVS tunnel manager is enabled
skipGuestTrafficStep = false; //reset it before ajax call
$.ajax({
url: createURL('listConfigurations'),
data: {
name: 'sdn.ovs.controller'
},
dataType: "json",
async: false,
success: function(json) {
var items = json.listconfigurationsresponse.configuration; //2 entries returned: 'sdn.ovs.controller', 'sdn.ovs.controller.default.label'
$(items).each(function(){
if(this.name == 'sdn.ovs.controller') {
if(this.value == 'true' || this.value == true) {
skipGuestTrafficStep = true;
if(args.data["zone-isolation-mode"] == "VLAN") {
//skip the step if OVS tunnel manager is enabled
skipGuestTrafficStep = false; //reset it before ajax call
$.ajax({
url: createURL('listConfigurations'),
data: {
name: 'sdn.ovs.controller'
},
dataType: "json",
async: false,
success: function(json) {
var items = json.listconfigurationsresponse.configuration; //2 entries returned: 'sdn.ovs.controller', 'sdn.ovs.controller.default.label'
$(items).each(function(){
if(this.name == 'sdn.ovs.controller') {
if(this.value == 'true' || this.value == true) {
skipGuestTrafficStep = true;
}
return false; //break each loop
}
return false; //break each loop
}
});
}
});
});
}
});
}
else { //args.data["zone-isolation-mode"] == "SG"
skipGuestTrafficStep = true;
}
}
return !skipGuestTrafficStep;
},