You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/07/27 01:14:10 UTC
git commit: VPC UI: IP address configuration fix
Updated Branches:
refs/heads/vpc 4a38f2be1 -> 00af51700
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/00af5170
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/00af5170
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/00af5170
Branch: refs/heads/vpc
Commit: 00af517003f781a9e513059a3b676d9003fd3798
Parents: 4a38f2b
Author: Brian Federle <br...@citrix.com>
Authored: Thu Jul 26 16:13:31 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Jul 26 16:13:57 2012 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/00af5170/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index b0ac12a..0ae3850 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1714,7 +1714,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