Update portmapping functional tests

Tests the new portmapping hierarchy with node-info

JIRA: TRNSPRTPCE-109

Change-Id: I6dcf4da32a55f2af7d3ea0768757a8ad52e3dc22
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Co-authored-by: Christophe Betoule <christophe.betoule@orange.com>

diff --git a/tests/transportpce_tests/1.2.1/test_portmapping.py b/tests/transportpce_tests/1.2.1/test_portmapping.py
index d66c2e14133cf41d4129020d2d2028084960237e..b337f8a960a974346fe22a62845515805be9b04f 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test_portmapping.py
@@ -36,7 +36,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         if os.path.isfile(executable):
             with open('honeynode1.log', 'w') as outfile:
                 cls.honeynode_process1 = subprocess.Popen(
-                    [executable, "17831", "sample_configs/openroadm/2.1/oper-XPDRA.xml"],
+                    [executable, "17830", "sample_configs/openroadm/2.1/oper-XPDRA.xml"],
                     stdout=outfile)
 
     @classmethod
@@ -46,7 +46,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         if os.path.isfile(executable):
             with open('honeynode2.log', 'w') as outfile:
                 cls.honeynode_process2 = subprocess.Popen(
-                    [executable, "17830", "sample_configs/openroadm/2.1/oper-ROADMA.xml"],
+                    [executable, "17831", "sample_configs/openroadm/2.1/oper-ROADMA.xml"],
                     stdout=outfile)
 
     @classmethod
@@ -121,7 +121,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             "netconf-node-topology:username": "admin",
             "netconf-node-topology:password": "admin",
             "netconf-node-topology:host": "127.0.0.1",
-            "netconf-node-topology:port": "17830",
+            "netconf-node-topology:port": "17831",
             "netconf-node-topology:tcp-only": "false",
             "netconf-node-topology:pass-through": {}}]}
         headers = {'content-type': 'application/json'}
@@ -145,7 +145,25 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             'connected')
         time.sleep(10)
 
-    def test_03_rdm_portmapping_DEG1_TTP_TXRX(self):
+    def test_03_rdm_portmapping_info(self):
+        url = ("{}/config/transportpce-portmapping:network/"
+               "nodes/ROADMA/node-info"
+               .format(self.restconf_baseurl))
+        headers = {'content-type': 'application/json'}
+        response = requests.request(
+            "GET", url, headers=headers, auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(
+            {u'node-info': {u'node-type': u'rdm',
+             u'node-ip-address': u'127.0.0.12',
+             u'node-clli': u'NodeA',
+             u'openroadm-version': u'1.2.1', u'node-vendor': u'vendorA',
+             u'node-model': u'2'}},
+            res)
+        time.sleep(3)
+
+    def test_04_rdm_portmapping_DEG1_TTP_TXRX(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADMA/mapping/DEG1-TTP-TXRX"
                .format(self.restconf_baseurl))
@@ -156,10 +174,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/0',
-             'logical-connection-point': 'DEG1-TTP-TXRX'},
+             'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'},
             res['mapping'])
 
-    def test_04_rdm_portmapping_SRG1_PP7_TXRX(self):
+    def test_05_rdm_portmapping_SRG1_PP7_TXRX(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADMA/mapping/SRG1-PP7-TXRX"
                .format(self.restconf_baseurl))
@@ -170,10 +188,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': 'C7', 'supporting-circuit-pack-name': '4/0',
-             'logical-connection-point': 'SRG1-PP7-TXRX'},
+             'logical-connection-point': 'SRG1-PP7-TXRX', 'port-direction': 'bidirectional'},
             res['mapping'])
 
-    def test_05_rdm_portmapping_SRG3_PP1_TXRX(self):
+    def test_06_rdm_portmapping_SRG3_PP1_TXRX(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADMA/mapping/SRG3-PP1-TXRX"
                .format(self.restconf_baseurl))
@@ -184,10 +202,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': 'C1', 'supporting-circuit-pack-name': '5/0',
-             'logical-connection-point': 'SRG3-PP1-TXRX'},
+             'logical-connection-point': 'SRG3-PP1-TXRX', 'port-direction': 'bidirectional'},
             res['mapping'])
 
-    def test_06_xpdr_device_connected(self):
+    def test_07_xpdr_device_connected(self):
         url = ("{}/config/network-topology:"
                "network-topology/topology/topology-netconf/node/XPDRA"
               .format(self.restconf_baseurl))
@@ -196,7 +214,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             "netconf-node-topology:username": "admin",
             "netconf-node-topology:password": "admin",
             "netconf-node-topology:host": "127.0.0.1",
-            "netconf-node-topology:port": "17831",
+            "netconf-node-topology:port": "17830",
             "netconf-node-topology:tcp-only": "false",
             "netconf-node-topology:pass-through": {}}]}
         headers = {'content-type': 'application/json'}
