X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2Fmapping%2FMappingUtilsImpl.java;h=44dc8b3cb6b26890df2bf0c58d18a4520391ed8b;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=3e2d055f3c6e904ac1c1ae04f7d9e84f67239818;hpb=dec29c25aaaa8fc10cc8cf979ecb6ce194de20f3;p=transportpce.git

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
index 3e2d055f3..44dc8b3cb 100644
--- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImpl.java
@@ -7,15 +7,19 @@
  */
 package org.opendaylight.transportpce.common.mapping;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.StringConstants;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.Network;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.mc.capabilities.McCapabilities;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.NodesKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.nodes.NodeInfo;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,28 +40,57 @@ public class MappingUtilsImpl implements MappingUtils {
         /*
          * Getting physical mapping corresponding to logical connection point
          */
-        InstanceIdentifier<Nodes> portMappingIID = InstanceIdentifier.builder(Network.class).child(Nodes.class,
-                new NodesKey(nodeId)).build();
-        try (ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction()) {
-            Optional<Nodes> mapObject =
-                    readTx.read(LogicalDatastoreType.CONFIGURATION, portMappingIID).get().toJavaUtil();
-            if (mapObject.isPresent()) {
-                Nodes mapping = mapObject.get();
-                switch (mapping.getOpenroadmVersion()) {
-                    case _22:
-                        return StringConstants.OPENROADM_DEVICE_VERSION_2_2;
+        InstanceIdentifier<NodeInfo> nodeInfoIID = InstanceIdentifier.builder(Network.class).child(Nodes.class,
+                new NodesKey(nodeId)).child(NodeInfo.class).build();
+        try (ReadTransaction readTx = dataBroker.newReadOnlyTransaction()) {
+            Optional<NodeInfo> nodeInfoObj =
+                    readTx.read(LogicalDatastoreType.CONFIGURATION, nodeInfoIID).get();
+            if (nodeInfoObj.isPresent()) {
+                NodeInfo nodInfo = nodeInfoObj.get();
+                switch (nodInfo.getOpenroadmVersion()) {
+                    case _710:
+                        return StringConstants.OPENROADM_DEVICE_VERSION_7_1_0;
+                    case _221:
+                        return StringConstants.OPENROADM_DEVICE_VERSION_2_2_1;
                     case _121:
                         return StringConstants.OPENROADM_DEVICE_VERSION_1_2_1;
                     default:
-                        return StringConstants.OPENROADM_DEVICE_VERSION_1_2_1;
+                        LOG.warn("unknown openROADM device version");
                 }
             } else {
-                LOG.warn("Could not find mapping for nodeId {}",
-                        nodeId);
+                LOG.warn("Could not find mapping for nodeId {}", nodeId);
             }
         } catch (InterruptedException | ExecutionException ex) {
             LOG.error("Unable to read mapping for nodeId {}",nodeId, ex);
         }
         return null;
     }
+
+    /*
+    * (non-Javadoc)
+    *
+    * @see org.opendaylight.transportpce.common.mapping.MappingUtils#getMcCapabilitiesForNode(java.lang.String)
+    */
+    @Override
+    public List<McCapabilities> getMcCapabilitiesForNode(String nodeId) {
+        List<McCapabilities> mcCapabilities = new ArrayList<>();
+        InstanceIdentifier<Nodes> nodePortMappingIID = InstanceIdentifier.builder(Network.class)
+                .child(Nodes.class, new NodesKey(nodeId)).build();
+        try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) {
+            Optional<Nodes> nodePortMapObject = readTx.read(LogicalDatastoreType.CONFIGURATION, nodePortMappingIID)
+                    .get();
+            if (nodePortMapObject.isPresent()) {
+                LOG.info("Found node {}", nodeId);
+                Nodes node = nodePortMapObject.get();
+                mcCapabilities.addAll(node.nonnullMcCapabilities().values());
+            }
+        } catch (ExecutionException e) {
+            LOG.error("Something went wrong while getting node {}", nodeId, e);
+        } catch (InterruptedException e) {
+            LOG.error("Request interrupted for node {} interrupted", nodeId, e);
+            Thread.currentThread().interrupt();
+        }
+        LOG.info("Capabilitities for node {}: {}", nodeId, mcCapabilities);
+        return mcCapabilities;
+    }
 }