Merge "Declare as final private classes"

diff --git a/tests/install_honeynode.sh b/tests/install_honeynode.sh
index 7b7c0b5d80741a5eda5a6f7c0a77f9712c0fae0f..a4c21ba1b1fef4761d2f3325fff5618c1a2daeff 100755 (executable)
--- a/tests/install_honeynode.sh
+++ b/tests/install_honeynode.sh
@@ -19,6 +19,9 @@ for VERSION in $VERSIONS_LIST
 do
     case "$VERSION" in
         "1.2.1") PLUGIN_VERSION=1.0.9
+        #update 1.2.1 openroadm device configuration samples to be compliant with honeynode
+        #device models ("multi-wavelegnth" instead of "multi-wavelength" whose typo has been solved with 2.2.1 device models)
+        sed -i_ 's/multi-wavelegnth/multi-wavelength/g' $(dirname $0)/sample_configs/openroadm/1.2.1/oper-ROADM*.xml
         ;;
         "2.2.1") PLUGIN_VERSION=2.0.10
         ;;

diff --git a/tests/install_lightynode.sh b/tests/install_lightynode.sh
new file mode 100755 (executable)
index 0000000..9634601
--- /dev/null
+++ b/tests/install_lightynode.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+#set -x
+
+#check if curl exists
+if ! [ -x "$(command -v curl)" ];then
+    echo "curl is not installed." >&2
+    exit 1
+fi
+#check if unzip exists
+if ! [ -x "$(command -v unzip)" ];then
+    echo "unzip is not installed." >&2
+    exit 1
+fi
+
+PLUGIN_VERSION=18.1.0.7
+TARGET_DIR=$(dirname $0)/lightynode
+INSTALL_DIR=$TARGET_DIR/lightynode-openroadm-device
+ARTIFACT_ZIPFILE=$TARGET_DIR/artifact.zip
+TARGET_URL="https://gitlab.com/api/v4/projects/36076125/packages/maven/io/lighty/transportpce/netconf/device/lighty-openroadm-device/$PLUGIN_VERSION/lighty-openroadm-device-$PLUGIN_VERSION-bin.zip"
+
+#clean lightynode install directory
+if [ -d "$INSTALL_DIR" ];then
+    echo "Removing $INSTALL_DIR directory"
+    rm -rf $INSTALL_DIR
+fi
+
+#download lightynode  and install it
+#complete source code can be found at https://gitlab.com/Orange-OpenSource/lfn/odl/lightynode-simulator.git
+echo "Installing lightynode device to $INSTALL_DIR directory "
+curl --retry-delay 10 --retry 3 -sS --location --request GET $TARGET_URL -o $ARTIFACT_ZIPFILE || exit 2
+unzip -q $ARTIFACT_ZIPFILE -d $TARGET_DIR
+rm -f $ARTIFACT_ZIPFILE
+mv $TARGET_DIR/lighty-openroadm-device-$PLUGIN_VERSION $INSTALL_DIR
+
+#update 1.2.1 openroadm device configuration samples to be compliant with 1.2.1
+#device models ("multi-wavelegnth" instead of "multi-wavelength" whose typo has been solved with 2.2.1 device models)
+sed -i_ 's/multi-wavelength/multi-wavelegnth/g' $(dirname $0)/sample_configs/openroadm/1.2.1/oper-ROADM*.xml

diff --git a/tests/install_sims.sh b/tests/install_sims.sh
new file mode 100755 (executable)
index 0000000..69f8afd
--- /dev/null
+++ b/tests/install_sims.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+#set -x
+
+cd $(dirname $0)
+
+if [ "$USE_SIMS" = "honeynode" ];then
+    ./install_honeynode.sh $@
+else
+    ./install_lightynode.sh
+fi
+
+exit

diff --git a/tests/lightynode/.gitkeep b/tests/lightynode/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 5ebd5e2e7e5284c53e9b5ce37a494f002859846c..654a1fbbbccd4a350d2a6aa4d83698149186ba5b 100644 (file)
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,2 +1,3 @@
 psutil>=5.6.7 # 3-clause / New BSD License
 requests!=2.12.2,>=2.10.0 # Apache License 2.0
+netconf_client

