Fix func. tests service-path calls

[transportpce.git] / tests / transportpce_tests / 2.2.1 / test06_renderer_service_path_nominal.py

diff --git a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
index ef6645103d68c717f2aa2515295ebfe5581c3dc3..ceeb049c4f1150b01bce69fe04489978aecb2c7f 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
@@ -84,8 +84,8 @@ class TransportPCERendererTesting(unittest.TestCase):
             response['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):
-        data = {
-            'input': {
+        response = test_utils_rfc8040.device_renderer_service_path_request(
+            {'input': {
                 'service-name': 'service_test',
                 'wave-number': '7',
                 'modulation-format': 'dp-qpsk',
@@ -98,10 +98,9 @@ class TransportPCERendererTesting(unittest.TestCase):
                 'max-freq': 195.825,
                 'lower-spectral-slot-number': 713,
                 'higher-spectral-slot-number': 720
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_service_path_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
+            }})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Interfaces created successfully for nodes: ROADM-A1', response['output']['result'])
 
     def test_06_service_path_create_rdm_check(self):
         response = test_utils_rfc8040.check_node_attribute_request("ROADM-A1", "interface", "DEG1-TTP-TXRX-nmc-713:720")
@@ -261,8 +260,8 @@ class TransportPCERendererTesting(unittest.TestCase):
         # FIXME: https://jira.opendaylight.org/browse/TRNSPRTPCE-591
 
     def test_17_service_path_delete(self):
-        data = {
-            'input': {
+        response = test_utils_rfc8040.device_renderer_service_path_request(
+            {'input': {
                 'service-name': 'service_test',
                 'wave-number': '7',
                 'modulation-format': 'dp-qpsk',
@@ -275,13 +274,9 @@ class TransportPCERendererTesting(unittest.TestCase):
                 'max-freq': 195.825,
                 'lower-spectral-slot-number': 713,
                 'higher-spectral-slot-number': 720
-            }
-        }
-        response = test_utils_rfc8040.device_renderer_service_path_request(data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn(response.json(),
-                      ({'output': {'result': 'Request processed', 'success': True}},
-                       {'transportpce-device-renderer:output': {'result': 'Request processed', 'success': True}}))
+            }})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertDictEqual(response['output'], {'result': 'Request processed', 'success': True})
 
     def test_18_service_path_delete_rdm_check(self):
         response = test_utils_rfc8040.check_node_attribute_request("ROADM-A1", "interface", "DEG1-TTP-TXRX-mc-713:720")