CLOUDSTACK-6725: [OVS][UI] vm deployment wizard does not show all available zones in a region while deploying vm in a Regionlevel vpc

This commit is contained in:
Gabor Apati-Nagy 2014-06-02 16:25:51 +01:00 committed by Brian Federle
parent 3077510838
commit 9f38fd6c9f

View File

@ -77,19 +77,23 @@
steps: [ steps: [
// Step 1: Setup // Step 1: Setup
function(args) { function(args) {
if (args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart //from VPC Tier chart -- when the tier (network) has strechedl2subnet==false:
//populate only one zone to the dropdown, the zone which the VPC is under. //only own zone is populated to the dropdown
zoneObjs = [{ if (args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard"
id: args.context.vpc[0].zoneid, && args.context.networks[0].strechedl2subnet) {
name: args.context.vpc[0].zonename, zoneObjs = [{
networktype: 'Advanced' id: args.context.vpc[0].zoneid,
}]; name: args.context.vpc[0].zonename,
args.response.success({ networktype: 'Advanced'
data: { }];
zones: zoneObjs args.response.success({
} data: {
}); zones: zoneObjs
} else { //from Instance page }
});
}
//in all other cases (as well as from instance page) all zones are populated to dropdown
else {
$.ajax({ $.ajax({
url: createURL("listZones&available=true"), url: createURL("listZones&available=true"),
dataType: "json", dataType: "json",