From affc16255676ec45a6ce45346c14cfbd780eb438 Mon Sep 17 00:00:00 2001 From: Vijay Venkatachalam Date: Sat, 10 Nov 2012 11:24:05 +0530 Subject: [PATCH] AutoScale: Fixing issues that occurred during rebase with master --- .../src/com/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(-) 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 1d8bcad5f35..4ec1c072991 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; diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 9c55a3f90ab..bd54f4701a8 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 providers = new ArrayList(); for (Provider provider : serviceProviderMap.get(service)) { if (provider != null) { diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 15ee363c9eb..e6a1eb326d8 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"); }