diff --git a/tests/sample_configs/openroadm/1.2.1/oper-ROADMA-full.xml b/tests/sample_configs/openroadm/1.2.1/oper-ROADMA-full.xml
index 9e3646ada688aa99ec2ba4ba1fba777311375e04..a9dc27df697397fbd82d4748ec738ad5838f9aab 100644 (file)
--- a/tests/sample_configs/openroadm/1.2.1/oper-ROADMA-full.xml
+++ b/tests/sample_configs/openroadm/1.2.1/oper-ROADMA-full.xml
@@ -133,7 +133,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -144,7 +144,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -155,7 +155,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -166,7 +166,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -177,7 +177,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -188,7 +188,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -199,7 +199,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -210,7 +210,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -221,7 +221,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -232,7 +232,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -255,7 +255,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -264,7 +264,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -297,7 +297,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -329,7 +329,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -367,7 +367,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -378,7 +378,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -389,7 +389,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -400,7 +400,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -411,7 +411,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -422,7 +422,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -433,7 +433,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -444,7 +444,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -455,7 +455,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -466,7 +466,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -483,7 +483,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -492,7 +492,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -525,7 +525,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -557,7 +557,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -836,7 +836,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -846,7 +846,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -856,7 +856,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -866,7 +866,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1150,7 +1150,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1160,7 +1160,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1170,7 +1170,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1180,7 +1180,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>

diff --git a/tests/sample_configs/openroadm/1.2.1/oper-ROADMA.xml b/tests/sample_configs/openroadm/1.2.1/oper-ROADMA.xml
index 3aeba3ca67c44829d28cb3cd482978cef5b69570..a21936b6a95ec41673c616c0623ea6e1d576f2c9 100644 (file)
--- a/tests/sample_configs/openroadm/1.2.1/oper-ROADMA.xml
+++ b/tests/sample_configs/openroadm/1.2.1/oper-ROADMA.xml
@@ -126,7 +126,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -137,7 +137,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -148,7 +148,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -159,7 +159,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -170,7 +170,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -181,7 +181,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -192,7 +192,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -203,7 +203,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -214,7 +214,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -225,7 +225,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -242,7 +242,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -251,7 +251,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -284,7 +284,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -316,7 +316,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -354,7 +354,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -365,7 +365,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -376,7 +376,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -387,7 +387,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -398,7 +398,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -409,7 +409,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -420,7 +420,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -431,7 +431,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -442,7 +442,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -453,7 +453,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -470,7 +470,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -479,7 +479,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -512,7 +512,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -544,7 +544,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -827,7 +827,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -837,7 +837,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -847,7 +847,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -857,7 +857,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1141,7 +1141,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1151,7 +1151,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1161,7 +1161,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1171,7 +1171,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>

diff --git a/tests/sample_configs/openroadm/1.2.1/oper-ROADMB.xml b/tests/sample_configs/openroadm/1.2.1/oper-ROADMB.xml
index 9ef8d0884b23f614e37a346b9fec0b4a66b96bc7..17457964129a02481c14f5d8f538b8ed07ab70bb 100644 (file)
--- a/tests/sample_configs/openroadm/1.2.1/oper-ROADMB.xml
+++ b/tests/sample_configs/openroadm/1.2.1/oper-ROADMB.xml
@@ -126,7 +126,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -137,7 +137,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -148,7 +148,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -159,7 +159,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -170,7 +170,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -181,7 +181,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -192,7 +192,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -203,7 +203,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -214,7 +214,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -225,7 +225,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -242,7 +242,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -251,7 +251,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -284,7 +284,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -316,7 +316,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -354,7 +354,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -365,7 +365,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -376,7 +376,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -387,7 +387,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -398,7 +398,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -409,7 +409,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -420,7 +420,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -431,7 +431,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -442,7 +442,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -453,7 +453,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -470,7 +470,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -479,7 +479,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -512,7 +512,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -544,7 +544,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -827,7 +827,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -837,7 +837,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -847,7 +847,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -857,7 +857,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1141,7 +1141,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1151,7 +1151,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1161,7 +1161,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1171,7 +1171,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>

