small improvement in PCE OTN node networkanalyzer

Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I30738d03fe7f94a1cc6af90025e382f8ed92aa34

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 bda495cfa1727d9b69c7e3735422e73e23d76104..5dbe3679db4e183e40a523a06ca29a66e3751049 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
@@ -169,9 +169,9 @@ public class PceOtnNode implements PceNode {
 
         if ((this.otnServiceType.equals("ODU4") && mode.equals("AZ"))
             || ((this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE"))
-                && mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1))
-            || ((this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE"))
-                && mode.equals("intermediate") && checkSwPool(null, availableXpdrNWTps, 0, 2))) {
+                && ((mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1))
+                     || (mode.equals("intermediate") && checkSwPool(null, availableXpdrNWTps, 0, 2)))
+               )) {
             this.valid = true;
         } else {
             this.valid = false;