AutoScale: Fixing issues that occurred during rebase with master
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/affc1625 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/affc1625 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/affc1625 Branch: refs/heads/master Commit: affc16255676ec45a6ce45346c14cfbd780eb438 Parents: 8fdd0a4 Author: Vijay Venkatachalam <[email protected]> Authored: Sat Nov 10 11:24:05 2012 +0530 Committer: Vijay Venkatachalam <[email protected]> Committed: Fri Nov 16 11:04:37 2012 +0530 ---------------------------------------------------------------------- .../cloud/network/element/NetscalerElement.java | 2 +- server/src/com/cloud/api/ApiResponseHelper.java | 2 +- ui/scripts/network.js | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/affc1625/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 1d8bcad..4ec1c07 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -754,7 +754,7 @@ StaticNatServiceProvider { } } - SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rulesTO); + SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rulesTO, null); answer = (SetStaticNatRulesAnswer) _agentMgr.send(lbDevice.getHostId(), cmd); if (answer == null) { return false; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/affc1625/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 9c55a3f..bd54f47 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -3722,7 +3722,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (service == Service.Gateway) { continue; } - svcRsp.setName(service.getName());response.setObjectName + svcRsp.setName(service.getName()); List<ProviderResponse> providers = new ArrayList<ProviderResponse>(); for (Provider provider : serviceProviderMap.get(service)) { if (provider != null) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/affc1625/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 15ee363..e6a1eb3 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1961,7 +1961,11 @@ }); } } - }); + if(args.context.ipAddresses[0].networkOfferingConserveMode == false) { + /* + (1) If IP is SourceNat, no StaticNat/VPN/PortForwarding/LoadBalancer can be enabled/added. + */ + if (args.context.ipAddresses[0].issourcenat){ if(havingFirewallService == false) { //firewall is not supported in IP from VPC section (because ACL has already supported in tier from VPC section) disallowedActions.push("firewall"); }
