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 522860c03d
commit dad47682cb

View File

@ -553,6 +553,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();
@ -577,18 +579,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();