Neutron bundle migration to the new redesigned schema independent Library and Plugin.

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

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
index dc0a6575ad5a2f37eb7781871f86a7dd68ffe81b..296a2f5b7ec06cc7b45827d4f06c29ffa02ea402 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
@@ -19,10 +19,10 @@ import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
 import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
-import org.opendaylight.ovsdb.lib.table.Interface;
-import org.opendaylight.ovsdb.lib.table.Table;
+import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
 import org.opendaylight.ovsdb.plugin.OVSDBInventoryListener;
+import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -149,20 +149,20 @@ public class NetworkHandler extends BaseHandler
                 for (Node node : nodes) {
                     List<String> phyIfName = adminConfigManager.getAllPhysicalInterfaceNames(node);
                     try {
-                        ConcurrentMap<String, Table<?>> interfaces = this.ovsdbConfigService.getRows(node, Interface.NAME.getName());
+                        ConcurrentMap<String, Row> interfaces = this.ovsdbConfigService.getRows(node, ovsdbConfigService.getTableName(node, Interface.class));
                         if (interfaces != null) {
                             for (String intfUUID : interfaces.keySet()) {
-                                Interface intf = (Interface) interfaces.get(intfUUID);
-                                String intfType = intf.getType();
+                                Interface intf = ovsdbConfigService.getTypedRow(node, Interface.class, interfaces.get(intfUUID));
+                                String intfType = intf.getTypeColumn().getData();
                                 if (intfType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) || intfType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
                                     /* delete tunnel ports on this node */
                                     logger.trace("Delete tunnel intf {}", intf);
-                                    inventoryListener.rowRemoved(node, Interface.NAME.getName(), intfUUID,
-                                            intf, null);
+                                    inventoryListener.rowRemoved(node, intf.getSchema().getName(), intfUUID,
+                                            intf.getRow(), null);
                                 } else if (!phyIfName.isEmpty() && phyIfName.contains(intf.getName())) {
                                     logger.trace("Delete physical intf {}", intf);
-                                    inventoryListener.rowRemoved(node, Interface.NAME.getName(), intfUUID,
-                                            intf, null);
+                                    inventoryListener.rowRemoved(node, intf.getSchema().getName(), intfUUID,
+                                            intf.getRow(), null);
                                 }
                             }
                         }