From ad691b38162c87b06c80b64a16687dfd632042b8 Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Mon, 11 May 2015 17:32:53 -0400 Subject: [PATCH] Remove SouthboundMapper and SouthboundConstants dependencies Change-Id: Ia061c66350df94a1df440c2baaa232253c3a3f87 Signed-off-by: Sam Hague --- .../providers/openflow13/OF13Provider.java | 9 +-- openstack/net-virt/pom.xml | 15 +++- .../ovsdb/openstack/netvirt/MdsalHelper.java | 77 ++++++++++++++++++- .../ovsdb/openstack/netvirt/MdsalUtils.java | 27 +++---- .../openstack/netvirt/SouthboundHandler.java | 5 +- .../netvirt/impl/OvsdbDataChangeListener.java | 6 +- .../BridgeConfigurationManagerImplTest.java | 2 +- 7 files changed, 107 insertions(+), 34 deletions(-) diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java index 1f36303c8..e323c7bb6 100644 --- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java +++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/OF13Provider.java @@ -14,6 +14,7 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.neutron.spi.NeutronNetwork; +import org.opendaylight.ovsdb.openstack.netvirt.MdsalHelper; import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler; import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager; import org.opendaylight.ovsdb.openstack.netvirt.api.ClassifierProvider; @@ -29,7 +30,6 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.Status; import org.opendaylight.ovsdb.openstack.netvirt.api.StatusCode; import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager; import org.opendaylight.ovsdb.openstack.netvirt.MdsalUtils; -import org.opendaylight.ovsdb.southbound.SouthboundMapper; import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCase; @@ -70,7 +70,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; @@ -153,7 +152,7 @@ public class OF13Provider implements NetworkingProvider { } if (!tenantNetworkManager.isTenantNetworkPresentInNode(node, tunnelKey)) { - logger.debug(node+" has no VM corresponding to segment "+ tunnelKey); + logger.debug(node + " has no VM corresponding to segment " + tunnelKey); return new Status(StatusCode.NOTACCEPTABLE, node+" has no VM corresponding to segment "+ tunnelKey); } return new Status(StatusCode.SUCCESS); @@ -1017,7 +1016,7 @@ public class OF13Provider implements NetworkingProvider { InetAddress dst = InetAddress.getByName( MdsalUtils.getOptionsValue(intf.getOptions(), "remote_ip")); deleteTunnelPort(srcNode, - SouthboundMapper.createOvsdbInterfaceType(intf.getInterfaceType()), + MdsalHelper.createOvsdbInterfaceType(intf.getInterfaceType()), src, dst); } catch (Exception e) { logger.error(e.getMessage(), e); @@ -1509,7 +1508,7 @@ public class OF13Provider implements NetworkingProvider { ReadWriteTransaction modification = dataBroker.newReadWriteTransaction(); InstanceIdentifier path1 = InstanceIdentifier.builder(Nodes.class).child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory - .rev130819.nodes.Node.class, + .rev130819.nodes.Node.class, nodeBuilder.getKey()).augmentation(FlowCapableNode.class).child(Table.class, new TableKey(flowBuilder.getTableId())).child(Flow.class, flowBuilder.getKey()).build(); diff --git a/openstack/net-virt/pom.xml b/openstack/net-virt/pom.xml index a43e33f26..9e719caf2 100644 --- a/openstack/net-virt/pom.xml +++ b/openstack/net-virt/pom.xml @@ -48,10 +48,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.apache.commons commons-lang3 - + org.osgi org.osgi.core @@ -64,13 +64,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-common-api + org.opendaylight.neutron neutron-spi org.opendaylight.ovsdb - southbound-impl + southbound-api 1.1.0-SNAPSHOT @@ -81,10 +85,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.ovsdb utils.servicehelper + + org.opendaylight.yangtools.model + ietf-inet-types + org.opendaylight.yangtools.model ietf-topology - org.slf4j diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalHelper.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalHelper.java index 0b81d4f95..f7772e00d 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalHelper.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalHelper.java @@ -8,6 +8,7 @@ package org.opendaylight.ovsdb.openstack.netvirt; +import com.google.common.base.Preconditions; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; @@ -27,6 +28,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeSystem; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeTap; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeVxlan; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeName; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolBase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow10; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow11; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow12; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow13; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow14; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow15; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbFailModeBase; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbFailModeSecure; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbFailModeStandalone; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; @@ -51,6 +63,22 @@ public class MdsalHelper { public static final String BRIDGE_URI_PREFIX = "bridge"; public static final String TP_URI_PREFIX = "termination-point"; + public static final ImmutableBiMap,String> OVSDB_PROTOCOL_MAP + = new ImmutableBiMap.Builder,String>() + .put(OvsdbBridgeProtocolOpenflow10.class,"OpenFlow10") + .put(OvsdbBridgeProtocolOpenflow11.class,"OpenFlow11") + .put(OvsdbBridgeProtocolOpenflow12.class,"OpenFlow12") + .put(OvsdbBridgeProtocolOpenflow13.class,"OpenFlow13") + .put(OvsdbBridgeProtocolOpenflow14.class,"OpenFlow14") + .put(OvsdbBridgeProtocolOpenflow15.class,"OpenFlow15") + .build(); + + public static final ImmutableBiMap,String> OVSDB_FAIL_MODE_MAP + = new ImmutableBiMap.Builder,String>() + .put(OvsdbFailModeStandalone.class,"standalone") + .put(OvsdbFailModeSecure.class,"secure") + .build(); + public static final ImmutableBiMap> OVSDB_INTERFACE_TYPE_MAP = new ImmutableBiMap.Builder>() .put("internal", InterfaceTypeInternal.class) @@ -71,8 +99,13 @@ public class MdsalHelper { .build(); + public static NodeId createManagedNodeId(InstanceIdentifier iid) { + NodeKey nodeKey = iid.firstKeyOf(Node.class, NodeKey.class); + return nodeKey.getNodeId(); + } + public static NodeId createManagedNodeId(ConnectionInfo key, String bridgeName) { - return createManagedNodeId(key.getRemoteIp(),key.getRemotePort(),bridgeName); + return createManagedNodeId(key.getRemoteIp(), key.getRemotePort(), bridgeName); } public static InstanceIdentifier createInstanceIdentifier(NodeId nodeId) { @@ -83,10 +116,40 @@ public class MdsalHelper { return nodePath; } - public static InstanceIdentifier createInstanceIdentifier(ConnectionInfo key,String bridgeName) { + public static InstanceIdentifier createInstanceIdentifier(ConnectionInfo key) { + return createInstanceIdentifier(key.getRemoteIp(), key.getRemotePort()); + } + + public static InstanceIdentifier createInstanceIdentifier(IpAddress ip, PortNumber port) { + InstanceIdentifier path = InstanceIdentifier + .create(NetworkTopology.class) + .child(Topology.class, new TopologyKey(OVSDB_TOPOLOGY_ID)) + .child(Node.class,createNodeKey(ip,port)); + LOG.debug("Created ovsdb path: {}",path); + return path; + } + + public static NodeKey createNodeKey(IpAddress ip, PortNumber port) { + return new NodeKey(createNodeId(ip,port)); + } + + public static InstanceIdentifier createInstanceIdentifier(ConnectionInfo key, String bridgeName) { return createInstanceIdentifier(createManagedNodeId(key, bridgeName)); } + public static InstanceIdentifier createInstanceIdentifier(ConnectionInfo key,OvsdbBridgeName bridgeName) { + return createInstanceIdentifier(createManagedNodeId(key, bridgeName)); + } + + public static NodeId createManagedNodeId(IpAddress ip, PortNumber port, OvsdbBridgeName bridgeName) { + return new NodeId(createNodeId(ip,port).getValue() + + "/" + BRIDGE_URI_PREFIX + "/" + bridgeName.getValue()); + } + + public static NodeId createManagedNodeId(ConnectionInfo key, OvsdbBridgeName bridgeName) { + return createManagedNodeId(key.getRemoteIp(), key.getRemotePort(), bridgeName); + } + public static NodeId createManagedNodeId(IpAddress ip, PortNumber port, String bridgeName) { return new NodeId(createNodeId(ip,port).getValue() + "/" + BRIDGE_URI_PREFIX + "/" + bridgeName); @@ -104,7 +167,8 @@ public class MdsalHelper { return createNodeId(connectionInfo.getRemoteIp(), connectionInfo.getRemotePort()); } - public static InstanceIdentifier createTerminationPointInstanceIdentifier(IpAddress ip, PortNumber port , String bridgeName, String portName){ + public static InstanceIdentifier createTerminationPointInstanceIdentifier( + IpAddress ip, PortNumber port, String bridgeName, String portName) { String tpUri = createManagedNodeId(ip, port, bridgeName) + "/" + TP_URI_PREFIX + "/" + portName; InstanceIdentifier nodePath = InstanceIdentifier .create(NetworkTopology.class) @@ -131,4 +195,11 @@ public class MdsalHelper { LOG.debug("Termination point InstanceIdentigier generated : {}",nodePath); return nodePath; } + + public static String createOvsdbInterfaceType(Class mdsaltype) { + Preconditions.checkNotNull(mdsaltype); + ImmutableBiMap, String> mapper = + OVSDB_INTERFACE_TYPE_MAP.inverse(); + return mapper.get(mdsaltype); + } } diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java index 7ac11ccf8..a421a92cb 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/MdsalUtils.java @@ -21,8 +21,6 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbTables; -import org.opendaylight.ovsdb.southbound.SouthboundConstants; -import org.opendaylight.ovsdb.southbound.SouthboundMapper; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeInternal; @@ -227,15 +225,15 @@ public class MdsalUtils { if (connectionInfo != null) { NodeBuilder bridgeNodeBuilder = new NodeBuilder(); InstanceIdentifier bridgeIid = - SouthboundMapper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)); - NodeId bridgeNodeId = SouthboundMapper.createManagedNodeId(bridgeIid); + MdsalHelper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)); + NodeId bridgeNodeId = MdsalHelper.createManagedNodeId(bridgeIid); bridgeNodeBuilder.setNodeId(bridgeNodeId); OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder = new OvsdbBridgeAugmentationBuilder(); ovsdbBridgeAugmentationBuilder.setControllerEntry(createControllerEntries(target)); ovsdbBridgeAugmentationBuilder.setBridgeName(new OvsdbBridgeName(bridgeName)); ovsdbBridgeAugmentationBuilder.setProtocolEntry(createMdsalProtocols()); ovsdbBridgeAugmentationBuilder.setFailMode( - SouthboundConstants.OVSDB_FAIL_MODE_MAP.inverse().get("secure")); + MdsalHelper.OVSDB_FAIL_MODE_MAP.inverse().get("secure")); setManagedByForBridge(ovsdbBridgeAugmentationBuilder, connectionInfo); bridgeNodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, ovsdbBridgeAugmentationBuilder.build()); @@ -250,7 +248,7 @@ public class MdsalUtils { public static boolean deleteBridge(Node ovsdbNode) { boolean result = false; InstanceIdentifier bridgeIid = - SouthboundMapper.createInstanceIdentifier(ovsdbNode.getNodeId()); + MdsalHelper.createInstanceIdentifier(ovsdbNode.getNodeId()); result = delete(LogicalDatastoreType.CONFIGURATION, bridgeIid); LOG.info("Delete bridge node: {}, bridgeName: {} result : {}", ovsdbNode, ovsdbNode.getNodeId(),result); @@ -262,8 +260,7 @@ public class MdsalUtils { ConnectionInfo connectionInfo = getConnectionInfo(node); if (connectionInfo != null) { InstanceIdentifier bridgeIid = - SouthboundMapper.createInstanceIdentifier(connectionInfo, - new OvsdbBridgeName(name)); + MdsalHelper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(name)); Node bridgeNode = read(LogicalDatastoreType.OPERATIONAL, bridgeIid); if (bridgeNode != null) { ovsdbBridgeAugmentation = bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class); @@ -283,7 +280,7 @@ public class MdsalUtils { private static void setManagedByForBridge(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, ConnectionInfo connectionInfo) { - InstanceIdentifier connectionNodePath = SouthboundMapper.createInstanceIdentifier(connectionInfo); + InstanceIdentifier connectionNodePath = MdsalHelper.createInstanceIdentifier(connectionInfo); ovsdbBridgeAugmentationBuilder.setManagedBy(new OvsdbNodeRef(connectionNodePath)); } @@ -292,7 +289,7 @@ public class MdsalUtils { if (connectionInfo != null) { for (ControllerEntry controllerEntry: createControllerEntries(targetString)) { InstanceIdentifier iid = - SouthboundMapper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)) + MdsalHelper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)) .augmentation(OvsdbBridgeAugmentation.class) .child(ControllerEntry.class, controllerEntry.getKey()); @@ -313,7 +310,7 @@ public class MdsalUtils { private static List createMdsalProtocols() { List protocolList = new ArrayList(); ImmutableBiMap> mapper = - SouthboundConstants.OVSDB_PROTOCOL_MAP.inverse(); + MdsalHelper.OVSDB_PROTOCOL_MAP.inverse(); protocolList.add(new ProtocolEntryBuilder(). setProtocol((Class) mapper.get("OpenFlow13")).build()); return protocolList; @@ -445,7 +442,7 @@ public class MdsalUtils { } public static List readTerminationPointAugmentationFromDataStore( Node node ) { - InstanceIdentifier bridgeNodeIid = SouthboundMapper.createInstanceIdentifier(node.getNodeId()); + InstanceIdentifier bridgeNodeIid = MdsalHelper.createInstanceIdentifier(node.getNodeId()); Node operNode = read(LogicalDatastoreType.OPERATIONAL, bridgeNodeIid); if(operNode != null){ return extractTerminationPointAugmentations(operNode); @@ -617,9 +614,9 @@ public class MdsalUtils { } public static boolean isTunnel(OvsdbTerminationPointAugmentation port) { - return SouthboundMapper.createOvsdbInterfaceType( + return MdsalHelper.createOvsdbInterfaceType( port.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_VXLAN) - || SouthboundMapper.createOvsdbInterfaceType( + || MdsalHelper.createOvsdbInterfaceType( port.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_GRE); } @@ -636,7 +633,7 @@ public class MdsalUtils { private static Topology getOvsdbTopology() { InstanceIdentifier path = InstanceIdentifier .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID)); + .child(Topology.class, new TopologyKey(MdsalHelper.OVSDB_TOPOLOGY_ID)); Topology topology = read(LogicalDatastoreType.OPERATIONAL, path); return topology; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java index ea9609f0b..8312b4813 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java @@ -12,7 +12,6 @@ import java.util.List; import org.opendaylight.neutron.spi.NeutronNetwork; import org.opendaylight.ovsdb.openstack.netvirt.api.*; import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter; -import org.opendaylight.ovsdb.southbound.SouthboundMapper; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation; @@ -189,10 +188,10 @@ public class SouthboundHandler extends AbstractHandler } private boolean isInterfaceOfInterest(OvsdbTerminationPointAugmentation terminationPoint, List phyIfName) { - return (SouthboundMapper.createOvsdbInterfaceType( + return (MdsalHelper.createOvsdbInterfaceType( terminationPoint.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_VXLAN) || - SouthboundMapper.createOvsdbInterfaceType( + MdsalHelper.createOvsdbInterfaceType( terminationPoint.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_GRE) || phyIfName.contains(terminationPoint.getName())); diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java index 32efa7d35..0f7b88d6e 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/OvsdbDataChangeListener.java @@ -15,9 +15,9 @@ import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.ovsdb.openstack.netvirt.MdsalHelper; import org.opendaylight.ovsdb.openstack.netvirt.api.Action; import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryListener; -import org.opendaylight.ovsdb.southbound.SouthboundConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation; @@ -46,7 +46,7 @@ public class OvsdbDataChangeListener implements DataChangeListener, AutoCloseabl this.dataBroker = dataBroker; InstanceIdentifier path = InstanceIdentifier .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID)) + .child(Topology.class, new TopologyKey(MdsalHelper.OVSDB_TOPOLOGY_ID)) .child(Node.class); registration = dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, path, this, DataChangeScope.SUBTREE); @@ -102,7 +102,7 @@ public class OvsdbDataChangeListener implements DataChangeListener, AutoCloseabl //Fetch data of removed connection info from original data @SuppressWarnings("unchecked") OvsdbNodeAugmentation removedOvsdbNodeAugmentationData = getDataChanges(changes.getOriginalData(), - (InstanceIdentifier)removedOvsdbNode); + (InstanceIdentifier) removedOvsdbNode); LOG.debug("Process ovsdb node delete : {} ", removedOvsdbNode); ////Assuming Openvswitch type represent the ovsdb node connection and not OvsdbType.NODE diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java index 84e083d2a..583979f3d 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java @@ -9,7 +9,7 @@ */ package org.opendaylight.ovsdb.openstack.netvirt.impl; -import com.fasterxml.jackson.annotation.JsonIgnoreType; +//import com.fasterxml.jackson.annotation.JsonIgnoreType; import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.Test; -- 2.36.6