add a method to get nodes oper DS in func tests

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I1ed16552d2941fc75f78a8fc85a6cc9763554e04

diff --git a/tests/transportpce_tests/1.2.1/test_portmapping.py b/tests/transportpce_tests/1.2.1/test_portmapping.py
index 693fbc2e49e067cc38feade80f08f90679ef6962..a1daf17f270c66950da29426721010e4df476a76 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test_portmapping.py
@@ -35,9 +35,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         time.sleep(10)
 
 #    def test_01_restconfAPI(self):
-#        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/controller-config"
-#        response = requests.request("GET", url, headers=test_utils.TYPE_APPLICATION_JSON,
-#                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+#        response = test_utils.get_netconf_oper_request("controller-config")
 #        self.assertEqual(response.status_code, requests.codes.ok)
 #        res = response.json()
 #        self.assertEqual(res['node'] [0] ['netconf-node-topology:connection-status'],
@@ -59,8 +57,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_02_rdm_device_connected(self):
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA01"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("ROADMA01")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
@@ -125,8 +122,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_08_xpdr_device_connected(self):
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/XPDRA01"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("XPDRA01")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
@@ -242,8 +238,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
 
     def test_17_xpdr_device_disconnected(self):
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/XPDRA01"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("XPDRA01")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
@@ -266,8 +261,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
 
     def test_20_rdm_device_disconnected(self):
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADMA01"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("ROADMA01")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(

diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
index 6e41792439f96c157e8645236dbfcd0f6f907118..0378b18982abd0b8aca9db7534dd667d36235a91 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
@@ -39,8 +39,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
 
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/SPDR-SA1"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("SPDR-SA1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(

diff --git a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
index 95586d1d01e8cabf0c5535141a324acfe03889e2..9b90d2cb2bd496e9e4151df6f4cd3f1fd71ad86b 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py
@@ -39,8 +39,7 @@ class TransportPCEtesting(unittest.TestCase):
                          test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
 
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/SPDR-SA1"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("SPDR-SA1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
@@ -53,8 +52,7 @@ class TransportPCEtesting(unittest.TestCase):
                          test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
 
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/SPDR-SC1"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("SPDR-SC1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(

diff --git a/tests/transportpce_tests/2.2.1/test_otn_topology.py b/tests/transportpce_tests/2.2.1/test_otn_topology.py
index ef4dbdb1240b10a0c6ce779c2ed54bea1f48d1ef..dd040f02f9491b2037f552e994cc5ef5254462f6 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py
@@ -39,8 +39,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
         time.sleep(10)
 
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/SPDR-SA1"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("SPDR-SA1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(

diff --git a/tests/transportpce_tests/2.2.1/test_portmapping.py b/tests/transportpce_tests/2.2.1/test_portmapping.py
index c065c8c1d220e5cd7c82934526dedc2fdf8c1793..942a0ee5a6fdbb5162f6f9abe4007575669953e7 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/2.2.1/test_portmapping.py
@@ -39,8 +39,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_02_rdm_device_connected(self):
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADM-A1"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("ROADM-A1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
@@ -109,8 +108,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_09_xpdr_device_connected(self):
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/XPDR-A1"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("XPDR-A1")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertEqual(
@@ -191,8 +189,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
 
     def test_16_xpdr_device_disconnected(self):
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/XPDR-A1"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("XPDR-A1")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(
@@ -215,8 +212,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
 
     def test_19_rdm_device_disconnected(self):
-        url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/ROADM-A1"
-        response = test_utils.get_request(url)
+        response = test_utils.get_netconf_oper_request("ROADM-A1")
         self.assertEqual(response.status_code, requests.codes.not_found)
         res = response.json()
         self.assertIn(

diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py
index 6b6958f73cf09e834b8fa04a7f9f49f533f053cb..33808b424e98c779ec9f4261cc5d0b77e826267a 100644 (file)
--- a/tests/transportpce_tests/common/test_utils.py
+++ b/tests/transportpce_tests/common/test_utils.py
@@ -258,6 +258,11 @@ def check_netconf_node_request(node: str, suffix: str):
     return get_request(url)
 
 
+def get_netconf_oper_request(node: str):
+    url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/" + node
+    return get_request(url)
+
+
 def shutdown_process(process):
     if process is not None:
         for child in psutil.Process(process.pid).children():