From 774ca37fcef33029444d9833e707f6addf86e5ea Mon Sep 17 00:00:00 2001 From: will Date: Fri, 7 Jan 2011 17:42:37 -0800 Subject: [PATCH] Added an additional query for shared direct networks in the vm wizard --- ui/scripts/cloud.core.instance.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index 297f987a2c3..1801609f1f7 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -899,6 +899,28 @@ function initVMWizard() { $directNetworkElement.find("#network_direct_desc").text(networks[i].displaytext); $networkDirectContainer.append($directNetworkElement.show()); } + + // Add any additional shared direct networks + $.ajax({ + data: createURL("command=listNetworks&isshared=true&zoneId="+$thisPopup.find("#wizard_zone").val()), + dataType: "json", + async: false, + success: function(json) { + var sharedNetworks = json.listnetworksresponse.network; + if (sharedNetworks != null && sharedNetworks.length > 0) { + for (var i = 0; i < sharedNetworks.length; i++) { + if (sharedNetworks[i].type != 'Direct') { + continue; + } + var $directNetworkElement = $networkDirectTemplate.clone().attr("id", "direct"+sharedNetworks[i].id); + $directNetworkElement.find("#network_direct_checkbox").data("jsonObj", sharedNetworks[i]); + $directNetworkElement.find("#network_direct_name").text(sharedNetworks[i].name); + $directNetworkElement.find("#network_direct_desc").text(sharedNetworks[i].displaytext); + $networkDirectContainer.append($directNetworkElement.show()); + } + } + } + }); } } });