diff --git a/tests/sample_configs/openroadm/1.2.1/oper-ROADMC-full.xml b/tests/sample_configs/openroadm/1.2.1/oper-ROADMC-full.xml
index a958bef4325fb05470644008a6e9e7c7be8f6a19..f60da3f29cdbc5db823d97e53aa9a52e6116b0a3 100644 (file)
--- a/tests/sample_configs/openroadm/1.2.1/oper-ROADMC-full.xml
+++ b/tests/sample_configs/openroadm/1.2.1/oper-ROADMC-full.xml
@@ -133,7 +133,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -144,7 +144,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -155,7 +155,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -166,7 +166,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -177,7 +177,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -188,7 +188,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -199,7 +199,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -210,7 +210,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -221,7 +221,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -232,7 +232,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -249,7 +249,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -258,7 +258,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -291,7 +291,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -323,7 +323,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -361,7 +361,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -372,7 +372,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -383,7 +383,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -394,7 +394,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -405,7 +405,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -416,7 +416,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -427,7 +427,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -438,7 +438,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -449,7 +449,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -460,7 +460,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -483,7 +483,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -492,7 +492,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -525,7 +525,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -557,7 +557,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -840,7 +840,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -850,7 +850,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -860,7 +860,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -870,7 +870,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1154,7 +1154,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1164,7 +1164,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1174,7 +1174,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -1184,7 +1184,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>

diff --git a/tests/sample_configs/openroadm/1.2.1/oper-ROADMC.xml b/tests/sample_configs/openroadm/1.2.1/oper-ROADMC.xml
index db7f3a9feaa04c36598fd1c45eed8a4015f04437..2937e25f7a61b985c4c3deea49e739649dd086c7 100644 (file)
--- a/tests/sample_configs/openroadm/1.2.1/oper-ROADMC.xml
+++ b/tests/sample_configs/openroadm/1.2.1/oper-ROADMC.xml
@@ -126,7 +126,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -137,7 +137,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -148,7 +148,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -159,7 +159,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -170,7 +170,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -181,7 +181,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -192,7 +192,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -203,7 +203,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -214,7 +214,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -225,7 +225,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -242,7 +242,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -251,7 +251,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -284,7 +284,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -316,7 +316,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -354,7 +354,7 @@
         <port-name>C1</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -365,7 +365,7 @@
         <port-name>C2</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -376,7 +376,7 @@
         <port-name>C3</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -387,7 +387,7 @@
         <port-name>C4</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -398,7 +398,7 @@
         <port-name>C5</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -409,7 +409,7 @@
         <port-name>C6</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -420,7 +420,7 @@
         <port-name>C7</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -431,7 +431,7 @@
         <port-name>C8</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -442,7 +442,7 @@
         <port-name>C9</port-name>
         <port-type>Client</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -453,7 +453,7 @@
         <port-name>L1</port-name>
         <port-type>LINE</port-type>
         <port-qual>roadm-external</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <circuit-id>1</circuit-id>
         <administrative-state>inService</administrative-state>
@@ -470,7 +470,7 @@
         <port-name>LOG1</port-name>
         <port-type>Logical</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -479,7 +479,7 @@
         <port-name>OSC-DEMUX</port-name>
         <port-type>OSC</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -512,7 +512,7 @@
         <port-name>OSC-PORT</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -544,7 +544,7 @@
         <port-name>ETH-PLUG</port-name>
         <port-type>1GEX</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -823,7 +823,7 @@
         <port-name>AD-DEG1</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -833,7 +833,7 @@
         <port-name>AD-DEG2</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -843,7 +843,7 @@
         <port-name>AD-DEG3</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
@@ -853,7 +853,7 @@
         <port-name>AD-DEG4</port-name>
         <port-type>Edge</port-type>
         <port-qual>roadm-internal</port-qual>
-        <port-wavelength-type>multi-wavelength</port-wavelength-type>
+        <port-wavelength-type>multi-wavelegnth</port-wavelength-type>
         <port-direction>bidirectional</port-direction>
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>

diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py
index 4911c2a3ff9d10595d78548afb5742ec2aaf65dc..f156ad67ac4838968ff05b1d8e72e6c4029b9a8e 100644 (file)
--- a/tests/transportpce_tests/common/test_utils.py
+++ b/tests/transportpce_tests/common/test_utils.py
@@ -29,6 +29,7 @@ import simulators
 SIMS = simulators.SIMS
 
 HONEYNODE_OK_START_MSG = 'Netconf SSH endpoint started successfully at 0.0.0.0'
+LIGHTYNODE_OK_START_MSG = 'Data tree change listeners registered'
 KARAF_OK_START_MSG = "Transportpce controller started"
 LIGHTY_OK_START_MSG = re.escape("lighty.io and RESTCONF-NETCONF started")
 
@@ -133,12 +134,52 @@ def post_request(url, data):
 #
 
 
