run autopep8 on functional tests suite
[transportpce.git] / tests / transportpce_tests / 1.2.1 / test_renderer_service_path_nominal.py
index 92fe6a0abd34d92b9cf396c136245c5decdc2fea..37bbfabaa6e65a62e115ae3d241d79f56637dbfa 100644 (file)
@@ -29,22 +29,22 @@ class TransportPCERendererTesting(unittest.TestCase):
     odl_process = None
     restconf_baseurl = "http://localhost:8181/restconf"
 
-#START_IGNORE_XTESTING
+# START_IGNORE_XTESTING
 
     @classmethod
     def setUpClass(cls):
-        print ("starting honeynode1...")
+        print("starting honeynode1...")
         cls.honeynode_process1 = test_utils.start_xpdra_honeynode()
         time.sleep(20)
 
-        print ("starting honeynode2...")
+        print("starting honeynode2...")
         cls.honeynode_process2 = test_utils.start_roadma_honeynode()
         time.sleep(20)
 
-        print ("starting opendaylight...")
+        print("starting opendaylight...")
         cls.odl_process = test_utils.start_tpce()
         time.sleep(60)
-        print ("opendaylight started")
+        print("opendaylight started")
 
     @classmethod
     def tearDownClass(cls):
@@ -65,36 +65,36 @@ class TransportPCERendererTesting(unittest.TestCase):
         cls.honeynode_process2.wait()
 
     def setUp(self):
-        print ("execution of {}".format(self.id().split(".")[-1]))
+        print("execution of {}".format(self.id().split(".")[-1]))
         time.sleep(10)
 
-#END_IGNORE_XTESTING
+# END_IGNORE_XTESTING
 
     def test_01_rdm_device_connected(self):
         url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/ROADMA"
+               "network-topology/topology/topology-netconf/node/ROADMA01"
                .format(self.restconf_baseurl))
         data = {"node": [{
-             "node-id": "ROADMA",
-             "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:tcp-only": "false",
-             "netconf-node-topology:pass-through": {}}]}
+            "node-id": "ROADMA01",
+            "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:tcp-only": "false",
+            "netconf-node-topology:pass-through": {}}]}
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "PUT", url, data=json.dumps(data), headers=headers,
-              auth=('admin', 'admin'))
+            "PUT", url, data=json.dumps(data), headers=headers,
+            auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.created)
         time.sleep(20)
 
     def test_02_xpdr_device_connected(self):
         url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/XPDRA"
