Update OTN E2E functional tests for 1GE

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

diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
index 2a1886cbc19f8500b400c657ebe6cbc1b52bb2df..35e2e379bb91e6aa6b3feb4244ba80ed4d2237a0 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
@@ -130,7 +130,8 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims(['spdra', 'roadma', 'roadmc', 'spdrc'])
+        cls.processes = test_utils.start_sims(
+            ['spdra', 'roadma', 'roadmc', 'spdrc'])
 
     @classmethod
     def tearDownClass(cls):
@@ -144,50 +145,58 @@ class TransportPCEtesting(unittest.TestCase):
 
     def test_01_connect_spdrA(self):
         response = test_utils.mount_device("SPDR-SA1", 'spdra')
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_02_connect_spdrC(self):
         response = test_utils.mount_device("SPDR-SC1", 'spdrc')
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_03_connect_rdmA(self):
         response = test_utils.mount_device("ROADM-A1", 'roadma')
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_04_connect_rdmC(self):
         response = test_utils.mount_device("ROADM-C1", 'roadmc')
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
-    def test_05_connect_sprdA_N1_to_roadmA_PP1(self):
+    def test_05_connect_sprdA_1_N1_to_roadmA_PP1(self):
         response = test_utils.connect_xpdr_to_rdm_request("SPDR-SA1", "1", "1",
                                                           "ROADM-A1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        self.assertIn('Xponder Roadm Link created successfully',
+                      res["output"]["result"])
         time.sleep(2)
 
-    def test_06_connect_roadmA_PP1_to_spdrA_N1(self):
+    def test_06_connect_roadmA_PP1_to_spdrA_1_N1(self):
         response = test_utils.connect_rdm_to_xpdr_request("SPDR-SA1", "1", "1",
                                                           "ROADM-A1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        self.assertIn('Roadm Xponder links created successfully',
+                      res["output"]["result"])
         time.sleep(2)
 
-    def test_07_connect_sprdC_N1_to_roadmC_PP1(self):
+    def test_07_connect_sprdC_1_N1_to_roadmC_PP1(self):
         response = test_utils.connect_xpdr_to_rdm_request("SPDR-SC1", "1", "1",
                                                           "ROADM-C1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        self.assertIn('Xponder Roadm Link created successfully',
+                      res["output"]["result"])
         time.sleep(2)
 
-    def test_08_connect_roadmC_PP1_to_spdrC_N1(self):
+    def test_08_connect_roadmC_PP1_to_spdrC_1_N1(self):
         response = test_utils.connect_rdm_to_xpdr_request("SPDR-SC1", "1", "1",
                                                           "ROADM-C1", "1", "SRG1-PP1-TXRX")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        self.assertIn('Roadm Xponder links created successfully',
+                      res["output"]["result"])
         time.sleep(2)
 
     def test_09_add_omsAttributes_ROADMA_ROADMC(self):
@@ -202,7 +211,8 @@ class TransportPCEtesting(unittest.TestCase):
                 "fiber-type": "smf",
                 "SRLG-length": 100000,
                 "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils.add_oms_attr_request(
+            "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
     def test_10_add_omsAttributes_ROADMC_ROADMA(self):
@@ -217,7 +227,8 @@ class TransportPCEtesting(unittest.TestCase):
                 "fiber-type": "smf",
                 "SRLG-length": 100000,
                 "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils.add_oms_attr_request(
+            "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
         self.assertEqual(response.status_code, requests.codes.created)
 
 # test service-create for OCH-OTU4 service from spdr to spdr
@@ -238,7 +249,8 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(self.WAITING)
 
     def test_13_get_OCH_OTU4_service1(self):
-        response = test_utils.get_service_list_request("services/service1-OCH-OTU4")
+        response = test_utils.get_service_list_request(
+            "services/service1-OCH-OTU4")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
@@ -253,7 +265,8 @@ class TransportPCEtesting(unittest.TestCase):
 
     # Check correct configuration of devices
     def test_14_check_interface_och_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1',