+def start_honeynode(log_file: str, sim):
+    executable = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                              '..', '..', 'honeynode', sim[1], 'honeynode-simulator', 'honeycomb-tpce')
+    sample_directory = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                                    '..', '..', 'sample_configs', 'openroadm', sim[1])
+    if os.path.isfile(executable):
+        with open(log_file, 'w', encoding='utf-8') as outfile:
+            return subprocess.Popen(
+                [executable, SIMS[sim]['port'], os.path.join(sample_directory, SIMS[sim]['configfile'])],
+                stdout=outfile, stderr=outfile)
+    return None
+
+
+def start_lightynode(log_file: str, sim):
+    executable = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                              '..', '..', 'lightynode', 'lightynode-openroadm-device', 'start-device.sh')
+    sample_directory = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                                    '..', '..', 'sample_configs', 'openroadm', sim[1])
+    if os.path.isfile(executable):
+        with open(log_file, 'w', encoding='utf-8') as outfile:
+            return subprocess.Popen(
+                [executable, "-v" + sim[1], "-p" + SIMS[sim]['port'], "-f" + os.path.join(sample_directory,
+                                                                                          SIMS[sim]['configfile'])],
+                stdout=outfile, stderr=outfile)
+    return None
+
+
 def start_sims(sims_list):
+    if 'USE_SIMS' in os.environ:
+        sims_to_use = os.environ['USE_SIMS']
+        print("Using SIMS " + sims_to_use)
+    else:
+        sims_to_use = 'lightynode'
+    if sims_to_use == 'None':
+        return None
+    if sims_to_use == 'honeynode':
+        start_msg = HONEYNODE_OK_START_MSG
+        start_method = start_honeynode
+    else:
+        start_msg = LIGHTYNODE_OK_START_MSG
+        start_method = start_lightynode
     for sim in sims_list:
         print('starting simulator ' + sim[0] + ' in OpenROADM device version ' + sim[1] + '...')
         log_file = os.path.join(SIM_LOG_DIRECTORY, SIMS[sim]['logfile'])
-        process = start_honeynode(log_file, sim)
-        if wait_until_log_contains(log_file, HONEYNODE_OK_START_MSG, 100):
+        process = start_method(log_file, sim)
+        if wait_until_log_contains(log_file, start_msg, 100):
             print('simulator for ' + sim[0] + ' started')
         else:
             print('simulator for ' + sim[0] + ' failed to start')
@@ -215,19 +256,6 @@ def shutdown_process(process):
         process.send_signal(signal.SIGINT)
 
 
-def start_honeynode(log_file: str, sim):
-    executable = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                              '..', '..', 'honeynode', sim[1], 'honeynode-simulator', 'honeycomb-tpce')
-    sample_directory = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                                    '..', '..', 'sample_configs', 'openroadm', sim[1])
-    if os.path.isfile(executable):
-        with open(log_file, 'w', encoding='utf-8') as outfile:
-            return subprocess.Popen(
-                [executable, SIMS[sim]['port'], os.path.join(sample_directory, SIMS[sim]['configfile'])],
-                stdout=outfile, stderr=outfile)
-    return None
-
-
 def wait_until_log_contains(log_file, regexp, time_to_wait=60):
     # pylint: disable=lost-exception
     # pylint: disable=consider-using-with

diff --git a/tox.ini b/tox.ini
index 98bde2aef98add84001c88d0825a485a7a88686e..13d77961f664cbbaea4523f1ccd0551d6234dc3f 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -26,6 +26,7 @@ setupdir = tests/
 [testenv]
 passenv = LAUNCHER
      USE_LIGHTY
+     USE_SIMS
      NO_ODL_STARTUP
      http_proxy
      HTTP_PROXY
@@ -62,24 +63,27 @@ commands =
   ./build.sh
 
 [testenv:sims121]
-allowlist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
 depends = buildcontroller
 # sims profiles does not strictly depends on buildcontroller
 # but this dependency avoids race condition in the gate
 commands =
-  ./install_honeynode.sh 1.2.1
+  ./install_sims.sh 1.2.1
 
 [testenv:sims221]
-allowlist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
 depends = buildcontroller
 commands =
-  ./install_honeynode.sh 2.2.1
+  ./install_sims.sh 2.2.1
 
 [testenv:sims71]
-allowlist_externals = install_honeynode.sh
+passenv = USE_SIMS
+allowlist_externals = install_sims.sh
 depends = buildcontroller
 commands =