-              .format(self.restconf_baseurl))
+               "network-topology/topology/topology-netconf/node/XPDRA01"
+               .format(self.restconf_baseurl))
         data = {"node": [{
-            "node-id": "XPDRA",
+            "node-id": "XPDRA01",
             "netconf-node-topology:username": "admin",
             "netconf-node-topology:password": "admin",
             "netconf-node-topology:host": "127.0.0.1",
@@ -110,226 +110,228 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_03_rdm_portmapping(self):
         url = ("{}/config/transportpce-portmapping:network/"
-               "nodes/ROADMA"
+               "nodes/ROADMA01"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-             {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/0',
-              'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'},
-             res['nodes'][0]['mapping'])
+            {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/0',
+             'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'},
+            res['nodes'][0]['mapping'])
         self.assertIn(
-             {'supporting-port': 'C7', 'supporting-circuit-pack-name': '4/0',
-              'logical-connection-point': 'SRG1-PP7-TXRX', 'port-direction': 'bidirectional'},
-             res['nodes'][0]['mapping'])
+            {'supporting-port': 'C7', 'supporting-circuit-pack-name': '4/0',
+             'logical-connection-point': 'SRG1-PP7-TXRX', 'port-direction': 'bidirectional'},
+            res['nodes'][0]['mapping'])
 
     def test_04_xpdr_portmapping(self):
         url = ("{}/config/transportpce-portmapping:network/"
-               "nodes/XPDRA"
+               "nodes/XPDRA01"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional',
-              'associated-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network'},
-             res['nodes'][0]['mapping'])
+            {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+             'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional',
+             'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network',
+             'lcp-hash-val': '3b3ab304d2a6eb3c3623e52746dbb7aa'},
+            res['nodes'][0]['mapping'])
         self.assertIn(
-             {'supporting-port': 'C1',
-              'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
-              'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
-              'associated-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client'},
-             res['nodes'][0]['mapping'])
+            {'supporting-port': 'C1',
+             'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
+             'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
+             'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client',
+             'lcp-hash-val': '64b8effe7ba72211420bf267d0ca1ae5'},
+            res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):
         url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl)
         data = {"renderer:input": {
-             "renderer:service-name": "service_test",
-             "renderer:wave-number": "7",
-             "renderer:modulation-format": "qpsk",
-             "renderer:operation": "create",
-             "renderer:nodes": [
-                 {"renderer:node-id": "ROADMA",
-                  "renderer:src-tp": "SRG1-PP7-TXRX",
-                  "renderer:dest-tp": "DEG1-TTP-TXRX"},
-                 {"renderer:node-id": "XPDRA",
-                  "renderer:src-tp": "XPDR1-CLIENT1",
-                  "renderer:dest-tp": "XPDR1-NETWORK1"}]}}
+            "renderer:service-name": "service_test",
+            "renderer:wave-number": "7",
+            "renderer:modulation-format": "qpsk",
+            "renderer:operation": "create",
+            "renderer:nodes": [
+                {"renderer:node-id": "ROADMA01",
+                 "renderer:src-tp": "SRG1-PP7-TXRX",
+                 "renderer:dest-tp": "DEG1-TTP-TXRX"},
+                {"renderer:node-id": "XPDRA01",
+                 "renderer:src-tp": "XPDR1-CLIENT1",
+                 "renderer:dest-tp": "XPDR1-NETWORK1"}]}}
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "POST", url, data=json.dumps(data),
-             headers=headers, auth=('admin', 'admin'))
+            "POST", url, data=json.dumps(data),
+            headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
-        self.assertIn('Roadm-connection successfully created for nodes: ROADMA', res["output"]["result"])
+        self.assertIn('Roadm-connection successfully created for nodes: ROADMA01', res["output"]["result"])
 
     def test_06_service_path_create_rdm_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/DEG1-TTP-TXRX-7"
-                .format(self.restconf_baseurl))
+               "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "interface/DEG1-TTP-TXRX-7"
+               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictContainsSubset({'name': 'DEG1-TTP-TXRX-7', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '2/0',
-              'type': 'org-openroadm-interfaces:opticalChannel',
-              'supporting-port': 'L1'}, res['interface'][0])
+                                       'supporting-circuit-pack-name': '2/0',
+                                       'type': 'org-openroadm-interfaces:opticalChannel',
+                                       'supporting-port': 'L1'}, res['interface'][0])
         self.assertDictEqual(
-             {'wavelength-number': 7},
-             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+            {'wavelength-number': 7},
+            res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_07_service_path_create_rdm_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/SRG1-PP7-TXRX-7"
-                .format(self.restconf_baseurl))
+               "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "interface/SRG1-PP7-TXRX-7"
+               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictContainsSubset(
-             {'name': 'SRG1-PP7-TXRX-7', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '4/0',
-              'type': 'org-openroadm-interfaces:opticalChannel',
-              'supporting-port': 'C7'},
-             res['interface'][0])
+            {'name': 'SRG1-PP7-TXRX-7', 'administrative-state': 'inService',
+             'supporting-circuit-pack-name': '4/0',
+             'type': 'org-openroadm-interfaces:opticalChannel',
+             'supporting-port': 'C7'},
+            res['interface'][0])
         self.assertDictEqual(
-             {'wavelength-number': 7},
-             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+            {'wavelength-number': 7},
+            res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_08_service_path_create_rdm_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictContainsSubset(
-             {'connection-number': 'SRG1-PP7-TXRX-DEG1-TTP-TXRX-7',
-              'wavelength-number': 7,
-              'opticalControlMode': 'off'},
-             res['roadm-connections'][0])
+            {'connection-number': 'SRG1-PP7-TXRX-DEG1-TTP-TXRX-7',
+             'wavelength-number': 7,
+             'opticalControlMode': 'off'},
+            res['roadm-connections'][0])
         self.assertDictEqual(
-             {'src-if': 'SRG1-PP7-TXRX-7'},
-             res['roadm-connections'][0]['source'])
+            {'src-if': 'SRG1-PP7-TXRX-7'},
+            res['roadm-connections'][0]['source'])
         self.assertDictEqual(
-             {'dst-if': 'DEG1-TTP-TXRX-7'},
-             res['roadm-connections'][0]['destination'])
+            {'dst-if': 'DEG1-TTP-TXRX-7'},
+            res['roadm-connections'][0]['destination'])
 
     def test_09_service_path_create_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/XPDR1-NETWORK1-7"