@@ -206,7 +224,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created)
         time.sleep(20)
 
-    def test_07_xpdr_device_connected(self):
+    def test_08_xpdr_device_connected(self):
         url = ("{}/operational/network-topology:"
                "network-topology/topology/topology-netconf/node/XPDRA"
                .format(self.restconf_baseurl))
@@ -220,7 +238,25 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             'connected')
         time.sleep(10)
 
-    def test_08_xpdr_portmapping_NETWORK1(self):
+    def test_09_xpdr_portmapping_info(self):
+        url = ("{}/config/transportpce-portmapping:network/"
+               "nodes/XPDRA/node-info"
+               .format(self.restconf_baseurl))
+        headers = {'content-type': 'application/json'}
+        response = requests.request(
+            "GET", url, headers=headers, auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(
+            {u'node-info': {u'node-type': u'xpdr',
+             u'node-ip-address': u'127.0.0.10',
+             u'node-clli': u'NodeA',
+             u'openroadm-version': u'1.2.1', u'node-vendor': u'vendorA',
+             u'node-model': u'1'}},
+            res)
+        time.sleep(3)
+
+    def test_10_xpdr_portmapping_NETWORK1(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDRA/mapping/XPDR1-NETWORK1"
                .format(self.restconf_baseurl))
@@ -231,10 +267,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-             'logical-connection-point': 'XPDR1-NETWORK1'},
+             'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional',
+             'associated-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'},
             res['mapping'])
 
-    def test_09_xpdr_portmapping_NETWORK2(self):
+    def test_11_xpdr_portmapping_NETWORK2(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDRA/mapping/XPDR1-NETWORK2"
                .format(self.restconf_baseurl))
@@ -245,10 +282,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET',
-             'logical-connection-point': 'XPDR1-NETWORK2'},
+             'logical-connection-point': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional',
+             'associated-lcp': 'XPDR1-CLIENT3', 'port-qual': 'xpdr-network'},
             res['mapping'])
 
-    def test_10_xpdr_portmapping_CLIENT1(self):
+    def test_12_xpdr_portmapping_CLIENT1(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDRA/mapping/XPDR1-CLIENT1"
                .format(self.restconf_baseurl))
@@ -260,10 +298,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': 'C1',
              'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
-             'logical-connection-point': 'XPDR1-CLIENT1'},
+             'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
+             'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
             res['mapping'])
 
-    def test_11_xpdr_portmapping_CLIENT2(self):
+    def test_13_xpdr_portmapping_CLIENT2(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDRA/mapping/XPDR1-CLIENT2"
                .format(self.restconf_baseurl))
@@ -274,11 +313,29 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': 'C2',
-                 'supporting-circuit-pack-name': '1/0/C2-PLUG-CLIENT',
-                 'logical-connection-point': 'XPDR1-CLIENT2'},
+             'supporting-circuit-pack-name': '1/0/C2-PLUG-CLIENT',
+             'logical-connection-point': 'XPDR1-CLIENT2', 'port-direction': 'bidirectional',
+             'port-qual': 'xpdr-client'},
+            res['mapping'])
+
+    def test_14_xpdr_portmapping_CLIENT3(self):
+        url = ("{}/config/transportpce-portmapping:network/"
+               "nodes/XPDRA/mapping/XPDR1-CLIENT3"
+               .format(self.restconf_baseurl))
+        headers = {'content-type': 'application/json'}
+        response = requests.request(
+            "GET", url, headers=headers, auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn(
+            {'supporting-port': 'C3',
+             'supporting-circuit-pack-name': '1/0/C3-PLUG-CLIENT',
+             'logical-connection-point': 'XPDR1-CLIENT3',
+             'associated-lcp': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional',
+             'port-qual': 'xpdr-client'},
             res['mapping'])
 
-    def test_12_xpdr_portmapping_CLIENT4(self):
+    def test_15_xpdr_portmapping_CLIENT4(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDRA/mapping/XPDR1-CLIENT4"
                .format(self.restconf_baseurl))
@@ -290,10 +347,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': 'C4',
              'supporting-circuit-pack-name': '1/0/C4-PLUG-CLIENT',
-             'logical-connection-point': 'XPDR1-CLIENT4'},
+             'logical-connection-point': 'XPDR1-CLIENT4', 'port-direction': 'bidirectional',
+             'port-qual': 'xpdr-client'},
             res['mapping'])
 
-    def test_13_xpdr_device_disconnected(self):
+    def test_16_xpdr_device_disconnected(self):
         url = ("{}/config/network-topology:"
                 "network-topology/topology/topology-netconf/node/XPDRA"
                .format(self.restconf_baseurl))
@@ -304,7 +362,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(20)
 
