add a method to manage otn topo in func tests

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

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 7b068f8970a478a40f96d7d5ccc89ea71ed58d16..0e6acc1f7ce8a2a597b0e30aad9bd897305d71e0 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
@@ -114,8 +114,7 @@ class TransportPCEtesting(unittest.TestCase):
 
 # test service-create for OCH-OTU4 service from spdr to spdr
     def test_11_check_otn_topology(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         nbNode = len(res['network'][0]['node'])
@@ -386,8 +385,7 @@ class TransportPCEtesting(unittest.TestCase):
         time.sleep(3)
 
     def test_22_check_otn_topo_otu4_links(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        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'])
@@ -585,8 +583,7 @@ class TransportPCEtesting(unittest.TestCase):
             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
 
     def test_27_check_otn_topo_links(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        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'])
@@ -610,8 +607,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.fail("this link should not exist")
 
     def test_28_check_otn_topo_tp(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         res = response.json()
         for node in res['network'][0]['node']:
             if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'):
@@ -927,8 +923,7 @@ class TransportPCEtesting(unittest.TestCase):
                              res['odu-connection'][0]['source'])
 
     def test_39_check_otn_topo_links(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        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'])
@@ -941,8 +936,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 10000)
 
     def test_40_check_otn_topo_tp(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         res = response.json()
         for node in res['network'][0]['node']:
             if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'):
@@ -1006,8 +1000,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.not_found)
 
     def test_47_check_otn_topo_links(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        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'])
@@ -1020,8 +1013,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
 
     def test_48_check_otn_topo_tp(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         res = response.json()
         for node in res['network'][0]['node']:
             if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'):
@@ -1070,8 +1062,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.test_22_check_otn_topo_otu4_links()
 
     def test_53_check_otn_topo_tp(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         res = response.json()
         for node in res['network'][0]['node']:
             if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'):
@@ -1124,8 +1115,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.not_found)
 
     def test_58_getLinks_OtnTopology(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertNotIn('ietf-network-topology:link', res['network'][0])

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 7abb2d73ec2c97bd121bc00bf0f4accf543a069d..91045e501d20e89bb31baaf9b02abfa1a8dabe37 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py
@@ -129,15 +129,13 @@ class TransportPCEtesting(unittest.TestCase):
             self.assertEqual(len(listNode), 0)
 
     def test_06_getLinks_OtnTopology(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertNotIn('ietf-network-topology:link', res['network'][0])
 
     def test_07_getNodes_OtnTopology(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         res = response.json()
         self.assertEqual(response.status_code, requests.codes.ok)
         nbNode = len(res['network'][0]['node'])
@@ -272,8 +270,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertNotIn('node', res['network'][0])
 
     def test_12_getNodes_OtnTopology(self):
-        url = "{}/config/ietf-network:networks/network/otn-topology"
-        response = test_utils.get_request(url)
+        response = test_utils.get_otn_topo_request()
         res = response.json()
         self.assertNotIn('node', res['network'][0])
 

diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py
index ea7f024c9e7c3025991e6d15324f4d2ebf9620ce..5a063b4d045615f58595448ba8ca1cc5cfd7e3a7 100644 (file)
--- a/tests/transportpce_tests/common/test_utils.py
+++ b/tests/transportpce_tests/common/test_utils.py
@@ -36,6 +36,7 @@ NODES_LOGIN = "admin"
 NODES_PWD = "admin"
 URL_CONFIG_NETCONF_TOPO = "{}/config/network-topology:network-topology/topology/topology-netconf/"
 URL_CONFIG_ORDM_TOPO = "{}/config/ietf-network:networks/network/openroadm-topology/"
+URL_CONFIG_OTN_TOPO = "{}/config/ietf-network:networks/network/otn-topology/"
 URL_CONFIG_CLLI_NET = "{}/config/ietf-network:networks/network/clli-network/"
 URL_CONFIG_ORDM_NET = "{}/config/ietf-network:networks/network/openroadm-network/"
 
@@ -284,20 +285,29 @@ def del_oms_attr_request(link: str):
     )
     return delete_request(url)
 
+
 def get_clli_net_request():
     return get_request(URL_CONFIG_CLLI_NET)
 
+
 def get_ordm_net_request():
     return get_request(URL_CONFIG_ORDM_NET)
 
+
+def get_otn_topo_request():
+    return get_request(URL_CONFIG_OTN_TOPO)
+
+
 def del_link_request(link: str):
     url = URL_CONFIG_ORDM_TOPO + ("ietf-network-topology:link/" + link)
     return delete_request(url)
 
+
 def del_node_request(node: str):
     url = URL_CONFIG_CLLI_NET + ("node/" + node)
     return delete_request(url)
 
+
 def shutdown_process(process):
     if process is not None:
         for child in psutil.Process(process.pid).children():