Merge remote-tracking branch 'origin/master' into merge-branch

[netvirt.git] / neutron / src / main / java / org / opendaylight / ovsdb / neutron / BaseHandler.java

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/BaseHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/BaseHandler.java
index 71480a29928b1977ed16f9b46d6dd6ff6868622b..9bee8fa1570515550c9e18e0d8f14ef3376347fd 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/BaseHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/BaseHandler.java
@@ -13,11 +13,15 @@ import java.net.HttpURLConnection;
 import java.util.UUID;
 
 import org.opendaylight.controller.containermanager.IContainerManager;
+import org.opendaylight.controller.forwardingrulesmanager.IForwardingRulesManager;
 import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
 import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD;
+import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityGroupCRUD;
+import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityRuleCRUD;
 import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
+import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
 import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -279,6 +283,22 @@ public class BaseHandler {
         this.containerManager = s;
     }
 
+    protected IForwardingRulesManager frm;
+
+    public IForwardingRulesManager getForwardingRulesManager() {
+        return frm;
+    }
+
+    public void unsetForwardingRulesManager(IForwardingRulesManager s) {
+        if (s == this.frm) {
+            this.frm = null;
+        }
+    }
+
+    public void setForwardingRulesManager(IForwardingRulesManager s) {
+        this.frm = s;
+    }
+
     protected OVSDBConfigService ovsdbConfigService;
 
     public OVSDBConfigService getOVSDBConfigService() {
@@ -295,6 +315,21 @@ public class BaseHandler {
         this.ovsdbConfigService = s;
     }
 
+    protected IConnectionServiceInternal connectionService;
+
+    public IConnectionServiceInternal getConnectionService() {
+        return connectionService;
+    }
+
+    public void unsetConnectionService(IConnectionServiceInternal s) {
+        if (s == this.connectionService) {
+            this.connectionService = null;
+        }
+    }
+
+    public void setConnectionService(IConnectionServiceInternal s) {
+        this.connectionService = s;
+    }
 
     protected INeutronPortCRUD neutronPortCache;
     public INeutronPortCRUD getNeutronPortCRUD() {
@@ -340,4 +375,14 @@ public class BaseHandler {
     public void setNeutronNetworkCRUD(INeutronNetworkCRUD s) {
         this.neutronNetworkCache = s;
     }
+
+    protected INeutronSecurityRuleCRUD neutronSecurityRuleCache;
+    public void setNeutronSecurityRuleCache(INeutronSecurityRuleCRUD s) {
+        this.neutronSecurityRuleCache = s;
+    }
+
+    protected INeutronSecurityGroupCRUD neutronSecurityGroupCache;
+    public void setNeutronSecurityGroupCache(INeutronSecurityGroupCRUD s) {
+        this.neutronSecurityGroupCache = s;
+    }
 }