From 5bde60743bb422747a1f88f6bdf699b6446fb281 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Thu, 26 Jul 2012 16:13:31 -0700 Subject: [PATCH] VPC UI: IP address configuration fix After acquiring a new IP, immeditaly clicking on its configuration tab will show an enabled firewall, which is incorrect. This fix always disables the firewall if in a VPC network. --- ui/scripts/network.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index f40e8f84bbe..aed52eb8b79 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1710,7 +1710,11 @@ }); } 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) + // Firewall is not supported in IP from VPC section + // (because ACL has already supported in tier from VPC section) + havingFirewallService = false; + disallowedActions.push("firewall"); + havingVpnService = false; //VPN is not supported in IP from VPC section if(args.context.ipAddresses[0].associatednetworkid == null) { //IP is not associated with any tier yet