From 960eac54a3300687d55bc6b374c3f59a99ddc786 Mon Sep 17 00:00:00 2001 From: Anil Vishnoi Date: Wed, 27 May 2015 22:30:23 +0530 Subject: [PATCH] Create node-iid in a connection-info agnostic way Cleaned up MdsalHelper class as well, removed unused methods. Change-Id: I521ff23be712ea2be16ce71d6921fe91f67f98d9 Signed-off-by: Anil Vishnoi --- .../ovsdb/openstack/netvirt/MdsalHelper.java | 75 ++----------------- .../ovsdb/openstack/netvirt/MdsalUtils.java | 15 ++-- 2 files changed, 15 insertions(+), 75 deletions(-) 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 0d391862c..a657595b3 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 @@ -104,10 +104,6 @@ public class MdsalHelper { return nodeKey.getNodeId(); } - public static NodeId createManagedNodeId(ConnectionInfo key, String bridgeName) { - return createManagedNodeId(key.getRemoteIp(), key.getRemotePort(), bridgeName); - } - public static InstanceIdentifier createInstanceIdentifier() { InstanceIdentifier path = InstanceIdentifier .create(NetworkTopology.class) @@ -123,82 +119,25 @@ public class MdsalHelper { return nodePath; } - 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 InstanceIdentifier createInstanceIdentifier(NodeKey ovsdbNodeKey, String bridgeName) { + return createInstanceIdentifier(createManagedNodeId(ovsdbNodeKey.getNodeId(), bridgeName)); } - 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() + public static NodeId createManagedNodeId(NodeId ovsdbNodeId, String bridgeName) { + return new NodeId(ovsdbNodeId.getValue() + "/" + BRIDGE_URI_PREFIX + "/" + bridgeName); } - public static NodeId createNodeId(IpAddress ip, PortNumber port) { - String uriString = OVSDB_URI_PREFIX + "://" - + new String(ip.getValue()) + ":" + port.getValue(); - Uri uri = new Uri(uriString); - NodeId nodeId = new NodeId(uri); - return nodeId; - } - - public static NodeId createNodeId(ConnectionInfo connectionInfo) { - return createNodeId(connectionInfo.getRemoteIp(), connectionInfo.getRemotePort()); - } - - public static InstanceIdentifier createTerminationPointInstanceIdentifier( - IpAddress ip, PortNumber port, String bridgeName, String portName) { - InstanceIdentifier nodePath = InstanceIdentifier - .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(OVSDB_TOPOLOGY_ID)) - .child(Node.class,new NodeKey(createNodeId(ip,port))) - .child(TerminationPoint.class, new TerminationPointKey(new TpId(portName))); - LOG.debug("Termination point InstanceIdentifier generated : {}",nodePath); - return nodePath; - } - - public static InstanceIdentifier createTerminationPointInstanceIdentifier(ConnectionInfo connectionInfo , String bridgeName, String portName){ - return createTerminationPointInstanceIdentifier(connectionInfo.getRemoteIp(), connectionInfo.getRemotePort(),bridgeName, portName); - } - public static InstanceIdentifier createTerminationPointInstanceIdentifier(Node node, String portName){ - InstanceIdentifier nodePath = InstanceIdentifier + InstanceIdentifier terminationPointPath = InstanceIdentifier .create(NetworkTopology.class) .child(Topology.class, new TopologyKey(OVSDB_TOPOLOGY_ID)) .child(Node.class,node.getKey()) .child(TerminationPoint.class, new TerminationPointKey(new TpId(portName))); - LOG.debug("Termination point InstanceIdentifier generated : {}",nodePath); - return nodePath; + LOG.debug("Termination point InstanceIdentifier generated : {}",terminationPointPath); + return terminationPointPath; } public static String createOvsdbInterfaceType(Class 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 f5221e50a..a672a6c85 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 @@ -52,6 +52,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey; 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.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -279,7 +280,7 @@ public class MdsalUtils { if (connectionInfo != null) { NodeBuilder bridgeNodeBuilder = new NodeBuilder(); InstanceIdentifier bridgeIid = - MdsalHelper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)); + MdsalHelper.createInstanceIdentifier(ovsdbNode.getKey(), bridgeName); NodeId bridgeNodeId = MdsalHelper.createManagedNodeId(bridgeIid); bridgeNodeBuilder.setNodeId(bridgeNodeId); OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder = new OvsdbBridgeAugmentationBuilder(); @@ -288,7 +289,7 @@ public class MdsalUtils { ovsdbBridgeAugmentationBuilder.setProtocolEntry(createMdsalProtocols()); ovsdbBridgeAugmentationBuilder.setFailMode( MdsalHelper.OVSDB_FAIL_MODE_MAP.inverse().get("secure")); - setManagedByForBridge(ovsdbBridgeAugmentationBuilder, connectionInfo); + setManagedByForBridge(ovsdbBridgeAugmentationBuilder, ovsdbNode.getKey()); bridgeNodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, ovsdbBridgeAugmentationBuilder.build()); result = put(LogicalDatastoreType.CONFIGURATION, bridgeIid, bridgeNodeBuilder.build()); @@ -314,7 +315,7 @@ public class MdsalUtils { ConnectionInfo connectionInfo = getConnectionInfo(node); if (connectionInfo != null) { InstanceIdentifier bridgeIid = - MdsalHelper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(name)); + MdsalHelper.createInstanceIdentifier(node.getKey(), name); Node bridgeNode = read(LogicalDatastoreType.OPERATIONAL, bridgeIid); if (bridgeNode != null) { ovsdbBridgeAugmentation = bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class); @@ -328,7 +329,7 @@ public class MdsalUtils { ConnectionInfo connectionInfo = getConnectionInfo(node); if (connectionInfo != null) { InstanceIdentifier bridgeIid = - MdsalHelper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(name)); + MdsalHelper.createInstanceIdentifier(node.getKey(), name); bridgeNode = read(LogicalDatastoreType.OPERATIONAL, bridgeIid); } return bridgeNode; @@ -358,8 +359,8 @@ public class MdsalUtils { } private static void setManagedByForBridge(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, - ConnectionInfo connectionInfo) { - InstanceIdentifier connectionNodePath = MdsalHelper.createInstanceIdentifier(connectionInfo); + NodeKey ovsdbNodeKey) { + InstanceIdentifier connectionNodePath = MdsalHelper.createInstanceIdentifier(ovsdbNodeKey.getNodeId()); ovsdbBridgeAugmentationBuilder.setManagedBy(new OvsdbNodeRef(connectionNodePath)); } @@ -368,7 +369,7 @@ public class MdsalUtils { if (connectionInfo != null) { for (ControllerEntry controllerEntry: createControllerEntries(targetString)) { InstanceIdentifier iid = - MdsalHelper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName)) + MdsalHelper.createInstanceIdentifier(ovsdbNode.getKey(), bridgeName) .augmentation(OvsdbBridgeAugmentation.class) .child(ControllerEntry.class, controllerEntry.getKey()); -- 2.36.6