BUG-5456:DHCP port ARP flows not removed in compute node.

[ovsdb.git] / openstack / net-virt / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / FWaasHandler.java

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java
index ed2c004d5079b4c45d2f2c2fd8eaa6bf8c5ec6c8..0b7881f31259d3f6b90773cd46933651b1697a15 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java
@@ -1,25 +1,23 @@
 /*
- * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (c) 2013, 2015 Red Hat, Inc. and others. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
  */
 
 package org.opendaylight.ovsdb.openstack.netvirt;
 
 import java.net.HttpURLConnection;
 
-import org.opendaylight.neutron.spi.INeutronFirewallAware;
-import org.opendaylight.neutron.spi.INeutronFirewallPolicyAware;
-import org.opendaylight.neutron.spi.INeutronFirewallRuleAware;
-import org.opendaylight.neutron.spi.NeutronFirewall;
-import org.opendaylight.neutron.spi.NeutronFirewallPolicy;
-import org.opendaylight.neutron.spi.NeutronFirewallRule;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronFirewall;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronFirewallPolicy;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.NeutronFirewallRule;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.INeutronFirewallAware;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.INeutronFirewallPolicyAware;
+import org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.INeutronFirewallRuleAware;
 import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
 import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,12 +46,10 @@ public class FWaasHandler extends AbstractHandler
     @Override
     public void neutronFirewallCreated(NeutronFirewall neutronFirewall) {
         LOG.debug("Neutron Firewall created by Neutron: {}", neutronFirewall);
-        int result = HttpURLConnection.HTTP_BAD_REQUEST;
 
-        result = canCreateNeutronFirewall(neutronFirewall);
+        int result = canCreateNeutronFirewall(neutronFirewall);
         if (result != HttpURLConnection.HTTP_CREATED) {
             LOG.error("Neutron Firewall creation failed: {} ", result);
-            return;
         }
     }
 
@@ -65,7 +61,6 @@ public class FWaasHandler extends AbstractHandler
     @Override
     public void neutronFirewallUpdated(NeutronFirewall neutronFirewall) {
         LOG.debug("NeutronFirewall updated from Neutron: {}", neutronFirewall);
-        return;
     }
 
     @Override
@@ -79,7 +74,6 @@ public class FWaasHandler extends AbstractHandler
         int result = canDeleteNeutronFirewall(neutronFirewall);
         if  (result != HttpURLConnection.HTTP_OK) {
             LOG.error(" delete Neutron Firewall validation failed for result - {} ", result);
-            return;
         }
     }
 
@@ -99,12 +93,9 @@ public class FWaasHandler extends AbstractHandler
     public void neutronFirewallRuleCreated(NeutronFirewallRule neutronFirewallRule) {
         LOG.debug("NeutronFirewallRule created by Neutron: {}", neutronFirewallRule);
 
-        int result = HttpURLConnection.HTTP_BAD_REQUEST;
-
-        result = canCreateNeutronFirewallRule(neutronFirewallRule);
+        int result = canCreateNeutronFirewallRule(neutronFirewallRule);
         if (result != HttpURLConnection.HTTP_CREATED) {
             LOG.error("Neutron Firewall Rule creation failed {} ", result);
-            return;
         }
     }
 
@@ -116,7 +107,6 @@ public class FWaasHandler extends AbstractHandler
     @Override
     public void neutronFirewallRuleUpdated(NeutronFirewallRule neutronFirewallRule) {
         LOG.debug("Neutron Firewall Rule updated from Neutron: {}", neutronFirewallRule);
-        return;
     }
 
     @Override
@@ -129,7 +119,6 @@ public class FWaasHandler extends AbstractHandler
         int result = canDeleteNeutronFirewallRule(neutronFirewallRule);
         if  (result != HttpURLConnection.HTTP_OK) {
             LOG.error(" delete Neutron Firewall Rule validation failed for result - {} ", result);
-            return;
         }
     }
 
@@ -149,12 +138,9 @@ public class FWaasHandler extends AbstractHandler
     public void neutronFirewallPolicyCreated(NeutronFirewallPolicy neutronFirewallPolicy) {
         LOG.debug("Neutron Firewall Policy created by Neutron: {}", neutronFirewallPolicy);
 
-        int result = HttpURLConnection.HTTP_BAD_REQUEST;
-
-        result = canCreateNeutronFirewallPolicy(neutronFirewallPolicy);
+        int result = canCreateNeutronFirewallPolicy(neutronFirewallPolicy);
         if (result != HttpURLConnection.HTTP_CREATED) {
             LOG.debug("Neutron Firewall Policy creation failed: {} ", result);
-            return;
         }
     }
 
@@ -166,7 +152,6 @@ public class FWaasHandler extends AbstractHandler
     @Override
     public void neutronFirewallPolicyUpdated(NeutronFirewallPolicy neutronFirewallPolicy) {
         LOG.debug("Neutron Firewall Policy updated from Neutron: {}", neutronFirewallPolicy);
-        return;
     }
 
     @Override
@@ -179,14 +164,13 @@ public class FWaasHandler extends AbstractHandler
         int result = canDeleteNeutronFirewallPolicy(neutronFirewallPolicy);
         if  (result != HttpURLConnection.HTTP_OK) {
             LOG.error(" delete Neutron Firewall Policy validation failed for result - {} ", result);
-            return;
         }
     }
 
     /**
      * Process the event.
      *
-     * @param abstractEvent@see org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher
+     * @param abstractEvent new FWaas Event@see org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher
      */
     @Override
     public void processEvent(AbstractEvent abstractEvent) {
@@ -205,11 +189,10 @@ public class FWaasHandler extends AbstractHandler
     }
 
     @Override
-    public void setDependencies(BundleContext bundleContext, ServiceReference serviceReference) {
+    public void setDependencies(ServiceReference serviceReference) {
         eventDispatcher =
                 (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this);
-        eventDispatcher.eventHandlerAdded(
-                bundleContext.getServiceReference(INeutronFirewallAware.class.getName()), this);
+        eventDispatcher.eventHandlerAdded(serviceReference, this);
     }
 
     @Override