etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4745: Add StaticNatRule through firewall manager 

This would fix CreateIpForwardingCmd API on 4.2+.
This commit is contained in:
Sheng Yang 2013-09-26 13:59:35 -07:00
parent 7f988d4e99
commit 92e9f6daf8
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
View File

@ -544,6 +544,8 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
throws ResourceUnavailableException {
boolean handled = false;
switch (purpose){
/* StaticNatRule would be applied by Firewall provider, since the incompatible of two object */
case StaticNat:
case Firewall:
for (FirewallServiceProvider fwElement: _firewallElements) {
Network.Provider provider = fwElement.getProvider();
@ -568,18 +570,6 @@ public class FirewallManagerImpl extends ManagerBase implements FirewallService,
break;
}
break;
case StaticNat:
for (StaticNatServiceProvider element: _staticNatElements) {
Network.Provider provider = element.getProvider();
boolean isSnatProvider = _networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.StaticNat, provider);
if (!isSnatProvider) {
continue;
}
handled = element.applyStaticNats(network, (List<? extends StaticNat>) rules);
if (handled)
break;
}
break;
/* case NetworkACL:
for (NetworkACLServiceProvider element: _networkAclElements) {
Network.Provider provider = element.getProvider();