@@ -270,7 +283,8 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_15_check_interface_OTU4_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-OTU")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU',
@@ -293,7 +307,8 @@ class TransportPCEtesting(unittest.TestCase):
                              ['org-openroadm-otn-otu-interfaces:otu'])
 
     def test_16_check_interface_och_spdrc(self):
-        response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-1")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR1-NETWORK1-1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1',
@@ -310,7 +325,8 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_17_check_interface_OTU4_spdrc(self):
-        response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-OTU")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR1-NETWORK1-OTU")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU',
@@ -336,7 +352,8 @@ class TransportPCEtesting(unittest.TestCase):
                              ['org-openroadm-otn-otu-interfaces:otu'])
 
     def test_18_check_no_interface_ODU4_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
         self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
@@ -403,11 +420,16 @@ class TransportPCEtesting(unittest.TestCase):
                       'OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1']
         for link in res['network'][0]['ietf-network-topology:link']:
             self.assertIn(link['link-id'], listLinkId)
-            self.assertEqual(link['transportpce-topology:otn-link-type'], 'OTU4')
-            self.assertEqual(link['org-openroadm-common-network:link-type'], 'OTN-LINK')
-            self.assertEqual(link['org-openroadm-otn-network-topology:available-bandwidth'], 100000)
-            self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
-            self.assertIn(link['org-openroadm-common-network:opposite-link'], listLinkId)
+            self.assertEqual(
+                link['transportpce-topology:otn-link-type'], 'OTU4')
+            self.assertEqual(
+                link['org-openroadm-common-network:link-type'], 'OTN-LINK')
+            self.assertEqual(
+                link['org-openroadm-otn-network-topology:available-bandwidth'], 100000)
+            self.assertEqual(
+                link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
+            self.assertIn(
+                link['org-openroadm-common-network:opposite-link'], listLinkId)
 
 # test service-create for ODU4 service from spdr to spdr
     def test_23_create_ODU4_service(self):
@@ -427,7 +449,8 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(self.WAITING)
 
     def test_24_get_ODU4_service1(self):
-        response = test_utils.get_service_list_request("services/service1-ODU4")
+        response = test_utils.get_service_list_request(
+            "services/service1-ODU4")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
@@ -441,7 +464,8 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(2)
 
     def test_25_check_interface_ODU4_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4',
@@ -469,7 +493,8 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_26_check_interface_ODU4_spdrc(self):
-        response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-ODU4")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU4")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4',
@@ -506,14 +531,20 @@ class TransportPCEtesting(unittest.TestCase):
             linkId = link['link-id']
             if (linkId in ('OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                            'OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1')):
-                self.assertEqual(link['org-openroadm-otn-network-topology:available-bandwidth'], 0)
-                self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 100000)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:available-bandwidth'], 0)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:used-bandwidth'], 100000)
             elif (linkId in ('ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                              'ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1')):
-                self.assertEqual(link['org-openroadm-otn-network-topology:available-bandwidth'], 100000)
-                self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
-                self.assertEqual(link['transportpce-topology:otn-link-type'], 'ODTU4')
-                self.assertEqual(link['org-openroadm-common-network:link-type'], 'OTN-LINK')
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:available-bandwidth'], 100000)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
+                self.assertEqual(
+                    link['transportpce-topology:otn-link-type'], 'ODTU4')
+                self.assertEqual(
+                    link['org-openroadm-common-network:link-type'], 'OTN-LINK')
                 self.assertIn(link['org-openroadm-common-network:opposite-link'],
                               ['ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                                'ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1'])
@@ -530,7 +561,8 @@ class TransportPCEtesting(unittest.TestCase):
                     if tp['tp-id'] == 'XPDR1-NETWORK1':
                         xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                         self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 80)
-                        self.assertEqual(len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80)
+                        self.assertEqual(
+                            len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80)
                         self.assertEqual(xpdrTpPortConAt['odtu-tpn-pool'][0]['odtu-type'],
                                          'org-openroadm-otn-common-types:ODTU4.ts-Allocated')
 
@@ -556,7 +588,8 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(self.WAITING)
 
     def test_30_get_10GE_service1(self):
-        response = test_utils.get_service_list_request("services/service1-10GE")
+        response = test_utils.get_service_list_request(
+            "services/service1-10GE")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
@@ -570,7 +603,8 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(2)
 
     def test_31_check_interface_10GE_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G',
@@ -586,7 +620,8 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_32_check_interface_ODU2E_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE',
@@ -610,7 +645,8 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_33_check_interface_ODU2E_NETWORK_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1-10GE',
@@ -657,7 +693,8 @@ class TransportPCEtesting(unittest.TestCase):
                              res['odu-connection'][0]['source'])
 
     def test_35_check_interface_10GE_CLIENT_spdrc(self):
-        response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-CLIENT1-ETHERNET10G")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR1-CLIENT1-ETHERNET10G")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G',
@@ -673,7 +710,8 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_36_check_interface_ODU2E_CLIENT_spdrc(self):
-        response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e-service1-10GE")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1-10GE',
@@ -697,7 +735,8 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_37_check_interface_ODU2E_NETWORK_spdrc(self):
-        response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e-service1-10GE")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e-service1-10GE',
@@ -757,8 +796,10 @@ class TransportPCEtesting(unittest.TestCase):
             linkId = link['link-id']
             if (linkId in ('ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                            'ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1')):
-                self.assertEqual(link['org-openroadm-otn-network-topology:available-bandwidth'], 90000)
-                self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 10000)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:available-bandwidth'], 90000)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:used-bandwidth'], 10000)
 
     def test_40_check_otn_topo_tp(self):
         response = test_utils.get_otn_topo_request()
