Streamlined UnimgrMapper, cleaned up the code

[unimgr.git] / impl / src / main / java / org / opendaylight / unimgr / impl / UnimgrMapper.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java
index 5eeda0fff9d5f40902c4638b58280fb722638254..5223f1ab28efd0fbad83f0b6108f76c85db9be79 100755 (executable)
--- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java
@@ -10,6 +10,7 @@ package org.opendaylight.unimgr.impl;
 import java.util.List;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev151012.UniAugmentation;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.LinkId;
@@ -25,26 +26,42 @@ 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.topology.node.TerminationPoint;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class UnimgrMapper {
 
-    private static final Logger LOG = LoggerFactory.getLogger(UnimgrMapper.class);
+    public static InstanceIdentifier<Link> getEvcLinkIID(LinkId id) {
+        InstanceIdentifier<Link> linkPath = InstanceIdentifier
+                                                .create(NetworkTopology.class)
+                                                .child(Topology.class,
+                                                        new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID))
+                                                .child(Link.class,
+                                                        new LinkKey(id));
+        return linkPath;
+    }
+
+    public static InstanceIdentifier<Topology> getEvcTopologyIid() {
+        InstanceIdentifier<Topology> topoPath = InstanceIdentifier
+                                                    .create(NetworkTopology.class)
+                                                    .child(Topology.class,
+                                                            new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID));
+        return topoPath;
+    }
 
-    public static InstanceIdentifier<Node> getOvsdbNodeIID(NodeId nodeId) {
+    public static InstanceIdentifier<Node> getEvcTopologyNodeIid() {
         InstanceIdentifier<Node> nodePath = InstanceIdentifier
                                                 .create(NetworkTopology.class)
                                                 .child(Topology.class,
-                                                        new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID))
-                                                .child(Node.class,
-                                                        new NodeKey(nodeId));
+                                                        new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID))
+                                                .child(Node.class);
         return nodePath;
     }
 
