Constants for service type

- add service type constants in common/StringConstant
- update classes with those new constants
- add Map in GridConstant to get spectral width slot number from
service type

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I6f21f5ea2ae06511e672b6bcfa223fa17dcc7501

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/StringConstants.java b/common/src/main/java/org/opendaylight/transportpce/common/StringConstants.java
index 1ee6eb16963fe02feb8a9bb3130bebb36de1f110..670a718d59051032603a73e8e323baae94fb84e9 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/StringConstants.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/StringConstants.java
@@ -25,6 +25,18 @@ public final class StringConstants {
 
     public static final String PP_TOKEN = "PP";
 
+    public static final String SERVICE_TYPE_100GE = "100GE";
+
+    public static final String SERVICE_TYPE_OTU4 = "OTU4";
+
+    public static final String SERVICE_TYPE_400GE = "400GE";
+
+    public static final String SERVICE_TYPE_10GE = "10GE";
+
+    public static final String SERVICE_TYPE_1GE = "1GE";
+
+    public static final String SERVICE_TYPE_ODU4 = "ODU4";
+
     private StringConstants() {
         // hiding the default constructor
     }

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
index 83e037aed01f9471636d5c1d33f622b547dfbdd4..5bff0189fe10a44c8d69532d5a98092e4ef33825 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
@@ -8,6 +8,9 @@
 
 package org.opendaylight.transportpce.common.fixedflex;
 
+import java.util.Map;
+import org.opendaylight.transportpce.common.StringConstants;
+
 /**
  * Constant class common to fixed grid and flex grid.
  *
@@ -24,6 +27,10 @@ public final class GridConstant {
     public static final double CENTRAL_FREQUENCY = 193.1;
     public static final int NB_SLOTS_100G = 8;
     public static final int NB_SLOTS_400G = 14;
+    public static final Map<String, Integer> SPECTRAL_WIDTH_SLOT_NUMBER_MAP = Map.of(
+            StringConstants.SERVICE_TYPE_100GE, NB_SLOTS_100G,
+            StringConstants.SERVICE_TYPE_400GE, NB_SLOTS_400G,
+            StringConstants.SERVICE_TYPE_OTU4, NB_SLOTS_100G);
 
     private GridConstant() {
     }

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java
index 5e63126bb36eeef3ea6f418e1a52c6c348ba18d1..dca626ce3fdb5c0aed2c8905b2fe52e5ecfcf22e 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java
@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.opendaylight.transportpce.common.ResponseCodes;
+import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceLink;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceResult;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.path.description.AToZDirectionBuilder;
@@ -84,10 +85,12 @@ public class PcePathDescription {
         AToZDirectionBuilder atoZDirectionBldr = new AToZDirectionBuilder()
             .setRate(Uint32.valueOf(rc.getRate()))
             .setAToZ(atozMap);
-        if ("100GE".equals(rc.getServiceType()) || "OTU4".equals(rc.getServiceType())) {
+        if (StringConstants.SERVICE_TYPE_100GE.equals(rc.getServiceType())
+                || StringConstants.SERVICE_TYPE_OTU4.equals(rc.getServiceType())) {
             atoZDirectionBldr.setAToZWavelengthNumber(Uint32.valueOf(rc.getResultWavelength()));
-        } else if ("10GE".equals(rc.getServiceType()) || "1GE".equals(rc.getServiceType())
-            || "ODU4".equals(rc.getServiceType())) {
+        } else if (StringConstants.SERVICE_TYPE_10GE.equals(rc.getServiceType())
+                || StringConstants.SERVICE_TYPE_1GE.equals(rc.getServiceType())
+            || StringConstants.SERVICE_TYPE_ODU4.equals(rc.getServiceType())) {
             if (rc.getResultTribSlot() != null && rc.getResultTribPort() != null) {
                 @SuppressWarnings("unchecked")
                 List<Uint16> tribSlotList = (List<Uint16>) rc.getResultTribSlot().values().toArray()[0];
@@ -111,10 +114,12 @@ public class PcePathDescription {
         ZToADirectionBuilder ztoADirectionBldr = new ZToADirectionBuilder()
             .setRate(Uint32.valueOf(rc.getRate()))
             .setZToA(ztoaMap);
-        if ("100GE".equals(rc.getServiceType()) || "OTU4".equals(rc.getServiceType())) {
+        if (StringConstants.SERVICE_TYPE_100GE.equals(rc.getServiceType())
+                || StringConstants.SERVICE_TYPE_OTU4.equals(rc.getServiceType())) {
             ztoADirectionBldr.setZToAWavelengthNumber(Uint32.valueOf(rc.getResultWavelength()));
-        } else if ("10GE".equals(rc.getServiceType()) || "1GE".equals(rc.getServiceType())
-            || "ODU4".equals(rc.getServiceType())) {
+        } else if (StringConstants.SERVICE_TYPE_10GE.equals(rc.getServiceType())
+                || StringConstants.SERVICE_TYPE_1GE.equals(rc.getServiceType())
+            || StringConstants.SERVICE_TYPE_ODU4.equals(rc.getServiceType())) {
             if (rc.getResultTribSlot() != null && rc.getResultTribPort() != null) {
                 @SuppressWarnings("unchecked")
                 List<Uint16> tribSlotList = (List<Uint16>) rc.getResultTribSlot().values().toArray()[0];

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
index 2aa77b9015518c4ebdcdb42e7d83bfd5377b7f59..f2d1c5dabbb56f84104ecffaa4cf3e04725146fe 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
@@ -18,6 +18,7 @@ import org.jgrapht.alg.shortestpath.KShortestSimplePaths;
 import org.jgrapht.alg.shortestpath.PathValidator;
 import org.jgrapht.graph.DefaultDirectedWeightedGraph;
 import org.opendaylight.transportpce.common.ResponseCodes;
+import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceLink;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceNode;
@@ -106,7 +107,8 @@ public class PceGraph {
             }
 
             shortestPathAtoZ = new ArrayList<>(pathAtoZ);
-            if (("100GE".equals(serviceType)) || ("OTU4".equals(serviceType))) {
+            if ((StringConstants.SERVICE_TYPE_100GE.equals(serviceType))
+                    || (StringConstants.SERVICE_TYPE_OTU4.equals(serviceType))) {
                 LOG.info("In calcPath Path FOUND path for wl [{}], hops {}, distance per metrics {}, path AtoZ {}",
                         pceResult.getResultWavelength(), pathAtoZ.size(), path.getWeight(), pathAtoZ);
                 break;

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java
index 22ded83c726bd78a36bcf845e08a4f45b7fe1eae..047d248a99022ee2d8facd93c388a0ae5f3be9a2 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.Map;
 import org.jgrapht.GraphPath;
 import org.opendaylight.transportpce.common.ResponseCodes;
+import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints.ResourcePair;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceNode;
@@ -53,8 +54,8 @@ public class PostAlgoPathValidator {
         //variable to deal with 1GE (Nb=1) and 10GE (Nb=10) cases
         switch (serviceType) {
 
-            case "100GE":
-            case "OTU4":
+            case StringConstants.SERVICE_TYPE_100GE:
+            case StringConstants.SERVICE_TYPE_OTU4:
                 // choose wavelength available in all nodes of the path
                 Long waveL = chooseWavelength(path, allPceNodes);
                 pceResult.setServiceType(serviceType);
@@ -96,10 +97,10 @@ public class PostAlgoPathValidator {
 
                 break;
 
-            case "10GE":
+            case StringConstants.SERVICE_TYPE_10GE:
                 tribSlotNb = 8;
             //fallthrough
-            case "1GE":
+            case StringConstants.SERVICE_TYPE_1GE:
                 pceResult.setRC(ResponseCodes.RESPONSE_FAILED);
                 pceResult.setServiceType(serviceType);
                 Map<String, Uint16> tribPort = chooseTribPort(path, allPceNodes);
@@ -115,7 +116,7 @@ public class PostAlgoPathValidator {
                 }
                 break;
 
-            case "ODU4":
+            case StringConstants.SERVICE_TYPE_ODU4:
                 pceResult.setRC(ResponseCodes.RESPONSE_OK);
                 LOG.info("In PostAlgoPathValidator: ODU4 path found {}", path);
                 break;

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
index 49650f08dc68d4a29a18b2bed69cbbe871dcdcd8..125eeed75407796d0ac0bffb3323d65a4be87e23 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
@@ -20,6 +20,7 @@ import java.util.stream.Collectors;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.common.ResponseCodes;
+import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.mapping.MappingUtils;
 import org.opendaylight.transportpce.common.mapping.MappingUtilsImpl;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
@@ -38,7 +39,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-//import org.opendaylight.yangtools.yang.common.Decimal64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -131,13 +131,13 @@ public class PceCalculation {
             switch (serviceFormatA) {
                 case "Ethernet":
                 case "OC":
-                    serviceType = "100GE";
+                    serviceType = StringConstants.SERVICE_TYPE_100GE;
                     break;
                 case "OTU":
-                    serviceType = "OTU4";
+                    serviceType = StringConstants.SERVICE_TYPE_OTU4;
                     break;
                 case "ODU":
-                    serviceType = "ODU4";
+                    serviceType = StringConstants.SERVICE_TYPE_ODU4;
                     break;
                 default:
                     LOG.debug("parseInput: unsupported service type: Format {} Rate 100L", serviceFormatA);
@@ -151,9 +151,9 @@ public class PceCalculation {
         } else if ("Ethernet".equals(serviceFormatA)) {
         //only rate 100L is currently supported except in Ethernet
             if (serviceRate == 10L) {
-                serviceType = "10GE";
+                serviceType = StringConstants.SERVICE_TYPE_10GE;
             } else if (serviceRate == 1L) {
-                serviceType = "1GE";
+                serviceType = StringConstants.SERVICE_TYPE_1GE;
             } else {
                 LOG.debug("parseInput: unsupported service type: Format Ethernet Rate {}", serviceRate);
             }
@@ -161,7 +161,9 @@ public class PceCalculation {
             LOG.debug("parseInput: unsupported service type: Format {} Rate {}",
                 serviceFormatA, serviceRate);
         }
-        if ("ODU4".equals(serviceType) || "10GE".equals(serviceType)  || "1GE".equals(serviceType)) {
+        if (StringConstants.SERVICE_TYPE_ODU4.equals(serviceType)
+                || StringConstants.SERVICE_TYPE_10GE.equals(serviceType)
+                || StringConstants.SERVICE_TYPE_1GE.equals(serviceType)) {
             anodeId = input.getServiceAEnd().getTxDirection().getPort().getPortDeviceName();
             znodeId = input.getServiceZEnd().getTxDirection().getPort().getPortDeviceName();
         } else {
@@ -244,7 +246,8 @@ public class PceCalculation {
 
         LOG.debug("analyzeNw: allNodes size {}, allLinks size {}", allNodes.size(), allLinks.size());
 
-        if (("100GE".equals(serviceType)) || ("OTU4".equals(serviceType))) {
+        if ((StringConstants.SERVICE_TYPE_100GE.equals(serviceType))
+                || (StringConstants.SERVICE_TYPE_OTU4.equals(serviceType))) {
             // 100GE service and OTU4 service are handled at the openroadm-topology layer
             for (Node node : allNodes) {
                 validateNode(node);
@@ -359,7 +362,8 @@ public class PceCalculation {
             return false;
         }
 
-        if (("100GE".equals(serviceType)) || ("OTU4".equals(serviceType))) {
+        if ((StringConstants.SERVICE_TYPE_100GE.equals(serviceType))
+                || (StringConstants.SERVICE_TYPE_OTU4.equals(serviceType))) {
             // 100GE or OTU4 services are handled at WDM Layer
             PceLink pcelink = new PceLink(link, source, dest);
             if (!pcelink.isValid()) {
@@ -429,7 +433,9 @@ public class PceCalculation {
             }
             return true;
 
-        } else if (("ODU4".equals(serviceType)) || ("10GE".equals(serviceType)) || ("1GE".equals(serviceType))) {
+        } else if ((StringConstants.SERVICE_TYPE_ODU4.equals(serviceType))
+                || (StringConstants.SERVICE_TYPE_10GE.equals(serviceType))
+                || (StringConstants.SERVICE_TYPE_1GE.equals(serviceType))) {
             // ODU4, 1GE and 10GE services relying on ODU2, ODU2e or ODU0 services are handled at OTN layer
             PceLink pceOtnLink = new PceLink(link, source, dest);
 
@@ -562,15 +568,6 @@ public class PceCalculation {
             LOG.error("ValidateOtnNode: no node-type augmentation. Node {} is ignored", node.getNodeId().getValue());
             return false;
         }
-
-//        if (mode == "AZ") {
-//            pceOtnNode.validateAZxponder(anodeId, znodeId);
-//        } else if (mode == "intermediate") {
-//            pceOtnNode.validateIntermediateSwitch();
-//        } else {
-//            LOG.error("validateOtnNode: unproper mode passed to the method : {} not supported", mode);
-//            return null;
-//        }
     }
 
     private ConstraintTypes validateNodeConstraints(PceNode pcenode) {

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 8f9c4940b7fd92105c5b61a2970b89bb9bf670a2..8442cedc6f8cda26fce15c8b8ee1508c477f9018 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
@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPools;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
@@ -114,7 +115,8 @@ public class PceOtnNode implements PceNode {
                 = tp.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529
                 .TerminationPoint1.class);
             //TODO many nested if-structures below, this needs to be reworked
-            if (OpenroadmTpType.XPONDERNETWORK.equals(ocnTp1.getTpType()) && this.otnServiceType.equals("ODU4")) {
+            if (OpenroadmTpType.XPONDERNETWORK.equals(ocnTp1.getTpType())
+                    && StringConstants.SERVICE_TYPE_ODU4.equals(this.otnServiceType)) {
                 TerminationPoint1 ontTp1;
                 if (tp.augmentation(TerminationPoint1.class) != null) {
                     ontTp1 = tp.augmentation(TerminationPoint1.class);
@@ -129,22 +131,25 @@ public class PceOtnNode implements PceNode {
                         node.getNodeId().getValue());
                 }
             } else if (OpenroadmTpType.XPONDERNETWORK.equals(ocnTp1.getTpType())
-                && (this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE"))) {
+                && (this.otnServiceType.equals(StringConstants.SERVICE_TYPE_10GE)
+                        || StringConstants.SERVICE_TYPE_1GE.equals(this.otnServiceType))) {
                 TerminationPoint1 ontTp1;
                 if (tp.augmentation(TerminationPoint1.class) != null) {
                     ontTp1 = tp.augmentation(TerminationPoint1.class);
                 } else {
                     continue;
                 }
-                if ("10GE".equals(otnServiceType) && checkOdtuTTPforLoOduCreation(ontTp1, 10)
-                    || "1GE".equals(otnServiceType) && checkOdtuTTPforLoOduCreation(ontTp1, 1)) {
+                if (StringConstants.SERVICE_TYPE_10GE.equals(otnServiceType)
+                        && checkOdtuTTPforLoOduCreation(ontTp1, 10)
+                    || StringConstants.SERVICE_TYPE_1GE.equals(otnServiceType)
+                    && checkOdtuTTPforLoOduCreation(ontTp1, 1)) {
                     LOG.info("TP {} of XPONDER {} is validated", tp.getTpId(), node.getNodeId().getValue());
                     this.availableXpdrNWTps.add(tp.getTpId());
                 } else {
-                    if ("10GE".equals(otnServiceType)) {
+                    if (StringConstants.SERVICE_TYPE_10GE.equals(otnServiceType)) {
                         LOG.error("TP {} of {} does not allow OD2e termination creation", tp.getTpId().getValue(),
                             node.getNodeId().getValue());
-                    } else if ("1GE".equals(otnServiceType)) {
+                    } else if (StringConstants.SERVICE_TYPE_1GE.equals(otnServiceType)) {
                         LOG.error("TP {} of {} does not allow ODU0 termination creation", tp.getTpId().getValue(),
                             node.getNodeId().getValue());
                     } else {
@@ -153,7 +158,8 @@ public class PceOtnNode implements PceNode {
                     }
                 }
             } else if (OpenroadmTpType.XPONDERCLIENT.equals(ocnTp1.getTpType())
-                && (this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE"))) {
+                && (StringConstants.SERVICE_TYPE_10GE.equals(this.otnServiceType)
+                        || StringConstants.SERVICE_TYPE_1GE.equals(this.otnServiceType))) {
                 TerminationPoint1 ontTp1;
                 if (tp.augmentation(TerminationPoint1.class) != null) {
                     ontTp1 = tp.augmentation(TerminationPoint1.class);
@@ -170,8 +176,9 @@ public class PceOtnNode implements PceNode {
             }
         }
 
-        if ((this.otnServiceType.equals("ODU4") && mode.equals("AZ"))
-            || ((this.otnServiceType.equals("10GE") || this.otnServiceType.equals("1GE"))
+        if ((StringConstants.SERVICE_TYPE_ODU4.equals(this.otnServiceType) && mode.equals("AZ"))
+            || ((StringConstants.SERVICE_TYPE_10GE.equals(this.otnServiceType)
+                    || StringConstants.SERVICE_TYPE_1GE.equals(this.otnServiceType))
                 && ((mode.equals("AZ") && checkSwPool(availableXpdrClientTps, availableXpdrNWTps, 1, 1))
                      || (mode.equals("intermediate") && checkSwPool(null, availableXpdrNWTps, 0, 2)))
                )) {
@@ -255,18 +262,18 @@ public class PceOtnNode implements PceNode {
                 .values()) {
             LOG.debug("in checkTpForOduTermination - sic = {}", sic.getIfCapType());
             switch (otnServiceType) {
-                case "1GE":
+                case StringConstants.SERVICE_TYPE_1GE:
                 // we could also check the administrative status of the tp
                     if (sic.getIfCapType().equals(If1GEODU0.class)) {
                         return true;
                     }
                     break;
-                case "10GE":
+                case StringConstants.SERVICE_TYPE_10GE:
                     if (sic.getIfCapType().equals(If10GEODU2e.class)) {
                         return true;
                     }
                     break;
-                case "100GE":
+                case StringConstants.SERVICE_TYPE_100GE:
                     if (sic.getIfCapType().equals(If100GEODU4.class)) {
                         return true;
                     }
@@ -418,11 +425,13 @@ public class PceOtnNode implements PceNode {
         }
 
         //Todo refactor Strings (mode and otnServiceType ) to enums
-        if ((pceOtnNode.otnServiceType.equals("ODU4") && pceOtnNode.modeType.equals("AZ"))) {
+        if ((pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_ODU4)
+                && pceOtnNode.modeType.equals("AZ"))) {
             return true;
         }
 
-        if ((pceOtnNode.otnServiceType.equals("10GE") || pceOtnNode.otnServiceType.equals("1GE"))
+        if ((pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_10GE)
+                || pceOtnNode.otnServiceType.equals(StringConstants.SERVICE_TYPE_1GE))
                 && (isAz(pceOtnNode) || isIntermediate(pceOtnNode))) {
             return true;
         }

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
index dcc9dcb79d61bdce070f22a37d492e04837e842f..9e7496255d034bdd47cc6fbc7baad7853edce3f6 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PcePathDescriptionTests.java
@@ -62,7 +62,7 @@ public class PcePathDescriptionTests extends AbstractTest {
         pceResult = new PceResult();
         pceResult.setRC("200");
         pceResult.setRate(Long.valueOf(1));
-        pceResult.setServiceType("100GE");
+        pceResult.setServiceType(StringConstants.SERVICE_TYPE_100GE);
         Map<LinkId, PceLink> map = Map.of(new LinkId("OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1"), pceLink);
         pcePathDescription = new PcePathDescription(List.of(pceLink),
                 map, pceResult);

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
index 89ef62efcecf1fe93d4c1e6d90c95470f726cd03..d132c9c797325467e306db5dddda547866c34c9e 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java
@@ -81,7 +81,7 @@ public class PceGraphTest {
         pceGraph = new PceGraph(pceOpticalNode, pceOpticalNode2, allPceNodes,
                 pceHardConstraints,
                 null, rc,
-                "ODU4");
+                StringConstants.SERVICE_TYPE_ODU4);
     }
 
     @Test
@@ -107,20 +107,20 @@ public class PceGraphTest {
         pceGraph = new PceGraph(pceOpticalNode, pceOpticalNode2, allPceNodes,
                 pceHardConstraints,
                 null, rc,
-                "100GE");
+                StringConstants.SERVICE_TYPE_100GE);
 
         Assert.assertEquals(pceGraph.calcPath(), false);
     }
 
     @Test(expected = Exception.class)
     public void clacPath10GE2() {
-        pceGraph = getOtnPceGraph("10GE");
+        pceGraph = getOtnPceGraph(StringConstants.SERVICE_TYPE_10GE);
         Assert.assertEquals(pceGraph.calcPath(), false);
     }
 
     @Test(expected = Exception.class)
     public void clacPath1GE() {
-        pceGraph = getOtnPceGraph("1GE");
+        pceGraph = getOtnPceGraph(StringConstants.SERVICE_TYPE_1GE);
         Assert.assertEquals(pceGraph.calcPath(), false);
     }
 

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java
index c166694e06cf208c8c216e733c66e55a3f26600e..4aeed59ab6340e15366d8478530089a753ef72d2 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculationTest.java
@@ -11,6 +11,7 @@ import java.util.concurrent.ExecutionException;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.RequestProcessor;
 import org.opendaylight.transportpce.pce.constraints.PceConstraintsCalc;
@@ -48,7 +49,7 @@ public class PceCalculationTest extends AbstractTest {
     public void testPceCalculationValues() {
 
         pceCalculation.retrievePceNetwork();
-        Assert.assertEquals("100GE", pceCalculation.getServiceType());
+        Assert.assertEquals(StringConstants.SERVICE_TYPE_100GE, pceCalculation.getServiceType());
         Assert.assertNotNull(pceCalculation.getReturnStructure());
 
         Assert.assertNull(pceCalculation.getaendPceNode());
@@ -65,7 +66,7 @@ public class PceCalculationTest extends AbstractTest {
                 pceConstraintsCalc.getPceSoftConstraints(),
                 pceResult);
         pceCalculation.retrievePceNetwork();
-        Assert.assertEquals("100GE", pceCalculation.getServiceType());
+        Assert.assertEquals(StringConstants.SERVICE_TYPE_100GE, pceCalculation.getServiceType());
         Assert.assertNotNull(pceCalculation.getReturnStructure());
 
         Assert.assertNull(pceCalculation.getaendPceNode());
@@ -87,7 +88,7 @@ public class PceCalculationTest extends AbstractTest {
                 pceResult);
 
         pceCalculation.retrievePceNetwork();
-//        Assert.assertEquals("100GE", pceCalculation.getServiceType());
+//        Assert.assertEquals(StringConstants.SERVICE_TYPE_100GE, pceCalculation.getServiceType());
         Assert.assertNotNull(pceCalculation.getReturnStructure());
 
         Assert.assertNull(pceCalculation.getaendPceNode());

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
index 32db757d1d7e61ea5170fae78186e3deff8213d5..7a3b5870540b490d17373b33a16cfb98c6ed436c 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
@@ -15,6 +15,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.transportpce.common.NetworkUtils;
+import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.fixedflex.GridUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder;
@@ -70,7 +71,7 @@ public class PceOtnNodeTest extends AbstractTest {
     @Test
     public void testInitXndrTpsODU4() {
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "ODU4");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_ODU4);
         pceOtnNode.initXndrTps("AZ");
         pceOtnNode.checkAvailableTribPort();
         pceOtnNode.checkAvailableTribSlot();
@@ -82,7 +83,7 @@ public class PceOtnNodeTest extends AbstractTest {
     @Test
     public void testInitXndrTps10GE() {
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "10GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_10GE);
         pceOtnNode.initXndrTps("mode");
         pceOtnNode.checkAvailableTribPort();
         pceOtnNode.checkAvailableTribSlot();
@@ -93,7 +94,7 @@ public class PceOtnNodeTest extends AbstractTest {
     public void testInitXndrTps10GXponderClient1() {
         node = getNodeBuilder(geSupportingNodes(), OpenroadmTpType.XPONDERCLIENT).build();
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.ROADM,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "10GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_10GE);
         pceOtnNode.initXndrTps("mode");
         pceOtnNode.checkAvailableTribPort();
         pceOtnNode.checkAvailableTribSlot();
@@ -107,7 +108,7 @@ public class PceOtnNodeTest extends AbstractTest {
     public void testInitXndrTps1GXponderClient() {
         node = getNodeBuilder(geSupportingNodes(), OpenroadmTpType.XPONDERCLIENT).build();
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "1GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_1GE);
         pceOtnNode.initXndrTps("mode");
         pceOtnNode.checkAvailableTribPort();
         pceOtnNode.checkAvailableTribSlot();
@@ -117,7 +118,7 @@ public class PceOtnNodeTest extends AbstractTest {
     @Test
     public void testInitXndrTps10GXponderClient() {
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "10GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_10GE);
         pceOtnNode.validateXponder("optical", "sl");
         pceOtnNode.validateXponder("not optical", "sl");
         pceOtnNode.initXndrTps("AZ");
@@ -131,7 +132,7 @@ public class PceOtnNodeTest extends AbstractTest {
     @Test
     public void testIsPceOtnNodeValid() {
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "10GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_10GE);
         pceOtnNode.initXndrTps("AZ");
         pceOtnNode.checkAvailableTribPort();
         pceOtnNode.checkAvailableTribSlot();
@@ -141,7 +142,7 @@ public class PceOtnNodeTest extends AbstractTest {
     @Test
     public void testIsPceOtnNodeValidNode() {
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.DEGREE,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "100GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_100GE);
         pceOtnNode.initXndrTps("AZ");
         pceOtnNode.checkAvailableTribPort();
         pceOtnNode.checkAvailableTribSlot();
@@ -154,7 +155,7 @@ public class PceOtnNodeTest extends AbstractTest {
     @Test
     public void testIsPceOtnNodeValidNodeTypeNull() {
         pceOtnNode = new PceOtnNode(node, null,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "100GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_100GE);
         pceOtnNode.initXndrTps("AZ");
         pceOtnNode.checkAvailableTribPort();
         pceOtnNode.checkAvailableTribSlot();
@@ -164,7 +165,7 @@ public class PceOtnNodeTest extends AbstractTest {
     @Test
     public void testIsPceOtnNodeValidNodeTypeDeg() {
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.DEGREE,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "100GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_100GE);
         pceOtnNode.initXndrTps("AZ");
         Assert.assertFalse("not valid node , its type isn't one of MUXPDR or SWITCH or TPDR" ,
                 pceOtnNode.isPceOtnNodeValid(pceOtnNode));
@@ -173,7 +174,7 @@ public class PceOtnNodeTest extends AbstractTest {
     @Test
     public void testIsPceOtnNodeValidTrue() {
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "ODU4");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_ODU4);
         pceOtnNode.initXndrTps("AZ");
         pceOtnNode.checkAvailableTribPort();
         pceOtnNode.checkAvailableTribSlot();
@@ -184,7 +185,7 @@ public class PceOtnNodeTest extends AbstractTest {
     public void testIsPceOtnNodeValidChecksw() {
         node = getNodeBuilder(geSupportingNodes(), OpenroadmTpType.XPONDERCLIENT).build();
         pceOtnNode = new PceOtnNode(node, OpenroadmNodeType.MUXPDR,
-                new NodeId("optical"), ServiceFormat.OMS.getName(), "1GE");
+                new NodeId("optical"), ServiceFormat.OMS.getName(), StringConstants.SERVICE_TYPE_1GE);
         pceOtnNode.initXndrTps("mode");
         Assert.assertFalse("not valid otn service Type" , pceOtnNode.isPceOtnNodeValid(pceOtnNode));
     }