@@ -771,9 +812,12 @@ class TransportPCEtesting(unittest.TestCase):
                         xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                         self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 72)
                         tsPoolList = list(range(1, 9))
-                        self.assertNotIn(tsPoolList, xpdrTpPortConAt['ts-pool'])
-                        self.assertEqual(len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 79)
-                        self.assertNotIn(1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool'])
+                        self.assertNotIn(
+                            tsPoolList, xpdrTpPortConAt['ts-pool'])
+                        self.assertEqual(
+                            len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 79)
+                        self.assertNotIn(
+                            1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool'])
 
     def test_41_delete_10GE_service(self):
         response = test_utils.service_delete_request("service1-10GE")
@@ -781,7 +825,7 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         self.assertIn('Renderer service delete in progress',
                       res['output']['configuration-response-common']['response-message'])
-        time.sleep(20)
+        time.sleep(self.WAITING)
 
     def test_42_check_service_list(self):
         response = test_utils.get_service_list_request("")
@@ -798,15 +842,18 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(1)
 
     def test_44_check_no_interface_ODU2E_NETWORK_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1")
         self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_45_check_no_interface_ODU2E_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1")
         self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_46_check_no_interface_10GE_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
         self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_47_check_otn_topo_links(self):
@@ -819,8 +866,10 @@ class TransportPCEtesting(unittest.TestCase):
             linkId = link['link-id']
             if (linkId in ('ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                            'ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1')):
-                self.assertEqual(link['org-openroadm-otn-network-topology:available-bandwidth'], 100000)
-                self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:available-bandwidth'], 100000)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
 
     def test_48_check_otn_topo_tp(self):
         response = test_utils.get_otn_topo_request()
@@ -832,7 +881,8 @@ class TransportPCEtesting(unittest.TestCase):
                     if tp['tp-id'] == 'XPDR1-NETWORK1':
                         xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                         self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 80)
-                        self.assertEqual(len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80)
+                        self.assertEqual(
+                            len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80)
 
     def test_49_delete_ODU4_service(self):
         response = test_utils.service_delete_request("service1-ODU4")
@@ -840,7 +890,7 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         self.assertIn('Renderer service delete in progress',
                       res['output']['configuration-response-common']['response-message'])
-        time.sleep(20)
+        time.sleep(self.WAITING)
 
     def test_50_check_service_list(self):
         response = test_utils.get_service_list_request("")
@@ -850,7 +900,8 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(2)
 
     def test_51_check_no_interface_ODU4_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
         self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_52_check_otn_topo_links(self):
@@ -866,7 +917,8 @@ class TransportPCEtesting(unittest.TestCase):
                     if tp['tp-id'] == 'XPDR1-NETWORK1':
                         xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                         self.assertNotIn('ts-pool', dict.keys(xpdrTpPortConAt))
-                        self.assertNotIn('odtu-tpn-pool', dict.keys(xpdrTpPortConAt))
+                        self.assertNotIn(
+                            'odtu-tpn-pool', dict.keys(xpdrTpPortConAt))
 
     def test_54_delete_OCH_OTU4_service(self):
         response = test_utils.service_delete_request("service1-OCH-OTU4")
@@ -874,7 +926,7 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         self.assertIn('Renderer service delete in progress',
                       res['output']['configuration-response-common']['response-message'])
-        time.sleep(20)
+        time.sleep(self.WAITING)
 
     def test_55_get_no_service(self):
         response = test_utils.get_service_list_request("")
@@ -887,11 +939,13 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(1)
 
     def test_56_check_no_interface_OTU4_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-OTU")
         self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_57_check_no_interface_OCH_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1")
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR1-NETWORK1-1")
         self.assertEqual(response.status_code, requests.codes.conflict)
 
     def test_58_getLinks_OtnTopology(self):
@@ -921,7 +975,8 @@ class TransportPCEtesting(unittest.TestCase):
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
             if ele['tp-id'] == 'SRG1-PP1-TXRX':
-                self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
+                self.assertNotIn(
+                    'org-openroadm-network-topology:pp-attributes', dict.keys(ele))
         time.sleep(3)
 
     def test_61_check_openroadm_topo_ROADMA_DEG(self):
@@ -939,24 +994,499 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertEqual(ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'][0]['freq-map'],
                                  AVAILABLE_FREQ_MAP)
             if ele['tp-id'] == 'DEG2-TTP-TXRX':
-                self.assertNotIn('org-openroadm-network-topology:tx-ttp-attributes', dict.keys(ele))
+                self.assertNotIn(
+                    'org-openroadm-network-topology:tx-ttp-attributes', dict.keys(ele))
         time.sleep(3)
 
-    def test_62_disconnect_spdrA(self):
+    def test_62_connect_sprdA_3_N1_to_roadmA_PP2(self):
+        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SA1", "3", "1",
+                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Xponder Roadm Link created successfully',
+                      res["output"]["result"])
+        time.sleep(2)
+
+    def test_63_connect_roadmA_PP2_to_spdrA_3_N1(self):
+        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SA1", "3", "1",
+                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Roadm Xponder links created successfully',
+                      res["output"]["result"])
+        time.sleep(2)
+
+    def test_64_connect_sprdC_3_N1_to_roadmC_PP2(self):
+        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SC1", "3", "1",
+                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Xponder Roadm Link created successfully',
+                      res["output"]["result"])
+        time.sleep(2)
+
+    def test_65_connect_roadmC_PP2_to_spdrC_3_N1(self):
+        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SC1", "3", "1",
+                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Roadm Xponder links created successfully',
+                      res["output"]["result"])
+        time.sleep(2)
+
+    def test_66_create_OCH_OTU4_service_2(self):
+        self.cr_serv_sample_data["input"]["service-name"] = "service2-OCH-OTU4"
+        self.cr_serv_sample_data["input"]["connection-type"] = "infrastructure"
+        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100"
+        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OTU"
+        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR3-NETWORK1"
+        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR3-NETWORK1"
+        self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"] = "org-openroadm-otn-common-types:OTU4"
+        self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "100"
+        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OTU"
+        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR3-NETWORK1"
+        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR3-NETWORK1"
+        self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"] = "org-openroadm-otn-common-types:OTU4"
+        response = test_utils.service_create_request(self.cr_serv_sample_data)
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('PCE calculation in progress',
+                      res['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
+
+    def test_67_get_OCH_OTU4_service2(self):
+        response = test_utils.get_service_list_request(
+            "services/service2-OCH-OTU4")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(
+            res['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(
+            res['services'][0]['service-name'], 'service2-OCH-OTU4')
+        self.assertEqual(
+            res['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(
+            res['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(2)
+
+    def test_68_create_ODU4_service_2(self):
+        self.cr_serv_sample_data["input"]["service-name"] = "service2-ODU4"
+        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "ODU"
+        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR3-NETWORK1"
+        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR3-NETWORK1"
+        self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
+        del self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"]
+        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "ODU"
+        self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
+        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR3-NETWORK1"
+        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR3-NETWORK1"
+        del self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"]
+
+        response = test_utils.service_create_request(self.cr_serv_sample_data)
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('PCE calculation in progress',
+                      res['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
+
+    def test_69_get_ODU4_service2(self):
+        response = test_utils.get_service_list_request(
+            "services/service2-ODU4")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(
+            res['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(
+            res['services'][0]['service-name'], 'service2-ODU4')
+        self.assertEqual(
+            res['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(
+            res['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(2)
+
+    def test_70_create_1GE_service(self):
+        self.cr_serv_sample_data["input"]["service-name"] = "service1-1GE"
+        self.cr_serv_sample_data["input"]["connection-type"] = "service"
+        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "1"
+        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
+        self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "1"
+        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
+        del self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"]
+        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"]["port"]["port-name"] = "XPDR3-CLIENT1"
+        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SA1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"]["port"]["port-name"] = "XPDR3-CLIENT1"
+        del self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"]
+        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"]["port"]["port-name"] = "XPDR3-CLIENT1"
+        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-device-name"] = "SPDR-SC1-XPDR3"
+        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"]["port"]["port-name"] = "XPDR3-CLIENT1"
+        response = test_utils.service_create_request(self.cr_serv_sample_data)
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('PCE calculation in progress',
+                      res['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
+
+    def test_71_get_1GE_service1(self):
+        response = test_utils.get_service_list_request("services/service1-1GE")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(
+            res['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(
+            res['services'][0]['service-name'], 'service1-1GE')
+        self.assertEqual(
+            res['services'][0]['connection-type'], 'service')
+        self.assertEqual(
+            res['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(2)
+
+    def test_72_check_interface_1GE_CLIENT_spdra(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR3-CLIENT1-ETHERNET1G")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        input_dict = {'name': 'XPDR3-CLIENT1-ETHERNET1G',
+                      'administrative-state': 'inService',
+                      'supporting-circuit-pack-name': 'CP1-SFP4',
+                      'type': 'org-openroadm-interfaces:ethernetCsmacd',
+                      'supporting-port': 'CP1-SFP4-P1'
+                      }
+        self.assertDictEqual(dict(input_dict, **res['interface'][0]),
+                             res['interface'][0])
+        self.assertDictEqual(
+            {u'speed': 1000},
+            res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+
+    def test_73_check_interface_ODU0_CLIENT_spdra(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR3-CLIENT1-ODU0-service1-1GE")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0-service1-1GE',
+                        'administrative-state': 'inService',
+                        'supporting-circuit-pack-name': 'CP3-SFP1',
+                        'supporting-interface': 'XPDR3-CLIENT1-ETHERNET1G',
+                        'type': 'org-openroadm-interfaces:otnOdu',
+                        'supporting-port': 'CP3-SFP1-P1'}
+        input_dict_2 = {
+            'odu-function': 'org-openroadm-otn-common-types:ODU-TTP-CTP',
+            'rate': 'org-openroadm-otn-common-types:ODU0',
+            'monitoring-mode': 'terminated'}
+
+        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
+                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_2,
+                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(
+            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+    def test_74_check_interface_ODU0_NETWORK_spdra(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR3-NETWORK1-ODU0-service1-1GE")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0-service1-1GE',
+                        'administrative-state': 'inService',
+                        'supporting-circuit-pack-name': 'CP3-CFP0',
+                        'supporting-interface': 'XPDR3-NETWORK1-ODU4',
+                        'type': 'org-openroadm-interfaces:otnOdu',
+                        'supporting-port': 'CP3-CFP0-P1'}
+        input_dict_2 = {
+            'odu-function': 'org-openroadm-otn-common-types:ODU-CTP',
+            'rate': 'org-openroadm-otn-common-types:ODU0',
+            'monitoring-mode': 'monitored'}
+        input_dict_3 = {'trib-port-number': 1}
+
+        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
+                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_2,
+                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_3,
+                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+                                      'parent-odu-allocation']),
+                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+        self.assertIn(1, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+                      ['trib-slots'])
+
+    def test_75_check_ODU0_connection_spdra(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1",
+            "odu-connection/XPDR3-CLIENT1-ODU0-service1-1GE-x-XPDR3-NETWORK1-ODU0-service1-1GE")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        input_dict_1 = {
+            'connection-name':
+            'XPDR3-CLIENT1-ODU0-service1-1GE-x-XPDR3-NETWORK1-ODU0-service1-1GE',
+            'direction': 'bidirectional'
+        }
+
+        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
+                             res['odu-connection'][0])
+        self.assertDictEqual({u'dst-if': u'XPDR3-NETWORK1-ODU0-service1-1GE'},
+                             res['odu-connection'][0]['destination'])
+        self.assertDictEqual({u'src-if': u'XPDR3-CLIENT1-ODU0-service1-1GE'},
+                             res['odu-connection'][0]['source'])
+
+    def test_76_check_interface_1GE_CLIENT_spdrc(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR3-CLIENT1-ETHERNET1G")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        input_dict = {'name': 'XPDR3-CLIENT1-ETHERNET1G',
+                      'administrative-state': 'inService',
+                      'supporting-circuit-pack-name': 'CP3-SFP1',
+                      'type': 'org-openroadm-interfaces:ethernetCsmacd',
+                      'supporting-port': 'CP3-SFP1-P1'
+                      }
+        self.assertDictEqual(dict(input_dict, **res['interface'][0]),
+                             res['interface'][0])
+        self.assertDictEqual(
+            {u'speed': 1000},
+            res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+
+    def test_77_check_interface_ODU0_CLIENT_spdrc(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR3-CLIENT1-ODU0-service1-1GE")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        input_dict_1 = {'name': 'XPDR3-CLIENT1-ODU0-service1-1GE',
+                        'administrative-state': 'inService',
+                        'supporting-circuit-pack-name': 'CP3-SFP1',
+                        'supporting-interface': 'XPDR3-CLIENT1-ETHERNET1G',
+                        'type': 'org-openroadm-interfaces:otnOdu',
+                        'supporting-port': 'CP3-SFP1-P1'}
+        input_dict_2 = {
+            'odu-function': 'org-openroadm-otn-common-types:ODU-TTP-CTP',
+            'rate': 'org-openroadm-otn-common-types:ODU0',
+            'monitoring-mode': 'terminated'}
+
+        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
+                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_2,
+                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(
+            {u'payload-type': u'07', u'exp-payload-type': u'07'},
+            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+    def test_78_check_interface_ODU0_NETWORK_spdrc(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1", "interface/XPDR3-NETWORK1-ODU0-service1-1GE")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        input_dict_1 = {'name': 'XPDR3-NETWORK1-ODU0-service1-1GE',
+                        'administrative-state': 'inService',
+                        'supporting-circuit-pack-name': 'CP3-CFP0',
+                        'supporting-interface': 'XPDR3-NETWORK1-ODU4',
+                        'type': 'org-openroadm-interfaces:otnOdu',
+                        'supporting-port': 'CP3-CFP0-P1'}
+        input_dict_2 = {
+            'odu-function': 'org-openroadm-otn-common-types:ODU-CTP',
+            'rate': 'org-openroadm-otn-common-types:ODU0',
+            'monitoring-mode': 'monitored'}
+
+        input_dict_3 = {'trib-port-number': 1}
+
+        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
+                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_2,
+                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_3,
+                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+                                      'parent-odu-allocation']),
+                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+            'parent-odu-allocation'])
+        self.assertIn(1,
+                      res['interface'][0][
+                          'org-openroadm-otn-odu-interfaces:odu'][
+                          'parent-odu-allocation']['trib-slots'])
+
+    def test_79_check_ODU0_connection_spdrc(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SC1",
+            "odu-connection/XPDR3-CLIENT1-ODU0-service1-1GE-x-XPDR3-NETWORK1-ODU0-service1-1GE")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        input_dict_1 = {
+            'connection-name':
+            'XPDR3-CLIENT1-ODU0-service1-1GE-x-XPDR3-NETWORK1-ODU0-service1-1GE',
+            'direction': 'bidirectional'
+        }
+
+        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
+                             res['odu-connection'][0])
+        self.assertDictEqual({u'dst-if': u'XPDR3-NETWORK1-ODU0-service1-1GE'},
+                             res['odu-connection'][0]['destination'])
+        self.assertDictEqual({u'src-if': u'XPDR3-CLIENT1-ODU0-service1-1GE'},
+                             res['odu-connection'][0]['source'])
+
+    def test_80_check_otn_topo_links(self):
+        response = test_utils.get_otn_topo_request()
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        nb_links = len(res['network'][0]['ietf-network-topology:link'])
+        self.assertEqual(nb_links, 4)
+        for link in res['network'][0]['ietf-network-topology:link']:
+            linkId = link['link-id']
+            if (linkId in ('ODU4-SPDR-SA1-XPDR3-XPDR3-NETWORK1toSPDR-SC1-XPDR3-XPDR3-NETWORK1',
+                           'ODU4-SPDR-SC1-XPDR3-XPDR3-NETWORK1toSPDR-SA1-XPDR3-XPDR3-NETWORK1')):
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:available-bandwidth'], 99000)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:used-bandwidth'], 1000)
+
+    def test_81_check_otn_topo_tp(self):
+        response = test_utils.get_otn_topo_request()
+        res = response.json()
+        for node in res['network'][0]['node']:
+            if node['node-id'] == 'SPDR-SA1-XPDR3' or 'SPDR-SC1-XPDR3':
+                tpList = node['ietf-network-topology:termination-point']
+                for tp in tpList:
+                    if tp['tp-id'] == 'XPDR3-NETWORK1':
+                        xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
+                        self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 79)
+                        tsPoolList = list(range(1, 2))
+                        self.assertNotIn(
+                            tsPoolList, xpdrTpPortConAt['ts-pool'])
+                        self.assertEqual(
+                            len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 79)
+                        self.assertNotIn(
+                            1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool'])
+
+    def test_82_delete_1GE_service(self):
+        response = test_utils.service_delete_request("service1-1GE")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Renderer service delete in progress',
+                      res['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
+
+    def test_83_check_service_list(self):
+        response = test_utils.get_service_list_request("")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertEqual(len(res['service-list']['services']), 2)
+        time.sleep(2)
+
+    def test_84_check_no_ODU0_connection_spdra(self):
+        response = test_utils.check_netconf_node_request("SPDR-SA1", "")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertNotIn(['odu-connection'][0], res['org-openroadm-device'])
+        time.sleep(1)
+
+    def test_85_check_no_interface_ODU0_NETWORK_spdra(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR3-NETWORK1-ODU0-service1")
+        self.assertEqual(response.status_code, requests.codes.conflict)
+
+    def test_86_check_no_interface_ODU0_CLIENT_spdra(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR3-CLIENT1-ODU0-service1")
+        self.assertEqual(response.status_code, requests.codes.conflict)
+
+    def test_87_check_no_interface_10GE_CLIENT_spdra(self):
+        response = test_utils.check_netconf_node_request(
+            "SPDR-SA1", "interface/XPDR3-CLIENT1-ETHERNET1G")
+        self.assertEqual(response.status_code, requests.codes.conflict)
+
+    def test_88_check_otn_topo_links(self):
+        response = test_utils.get_otn_topo_request()
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        nb_links = len(res['network'][0]['ietf-network-topology:link'])
+        self.assertEqual(nb_links, 4)
+        for link in res['network'][0]['ietf-network-topology:link']:
+            linkId = link['link-id']
+            if (linkId in ('ODU4-SPDR-SA1-XPDR3-XPDR3-NETWORK1toSPDR-SC1-XPDR3-XPDR3-NETWORK1',
+                           'ODU4-SPDR-SC1-XPDR3-XPDR3-NETWORK1toSPDR-SA1-XPDR3-XPDR3-NETWORK1')):
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:available-bandwidth'], 100000)
+                self.assertEqual(
+                    link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
+
+    def test_89_check_otn_topo_tp(self):
+        response = test_utils.get_otn_topo_request()
+        res = response.json()
+        for node in res['network'][0]['node']:
+            if (node['node-id'] == 'SPDR-SA1-XPDR3' or 'SPDR-SC1-XPDR3'):
+                tpList = node['ietf-network-topology:termination-point']
+                for tp in tpList:
+                    if tp['tp-id'] == 'XPDR3-NETWORK1':
+                        xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
+                        self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 80)
+                        self.assertEqual(
+                            len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80)
+
+    def test_90_delete_ODU4_service(self):
+        response = test_utils.service_delete_request("service2-ODU4")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Renderer service delete in progress',
+                      res['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
+
+    def test_91_delete_OCH_OTU4_service(self):
+        response = test_utils.service_delete_request("service2-OCH-OTU4")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        self.assertIn('Renderer service delete in progress',
+                      res['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
+
+    def test_92_disconnect_xponders_from_roadm(self):
+        url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
+        response = test_utils.get_ordm_topo_request("")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        links = res['network'][0]['ietf-network-topology:link']
+        for link in links:
+            if (link["org-openroadm-common-network:link-type"] == "XPONDER-OUTPUT" or
+                    link["org-openroadm-common-network:link-type"] == "XPONDER-INPUT"):
+                link_name = link["link-id"]
+                response = test_utils.delete_request(url+link_name)
+                self.assertEqual(response.status_code, requests.codes.ok)
+
+    def test_93_check_openroadm_topology(self):
+        response = test_utils.get_ordm_topo_request("")
+        self.assertEqual(response.status_code, requests.codes.ok)
+        res = response.json()
+        links = res['network'][0]['ietf-network-topology:link']
+        self.assertEqual(18, len(links), 'Topology should contain 18 links')
+
+    def test_94_disconnect_spdrA(self):
         response = test_utils.unmount_device("SPDR-SA1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        self.assertEqual(response.status_code, requests.codes.ok,
+                         test_utils.CODE_SHOULD_BE_200)
 
-    def test_63_disconnect_spdrC(self):
+    def test_95_disconnect_spdrC(self):
         response = test_utils.unmount_device("SPDR-SC1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        self.assertEqual(response.status_code, requests.codes.ok,
+                         test_utils.CODE_SHOULD_BE_200)
 
-    def test_64_disconnect_roadmA(self):
+    def test_96_disconnect_roadmA(self):
         response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        self.assertEqual(response.status_code, requests.codes.ok,
+                         test_utils.CODE_SHOULD_BE_200)
 
-    def test_65_disconnect_roadmC(self):
+    def test_97_disconnect_roadmC(self):
         response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        self.assertEqual(response.status_code, requests.codes.ok,
+                         test_utils.CODE_SHOULD_BE_200)
 
 
 if __name__ == "__main__":