-    def test_14_xpdr_device_disconnected(self):
+    def test_17_xpdr_device_disconnected(self):
         url = ("{}/operational/network-topology:network-topology/topology/"
                "topology-netconf/node/XPDRA".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -317,7 +375,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              "error-message":"Request could not be completed because the relevant data model content does not exist"},
             res['errors']['error'])
 
-    def test_15_xpdr_device_disconnected(self):
+    def test_18_xpdr_device_disconnected(self):
         url = ("{}/config/transportpce-portmapping:network/nodes/XPDRA".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -329,7 +387,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              "error-message":"Request could not be completed because the relevant data model content does not exist"},
             res['errors']['error'])
 
-    def test_16_rdm_device_disconnected(self):
+    def test_19_rdm_device_disconnected(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADMA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -339,7 +397,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(20)
 
-    def test_17_rdm_device_disconnected(self):
+    def test_20_rdm_device_disconnected(self):
         url = ("{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -352,7 +410,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              "error-message":"Request could not be completed because the relevant data model content does not exist"},
             res['errors']['error'])
 
-    def test_18_rdm_device_disconnected(self):
+    def test_21_rdm_device_disconnected(self):
         url = ("{}/config/transportpce-portmapping:network/nodes/ROADMA".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(

diff --git a/tests/transportpce_tests/2.2.1/test_portmapping.py b/tests/transportpce_tests/2.2.1/test_portmapping.py
index de1dbcfc8eccdbf23de45e6c2f19a3a1042974b9..6edac72f2a3daff3b3257ac020c7ba37a49fd542 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/2.2.1/test_portmapping.py
@@ -119,7 +119,25 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             'connected')
         time.sleep(10)
 
-    def test_03_rdm_portmapping_DEG1_TTP_TXRX(self):
+    def test_03_rdm_portmapping_info(self):
+        url = ("{}/config/transportpce-portmapping:network/"
+               "nodes/ROADM-A1/node-info"
+               .format(self.restconf_baseurl))
+        headers = {'content-type': 'application/json'}
+        response = requests.request(
+            "GET", url, headers=headers, auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(
+            {u'node-info': {u'node-type': u'rdm',
+             u'node-ip-address': u'127.0.0.11',
+             u'node-clli': u'NodeA',
+             u'openroadm-version': u'2.2.1', u'node-vendor': u'vendorA',
+             u'node-model': u'model2'}},
+            res)
+        time.sleep(3)
+
+    def test_04_rdm_portmapping_DEG1_TTP_TXRX(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADM-A1/mapping/DEG1-TTP-TXRX"
                .format(self.restconf_baseurl))
@@ -130,10 +148,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0',
-             'logical-connection-point': 'DEG1-TTP-TXRX'},
+             'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'},
             res['mapping'])
 
-    def test_04_rdm_portmapping_DEG2_TTP_TXRX_with_ots_oms(self):
+    def test_05_rdm_portmapping_DEG2_TTP_TXRX_with_ots_oms(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADM-A1/mapping/DEG2-TTP-TXRX"
                .format(self.restconf_baseurl))
@@ -145,10 +163,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/0',
              'logical-connection-point': 'DEG2-TTP-TXRX',
-             'supporting-oms': 'OMS-DEG2-TTP-TXRX', 'supporting-ots': 'OTS-DEG2-TTP-TXRX'},
+             'supporting-oms': 'OMS-DEG2-TTP-TXRX', 'supporting-ots': 'OTS-DEG2-TTP-TXRX',
+             'port-direction': 'bidirectional'},
             res['mapping'])
 
-    def test_05_rdm_portmapping_SRG1_PP3_TXRX(self):
+    def test_06_rdm_portmapping_SRG1_PP3_TXRX(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADM-A1/mapping/SRG1-PP3-TXRX"
                .format(self.restconf_baseurl))
@@ -159,10 +178,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0',
-             'logical-connection-point': 'SRG1-PP3-TXRX'},
+             'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional'},
             res['mapping'])
 
-    def test_06_rdm_portmapping_SRG3_PP1_TXRX(self):
+    def test_07_rdm_portmapping_SRG3_PP1_TXRX(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/ROADM-A1/mapping/SRG3-PP1-TXRX"
                .format(self.restconf_baseurl))
@@ -173,10 +192,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': 'C1', 'supporting-circuit-pack-name': '5/0',
-             'logical-connection-point': 'SRG3-PP1-TXRX'},
+             'logical-connection-point': 'SRG3-PP1-TXRX', 'port-direction': 'bidirectional'},
             res['mapping'])
 
-    def test_07_xpdr_device_connected(self):
+    def test_08_xpdr_device_connected(self):
         url = ("{}/config/network-topology:"
                "network-topology/topology/topology-netconf/node/XPDR-A1"
               .format(self.restconf_baseurl))
@@ -195,7 +214,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created)
         time.sleep(20)
 
