Adapt PCE to compute a 100GE path on OTN Switch

[transportpce.git] / pce / src / main / java / org / opendaylight / transportpce / pce / networkanalyzer / PceOtnNode.java

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
index 9f7d85fde1ba39aa2dd19f37a1470d49874b858f..db41be4b8b001a27ac5b55858a3e42e6225cf200 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
@@ -207,6 +207,8 @@ public class PceOtnNode implements PceNode {
                )
             || (StringConstants.SERVICE_TYPE_100GE_S.equals(this.otnServiceType)
                 && (mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1)))
+            || (StringConstants.SERVICE_TYPE_100GE_S.equals(this.otnServiceType)
+                && (mode.equals("intermediate") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 0, 2)))
             ) {
             this.valid = true;
         } else {
@@ -237,7 +239,7 @@ public class PceOtnNode implements PceNode {
             }
 
         }
-        if (clientTps == null && netwTps != null && nbClient == 0 && nbNetw == 2) {
+        if (netwTps != null && nbClient == 0 && nbNetw == 2) {
             netwTps.sort(Comparator.comparing(TpId::getValue));
             @Nullable
             List<NonBlockingList> nblList = new ArrayList<>(node.augmentation(Node1.class).getSwitchingPools()