Merge "Introducing Bridge Operational State"

[ovsdb.git] / southbound / southbound-impl / src / main / java / org / opendaylight / ovsdb / southbound / SouthboundMapper.java

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
index e12bd7116a0290b56576108e44fddefafc463c4e..fba60f5ebf97baf9a409308096cb8f6cf0bf1320 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java
@@ -45,7 +45,6 @@ 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.ovsdb.bridge.attributes.ProtocolEntryBuilder;
 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;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.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;
@@ -154,7 +153,7 @@ public class SouthboundMapper {
                 .create(NetworkTopology.class)
                 .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID))
                 .child(Node.class,createNodeKey(ip,port));
-        LOG.info("Created ovsdb path: {}",path);
+        LOG.debug("Created ovsdb path: {}",path);
         return path;
     }
 
@@ -190,24 +189,6 @@ public class SouthboundMapper {
         return nodeId;
     }
 
-    public static TpId createTerminationPointId(OvsdbConnectionInfo connectionInfo,
-                                                OvsdbBridgeName bridgeName, String tpName) {
-        return createTerminationPointId(createIpAddress(connectionInfo.getRemoteAddress()),
-                new PortNumber(connectionInfo.getRemotePort()),
-                bridgeName, tpName);
-    }
-
-    public static TpId createTerminationPointId(OvsdbClientKey key, OvsdbBridgeName bridgeName, String tpName) {
-        return createTerminationPointId(key.getIp(),key.getPort(),bridgeName, tpName);
-    }
-
-    public static TpId createTerminationPointId(IpAddress ip, PortNumber port,
-                                                OvsdbBridgeName bridgeName, String tpName) {
-        return new TpId(createNodeId(ip,port).getValue()
-                + "/" + SouthboundConstants.BRIDGE_URI_PREFIX + "/" + bridgeName.getValue()
-                + "/" + SouthboundConstants.TP_URI_PREFIX + "/" + tpName);
-    }
-
     public static InetAddress createInetAddress(IpAddress ip) throws UnknownHostException {
         if (ip.getIpv4Address() != null) {
             return InetAddress.getByName(ip.getIpv4Address().getValue());