-                .format(self.restconf_baseurl))
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "interface/XPDR1-NETWORK1-7"
+               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictContainsSubset(
-             {'name': 'XPDR1-NETWORK1-7', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'type': 'org-openroadm-interfaces:opticalChannel',
-              'supporting-port': '1'},
-             res['interface'][0])
+            {'name': 'XPDR1-NETWORK1-7', 'administrative-state': 'inService',
+             'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+             'type': 'org-openroadm-interfaces:opticalChannel',
+             'supporting-port': '1'},
+            res['interface'][0])
         self.assertDictEqual(
-             {u'rate': u'org-openroadm-optical-channel-interfaces:R100G',
-              u'transmit-power':-5,
-              u'wavelength-number': 7,
-              u'modulation-format': u'dp-qpsk'},
-             res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+            {u'rate': u'org-openroadm-optical-channel-interfaces:R100G',
+             u'transmit-power': -5,
+             u'wavelength-number': 7,
+             u'modulation-format': u'dp-qpsk'},
+            res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
 
     def test_10_service_path_create_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/XPDR1-NETWORK1-OTU"
-                .format(self.restconf_baseurl))
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "interface/XPDR1-NETWORK1-OTU"
+               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictContainsSubset(
-             {'name': 'XPDR1-NETWORK1-OTU', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'type': 'org-openroadm-interfaces:otnOtu',
-              'supporting-port': '1',
-              'supporting-interface': 'XPDR1-NETWORK1-7'},
-             res['interface'][0])
+            {'name': 'XPDR1-NETWORK1-OTU', 'administrative-state': 'inService',
+             'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+             'type': 'org-openroadm-interfaces:otnOtu',
+             'supporting-port': '1',
+             'supporting-interface': 'XPDR1-NETWORK1-7'},
+            res['interface'][0])
         self.assertDictEqual(
-             {u'rate': u'org-openroadm-otn-otu-interfaces:OTU4',
-              u'fec': u'scfec'},
-             res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+            {u'rate': u'org-openroadm-otn-otu-interfaces:OTU4',
+             u'fec': u'scfec'},
+            res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
 
     def test_11_service_path_create_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/XPDR1-NETWORK1-ODU"
-                .format(self.restconf_baseurl))
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "interface/XPDR1-NETWORK1-ODU"
+               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictContainsSubset(
-             {'name': 'XPDR1-NETWORK1-ODU', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'type': 'org-openroadm-interfaces:otnOdu',
-              'supporting-port': '1',
-              'supporting-interface': 'XPDR1-NETWORK1-OTU'},
-             res['interface'][0])
+            {'name': 'XPDR1-NETWORK1-ODU', 'administrative-state': 'inService',
+             'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+             'type': 'org-openroadm-interfaces:otnOdu',
+             'supporting-port': '1',
+             'supporting-interface': 'XPDR1-NETWORK1-OTU'},
+            res['interface'][0])
         self.assertDictContainsSubset(
-             {'rate': 'org-openroadm-otn-odu-interfaces:ODU4',
-              u'monitoring-mode': u'terminated'},
-             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+            {'rate': 'org-openroadm-otn-odu-interfaces:ODU4',
+             u'monitoring-mode': u'terminated'},
+            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
         self.assertDictEqual({u'exp-payload-type': u'07', u'payload-type': u'07'},
-                              res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_12_service_path_create_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "interface/XPDR1-CLIENT1-ETHERNET"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertDictContainsSubset(
-             {'name': 'XPDR1-CLIENT1-ETHERNET', 'administrative-state': 'inService',
-              'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
-              'type': 'org-openroadm-interfaces:ethernetCsmacd',
-              'supporting-port': 'C1'},
-             res['interface'][0])
+            {'name': 'XPDR1-CLIENT1-ETHERNET', 'administrative-state': 'inService',
+             'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
+             'type': 'org-openroadm-interfaces:ethernetCsmacd',
+             'supporting-port': 'C1'},
+            res['interface'][0])
         self.assertDictEqual(
-             {'speed': 100000,
-              'mtu': 9000,
-              'auto-negotiation': 'enabled',
-              'duplex': 'full',
-              'fec': 'off'},
-             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+            {'speed': 100000,
+             'mtu': 9000,
+             'auto-negotiation': 'enabled',
+             'duplex': 'full',
+             'fec': 'off'},
+            res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
 
     def test_13_service_path_create_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "circuit-packs/1%2F0%2F1-PLUG-NET"
-                .format(self.restconf_baseurl))
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "circuit-packs/1%2F0%2F1-PLUG-NET"
+               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"])
@@ -337,126 +339,132 @@ class TransportPCERendererTesting(unittest.TestCase):
     def test_14_service_path_delete(self):
         url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl)
         data = {"renderer:input": {
-             "renderer:service-name": "service_test",
-             "renderer:wave-number": "7",
-             "renderer:operation": "delete",
-             "renderer:nodes": [
-                 {"renderer:node-id": "ROADMA",
-                  "renderer:src-tp": "SRG1-PP7-TXRX",
-                  "renderer:dest-tp": "DEG1-TTP-TXRX"},
-                 {"renderer:node-id": "XPDRA",
-                  "renderer:src-tp": "XPDR1-CLIENT1",
-                  "renderer:dest-tp": "XPDR1-NETWORK1"}]}}
+            "renderer:service-name": "service_test",
+            "renderer:wave-number": "7",
+            "renderer:operation": "delete",
+            "renderer:nodes": [
+                {"renderer:node-id": "ROADMA01",
+                 "renderer:src-tp": "SRG1-PP7-TXRX",
+                 "renderer:dest-tp": "DEG1-TTP-TXRX"},
+                {"renderer:node-id": "XPDRA01",
+                 "renderer:src-tp": "XPDR1-CLIENT1",
+                 "renderer:dest-tp": "XPDR1-NETWORK1"}]}}
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "POST", url, data=json.dumps(data),
-             headers=headers, auth=('admin', 'admin'))
+            "POST", url, data=json.dumps(data),
+            headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         self.assertEqual(response.json(), {
-             'output': {'result': 'Request processed', 'success': True}})
+            'output': {'result': 'Request processed', 'success': True}})
 
     def test_15_service_path_delete_rdm_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-                "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
