apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4693: UI > Network > Add Guest Network dialog > physical network dropdown - populate only physical networks that have Guest traffic type.

Browse Source
This commit is contained in:
Jessica Wang 2013-09-23 16:10:36 -07:00
parent 3e813ce61d
commit fb7f5a0a46
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ui/scripts/sharedFunctions.js
View File

@ -235,9 +235,9 @@ var addGuestNetworkDialog = {
label: 'label.physical.network', label: 'label.physical.network',
dependsOn: 'zoneId', dependsOn: 'zoneId',
select: function(args) { select: function(args) {
if ('physicalNetworks' in args.context) { if ('physicalNetworks' in args.context) { //Infrastructure menu > zone detail > guest traffic type > network tab (only shown in advanced zone) > add guest network dialog
addGuestNetworkDialog.physicalNetworkObjs = args.context.physicalNetworks; addGuestNetworkDialog.physicalNetworkObjs = args.context.physicalNetworks;
} else { } else { //Network menu > guest network section > add guest network dialog
var selectedZoneId = args.$form.find('.form-item[rel=zoneId]').find('select').val(); var selectedZoneId = args.$form.find('.form-item[rel=zoneId]').find('select').val();
$.ajax({ $.ajax({
url: createURL('listPhysicalNetworks'), url: createURL('listPhysicalNetworks'),
@ -246,7 +246,32 @@ var addGuestNetworkDialog = {
}, },
async: false, async: false,
success: function(json) { success: function(json) {
addGuestNetworkDialog.physicalNetworkObjs = json.listphysicalnetworksresponse.physicalnetwork; var items = [];
var physicalnetworks = json.listphysicalnetworksresponse.physicalnetwork;
if (physicalnetworks != null) {
for (var i = 0; i < physicalnetworks.length; i++) {
$.ajax({
url: createURL('listTrafficTypes'),
data: {
physicalnetworkid: physicalnetworks[i].id
},
async: false,
success: function(json) {
var traffictypes = json.listtraffictypesresponse.traffictype;
if (traffictypes != null) {
for (var k = 0; k < traffictypes.length; k++) {
if (traffictypes[k].traffictype == 'Guest') {
items.push(physicalnetworks[i]);
break;
}
}
}
}
});
}
}
addGuestNetworkDialog.physicalNetworkObjs = items;
} }
}); });
} }