Make TransportPCE functional tests running

[transportpce.git] / tests / transportpce_tests / 1.2.1 / test_renderer_service_path_nominal.py

diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
index 7dd4bf66abf3192ede600db8558f0069760f07d9..dbf11a074addba0b13ddefb41f8d9204dab8740b 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
@@ -44,10 +44,7 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
 
     def test_03_rdm_portmapping(self):
-        url = ("{}/config/transportpce-portmapping:network/"
-               "nodes/ROADMA01"
-               )
-        response = test_utils.get_request(url)
+        response = test_utils.portmapping_request("ROADMA01")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
@@ -60,10 +57,7 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['nodes'][0]['mapping'])
 
     def test_04_xpdr_portmapping(self):
-        url = ("{}/config/transportpce-portmapping:network/"
-               "nodes/XPDRA01"
-               )
-        response = test_utils.get_request(url)
+        response = test_utils.portmapping_request("XPDRA01")
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
@@ -81,20 +75,11 @@ class TransportPCERendererTesting(unittest.TestCase):
             res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):
-        url = "{}/operations/transportpce-device-renderer:service-path"
-        data = {"renderer:input": {
-            "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"}]}}
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_path_request("create", "service_test", "7",
+                                                   [{"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"}])
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn('Roadm-connection successfully created for nodes: ROADMA01', res["output"]["result"])
@@ -256,26 +241,18 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"])
 
     def test_14_service_path_delete(self):
-        url = "{}/operations/transportpce-device-renderer:service-path"
-        data = {"renderer:input": {
-            "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"}]}}
-        response = test_utils.post_request(url, data)
+        response = test_utils.service_path_request("delete", "service_test", "7",
+                                                   [{"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"}])
         self.assertEqual(response.status_code, requests.codes.ok)
         self.assertEqual(response.json(), {
             'output': {'result': 'Request processed', 'success': True}})
 
     def test_15_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADMA01", "interface/DEG1-TTP-TXRX-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -284,7 +261,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_16_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADMA01", "interface/SRG1-PP7-TXRX-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -293,7 +270,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_17_service_path_delete_rdm_check(self):
         response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP7-TXRX-DEG1-TTP-TXRX-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -302,7 +279,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_18_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-7")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -311,7 +288,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_19_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -320,7 +297,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_20_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-NETWORK1-ODU")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",
@@ -329,7 +306,7 @@ class TransportPCERendererTesting(unittest.TestCase):
 
     def test_21_service_path_delete_xpdr_check(self):
         response = test_utils.check_netconf_node_request("XPDRA01", "interface/XPDR1-CLIENT1-ETHERNET")
-        self.assertEqual(response.status_code, requests.codes.not_found)
+        self.assertEqual(response.status_code, requests.codes.conflict)
         res = response.json()
         self.assertIn(
             {"error-type": "application", "error-tag": "data-missing",