X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FMapUtils.java;fp=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fnetworkanalyzer%2FMapUtils.java;h=4db6dbb5baed4b59cdbd8c4a9c97d55279d15a31;hb=62fc6625966276207a38955eaf07988f77f6984f;hp=54868a35ecf4d43305a4a91c800f45e1f104587c;hpb=aafa2ea596dc9ea93b5ce5a7156ae68acf4b403f;p=transportpce.git

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java
index 54868a35e..4db6dbb5b 100644
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java
@@ -48,7 +48,7 @@ public final class MapUtils {
 
             if (excNodes.contains(node.getNodeId().getValue())) {
                 LOG.debug("mapDiversityConstraints setExcludeSupNodes for node {}", node.getNodeId().getValue());
-                pceHardConstraints.setExcludeSupNodes(Arrays.asList(getSupNode(node)));
+                pceHardConstraints.setExcludeSupNodes(Arrays.asList(getSupNetworkNode(node)));
             }
         }
 
@@ -116,7 +116,7 @@ public final class MapUtils {
         return srlgList;
     }
 
-    public static String getSupNode(Node node) {
+    public static String getSupNetworkNode(Node node) {
         List<SupportingNode> supNodes = node.getSupportingNode();
         for (SupportingNode snode : supNodes) {
             if (NetworkUtils.UNDERLAY_NETWORK_ID.equals(snode.getNetworkRef().getValue())) {
@@ -126,6 +126,16 @@ public final class MapUtils {
         return null;
     }
 
+    public static String getSupClliNode(Node node) {
+        List<SupportingNode> supNodes = node.getSupportingNode();
+        for (SupportingNode snode : supNodes) {
+            if (NetworkUtils.CLLI_NETWORK_ID.equals(snode.getNetworkRef().getValue())) {
+                return snode.getNodeRef().getValue();
+            }
+        }
+        return null;
+    }
+
     public static TreeMap<String, String> getAllSupNode(Node node) {
         TreeMap<String, String> allSupNodes = new TreeMap<String, String>();
         List<SupportingNode> supNodes = new ArrayList<SupportingNode>();
@@ -153,38 +163,29 @@ public final class MapUtils {
 
 
     public static Long getAvailableBandwidth(Link link) {
-        Link1 link1 = null;
-        Long availableBW  = 0L;
-        // ID and type
-        link1 = link.augmentation(Link1.class);
-        if (link1 == null) {
-            LOG.error("MapUtils: No Link augmentation available. {}", link.getLinkId().getValue());
-            return availableBW;
+        if (link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+            .Link1.class) != null
+            && link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+                .Link1.class).getAvailableBandwidth() != null) {
+            return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+                .Link1.class).getAvailableBandwidth();
         } else {
-            OpenroadmLinkType tmplType = null;
-            tmplType = link1.getLinkType();
-            if (tmplType == null) {
-                LOG.error("MapUtils: No Link type available. {}", link.getLinkId().getValue());
-                return null;
-            } else if (tmplType == OpenroadmLinkType.OTNLINK) {
-                org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1 link11 =
-                    link.augmentation(
-                        org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1.class);
-                if (link11 == null) {
-                    LOG.error("MapUtils: No Link augmentation available for {}", link.getLinkId().getValue());
-                    return availableBW;
-                } else {
-                    availableBW = link11.getAvailableBandwidth();
-                    return availableBW;
-                }
-
-            } else {
-                LOG.error("MapUtils: Evaluated Link is not of OTN Type");
-            }
+            LOG.warn("MapUtils: no Available Bandwidth available for link {}", link.getLinkId());
+            return 0L;
         }
+    }
 
-
-        return 0L;
+    public static Long getUsedBandwidth(Link link) {
+        if (link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+            .Link1.class) != null
+            && link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+                .Link1.class).getUsedBandwidth() != null) {
+            return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+                .Link1.class).getUsedBandwidth();
+        } else {
+            LOG.warn("MapUtils: no Available Bandwidth available for link {}", link.getLinkId());
+            return 0L;
+        }
     }
 
     public static OpenroadmLinkType calcType(Link link) {