-  ./install_honeynode.sh 7.1
+  ./install_sims.sh 7.1
 
 [testenv:testsPCE]
 depends = buildcontroller
@@ -120,7 +124,7 @@ depends = buildcontroller,build_karaf_tests121,sims121,testsPCE
 allowlist_externals = launch_tests.sh
 passenv = LAUNCHER
     USE_LIGHTY
-    NO_ODL_STARTUP
+    USE_SIMS
     USE_ODL_RESTCONF_VERSION
 setenv =
 #    USE_LIGHTY=True
@@ -173,6 +177,7 @@ depends = buildcontroller,build_karaf_tests221,sims221,tests71
 allowlist_externals = launch_tests.sh
 passenv = LAUNCHER
     USE_LIGHTY
+    USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 setenv =
@@ -197,7 +202,7 @@ commands =
 
 [testenv:tests71]
 depends = buildcontroller,build_karaf_tests71,sims71,tests_tapi
-allowlist_externals = launch_tests.sh
+allowlist_externals = launch_tests.sh install_honeynode.sh
 passenv = LAUNCHER
     USE_LIGHTY
     NO_ODL_STARTUP
@@ -205,9 +210,11 @@ passenv = LAUNCHER
 setenv =
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
+    USE_SIMS=honeynode
     USE_ODL_ALT_KARAF_ENV=./karaf71.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf71
 commands =
+  ./install_honeynode.sh 7.1
   ./launch_tests.sh 7.1 {posargs:}
 
 [testenv:build_karaf_tests_hybrid]
@@ -224,23 +231,27 @@ commands =
 [testenv:tests_hybrid]
 depends = buildcontroller,build_karaf_tests_hybrid,sims121,sims221,sims71,tests121,tests221,tests71
 #the last dependency is to avoid temporarily concurrent ressources problem in parallel mode
-allowlist_externals = launch_tests.sh
+allowlist_externals = launch_tests.sh install_honeynode.sh
 passenv = LAUNCHER
     USE_LIGHTY
+    USE_SIMS
     NO_ODL_STARTUP
     USE_ODL_RESTCONF_VERSION
 setenv =
+    USE_SIMS=honeynode
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf121.env
     USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
 commands =
 #  nosetests --with-xunit transportpce_tests/hybrid/test01_device_change_notifications.py
+  ./install_honeynode.sh
   ./launch_tests.sh hybrid {posargs:}
 
 [testenv:tests_tapi]
 depends = buildcontroller,build_karaf_tests221,sims221
-allowlist_externals = launch_tests.sh add_tapi_feature_to_tests221.sh
+allowlist_externals = launch_tests.sh install_honeynode.sh
+#                      add_tapi_feature_to_tests221.sh
 passenv = LAUNCHER
     USE_LIGHTY
     NO_ODL_STARTUP
@@ -248,6 +259,7 @@ passenv = LAUNCHER
     OLM_TIMER2
     USE_ODL_RESTCONF_VERSION
 setenv =
+    USE_SIMS=honeynode
 #    USE_LIGHTY=True
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
     USE_ODL_ALT_KARAF_ENV=./karaf221.env
@@ -257,13 +269,13 @@ setenv =
     OLM_TIMER2=2000
 
 commands =
+  ./install_honeynode.sh 2.2.1
 #  ./add_tapi_feature_to_tests221.sh
 -  ./launch_tests.sh tapi {posargs:}
 
 [testenv:with_docker]
 depends = buildcontroller,sims221
-allowlist_externals = launch_tests.sh
-                      dockercmd.sh
+allowlist_externals = launch_tests.sh dockercmd.sh install_honeynode.sh
 passenv = LAUNCHER
     USE_LIGHTY
     NO_ODL_STARTUP
@@ -271,6 +283,7 @@ passenv = LAUNCHER
 #    OLM_TIMER1
 #    OLM_TIMER2
 setenv =
+    USE_SIMS=honeynode
     OLM_TIMER1=3000
     OLM_TIMER2=2000
     INSTALL_TAPI=True
@@ -278,6 +291,7 @@ setenv =
 #    USE_ODL_RESTCONF_VERSION=draft-bierman02
 
 commands =
+  ./install_honeynode.sh 2.2.1
   ./dockercmd.sh run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 --name tpce_kafka1 teivah/kafka:2.0.0
   ./launch_tests.sh with_docker {posargs:}
   ./dockercmd.sh container rm -f tpce_kafka1