CLOUDSTACK-4745: Add StaticNatRule through firewall manager

Sheng Yang · Sheng Yang · commit 92e9f6daf8e7 · 2013-09-26T14:05:13.000-07:00
This would fix CreateIpForwardingCmd API on 4.2+.
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -544,6 +544,8 @@ public  boolean applyRules(Network network, Purpose purpose, List<? extends Fire
             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  boolean applyRules(Network network, Purpose purpose, List<? extends Fire
                     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();
