Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
fix deprecated openroadm interfaces/objects
[transportpce.git] / tests / transportpce_tests / 1.2.1 / test_end2end.py
diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py
index 610878fd2db0c8987eeb2988bf62cfd954e099b3..4c44655306c39d2085a5a252610cd422be353c32 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test_end2end.py
@@ -94,10 +94,10 @@ class TransportPCEFulltesting(unittest.TestCase):
 #  connect netconf devices
     def test_01_connect_xpdrA(self):
         url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/XPDRA"
+               "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",
@@ -113,10 +113,10 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_02_connect_xpdrC(self):
         url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/XPDRC"
+               "network-topology/topology/topology-netconf/node/XPDRC01"
               .format(self.restconf_baseurl))
         data = {"node": [{
-            "node-id": "XPDRC",
+            "node-id": "XPDRC01",
             "netconf-node-topology:username": "admin",
             "netconf-node-topology:password": "admin",
             "netconf-node-topology:host": "127.0.0.1",
@@ -132,10 +132,10 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_03_connect_rdmA(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",
+             "node-id": "ROADMA01",
              "netconf-node-topology:username": "admin",
              "netconf-node-topology:password": "admin",
              "netconf-node-topology:host": "127.0.0.1",
@@ -151,10 +151,10 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_04_connect_rdmC(self):
         url = ("{}/config/network-topology:"
-               "network-topology/topology/topology-netconf/node/ROADMC"
+               "network-topology/topology/topology-netconf/node/ROADMC01"
                .format(self.restconf_baseurl))
         data = {"node": [{
-             "node-id": "ROADMC",
+             "node-id": "ROADMC01",
              "netconf-node-topology:username": "admin",
              "netconf-node-topology:password": "admin",
              "netconf-node-topology:host": "127.0.0.1",
@@ -173,10 +173,10 @@ class TransportPCEFulltesting(unittest.TestCase):
         data = {
             "networkutils:input": {
                 "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRA",
+                    "networkutils:xpdr-node": "XPDRA01",
                     "networkutils:xpdr-num": "1",
                     "networkutils:network-num": "1",
-                    "networkutils:rdm-node": "ROADMA",
+                    "networkutils:rdm-node": "ROADMA01",
                     "networkutils:srg-num": "1",
                     "networkutils:termination-point-num": "SRG1-PP1-TXRX"
                 }
@@ -196,10 +196,10 @@ class TransportPCEFulltesting(unittest.TestCase):
         data = {
             "networkutils:input": {
                 "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRA",
+                    "networkutils:xpdr-node": "XPDRA01",
                     "networkutils:xpdr-num": "1",
                     "networkutils:network-num": "1",
-                    "networkutils:rdm-node": "ROADMA",
+                    "networkutils:rdm-node": "ROADMA01",
                     "networkutils:srg-num": "1",
                     "networkutils:termination-point-num": "SRG1-PP1-TXRX"
                 }
@@ -219,10 +219,10 @@ class TransportPCEFulltesting(unittest.TestCase):
         data = {
             "networkutils:input": {
                 "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRC",
+                    "networkutils:xpdr-node": "XPDRC01",
                     "networkutils:xpdr-num": "1",
                     "networkutils:network-num": "1",
-                    "networkutils:rdm-node": "ROADMC",
+                    "networkutils:rdm-node": "ROADMC01",
                     "networkutils:srg-num": "1",
                     "networkutils:termination-point-num": "SRG1-PP1-TXRX"
                 }
@@ -242,10 +242,10 @@ class TransportPCEFulltesting(unittest.TestCase):
         data = {
             "networkutils:input": {
                 "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRC",
+                    "networkutils:xpdr-node": "XPDRC01",
                     "networkutils:xpdr-num": "1",
                     "networkutils:network-num": "1",
-                    "networkutils:rdm-node": "ROADMC",
+                    "networkutils:rdm-node": "ROADMC01",
                     "networkutils:srg-num": "1",
                     "networkutils:termination-point-num": "SRG1-PP1-TXRX"
                 }
@@ -263,7 +263,7 @@ class TransportPCEFulltesting(unittest.TestCase):
     def test_09_add_omsAttributes_ROADMA_ROADMC(self):
         # Config ROADMA-ROADMC oms-attributes
         url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
-               "link/ROADMA-DEG1-DEG1-TTP-TXRXtoROADMC-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
+               "link/ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:"
                "OMS-attributes/span"
                .format(self.restconf_baseurl))
         data = {"span": {
@@ -286,7 +286,7 @@ class TransportPCEFulltesting(unittest.TestCase):
     def test_10_add_omsAttributes_ROADMC_ROADMA(self):
         # Config ROADMC-ROADMA oms-attributes
         url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:"
-               "link/ROADMC-DEG2-DEG2-TTP-TXRXtoROADMA-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
+               "link/ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:"
                "OMS-attributes/span"
                .format(self.restconf_baseurl))
         data = {"span": {
@@ -322,7 +322,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 "connection-type": "service",
                 "service-a-end": {
                     "service-rate": "100",
-                    "node-id": "XPDRA",
+                    "node-id": "XPDRA01",
                     "service-format": "Ethernet",
                     "clli": "SNJSCAMCJP8",
                     "tx-direction": {
@@ -359,7 +359,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 },
                 "service-z-end": {
                     "service-rate": "100",
-                    "node-id": "XPDRC",
+                    "node-id": "XPDRC01",
                     "service-format": "Ethernet",
                     "clli": "SNJSCAMCJT4",
                     "tx-direction": {
@@ -431,7 +431,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_13_check_xc1_ROADMA(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-PP1-TXRX-DEG1-TTP-TXRX-1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -455,7 +455,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_14_check_xc1_ROADMC(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADMC/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/ROADMC01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -478,7 +478,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(5)
 
     def test_15_check_topo_XPDRA(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA-XPDR1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -496,7 +496,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(3)
 
     def test_16_check_topo_ROADMA_SRG1(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -514,7 +514,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(3)
 
     def test_17_check_topo_ROADMA_DEG1(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-DEG1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -537,10 +537,10 @@ class TransportPCEFulltesting(unittest.TestCase):
         data = {
             "networkutils:input": {
                 "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRA",
+                    "networkutils:xpdr-node": "XPDRA01",
                     "networkutils:xpdr-num": "1",
                     "networkutils:network-num": "2",
-                    "networkutils:rdm-node": "ROADMA",
+                    "networkutils:rdm-node": "ROADMA01",
                     "networkutils:srg-num": "1",
                     "networkutils:termination-point-num": "SRG1-PP2-TXRX"
                 }
@@ -555,16 +555,15 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
         time.sleep(2)
 
-
     def test_19_connect_roadmA_PP2_to_xpdrA_N2(self):
         url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(self.restconf_baseurl)
         data = {
             "networkutils:input": {
                 "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRA",
+                    "networkutils:xpdr-node": "XPDRA01",
                     "networkutils:xpdr-num": "1",
                     "networkutils:network-num": "2",
-                    "networkutils:rdm-node": "ROADMA",
+                    "networkutils:rdm-node": "ROADMA01",
                     "networkutils:srg-num": "1",
                     "networkutils:termination-point-num": "SRG1-PP2-TXRX"
                 }
@@ -579,16 +578,15 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
         time.sleep(2)
 
-
     def test_20_connect_xprdC_N2_to_roadmC_PP2(self):
         url = "{}/operations/transportpce-networkutils:init-xpdr-rdm-links".format(self.restconf_baseurl)
         data = {
             "networkutils:input": {
                 "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRC",
+                    "networkutils:xpdr-node": "XPDRC01",
                     "networkutils:xpdr-num": "1",
                     "networkutils:network-num": "2",
-                    "networkutils:rdm-node": "ROADMC",
+                    "networkutils:rdm-node": "ROADMC01",
                     "networkutils:srg-num": "1",
                     "networkutils:termination-point-num": "SRG1-PP2-TXRX"
                 }
@@ -603,16 +601,15 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
         time.sleep(2)
 
-
     def test_21_connect_roadmC_PP2_to_xpdrC_N2(self):
         url = "{}/operations/transportpce-networkutils:init-rdm-xpdr-links".format(self.restconf_baseurl)
         data = {
             "networkutils:input": {
                 "networkutils:links-input": {
-                    "networkutils:xpdr-node": "XPDRC",
+                    "networkutils:xpdr-node": "XPDRC01",
                     "networkutils:xpdr-num": "1",
                     "networkutils:network-num": "2",
-                    "networkutils:rdm-node": "ROADMC",
+                    "networkutils:rdm-node": "ROADMC01",
                     "networkutils:srg-num": "1",
                     "networkutils:termination-point-num": "SRG1-PP2-TXRX"
                 }
@@ -642,7 +639,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 "connection-type": "service",
                 "service-a-end": {
                     "service-rate": "100",
-                    "node-id": "XPDRA",
+                    "node-id": "XPDRA01",
                     "service-format": "Ethernet",
                     "clli": "SNJSCAMCJP8",
                     "tx-direction": {
@@ -679,7 +676,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 },
                 "service-z-end": {
                     "service-rate": "100",
-                    "node-id": "XPDRC",
+                    "node-id": "XPDRC01",
                     "service-format": "Ethernet",
                     "clli": "SNJSCAMCJT4",
                     "tx-direction": {
@@ -751,7 +748,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_24_check_xc2_ROADMA(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/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -772,7 +769,7 @@ class TransportPCEFulltesting(unittest.TestCase):
              res['roadm-connections'][0]['destination'])
 
     def test_25_check_topo_XPDRA(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA-XPDR1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -791,7 +788,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(10)
 
     def test_26_check_topo_ROADMA_SRG1(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -815,9 +812,8 @@ class TransportPCEFulltesting(unittest.TestCase):
                 self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
         time.sleep(10)
 
-
     def test_27_check_topo_ROADMA_DEG1(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-DEG1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -855,7 +851,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 "connection-type": "service",
                 "service-a-end": {
                     "service-rate": "100",
-                    "node-id": "XPDRA",
+                    "node-id": "XPDRA01",
                     "service-format": "Ethernet",
                     "clli": "SNJSCAMCJP8",
                     "tx-direction": {
@@ -892,7 +888,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 },
                 "service-z-end": {
                     "service-rate": "100",
-                    "node-id": "XPDRC",
+                    "node-id": "XPDRC01",
                     "service-format": "Ethernet",
                     "clli": "SNJSCAMCJT4",
                     "tx-direction": {
@@ -1026,7 +1022,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_32_check_no_xc_ROADMA(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/"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url, auth=('admin', 'admin'))
@@ -1036,7 +1032,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(2)
 
     def test_33_check_topo_XPDRA(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA-XPDR1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/XPDRA01-XPDR1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -1044,16 +1040,16 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ((ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-CLIENT') 
+            if ((ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT')
                 and (ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT3')):
                 self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes']))
-            elif ((ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-NETWORK')
+            elif ((ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK')
                 and (ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT3')):
                 self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes']))
         time.sleep(10)
 
     def test_34_check_topo_ROADMA_SRG1(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-SRG1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-SRG1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -1070,7 +1066,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(10)
 
     def test_35_check_topo_ROADMA_DEG1(self):
-        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA-DEG1"
+        url1 = ("{}/config/ietf-network:networks/network/openroadm-topology/node/ROADMA01-DEG1"
                .format(self.restconf_baseurl))
         response = requests.request(
              "GET", url1, auth=('admin', 'admin'))
@@ -1103,7 +1099,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 "connection-type": "roadm-line",
                 "service-a-end": {
                     "service-rate": "100",
-                    "node-id": "ROADMA",
+                    "node-id": "ROADMA01",
                     "service-format": "OC",
                     "clli": "SNJSCAMCJP8",
                     "tx-direction": {
@@ -1140,7 +1136,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 },
                 "service-z-end": {
                     "service-rate": "100",
-                    "node-id": "ROADMC",
+                    "node-id": "ROADMC01",
                     "service-format": "OC",
                     "clli": "SNJSCAMCJT4",
                     "tx-direction": {
@@ -1212,7 +1208,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_38_check_xc1_ROADMA(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-PP1-TXRX-DEG1-TTP-TXRX-1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -1236,7 +1232,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_39_check_xc1_ROADMC(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
-               "node/ROADMC/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
+               "node/ROADMC01/yang-ext:mount/org-openroadm-device:org-openroadm-device/"
                "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -1273,7 +1269,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 "connection-type": "roadm-line",
                 "service-a-end": {
                     "service-rate": "100",
-                    "node-id": "ROADMA",
+                    "node-id": "ROADMA01",
                     "service-format": "OC",
                     "clli": "SNJSCAMCJP8",
                     "tx-direction": {
@@ -1310,7 +1306,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 },
                 "service-z-end": {
                     "service-rate": "100",
-                    "node-id": "ROADMC",
+                    "node-id": "ROADMC01",
                     "service-format": "OC",
                     "clli": "SNJSCAMCJT4",
                     "tx-direction": {
@@ -1382,7 +1378,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_42_check_xc2_ROADMA(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-PP2-TXRX-DEG1-TTP-TXRX-2"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
@@ -1409,7 +1405,6 @@ class TransportPCEFulltesting(unittest.TestCase):
         self.test_27_check_topo_ROADMA_DEG1()
         time.sleep(3)
 
-
     def test_44_delete_oc_service1(self):
         url = ("{}/operations/org-openroadm-service:service-delete"
               .format(self.restconf_baseurl))
@@ -1480,7 +1475,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_47_get_no_xc_ROADMA(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/"
               .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json',
         "Accept": "application/json"}
@@ -1500,9 +1495,9 @@ class TransportPCEFulltesting(unittest.TestCase):
             print ("trial number {}".format(i))
             print("eth service creation")
             self.test_11_create_eth_service1()
-            print ("check xc in ROADMA")
+            print ("check xc in ROADMA01")
             self.test_13_check_xc1_ROADMA()
-            print ("check xc in ROADMC")
+            print ("check xc in ROADMC01")
             self.test_14_check_xc1_ROADMC()
             print ("eth service deletion\n")
             self.test_30_delete_eth_service1()
@@ -1535,17 +1530,16 @@ class TransportPCEFulltesting(unittest.TestCase):
             print ("trial number {}".format(i))
             print("oc service creation")
             self.test_36_create_oc_service1()
-            print ("check xc in ROADMA")
+            print ("check xc in ROADMA01")
             self.test_38_check_xc1_ROADMA()
-            print ("check xc in ROADMC")
+            print ("check xc in ROADMC01")
             self.test_39_check_xc1_ROADMC()
             print ("oc service deletion\n")
             self.test_44_delete_oc_service1()
 
-
     def test_51_disconnect_XPDRA(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(
@@ -1556,7 +1550,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_52_disconnect_XPDRC(self):
         url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/XPDRC"
+                "network-topology/topology/topology-netconf/node/XPDRC01"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
@@ -1567,7 +1561,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_53_disconnect_ROADMA(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(
@@ -1578,7 +1572,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_54_disconnect_ROADMC(self):
         url = ("{}/config/network-topology:"
-                "network-topology/topology/topology-netconf/node/ROADMC"
+                "network-topology/topology/topology-netconf/node/ROADMC01"
                .format(self.restconf_baseurl))
         headers = {'content-type': 'application/json'}
         response = requests.request(
Repository for Transport PCE project.