Remove plugin dependencies

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

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
index 521ed27130c1a708aad35ef8f1173f0e4bef3b6c..5682e0811b6c1bc2bddcacaafd91d87d1c40ccfe 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
@@ -17,11 +17,9 @@ import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
 import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
 //import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.MdsalConsumer;
 import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
 import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
-import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
-import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
-//import org.opendaylight.ovsdb.plugin.api.OvsdbInventoryListener;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.opendaylight.ovsdb.schema.openvswitch.Port;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
@@ -51,11 +49,11 @@ public class NetworkHandler extends AbstractHandler
     // The implementation for each of these services is resolved by the OSGi Service Manager
     private volatile TenantNetworkManager tenantNetworkManager;
     private volatile BridgeConfigurationManager bridgeConfigurationManager;
-    //private volatile ConfigurationService configurationService;
-    private volatile OvsdbConfigurationService ovsdbConfigurationService;
-    private volatile OvsdbConnectionService connectionService;
+    /* TODO SB_MIGRATION */
+    //private volatile OvsdbConfigurationService ovsdbConfigurationService;
+    //private volatile OvsdbConnectionService connectionService;
+    private volatile MdsalConsumer mdsalConsumer; // TODO SB_MIGRATION
     private volatile INeutronNetworkCRUD neutronNetworkCache;
-    //private volatile OvsdbInventoryListener ovsdbInventoryListener;
     private volatile NeutronL3Adapter neutronL3Adapter;
 
     /**
@@ -148,6 +146,7 @@ public class NetworkHandler extends AbstractHandler
         enqueueEvent(new NorthboundEvent(network, Action.DELETE));
     }
     private void doNeutronNetworkDeleted(NeutronNetwork network) {
+        /* TODO SB_MIGRATION
         neutronL3Adapter.handleNeutronNetworkEvent(network, Action.DELETE);
 
         int result = canDeleteNetwork(network);
@@ -157,7 +156,7 @@ public class NetworkHandler extends AbstractHandler
                     result);
             return;
         }
-        /* Is this the last Neutron tenant network */
+        *//* Is this the last Neutron tenant network *//*
         List <NeutronNetwork> networks;
         if (neutronNetworkCache != null) {
             networks = neutronNetworkCache.getAllNetworks();
@@ -184,7 +183,7 @@ public class NetworkHandler extends AbstractHandler
                                     if (interfaceType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)
                                         || interfaceType.equalsIgnoreCase(
                                             NetworkHandler.NETWORK_TYPE_GRE)) {
-                                        /* delete tunnel ports on this node */
+                                        *//* delete tunnel ports on this node *//*
                                         logger.trace("Delete tunnel interface {}", iface.getName());
                                         ovsdbConfigurationService.deleteRow(node,
                                                                      ovsdbConfigurationService.getTableName(node, Port.class),
@@ -206,7 +205,7 @@ public class NetworkHandler extends AbstractHandler
                 }
             }
         }
-        tenantNetworkManager.networkDeleted(network.getID());
+        tenantNetworkManager.networkDeleted(network.getID());*/
     }
 
     /**