Remove ad-sal from lbaas - part 2

[netvirt.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 8fc2a231b13bb8417e0e4a51c3832aa59179c344..37afc7fc622ae6b49430c071f6524420944f8d3d 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
@@ -9,13 +9,14 @@
  */
 package org.opendaylight.ovsdb.openstack.netvirt;
 
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
-import org.opendaylight.controller.sal.core.Node;
+import org.opendaylight.neutron.spi.INeutronNetworkAware;
+import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.spi.NeutronNetwork;
 import org.opendaylight.ovsdb.lib.notation.Row;
 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.TenantNetworkManager;
 import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
@@ -23,6 +24,7 @@ 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;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +51,7 @@ 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 org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService configurationService;
+    private volatile ConfigurationService configurationService;
     private volatile OvsdbConfigurationService ovsdbConfigurationService;
     private volatile OvsdbConnectionService connectionService;
     private volatile INeutronNetworkCRUD neutronNetworkCache;
@@ -88,10 +90,10 @@ public class NetworkHandler extends AbstractHandler
             return;
         }
 
-        enqueueEvent(new NorthboundEvent(network, AbstractEvent.Action.ADD));
+        enqueueEvent(new NorthboundEvent(network, Action.ADD));
     }
     private void doNeutronNetworkCreated(NeutronNetwork network) {
-        neutronL3Adapter.handleNeutronNetworkEvent(network, AbstractEvent.Action.ADD);
+        neutronL3Adapter.handleNeutronNetworkEvent(network, Action.ADD);
     }
 
     /**
@@ -118,10 +120,10 @@ public class NetworkHandler extends AbstractHandler
      */
     @Override
     public void neutronNetworkUpdated(NeutronNetwork network) {
-        enqueueEvent(new NorthboundEvent(network, AbstractEvent.Action.UPDATE));
+        enqueueEvent(new NorthboundEvent(network, Action.UPDATE));
     }
     private void doNeutronNetworkUpdated(NeutronNetwork network) {
-        neutronL3Adapter.handleNeutronNetworkEvent(network, AbstractEvent.Action.UPDATE);
+        neutronL3Adapter.handleNeutronNetworkEvent(network, Action.UPDATE);
     }
 
     /**
@@ -143,10 +145,10 @@ public class NetworkHandler extends AbstractHandler
      */
     @Override
     public void neutronNetworkDeleted(NeutronNetwork network) {
-        enqueueEvent(new NorthboundEvent(network, AbstractEvent.Action.DELETE));
+        enqueueEvent(new NorthboundEvent(network, Action.DELETE));
     }
     private void doNeutronNetworkDeleted(NeutronNetwork network) {
-        neutronL3Adapter.handleNeutronNetworkEvent(network, AbstractEvent.Action.DELETE);
+        neutronL3Adapter.handleNeutronNetworkEvent(network, Action.DELETE);
 
         int result = canDeleteNetwork(network);
         logger.trace("canDeleteNetwork: network: {}", network);
@@ -173,23 +175,23 @@ public class NetworkHandler extends AbstractHandler
                             for (Row portRow : ports.values()) {
                                 Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
                                 for (UUID interfaceUuid : port.getInterfacesColumn().getData()) {
-                                    Interface interfaceRow = (Interface) ovsdbConfigurationService
+                                    Row ifaceRow = ovsdbConfigurationService
                                             .getRow(node,
                                                     ovsdbConfigurationService.getTableName(node, Interface.class),
                                                     interfaceUuid.toString());
-
-                                    String interfaceType = interfaceRow.getTypeColumn().getData();
+                                    Interface iface = ovsdbConfigurationService.getTypedRow(node, Interface.class, ifaceRow);
+                                    String interfaceType = iface.getTypeColumn().getData();
                                     if (interfaceType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)
                                         || interfaceType.equalsIgnoreCase(
                                             NetworkHandler.NETWORK_TYPE_GRE)) {
                                         /* delete tunnel ports on this node */
-                                        logger.trace("Delete tunnel interface {}", interfaceRow);
+                                        logger.trace("Delete tunnel interface {}", iface.getName());
                                         ovsdbConfigurationService.deleteRow(node,
                                                                      ovsdbConfigurationService.getTableName(node, Port.class),
                                                                      port.getUuid().toString());
                                         break;
-                                    } else if (!phyIfName.isEmpty() && phyIfName.contains(interfaceRow.getName())) {
-                                        logger.trace("Delete physical interface {}", interfaceRow);
+                                    } else if (!phyIfName.isEmpty() && phyIfName.contains(iface.getName())) {
+                                        logger.trace("Delete physical interface {}", iface.getName());
                                         ovsdbConfigurationService.deleteRow(node,
                                                                      ovsdbConfigurationService.getTableName(node, Port.class),
                                                                      port.getUuid().toString());
@@ -199,7 +201,7 @@ public class NetworkHandler extends AbstractHandler
                             }
                         }
                     } catch (Exception e) {
-                        logger.error("Exception during handlingNeutron network delete");
+                        logger.error("Exception during handlingNeutron network delete", e);
                     }
                 }
             }