Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Integration of end-to-end otn services
[transportpce.git] / pce / src / main / java / org / opendaylight / transportpce / pce / networkanalyzer / MapUtils.java
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 e6b9e3a4c06309e63a5f42fd5c2a7bb78e5efd3c..2385de736dc91f26e95c6d53f7e627a050af1a19 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java
@@ -10,11 +10,11 @@ package org.opendaylight.transportpce.pce.networkanalyzer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.TreeMap;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.span.attributes.LinkConcatenation;
-
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.link.oms.attributes.Span;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node;
@@ -38,7 +38,7 @@ public final class MapUtils {
         List<String> excSrlgLinks = pceHardConstraints.getExcludeSrlgLinks();
 
         LOG.info("mapDiversityConstraints before : ExcludeClliNodes {} \n ExcludeNodes {} \n ExcludeSrlgLinks {}",
-                excClliNodes.toString(), excNodes.toString(), excSrlgLinks.toString());
+                excClliNodes, excNodes, excSrlgLinks);
 
         for (Node node : allNodes) {
             if (excClliNodes.contains(node.getNodeId().getValue())) {
@@ -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)));
             }
         }
 
@@ -61,16 +61,16 @@ public final class MapUtils {
                     if (!srlg.isEmpty()) {
                         pceHardConstraints.setExcludeSRLG(srlg);
                         LOG.debug("mapDiversityConstraints setExcludeSRLG {} for link {}",
-                                srlg.toString(), link.getLinkId().getValue());
+                                srlg, link.getLinkId().getValue());
                     }
                 }
             }
         }
 
         LOG.info("mapDiversityConstraints after : ExcludeCLLI {} \n ExcludeSupNodes {} \n ExcludeSRLG {}",
-                pceHardConstraints.getExcludeCLLI().toString(),
-                pceHardConstraints.getExcludeSupNodes().toString(),
-                pceHardConstraints.getExcludeSRLG().toString());
+                pceHardConstraints.getExcludeCLLI(),
+                pceHardConstraints.getExcludeSupNodes(),
+                pceHardConstraints.getExcludeSRLG());
 
     }
 
@@ -80,11 +80,11 @@ public final class MapUtils {
     }
 
     public static List<Long> getSRLG(Link link) {
-        List<Long> srlgList = new ArrayList<Long>();
+        List<Long> srlgList = new ArrayList<>();
         try {
             List<LinkConcatenation> linkList = getOmsAttributesSpan(link).getLinkConcatenation();
             for (LinkConcatenation lc : linkList) {
-                srlgList.add(lc.getSRLGId());
+                srlgList.add(lc.getSRLGId().toJava());
             }
         } catch (NullPointerException e) {
             LOG.debug("No concatenation for this link");
@@ -92,7 +92,31 @@ public final class MapUtils {
         return srlgList;
     }
 
-    public static String getSupNode(Node node) {
+    public static List<Long> getSRLGfromLink(Link link) {
+        List<Long> srlgList = new ArrayList<>();
+        org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1 linkC =
+            link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class);
+        if (linkC == null) {
+            LOG.error("MapUtils: No Link augmentation available. {}", link.getLinkId().getValue());
+
+        } else {
+            try {
+                List<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.link
+                    .LinkConcatenation> linkConcatenation = linkC.getLinkConcatenation();
+
+
+                for (org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.link
+                        .LinkConcatenation lc : linkConcatenation) {
+                    srlgList.add(lc.getSRLGId().toJava());
+                }
+            } catch (NullPointerException e) {
+                LOG.debug("No concatenation for this link");
+            }
+        }
+        return srlgList;
+    }
+
+    public static String getSupNetworkNode(Node node) {
         List<SupportingNode> supNodes = node.getSupportingNode();
         for (SupportingNode snode : supNodes) {
             if (NetworkUtils.UNDERLAY_NETWORK_ID.equals(snode.getNetworkRef().getValue())) {
@@ -102,6 +126,68 @@ 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<>();
+        List<SupportingNode> supNodes = new ArrayList<>();
+        try {
+            supNodes = node.getSupportingNode();
+        } catch (NullPointerException e) {
+            LOG.debug("No Supporting Node for the node {}", node);
+        }
+        for (SupportingNode supnode :supNodes) {
+            allSupNodes.put(supnode.getNetworkRef().getValue(),
+                    supnode.getNodeRef().getValue());
+        }
+        return allSupNodes;
+    }
+
+    public static String getSupLink(Link link) {
+        String supLink = "";
+        try {
+            supLink = link.getSupportingLink().get(0).getLinkRef().toString();
+        } catch (NullPointerException e) {
+            LOG.debug("No Supporting Link for the link {}", link);
+        }
+        return supLink;
+    }
+
+
+    public static Long getAvailableBandwidth(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).getAvailableBandwidth() != null) {
+            return link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130
+                .Link1.class).getAvailableBandwidth().toJava();
+        } else {
+            LOG.warn("MapUtils: no Available Bandwidth available for link {}", link.getLinkId());
+            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().toJava();
+        } else {
+            LOG.warn("MapUtils: no Available Bandwidth available for link {}", link.getLinkId());
+            return 0L;
+        }
+    }
+
     public static OpenroadmLinkType calcType(Link link) {
         Link1 link1 = null;
         OpenroadmLinkType tmplType = null;
@@ -145,7 +231,7 @@ public final class MapUtils {
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1 linkOpposite
             = link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class);
         tmpoppositeLink = linkOpposite.getOppositeLink();
-        LOG.debug("PceLink: reading oppositeLink.  {}", linkOpposite.toString());
+        LOG.debug("PceLink: reading oppositeLink.  {}", linkOpposite);
         if (tmpoppositeLink == null) {
             LOG.error("PceLink: Error reading oppositeLink. Link is ignored {}", link.getLinkId().getValue());
             return null;
Repository for Transport PCE project.