-    public static InstanceIdentifier<Node> getOvsdbBridgeNodeIID(NodeId ovsdbNode,
+    public static InstanceIdentifier<Node> getOvsdbBridgeNodeIid(NodeId ovsdbNode,
                                                                  String bridgeName) {
-        NodeId bridgeNodeId = new NodeId(ovsdbNode + UnimgrConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX + bridgeName);
+        String ovsdbNodeId = ovsdbNode.getValue();
+        NodeId bridgeNodeId = new NodeId(ovsdbNodeId
+                                       + UnimgrConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX
+                                       + bridgeName);
         InstanceIdentifier<Node> nodePath = InstanceIdentifier
                                                 .create(NetworkTopology.class)
                                                 .child(Topology.class,
@@ -54,11 +71,11 @@ public class UnimgrMapper {
         return nodePath;
     }
 
-    public static InstanceIdentifier<Node> getOvsdbNodeIID(IpAddress ipAddress) {
+    public static InstanceIdentifier<Node> getOvsdbNodeIid(IpAddress ipAddress) {
         String nodeId = UnimgrConstants.OVSDB_PREFIX
-                + ipAddress.getIpv4Address().getValue().toString()
-                + ":"
-                + UnimgrConstants.OVSDB_PORT;
+                            + ipAddress.getIpv4Address().getValue().toString()
+                            + ":"
+                            + UnimgrConstants.OVSDB_PORT;
         InstanceIdentifier<Node> nodePath = InstanceIdentifier
                                                 .create(NetworkTopology.class)
                                                 .child(Topology.class,
@@ -68,16 +85,25 @@ public class UnimgrMapper {
         return nodePath;
     }
 
-    public static InstanceIdentifier<Node> getOvsdbTopologyIdentifier() {
-        InstanceIdentifier<Node> path = InstanceIdentifier
-                                            .create(NetworkTopology.class)
-                                            .child(Topology.class,
-                                                    new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID))
-                                            .child(Node.class);
-        return path;
+    public static InstanceIdentifier<Node> getOvsdbNodeIid(NodeId nodeId) {
+        InstanceIdentifier<Node> nodePath = InstanceIdentifier
+                                                .create(NetworkTopology.class)
+                                                .child(Topology.class,
+                                                        new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID))
+                                                .child(Node.class,
+                                                        new NodeKey(nodeId));
+        return nodePath;
+    }
+
+    public static InstanceIdentifier<Topology> getOvsdbTopologyIid() {
+        InstanceIdentifier<Topology> topoPath = InstanceIdentifier
+                                                    .create(NetworkTopology.class)
+                                                    .child(Topology.class,
+                                                            new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID));
+        return topoPath;
     }
 
-    public static InstanceIdentifier<TerminationPoint> createTerminationPointInstanceIdentifier(
+    public static InstanceIdentifier<TerminationPoint> getTerminationPointIid(
                                                            Node bridgeNode,
                                                            String portName) {
         InstanceIdentifier<TerminationPoint> terminationPointPath =
@@ -85,25 +111,17 @@ public class UnimgrMapper {
                                                      .create(NetworkTopology.class)
                                                      .child(Topology.class,
                                                              new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID))
-                                                     .child(Node.class,bridgeNode.getKey())
+                                                     .child(Node.class, bridgeNode.getKey())
                                                      .child(TerminationPoint.class,
                                                              new TerminationPointKey(new TpId(portName)));
-
-        LOG.debug("Termination point InstanceIdentifier generated : {}",terminationPointPath);
         return terminationPointPath;
     }
 
-    public static InstanceIdentifier<Node> createUniIid() {
-        InstanceIdentifier<Node> iid = InstanceIdentifier.create(NetworkTopology.class)
-                .child(Topology.class, new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID))
-                .child(Node.class);
-        return iid;
-    }
-
-    public static InstanceIdentifier<Node> createUniIid(DataBroker dataBroker,
-                                                        IpAddress ip) {
-        List<Node> uniNodes = UnimgrUtils.getUniNodes(dataBroker);
-        for (Node node: uniNodes) {
+    public static InstanceIdentifier<Node> getUniIid(DataBroker dataBroker,
+                                                     IpAddress ip) {
+        List<Node> uniNodes = UnimgrUtils.getUniNodes(dataBroker,
+                                                      LogicalDatastoreType.OPERATIONAL);
+        for (Node node : uniNodes) {
             UniAugmentation uniAugmentation = node.getAugmentation(UniAugmentation.class);
             if (uniAugmentation.getIpAddress().equals(ip)) {
                 InstanceIdentifier<Node> uniNode = InstanceIdentifier
@@ -118,29 +136,41 @@ public class UnimgrMapper {
         return null;
     }
 
-    public static InstanceIdentifier<Node> createEvcIid() {
-        InstanceIdentifier<Node> iid = InstanceIdentifier
-                                           .create(NetworkTopology.class)
-                                           .child(Topology.class,
-                                                   new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID))
-                                           .child(Node.class);
-        return iid;
+    public static InstanceIdentifier<Node> getUniIid(DataBroker dataBroker,
+                                                     IpAddress ip,
+                                                     LogicalDatastoreType store) {
+        List<Node> uniNodes = UnimgrUtils.getUniNodes(dataBroker,
+                                                      store);
+        for (Node node : uniNodes) {
+            UniAugmentation uniAugmentation = node.getAugmentation(UniAugmentation.class);
+            if (uniAugmentation.getIpAddress().equals(ip)) {
+                InstanceIdentifier<Node> uniNode = InstanceIdentifier
+                                                       .create(NetworkTopology.class)
+                                                       .child(Topology.class,
+                                                               new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID))
+                                                       .child(Node.class,
+                                                               new NodeKey(node.getKey()));
+                return uniNode;
+            }
+        }
+        return null;
     }
 
-    public static InstanceIdentifier<Topology> createTopologyIid() {
-        InstanceIdentifier<Topology> iid = InstanceIdentifier
-                                               .create(NetworkTopology.class)
-                                               .child(Topology.class,
-                                                       new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID));
-        return iid;
+    public static InstanceIdentifier<Topology> getUniTopologyIid() {
+        InstanceIdentifier<Topology> topoPath = InstanceIdentifier
+                                                   .create(NetworkTopology.class)
+                                                   .child(Topology.class,
+                                                           new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID));
+        return topoPath;
     }
 
-    public static InstanceIdentifier<Link> getEvcLinkIID(LinkId id) {
-        InstanceIdentifier<Link> linkPath = InstanceIdentifier
+    public static InstanceIdentifier<Node> getUniTopologyNodeIid() {
+        InstanceIdentifier<Node> nodePath = InstanceIdentifier
                                                 .create(NetworkTopology.class)
                                                 .child(Topology.class,
-                                                        new TopologyKey(UnimgrConstants.EVC_TOPOLOGY_ID))
-                                                .child(Link.class,new LinkKey(id));
-        return linkPath;
+                                                        new TopologyKey(UnimgrConstants.UNI_TOPOLOGY_ID))
+                                                .child(Node.class);
+        return nodePath;
     }
+
 }