From d4f8d3b3a4d2d17e37ecee771ea7b9ec5c366f73 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 16 Jul 2012 17:05:39 -0700 Subject: [PATCH] cloudstack 3.0 UI - network page - Guest Network section - select a VPC network - IP Address' configuration chart will be the same as the one from VPC section. --- ui/scripts/network.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index ada01629d28..a0cde663062 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1693,7 +1693,7 @@ var havingLbService = false; var havingVpnService = false; - if('networks' in args.context) { //from Guest Network section + if('networks' in args.context && args.context.networks[0].vpcid == null) { //a non-VPC network from Guest Network section $.ajax({ url: createURL("listNetworkOfferings&id=" + args.context.networks[0].networkofferingid), dataType: "json", @@ -1714,7 +1714,7 @@ } }); } - else { //from VPC section + else { //a VPC network from Guest Network section or from VPC section havingFirewallService = false; //firewall is not supported in IP from VPC section (because ACL has already supported in tier from VPC section) havingVpnService = false; //VPN is not supported in IP from VPC section