apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

AutoScale: Fixing issues that occurred during rebase with master

Browse Source
This commit is contained in:
Vijay Venkatachalam 2012-11-10 11:24:05 +05:30
parent 8fdd0a469a
commit affc162556
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
View File

@ -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;

2
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -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) {

6
ui/scripts/network.js
View File

@ -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");
}