X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_end2end.py;h=6db0f3ed23a2938b005e248a65c7a92d3a5314a0;hp=245d5c1487592f82318f1fb56ac81a56f8b5b97e;hb=d81a3d491cbc1566f4bf93a4c28438be19687dbc;hpb=9f1b941b71c83b99e980e7cae3d548f0d268fbae

diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py
index 245d5c148..6db0f3ed2 100644
--- a/tests/transportpce_tests/1.2.1/test_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test_end2end.py
@@ -276,14 +276,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(2)
 
     def test_13_check_xc1_ROADMA(self):
-        url = (
-            "{}/config/network-topology:"
-            "network-topology/topology/topology-netconf/"
-            "node/ROADMA01/yang-ext:"
-            "mount/org-openroadm-device:org-openroadm-device/"
-            "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1"
-        )
-        response = test_utils.get_request(url)
+        response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
@@ -305,14 +298,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(5)
 
     def test_14_check_xc1_ROADMC(self):
-        url = (
-            "{}/config/network-topology:"
-            "network-topology/topology/topology-netconf/"
-            "node/ROADMC01/yang-ext:mount/org-openroadm-device:"
-            "org-openroadm-device/"
-            "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1"
-        )
-        response = test_utils.get_request(url)
+        response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
@@ -558,14 +544,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(1)
 
     def test_24_check_xc2_ROADMA(self):
-        url = (
-            "{}/config/network-topology:"
-            "network-topology/topology/topology-netconf/"
-            "node/ROADMA01/yang-ext:"
-            "mount/org-openroadm-device:org-openroadm-device/"
-            "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2"
-        )
-        response = test_utils.get_request(url)
+        response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-2")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
@@ -860,13 +839,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(20)
 
     def test_32_check_no_xc_ROADMA(self):
-        url = (
-            "{}/config/network-topology:"
-            "network-topology/topology/topology-netconf/"
-            "node/ROADMA01/yang-ext:"
-            "mount/org-openroadm-device:org-openroadm-device/"
-        )
-        response = test_utils.get_request(url)
+        response = test_utils.check_netconf_node_request("ROADMA01", "")
         res = response.json()
         self.assertEqual(response.status_code, requests.codes.ok)
         self.assertNotIn('roadm-connections',
@@ -1066,14 +1039,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(1)
 
     def test_38_check_xc1_ROADMA(self):
-        url = (
-            "{}/config/network-topology:"
-            "network-topology/topology/topology-netconf/"
-            "node/ROADMA01/yang-ext:"
-            "mount/org-openroadm-device:org-openroadm-device/"
-            "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1"
-        )
-        response = test_utils.get_request(url)
+        response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
@@ -1095,14 +1061,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(7)
 
     def test_39_check_xc1_ROADMC(self):
-        url = (
-            "{}/config/network-topology:"
-            "network-topology/topology/topology-netconf/"
-            "node/ROADMC01/yang-ext:mount/org-openroadm-device:"
-            "org-openroadm-device/"
-            "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1"
-        )
-        response = test_utils.get_request(url)
+        response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
@@ -1248,14 +1207,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(2)
 
     def test_42_check_xc2_ROADMA(self):
-        url = (
-            "{}/config/network-topology:"
-            "network-topology/topology/topology-netconf/"
-            "node/ROADMA01/yang-ext:mount/org-openroadm-device:"
-            "org-openroadm-device/"
-            "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2"
-        )
-        response = test_utils.get_request(url)
+        response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-2")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
@@ -1331,8 +1283,7 @@ class TransportPCEFulltesting(unittest.TestCase):
 
     def test_46_get_no_oc_services(self):
         print("start test")
-        url = ("{}/operational/org-openroadm-service:service-list"
-               )
+        url = "{}/operational/org-openroadm-service:service-list"
         response = test_utils.get_request(url)
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
@@ -1348,13 +1299,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         time.sleep(1)
 
     def test_47_get_no_xc_ROADMA(self):
-        url = (
-            "{}/config/network-topology:"
-            "network-topology/topology/topology-netconf"
-            "/node/ROADMA01/yang-ext:mount/org-openroadm-device:"
-            "org-openroadm-device/"
-        )
-        response = test_utils.get_request(url)
+        response = test_utils.check_netconf_node_request("ROADMA01", "")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device'])
@@ -1380,8 +1325,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         url = "{}/operational/org-openroadm-service:service-list/services/service1"
         response = test_utils.get_request(url)
         if response.status_code != 404:
-            url = ("{}/operations/org-openroadm-service:service-delete"
-                   )
+            url = "{}/operations/org-openroadm-service:service-delete"
             data = {"input": {
                 "sdnc-request-header": {
                     "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",