-    def test_08_xpdr_device_connected(self):
+    def test_09_xpdr_device_connected(self):
         url = ("{}/operational/network-topology:"
                "network-topology/topology/topology-netconf/node/XPDR-A1"
                .format(self.restconf_baseurl))
@@ -209,7 +228,25 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             'connected')
         time.sleep(10)
 
-    def test_09_xpdr_portmapping_NETWORK1(self):
+    def test_10_xpdr_portmapping_info(self):
+        url = ("{}/config/transportpce-portmapping:network/"
+               "nodes/XPDR-A1/node-info"
+               .format(self.restconf_baseurl))
+        headers = {'content-type': 'application/json'}
+        response = requests.request(
+            "GET", url, headers=headers, auth=('admin', 'admin'))
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(
+            {u'node-info': {u'node-type': u'xpdr',
+             u'node-ip-address': u'1.2.3.4',
+             u'node-clli': u'NodeA',
+             u'openroadm-version': u'2.2.1', u'node-vendor': u'vendorA',
+             u'node-model': u'model2'}},
+            res)
+        time.sleep(3)
+
+    def test_11_xpdr_portmapping_NETWORK1(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDR-A1/mapping/XPDR1-NETWORK1"
                .format(self.restconf_baseurl))
@@ -220,10 +257,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-             'logical-connection-point': 'XPDR1-NETWORK1'},
+             'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network',
+             'port-direction': 'bidirectional', 'associated-lcp': 'XPDR1-CLIENT1'},
             res['mapping'])
 
-    def test_10_xpdr_portmapping_NETWORK2(self):
+    def test_12_xpdr_portmapping_NETWORK2(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDR-A1/mapping/XPDR1-NETWORK2"
                .format(self.restconf_baseurl))
@@ -234,10 +272,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET',
-             'logical-connection-point': 'XPDR1-NETWORK2'},
+             'logical-connection-point': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional',
+             'associated-lcp': 'XPDR1-CLIENT2', 'port-qual': 'xpdr-network'},
             res['mapping'])
 
-    def test_11_xpdr_portmapping_CLIENT1(self):
+    def test_13_xpdr_portmapping_CLIENT1(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDR-A1/mapping/XPDR1-CLIENT1"
                .format(self.restconf_baseurl))
@@ -249,10 +288,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': 'C1',
              'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT',
-             'logical-connection-point': 'XPDR1-CLIENT1'},
+             'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
+             'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
             res['mapping'])
 
-    def test_12_xpdr_portmapping_CLIENT2(self):
+    def test_14_xpdr_portmapping_CLIENT2(self):
         url = ("{}/config/transportpce-portmapping:network/"
                "nodes/XPDR-A1/mapping/XPDR1-CLIENT2"
                .format(self.restconf_baseurl))
@@ -264,10 +304,11 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertIn(
             {'supporting-port': 'C1',
                  'supporting-circuit-pack-name': '1/0/2-PLUG-CLIENT',
-                 'logical-connection-point': 'XPDR1-CLIENT2'},
+                 'logical-connection-point': 'XPDR1-CLIENT2', 'port-direction': 'bidirectional',
+                 'associated-lcp': 'XPDR1-NETWORK2', 'port-qual': 'xpdr-client'},
             res['mapping'])
 
-    def test_13_xpdr_device_disconnected(self):
+    def test_15_xpdr_device_disconnected(self):
         url = ("{}/config/network-topology:"
                 "network-topology/topology/topology-netconf/node/XPDR-A1"
                .format(self.restconf_baseurl))
@@ -278,7 +319,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(20)
 
-    def test_14_xpdr_device_disconnected(self):
+    def test_16_xpdr_device_disconnected(self):
         url = ("{}/operational/network-topology:network-topology/topology/"
                "topology-netconf/node/XPDR-A1".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -291,7 +332,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              "error-message":"Request could not be completed because the relevant data model content does not exist"},
             res['errors']['error'])
 
-    def test_15_xpdr_device_disconnected(self):
+    def test_17_xpdr_device_disconnected(self):
         url = ("{}/config/transportpce-portmapping:network/nodes/XPDR-A1".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -303,7 +344,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              "error-message":"Request could not be completed because the relevant data model content does not exist"},
             res['errors']['error'])
 
-    def test_16_rdm_device_disconnected(self):
+    def test_18_rdm_device_disconnected(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/node/ROADM-A1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -313,7 +354,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(20)
 
-    def test_17_rdm_device_disconnected(self):
+    def test_19_rdm_device_disconnected(self):
         url = ("{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADM-A1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -326,7 +367,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              "error-message":"Request could not be completed because the relevant data model content does not exist"},
             res['errors']['error'])
 
-    def test_18_rdm_device_disconnected(self):
+    def test_20_rdm_device_disconnected(self):
         url = ("{}/config/transportpce-portmapping:network/nodes/ROADM-A1".format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(