X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest04_renderer_service_path_nominal.py;h=40f6bb96116b7f9afa07c8b2aa2e55c886e6010c;hb=8ec42577fc9bb12bed1a7689cd4a17487e3c1ff6;hp=7b7bf35d80a9a34afe6be2f46564f3d83e2fee2b;hpb=8e571931e3517543508ae6baff87ac77b9a93b5c;p=transportpce.git 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 7b7bf35d8..40f6bb961 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 @@ -87,8 +87,9 @@ class TransportPCERendererTesting(unittest.TestCase): response['nodes'][0]['mapping']) def test_05_service_path_create(self): - data = { - 'input': { + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'service-path', + { 'service-name': 'service_test', 'wave-number': '7', 'modulation-format': 'dp-qpsk', @@ -101,13 +102,12 @@ 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: ROADMA01', response['output']['result']) def test_06_service_path_create_rdm_check(self): - response = test_utils_rfc8040.check_interface_request("ROADMA01", "DEG1-TTP-TXRX-713:720") + response = test_utils_rfc8040.check_node_attribute_request("ROADMA01", "interface", "DEG1-TTP-TXRX-713:720") self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( @@ -123,7 +123,7 @@ class TransportPCERendererTesting(unittest.TestCase): response['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_07_service_path_create_rdm_check(self): - response = test_utils_rfc8040.check_interface_request("ROADMA01", "SRG1-PP7-TXRX-713:720") + response = test_utils_rfc8040.check_node_attribute_request("ROADMA01", "interface", "SRG1-PP7-TXRX-713:720") self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( @@ -139,7 +139,8 @@ class TransportPCERendererTesting(unittest.TestCase): response['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_08_service_path_create_rdm_check(self): - response = test_utils_rfc8040.check_roadm_connections_request("ROADMA01", "SRG1-PP7-TXRX-DEG1-TTP-TXRX-713:720") + response = test_utils_rfc8040.check_node_attribute_request( + "ROADMA01", "roadm-connections", "SRG1-PP7-TXRX-DEG1-TTP-TXRX-713:720") self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( @@ -152,7 +153,7 @@ class TransportPCERendererTesting(unittest.TestCase): self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-713:720'}, response['roadm-connections'][0]['destination']) def test_09_service_path_create_xpdr_check(self): - response = test_utils_rfc8040.check_interface_request("XPDRA01", "XPDR1-NETWORK1-713:720") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-NETWORK1-713:720") self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( @@ -175,7 +176,7 @@ class TransportPCERendererTesting(unittest.TestCase): 'modulation-format': 'dp-qpsk'}]) def test_10_service_path_create_xpdr_check(self): - response = test_utils_rfc8040.check_interface_request("XPDRA01", "XPDR1-NETWORK1-OTU") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-NETWORK1-OTU") self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( @@ -192,7 +193,7 @@ class TransportPCERendererTesting(unittest.TestCase): response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']) def test_11_service_path_create_xpdr_check(self): - response = test_utils_rfc8040.check_interface_request("XPDRA01", "XPDR1-NETWORK1-ODU") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-NETWORK1-ODU") self.assertEqual(response['status_code'], requests.codes.ok) # the 2 following statements replace self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( @@ -215,7 +216,7 @@ class TransportPCERendererTesting(unittest.TestCase): response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']) def test_12_service_path_create_xpdr_check(self): - response = test_utils_rfc8040.check_interface_request("XPDRA01", "XPDR1-CLIENT1-ETHERNET") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-CLIENT1-ETHERNET") self.assertEqual(response['status_code'], requests.codes.ok) # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( @@ -235,14 +236,15 @@ class TransportPCERendererTesting(unittest.TestCase): response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_13_service_path_create_xpdr_check(self): - response = test_utils_rfc8040.check_circuit_packs_request("XPDRA01", "1%2F0%2F1-PLUG-NET") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "circuit-packs", "1%2F0%2F1-PLUG-NET") # FIXME: https://jira.opendaylight.org/browse/TRNSPRTPCE-591 self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('not-reserved-inuse', response['circuit-packs'][0]["equipment-state"]) def test_14_service_path_delete(self): - data = { - 'input': { + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'service-path', + { 'service-name': 'service_test', 'wave-number': '7', 'modulation-format': 'dp-qpsk', @@ -255,44 +257,41 @@ 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_15_service_path_delete_rdm_check(self): - response = test_utils_rfc8040.check_interface_request("ROADMA01", "DEG1-TTP-TXRX-713:720") + response = test_utils_rfc8040.check_node_attribute_request("ROADMA01", "interface", "DEG1-TTP-TXRX-713:720") self.assertEqual(response['status_code'], requests.codes.conflict) def test_16_service_path_delete_rdm_check(self): - response = test_utils_rfc8040.check_interface_request("ROADMA01", "SRG1-PP7-TXRX-713:720") + response = test_utils_rfc8040.check_node_attribute_request("ROADMA01", "interface", "SRG1-PP7-TXRX-713:720") self.assertEqual(response['status_code'], requests.codes.conflict) def test_17_service_path_delete_rdm_check(self): - response = test_utils_rfc8040.check_roadm_connections_request("ROADMA01", "SRG1-PP7-TXRX-DEG1-TTP-TXRX-713:720") + response = test_utils_rfc8040.check_node_attribute_request( + "ROADMA01", "roadm-connections", "SRG1-PP7-TXRX-DEG1-TTP-TXRX-713:720") self.assertEqual(response['status_code'], requests.codes.conflict) def test_18_service_path_delete_xpdr_check(self): - response = test_utils_rfc8040.check_interface_request("XPDRA01", "XPDR1-NETWORK1-713:720") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-NETWORK1-713:720") self.assertEqual(response['status_code'], requests.codes.conflict) def test_19_service_path_delete_xpdr_check(self): - response = test_utils_rfc8040.check_interface_request("XPDRA01", "XPDR1-NETWORK1-OTU") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-NETWORK1-OTU") self.assertEqual(response['status_code'], requests.codes.conflict) def test_20_service_path_delete_xpdr_check(self): - response = test_utils_rfc8040.check_interface_request("XPDRA01", "XPDR1-NETWORK1-ODU") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-NETWORK1-ODU") self.assertEqual(response['status_code'], requests.codes.conflict) def test_21_service_path_delete_xpdr_check(self): - response = test_utils_rfc8040.check_interface_request("XPDRA01", "XPDR1-CLIENT1-ETHERNET") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-CLIENT1-ETHERNET") self.assertEqual(response['status_code'], requests.codes.conflict) def test_22_service_path_delete_xpdr_check(self): - response = test_utils_rfc8040.check_circuit_packs_request("XPDRA01", "1%2F0%2F1-PLUG-NET") + response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "circuit-packs", "1%2F0%2F1-PLUG-NET") self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual('not-reserved-available', response["circuit-packs"][0]['equipment-state'])