Merge "Bump lighty.io build to Sulfur SR1"

diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
index 01f38fecf3b8667ee78e0567c6cc81d07aa755fa..20817b27e8683a1b6cb1786af8a7c27658cfd7b6 100644 (file)
--- a/docs/developer-guide.rst
+++ b/docs/developer-guide.rst
@@ -1669,7 +1669,7 @@ The user can provide, either the Uuid associated to the attribute or its name.
     {
       "tapi-topology:input": {
         "tapi-topology:topology-id-or-name": "T0 - Full Multi-layer topology",
-        "tapi-topology:node-id-or-name": "ROADM-A1+PHOTONINC_MEDIA"
+        "tapi-topology:node-id-or-name": "ROADM-A1+PHOTONIC_MEDIA"
       }
     }
 
@@ -1685,8 +1685,8 @@ The user can provide, either the Uuid associated to the attribute or its name.
     {
       "tapi-topology:input": {
         "tapi-topology:topology-id-or-name": "T0 - Full Multi-layer topology",
-        "tapi-topology:node-id-or-name": "ROADM-A1+PHOTONINC_MEDIA",
-        "tapi-topology:ep-id-or-name": "ROADM-A1+PHOTONINC_MEDIA+DEG1-TTP-TXRX"
+        "tapi-topology:node-id-or-name": "ROADM-A1+PHOTONIC_MEDIA",
+        "tapi-topology:ep-id-or-name": "ROADM-A1+PHOTONIC_MEDIA+DEG1-TTP-TXRX"
       }
     }
 

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
index d53b05567e9350ae0b22f44d0a74eac1f6a9b6c4..bcdab98ab74e7e80847df6d3879e480205097902 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
@@ -78,15 +78,10 @@ public final class OpenRoadmTopology {
         "switch-network", OpenroadmTpType.XPONDERNETWORK,
         "xpdr-client", OpenroadmTpType.XPONDERCLIENT
     );
-    private static Map<String, OpenroadmTpType> PORTDIR_ORD_DEG_TYPE_MAP = Map.of(
-        "bidirectional", OpenroadmTpType.DEGREETXRXTTP,
-        "tx", OpenroadmTpType.DEGREETXTTP,
-        "rx", OpenroadmTpType.DEGREERXTTP
-    );
-    private static Map<String, OpenroadmTpType> PORTDIR_ORD_SRG_TYPE_MAP = Map.of(
-        "bidirectional", OpenroadmTpType.SRGTXRXPP,
-        "tx", OpenroadmTpType.SRGTXPP,
-        "rx", OpenroadmTpType.SRGRXPP
+    private static Map<String, List<OpenroadmTpType>> PORTDIR_ORD_TYPE_MAP = Map.of(
+        "bidirectional", List.of(OpenroadmTpType.DEGREETXRXTTP, OpenroadmTpType.SRGTXRXPP),
+        "tx", List.of(OpenroadmTpType.DEGREETXTTP, OpenroadmTpType.SRGTXPP),
+        "rx", List.of(OpenroadmTpType.DEGREERXTTP, OpenroadmTpType.SRGRXPP)
     );
 
     private OpenRoadmTopology() {
@@ -171,16 +166,16 @@ public final class OpenRoadmTopology {
                 List<Mapping> extractedMappings = mappingNode.nonnullMapping().values()
                         .stream().filter(lcp -> lcp.getLogicalConnectionPoint().contains("XPDR" + xpdrNb))
                         .collect(Collectors.toList());
-                Boolean lastArg;
+                Boolean isOtn;
                 String xpdrType;
                 switch (mapping.getXponderType() == null ? Tpdr : mapping.getXponderType()) {
                     case Tpdr :
-                        lastArg = false;
+                        isOtn = false;
                         xpdrType = "Tpdr";
                         break;
                     case Mpdr :
                     case Switch :
-                        lastArg = true;
+                        isOtn = true;
                         xpdrType = mapping.getXponderType().getName();
                         break;
                     default :
@@ -195,7 +190,7 @@ public final class OpenRoadmTopology {
                                 mappingNode.getNodeInfo().getNodeClli(),
                                 xpdrNb,
                                 extractedMappings,
-                                lastArg)
+                                isOtn)
                           .build());
             }
         }
@@ -255,14 +250,14 @@ public final class OpenRoadmTopology {
         for (Mapping m : degListMap) {
             // Add openroadm-common-network tp type augmentations
             // Added states to degree port. TODO: add to mapping relation between abstracted and physical node states
-            if (!PORTDIR_ORD_DEG_TYPE_MAP.containsKey(m.getPortDirection())) {
+            if (!PORTDIR_ORD_TYPE_MAP.containsKey(m.getPortDirection())) {
                 LOG.error("impossible to set tp-type to {}", m.getLogicalConnectionPoint());
             }
             TerminationPoint ietfTp =  createTpBldr(m.getLogicalConnectionPoint())
                 .addAugmentation(
                     new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
                             .TerminationPoint1Builder()
-                        .setTpType(PORTDIR_ORD_DEG_TYPE_MAP.get(m.getPortDirection()))
+                        .setTpType(PORTDIR_ORD_TYPE_MAP.get(m.getPortDirection()).get(0))
                         .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
                         .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()))
                         .build())
@@ -313,7 +308,7 @@ public final class OpenRoadmTopology {
         Map<TerminationPointKey,TerminationPoint> tpMap = new HashMap<>();
         for (Mapping m : srgListMap) {
             // Added states to srg port. TODO: add to mapping relation between abstracted and physical node states
-            if (!PORTDIR_ORD_SRG_TYPE_MAP.containsKey(m.getPortDirection())) {
+            if (!PORTDIR_ORD_TYPE_MAP.containsKey(m.getPortDirection())) {
                 LOG.error("impossible to set tp-type to {}", m.getLogicalConnectionPoint());
             }
             TerminationPoint ietfTp = createTpBldr(m.getLogicalConnectionPoint())
@@ -321,7 +316,7 @@ public final class OpenRoadmTopology {
                     // Add openroadm-common-network tp type augmentations
                     new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
                             .TerminationPoint1Builder()
-                        .setTpType(PORTDIR_ORD_SRG_TYPE_MAP.get(m.getPortDirection()))
+                        .setTpType(PORTDIR_ORD_TYPE_MAP.get(m.getPortDirection()).get(1))
                         .setAdministrativeState(TopologyUtils.setNetworkAdminState(m.getPortAdminState()))
                         .setOperationalState(TopologyUtils.setNetworkOperState(m.getPortOperState()))
                         .build())

diff --git a/tests/launch_tests.sh b/tests/launch_tests.sh
index a2f3f1997ddd50e7c02b198161c05aa9f687ea12..54d1cd1033eb34aca16125e960b430bfd71d2718 100755 (executable)
--- a/tests/launch_tests.sh
+++ b/tests/launch_tests.sh
@@ -31,7 +31,7 @@ else
     done
 fi
 if [ -z "$LAUNCHER" ]; then
-    LAUNCHER="nosetests --with-xunit";
+    LAUNCHER="python3 -m pytest -q";
 fi
 
 for script in $scriptlist; do

diff --git a/tests/test-requirements.txt b/tests/test-requirements.txt
index 55c4d55e6bdc6dc0bb99237d94d1833da73e6d5b..2049e9133df8777b93e138827476059dd4089395 100644 (file)
--- a/tests/test-requirements.txt
+++ b/tests/test-requirements.txt
@@ -1 +1 @@
-nose # LGPL v2 or later
+pytest # MIT License