From 511abb9f842e981a02c56baa7d6e0d8428ffe73c Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 31 Jan 2022 13:34:46 +0100 Subject: [PATCH] Refactor func. tests RFC8040 service-path calls JIRA: TRNSPRTPCE-567 Signed-off-by: guillaume.lambert Change-Id: I47dc2aad73fbbb1f1f3afa855381c94d5d164ffb --- .../test04_renderer_service_path_nominal.py | 8 +-- .../2.2.1/test05_flex_grid.py | 4 +- .../test06_renderer_service_path_nominal.py | 8 +-- .../2.2.1/test07_otn_renderer.py | 24 ++++---- .../7.1/test02_otn_renderer.py | 56 +++++++++---------- .../common/test_utils_rfc8040.py | 8 +-- 6 files changed, 54 insertions(+), 54 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py index 6b9f3cb98..954c4d907 100644 --- a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py @@ -88,7 +88,7 @@ class TransportPCERendererTesting(unittest.TestCase): def test_05_service_path_create(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_test', 'wave-number': '7', 'modulation-format': 'dp-qpsk', @@ -101,7 +101,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'max-freq': 195.825, 'lower-spectral-slot-number': 713, 'higher-spectral-slot-number': 720 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Interfaces created successfully for nodes: ROADMA01', response['output']['result']) @@ -242,7 +242,7 @@ class TransportPCERendererTesting(unittest.TestCase): def test_14_service_path_delete(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_test', 'wave-number': '7', 'modulation-format': 'dp-qpsk', @@ -255,7 +255,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'max-freq': 195.825, 'lower-spectral-slot-number': 713, 'higher-spectral-slot-number': 720 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertDictEqual(response['output'], {'result': 'Request processed', 'success': True}) diff --git a/tests/transportpce_tests/2.2.1/test05_flex_grid.py b/tests/transportpce_tests/2.2.1/test05_flex_grid.py index 860d242d4..f75caed02 100644 --- a/tests/transportpce_tests/2.2.1/test05_flex_grid.py +++ b/tests/transportpce_tests/2.2.1/test05_flex_grid.py @@ -97,7 +97,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): # Renderer interface creations def test_07_device_renderer(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'modulation-format': 'dp-qpsk', 'operation': 'create', 'service-name': 'testNMC-MC', @@ -115,7 +115,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): 'max-freq': 196.09375, 'lower-spectral-slot-number': 749, 'higher-spectral-slot-number': 763 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Interfaces created successfully for nodes: ', response['output']['result']) time.sleep(10) 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 ceeb049c4..98397892a 100644 --- 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 @@ -85,7 +85,7 @@ class TransportPCERendererTesting(unittest.TestCase): def test_05_service_path_create(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_test', 'wave-number': '7', 'modulation-format': 'dp-qpsk', @@ -98,7 +98,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'max-freq': 195.825, 'lower-spectral-slot-number': 713, 'higher-spectral-slot-number': 720 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Interfaces created successfully for nodes: ROADM-A1', response['output']['result']) @@ -261,7 +261,7 @@ class TransportPCERendererTesting(unittest.TestCase): def test_17_service_path_delete(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_test', 'wave-number': '7', 'modulation-format': 'dp-qpsk', @@ -274,7 +274,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'max-freq': 195.825, 'lower-spectral-slot-number': 713, 'higher-spectral-slot-number': 720 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertDictEqual(response['output'], {'result': 'Request processed', 'success': True}) diff --git a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py index 6bb1fd664..d8aeb23d8 100644 --- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py @@ -89,7 +89,7 @@ class TransportPCEtesting(unittest.TestCase): def test_04_service_path_create_OCH_OTU4(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_test', 'wave-number': '7', 'modulation-format': 'dp-qpsk', @@ -101,7 +101,7 @@ class TransportPCEtesting(unittest.TestCase): 'max-freq': 196.125, 'lower-spectral-slot-number': 761, 'higher-spectral-slot-number': 768 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Interfaces created successfully for nodes: ', response['output']['result']) self.assertTrue(response['output']['success']) @@ -160,13 +160,13 @@ class TransportPCEtesting(unittest.TestCase): def test_08_otn_service_path_create_ODU4(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_ODU4', 'operation': 'create', 'service-rate': '100', 'service-format': 'ODU', 'nodes': [{'node-id': 'SPDR-SA1', 'network-tp': 'XPDR1-NETWORK1'}] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Otn Service path was set up successfully for node :SPDR-SA1', response['output']['result']) self.assertTrue(response['output']['success']) @@ -206,7 +206,7 @@ class TransportPCEtesting(unittest.TestCase): def test_11_otn_service_path_create_10GE(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service1', 'operation': 'create', 'service-rate': '10', @@ -215,7 +215,7 @@ class TransportPCEtesting(unittest.TestCase): 'ethernet-encoding': 'eth encode', 'trib-slot': ['1'], 'trib-port-number': '1' - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Otn Service path was set up successfully for node :SPDR-SA1', response['output']['result']) self.assertTrue(response['output']['success']) @@ -314,7 +314,7 @@ class TransportPCEtesting(unittest.TestCase): def test_16_otn_service_path_delete_10GE(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service1', 'operation': 'delete', 'service-rate': '10', @@ -323,7 +323,7 @@ class TransportPCEtesting(unittest.TestCase): 'ethernet-encoding': 'eth encode', 'trib-slot': ['1'], 'trib-port-number': '1' - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) self.assertTrue(response['output']['success']) @@ -349,13 +349,13 @@ class TransportPCEtesting(unittest.TestCase): def test_21_otn_service_path_delete_ODU4(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_ODU4', 'operation': 'delete', 'service-rate': '100', 'service-format': 'ODU', 'nodes': [{'node-id': 'SPDR-SA1', 'network-tp': 'XPDR1-NETWORK1'}] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) self.assertTrue(response['output']['success']) @@ -366,7 +366,7 @@ class TransportPCEtesting(unittest.TestCase): def test_23_service_path_delete_OCH_OTU4(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_test', 'wave-number': '7', 'modulation-format': 'dp-qpsk', @@ -378,7 +378,7 @@ class TransportPCEtesting(unittest.TestCase): 'max-freq': 196.125, 'lower-spectral-slot-number': 761, 'higher-spectral-slot-number': 768 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) self.assertTrue(response['output']['success']) diff --git a/tests/transportpce_tests/7.1/test02_otn_renderer.py b/tests/transportpce_tests/7.1/test02_otn_renderer.py index 7d77949ce..2ef26c1e2 100644 --- a/tests/transportpce_tests/7.1/test02_otn_renderer.py +++ b/tests/transportpce_tests/7.1/test02_otn_renderer.py @@ -67,7 +67,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 1a) create a OTUC2 device renderer def test_02_service_path_create_otuc2(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_OTUC2', 'wave-number': '0', 'modulation-format': 'dp-qpsk', @@ -79,7 +79,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): 'max-freq': 196.125, 'lower-spectral-slot-number': 755, 'higher-spectral-slot-number': 768 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Interfaces created successfully for nodes: ', response['output']['result']) self.assertIn( @@ -164,13 +164,13 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 1b) create a ODUC2 device renderer def test_07_otn_service_path_create_oduc2(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_ODUC2', 'operation': 'create', 'service-rate': '200', 'service-format': 'ODU', 'nodes': [{'node-id': 'XPDR-A2', 'network-tp': 'XPDR2-NETWORK1'}] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', response['output']['result']) self.assertIn( @@ -218,7 +218,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 1c) create Ethernet device renderer def test_10_otn_service_path_create_100ge(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_Ethernet', 'operation': 'create', 'service-rate': '100', @@ -226,7 +226,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): 'nodes': [{'node-id': 'XPDR-A2', 'client-tp': 'XPDR2-CLIENT1', 'network-tp': 'XPDR2-NETWORK1'}], 'ethernet-encoding': 'eth encode', 'opucn-trib-slots': ['1.1', '1.20'] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', response['output']['result']) self.assertEqual('XPDR-A2', response['output']['node-interface'][0]['node-id']) @@ -330,7 +330,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 1d) Delete Ethernet device interfaces def test_15_otn_service_path_delete_100ge(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_Ethernet', 'operation': 'delete', 'service-rate': '100', @@ -339,7 +339,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): 'ethernet-encoding': 'eth encode', 'trib-slot': ['1'], 'trib-port-number': '1' - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) @@ -367,13 +367,13 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 1e) Delete ODUC2 device interfaces def test_20_otn_service_path_delete_oduc2(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_ODUC2', 'operation': 'delete', 'service-rate': '200', 'service-format': 'ODU', 'nodes': [{'node-id': 'XPDR-A2', 'network-tp': 'XPDR2-NETWORK1'}] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) @@ -384,7 +384,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 1f) Delete OTUC2 device interfaces def test_22_service_path_delete_otuc2(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_OTUC2', 'wave-number': '0', 'modulation-format': 'dp-qpsk', @@ -396,7 +396,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): 'max-freq': 196.125, 'lower-spectral-slot-number': 755, 'higher-spectral-slot-number': 768 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) @@ -416,7 +416,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 2a) create a OTUC3 device renderer def test_26_service_path_create_otuc3(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_OTUC3', 'wave-number': '0', 'modulation-format': 'dp-qam8', @@ -428,7 +428,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): 'max-freq': 196.125, 'lower-spectral-slot-number': 755, 'higher-spectral-slot-number': 768 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Interfaces created successfully for nodes: ', response['output']['result']) self.assertIn( @@ -514,13 +514,13 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 2b) create a ODUC3 device renderer def test_31_otn_service_path_create_oduc3(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_ODUC3', 'operation': 'create', 'service-rate': '300', 'service-format': 'ODU', 'nodes': [{'node-id': 'XPDR-A2', 'network-tp': 'XPDR2-NETWORK1'}] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', response['output']['result']) self.assertIn( @@ -573,13 +573,13 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 2e) Delete ODUC3 device interfaces def test_34_otn_service_path_delete_oduc3(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_ODUC3', 'operation': 'delete', 'service-rate': '300', 'service-format': 'ODU', 'nodes': [{'node-id': 'XPDR-A2', 'network-tp': 'XPDR2-NETWORK1'}] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) @@ -590,7 +590,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 2f) Delete OTUC3 device interfaces def test_36_service_path_delete_otuc3(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_OTUC3', 'wave-number': '0', 'modulation-format': 'dp-qam8', @@ -602,7 +602,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): 'max-freq': 196.125, 'lower-spectral-slot-number': 755, 'higher-spectral-slot-number': 768 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) @@ -622,7 +622,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 3a) create a OTUC4 device renderer def test_40_service_path_create_otuc3(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_OTUC4', 'wave-number': '0', 'modulation-format': 'dp-qam16', @@ -634,7 +634,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): 'max-freq': 196.125, 'lower-spectral-slot-number': 755, 'higher-spectral-slot-number': 768 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Interfaces created successfully for nodes: ', response['output']['result']) self.assertIn( @@ -720,13 +720,13 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 3b) create a ODUC4 device renderer def test_45_otn_service_path_create_oduc3(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_ODUC4', 'operation': 'create', 'service-rate': '400', 'service-format': 'ODU', 'nodes': [{'node-id': 'XPDR-A2', 'network-tp': 'XPDR2-NETWORK1'}] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Otn Service path was set up successfully for node :XPDR-A2', response['output']['result']) self.assertIn( @@ -779,13 +779,13 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 3e) Delete ODUC4 device interfaces def test_48_otn_service_path_delete_oduc4(self): response = test_utils_rfc8040.device_renderer_otn_service_path_request( - {'input': { + { 'service-name': 'service_ODUC4', 'operation': 'delete', 'service-rate': '400', 'service-format': 'ODU', 'nodes': [{'node-id': 'XPDR-A2', 'network-tp': 'XPDR2-NETWORK1'}] - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) @@ -796,7 +796,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): # 3f) Delete OTUC4 device interfaces def test_50_service_path_delete_otuc4(self): response = test_utils_rfc8040.device_renderer_service_path_request( - {'input': { + { 'service-name': 'service_OTUC4', 'wave-number': '0', 'modulation-format': 'dp-qam16', @@ -808,7 +808,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase): 'max-freq': 196.125, 'lower-spectral-slot-number': 755, 'higher-spectral-slot-number': 768 - }}) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Request processed', response['output']['result']) diff --git a/tests/transportpce_tests/common/test_utils_rfc8040.py b/tests/transportpce_tests/common/test_utils_rfc8040.py index 590577cd4..00c016555 100644 --- a/tests/transportpce_tests/common/test_utils_rfc8040.py +++ b/tests/transportpce_tests/common/test_utils_rfc8040.py @@ -520,9 +520,9 @@ def connect_rdm_to_xpdr_request(payload: dict): def device_renderer_service_path_request(payload: dict): url = "{}/operations/transportpce-device-renderer:service-path" if RESTCONF_VERSION == 'draft-bierman02': - data = prepend_dict_keys(payload, 'transportpce-device-renderer:') + data = prepend_dict_keys({'input': payload}, 'transportpce-device-renderer:') else: - data = payload + data = {'input': payload} response = post_request(url, data) res = response.json() return_key = {'rfc8040': 'transportpce-device-renderer:output', @@ -535,9 +535,9 @@ def device_renderer_service_path_request(payload: dict): def device_renderer_otn_service_path_request(payload: dict): url = "{}/operations/transportpce-device-renderer:otn-service-path" if RESTCONF_VERSION == 'draft-bierman02': - data = prepend_dict_keys(payload, 'transportpce-device-renderer:') + data = prepend_dict_keys({'input': payload}, 'transportpce-device-renderer:') else: - data = payload + data = {'input': payload} response = post_request(url, data) res = response.json() return_key = {'rfc8040': 'transportpce-device-renderer:output', -- 2.36.6