-                "interface/DEG1-TTP-TXRX-7"
-                .format(self.restconf_baseurl))
+               "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "interface/DEG1-TTP-TXRX-7"
+               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing",
-              "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+             "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_16_service_path_delete_rdm_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "interface/SRG1-PP7-TXRX-7"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+                "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_17_service_path_delete_rdm_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADMA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/ROADMA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+                "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_18_service_path_delete_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "interface/XPDR1-NETWORK1-7"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+                "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_19_service_path_delete_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "interface/XPDR1-NETWORK1-OTU"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+                "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_20_service_path_delete_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "interface/XPDR1-NETWORK1-ODU"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+                "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_21_service_path_delete_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "interface/XPDR1-CLIENT1-ETHERNET"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "GET", url, headers=headers, auth=('admin', 'admin'))
+            "GET", url, headers=headers, auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
-             {"error-type":"application", "error-tag":"data-missing", "error-message":"Request could not be completed because the relevant data model content does not exist"},
-             res['errors']['error'])
+            {"error-type": "application", "error-tag": "data-missing",
+                "error-message": "Request could not be completed because the relevant data model content does not exist"},
+            res['errors']['error'])
 
     def test_22_service_path_delete_xpdr_check(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/XPDRA/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/XPDRA01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "circuit-packs/1%2F0%2F1-PLUG-NET"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -468,23 +476,23 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_23_rdm_device_disconnected(self):
         url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/ROADMA"
+               "network-topology/topology/topology-netconf/node/ROADMA01"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-              "DELETE", url, headers=headers,
-              auth=('admin', 'admin'))
+            "DELETE", url, headers=headers,
+            auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(20)
 
     def test_24_xpdr_device_disconnected(self):
         url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/XPDRA"
+               "network-topology/topology/topology-netconf/node/XPDRA01"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
-             "DELETE", url, headers=headers,
-             auth=('admin', 'admin'))
+            "DELETE", url, headers=headers,
+            auth=('admin', 'admin'))
         self.assertEqual(response.status_code, requests.codes.ok)
         time.sleep(20)