From 4fbbfe6eae792b193ad5029c9d1c1f1c02826ead Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 19 Feb 2012 11:43:23 -0800 Subject: [PATCH] system page - guest traffic type - network tab - pass physical network ID to listNetworks API since there could be multiple physical networks in one zone. [reviewed-by: Brian] --- ui/scripts/system.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 2e349eb275f..c07e2ab1567 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1146,7 +1146,8 @@ var $form = args.$form; var array1 = []; - array1.push("&zoneId=" + selectedZoneObj.id); + array1.push("&zoneId=" + selectedZoneObj.id); + array1.push("&physicalnetworkid=" + selectedPhysicalNetworkObj.id); array1.push("&name=" + todb(args.data.name)); array1.push("&displayText=" + todb(args.data.description)); array1.push("&networkOfferingId=" + args.data.networkOfferingId); @@ -1223,10 +1224,10 @@ } } - //need to make 2 listNetworks API call to get all networks + //need to make 2 listNetworks API call to get all guest networks from one physical network in Advanced zone var items = []; $.ajax({ - url: createURL("listNetworks&listAll=true&trafficType=Guest&zoneId=" + selectedZoneObj.id + "&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), + url: createURL("listNetworks&listAll=true&trafficType=Guest&zoneId=" + selectedZoneObj.id + "&physicalnetworkid=" + selectedPhysicalNetworkObj.id + "&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), dataType: "json", async: false, success: function(json) { @@ -1241,7 +1242,7 @@ }); $.ajax({ - url: createURL("listNetworks&projectid=-1&trafficType=Guest&zoneId=" + selectedZoneObj.id + "&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), + url: createURL("listNetworks&projectid=-1&trafficType=Guest&zoneId=" + selectedZoneObj.id + "&physicalnetworkid=" + selectedPhysicalNetworkObj.id + "&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), dataType: "json", async: false, success: function(json) {