From 77e4f4f3d902a4e68df297fa9a80dfd4515f68ca Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Wed, 13 Sep 2023 16:16:51 +0200 Subject: [PATCH] Leverage urllib in test_utils sims REST connector Signed-off-by: guillaume.lambert Change-Id: Iaa2e53f0dce17da7f9a1dc9dca253560ac2d525f --- tests/transportpce_tests/common/test_utils.py | 5 ++++- .../test01_device_change_notifications.py | 18 +++++++++--------- .../test03_tapi_device_change_notifications.py | 12 ++++++------ .../with_docker/test02_nbinotifications.py | 4 ++-- .../test03_tapi_nbinotifications.py | 4 ++-- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py index cc0604abb..1b2b01794 100644 --- a/tests/transportpce_tests/common/test_utils.py +++ b/tests/transportpce_tests/common/test_utils.py @@ -22,6 +22,7 @@ import time import psutil import requests +import urllib.parse # pylint: disable=import-error import simulators @@ -685,7 +686,9 @@ def transportpce_api_rpc_request(api_module: str, rpc: str, payload: dict): def sims_update_cp_port(sim: tuple, circuitpack: str, port: str, payload: dict): # pylint: disable=consider-using-f-string url = "{}/config/org-openroadm-device:org-openroadm-device/circuit-packs/{}/ports/{}".format( - SIMS[sim]['restconf_baseurl'], circuitpack, port) + SIMS[sim]['restconf_baseurl'], + urllib.parse.quote(circuitpack, safe=''), + urllib.parse.quote(port, safe='')) body = {"ports": [payload]} print(sim) print(url) diff --git a/tests/transportpce_tests/hybrid/test01_device_change_notifications.py b/tests/transportpce_tests/hybrid/test01_device_change_notifications.py index c0d8c3e64..bb28a3cf0 100644 --- a/tests/transportpce_tests/hybrid/test01_device_change_notifications.py +++ b/tests/transportpce_tests/hybrid/test01_device_change_notifications.py @@ -197,7 +197,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_13_change_status_line_port_xpdra(self): - self.assertTrue(test_utils.sims_update_cp_port(('xpdra', self.NODE_VERSION_121), '1%2F0%2F1-PLUG-NET', '1', + self.assertTrue(test_utils.sims_update_cp_port(('xpdra', self.NODE_VERSION_121), '1/0/1-PLUG-NET', '1', { "port-name": "1", "logical-connection-point": "XPDR1-NETWORK1", @@ -267,7 +267,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_17_restore_status_line_port_xpdra(self): - self.assertTrue(test_utils.sims_update_cp_port(('xpdra', self.NODE_VERSION_121), '1%2F0%2F1-PLUG-NET', '1', + self.assertTrue(test_utils.sims_update_cp_port(('xpdra', self.NODE_VERSION_121), '1/0/1-PLUG-NET', '1', { "port-name": "1", "logical-connection-point": "XPDR1-NETWORK1", @@ -311,7 +311,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_12_get_eth_service1() def test_21_change_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C1', { "port-name": "C1", "logical-connection-point": "SRG1-PP1", @@ -374,7 +374,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_24_restore_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C1', { "port-name": "C1", "logical-connection-point": "SRG1-PP1", @@ -395,7 +395,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_12_get_eth_service1() def test_28_change_status_line_port_roadma_deg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '2%2F0', 'L1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '2/0', 'L1', { "port-name": "L1", "logical-connection-point": "DEG2-TTP-TXRX", @@ -458,7 +458,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_31_restore_status_line_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '2%2F0', 'L1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '2/0', 'L1', { "port-name": "L1", "logical-connection-point": "DEG2-TTP-TXRX", @@ -479,7 +479,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_12_get_eth_service1() def test_35_change_status_line_port_xpdrc(self): - self.assertTrue(test_utils.sims_update_cp_port(('xpdrc', self.NODE_VERSION_71), '1%2F0%2F1-PLUG-NET', '1', + self.assertTrue(test_utils.sims_update_cp_port(('xpdrc', self.NODE_VERSION_71), '1/0/1-PLUG-NET', '1', { "port-name": "1", "port-type": "CFP2", @@ -540,7 +540,7 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(1) def test_38_restore_status_line_port_xpdrc(self): - self.assertTrue(test_utils.sims_update_cp_port(('xpdrc', self.NODE_VERSION_71), '1%2F0%2F1-PLUG-NET', '1', + self.assertTrue(test_utils.sims_update_cp_port(('xpdrc', self.NODE_VERSION_71), '1/0/1-PLUG-NET', '1', { "port-name": "1", "port-type": "CFP2", @@ -559,7 +559,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_12_get_eth_service1() def test_42_change_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C2', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C2', { "port-name": "C2", "logical-connection-point": "SRG1-PP2", diff --git a/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py b/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py index cc02a6ae8..8b589e0d8 100644 --- a/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py +++ b/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py @@ -503,7 +503,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_13_get_connectivity_service_Ethernet() def test_28_change_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C1', { "port-name": "C1", "logical-connection-point": "SRG1-PP1", @@ -614,7 +614,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_20_check_update_connectivity_service_Ethernet() def test_35_restore_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C1', { "port-name": "C1", "logical-connection-point": "SRG1-PP1", @@ -664,7 +664,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_13_get_connectivity_service_Ethernet() def test_42_change_status_line_port_roadma_deg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '2%2F0', 'L1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '2/0', 'L1', { "port-name": "L1", "logical-connection-point": "DEG2-TTP-TXRX", @@ -776,7 +776,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_20_check_update_connectivity_service_Ethernet() def test_49_restore_status_line_port_roadma_deg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '2%2F0', 'L1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '2/0', 'L1', { "port-name": "L1", "logical-connection-point": "DEG2-TTP-TXRX", @@ -806,7 +806,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.test_13_get_connectivity_service_Ethernet() def test_56_change_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C2', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C2', { "port-name": "C2", "logical-connection-point": "SRG1-PP2", @@ -944,7 +944,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_69_restore_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C2', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C2', { "port-name": "C2", "logical-connection-point": "SRG1-PP2", diff --git a/tests/transportpce_tests/with_docker/test02_nbinotifications.py b/tests/transportpce_tests/with_docker/test02_nbinotifications.py index 2cbf4e2a5..92aed86cc 100644 --- a/tests/transportpce_tests/with_docker/test02_nbinotifications.py +++ b/tests/transportpce_tests/with_docker/test02_nbinotifications.py @@ -261,7 +261,7 @@ class TransportNbiNotificationstesting(unittest.TestCase): 'The service is now inService') def test_18_change_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION), '3%2F0', 'C1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION), '3/0', 'C1', { "port-name": "C1", "logical-connection-point": "SRG1-PP1", @@ -282,7 +282,7 @@ class TransportNbiNotificationstesting(unittest.TestCase): 'The service is now outOfService') def test_20_restore_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION), '3%2F0', 'C1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION), '3/0', 'C1', { "port-name": "C1", "logical-connection-point": "SRG1-PP1", diff --git a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py index a58ef7a05..89537ebc4 100644 --- a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py +++ b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py @@ -330,7 +330,7 @@ class TransportNbiNotificationstesting(unittest.TestCase): time.sleep(2) def test_15_change_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C1', { "port-name": "C1", "logical-connection-point": "SRG1-PP1", @@ -352,7 +352,7 @@ class TransportNbiNotificationstesting(unittest.TestCase): time.sleep(2) def test_17_restore_status_port_roadma_srg(self): - self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3%2F0', 'C1', + self.assertTrue(test_utils.sims_update_cp_port(('roadma', self.NODE_VERSION_221), '3/0', 'C1', { "port-name": "C1", "logical-connection-point": "SRG1-PP1", -- 2.36.6