Create node-iid in a connection-info agnostic way

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

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 0d391862c5617e8166f5b1d047602ca1dbd62a5d..a657595b3c9c3457f420260e6624ecb5d3e3dbb5 100644 (file)
--- 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<Topology> createInstanceIdentifier() {
         InstanceIdentifier<Topology> path = InstanceIdentifier
                 .create(NetworkTopology.class)
@@ -123,82 +119,25 @@ public class MdsalHelper {
         return nodePath;
     }
 
-    public static InstanceIdentifier<Node> createInstanceIdentifier(ConnectionInfo key) {
-        return createInstanceIdentifier(key.getRemoteIp(), key.getRemotePort());
-    }
-
-    public static InstanceIdentifier<Node> createInstanceIdentifier(IpAddress ip, PortNumber port) {
-        InstanceIdentifier<Node> 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<Node> createInstanceIdentifier(ConnectionInfo key, String bridgeName) {
-        return createInstanceIdentifier(createManagedNodeId(key, bridgeName));
-    }
-
-    public static InstanceIdentifier<Node> 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<Node> 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<TerminationPoint> createTerminationPointInstanceIdentifier(
-            IpAddress ip, PortNumber port, String bridgeName, String portName) {
-        InstanceIdentifier<TerminationPoint> 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<TerminationPoint> createTerminationPointInstanceIdentifier(ConnectionInfo connectionInfo , String bridgeName, String portName){
-        return createTerminationPointInstanceIdentifier(connectionInfo.getRemoteIp(), connectionInfo.getRemotePort(),bridgeName, portName);
-    }
-
     public static InstanceIdentifier<TerminationPoint> createTerminationPointInstanceIdentifier(Node node, String portName){
 
-        InstanceIdentifier<TerminationPoint> nodePath = InstanceIdentifier
+        InstanceIdentifier<TerminationPoint> 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<? extends InterfaceTypeBase> mdsaltype) {