From: guillaume.lambert Date: Tue, 12 Sep 2023 14:41:05 +0000 (+0200) Subject: Fix some typos in functional tests naming X-Git-Tag: 8.0.0~9 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=4b6d551d99de440b20ee0850b588ef01a0d65da2;p=transportpce.git Fix some typos in functional tests naming Signed-off-by: guillaume.lambert Change-Id: Ie6528fa73b07af9a9514dab9dfb4a2f6c9e487a3 --- diff --git a/tests/transportpce_tests/1.2.1/test05_olm.py b/tests/transportpce_tests/1.2.1/test05_olm.py index ba0f8f1f5..b277c23c9 100644 --- a/tests/transportpce_tests/1.2.1/test05_olm.py +++ b/tests/transportpce_tests/1.2.1/test05_olm.py @@ -64,7 +64,7 @@ class TransportOlmTesting(unittest.TestCase): response = test_utils.mount_device("ROADMC01", ('roadmc-full', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprdA_to_roadmA(self): + def test_05_connect_xpdrA_to_roadmA(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', @@ -78,7 +78,7 @@ class TransportOlmTesting(unittest.TestCase): 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) self.assertEqual(response['status_code'], requests.codes.ok) - def test_07_connect_xprdC_to_roadmC(self): + def test_07_connect_xpdrC_to_roadmC(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1', @@ -484,7 +484,7 @@ class TransportOlmTesting(unittest.TestCase): # """to test case where SRG where the xpdr is connected to has no optical range data""" - def test_31_connect_xprdA_to_roadmA(self): + def test_31_connect_xpdrA_to_roadmA(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2', diff --git a/tests/transportpce_tests/1.2.1/test06_end2end.py b/tests/transportpce_tests/1.2.1/test06_end2end.py index 68bd01bfc..2b428ea0a 100644 --- a/tests/transportpce_tests/1.2.1/test06_end2end.py +++ b/tests/transportpce_tests/1.2.1/test06_end2end.py @@ -106,7 +106,7 @@ class TransportPCEFulltesting(unittest.TestCase): response = test_utils.mount_device("ROADMC01", ('roadmc-full', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprdA_N1_to_roadmA_PP1(self): + def test_05_connect_xpdrA_N1_to_roadmA_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', @@ -124,7 +124,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_07_connect_xprdC_N1_to_roadmC_PP1(self): + def test_07_connect_xpdrC_N1_to_roadmC_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1', @@ -282,7 +282,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available") time.sleep(1) - def test_18_connect_xprdA_N2_to_roadmA_PP2(self): + def test_18_connect_xpdrA_N2_to_roadmA_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2', @@ -300,7 +300,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_20_connect_xprdC_N2_to_roadmC_PP2(self): + def test_20_connect_xpdrC_N2_to_roadmC_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '2', diff --git a/tests/transportpce_tests/2.2.1/test09_olm.py b/tests/transportpce_tests/2.2.1/test09_olm.py index dc00e8739..55c4eaf52 100644 --- a/tests/transportpce_tests/2.2.1/test09_olm.py +++ b/tests/transportpce_tests/2.2.1/test09_olm.py @@ -64,7 +64,7 @@ class TransportOlmTesting(unittest.TestCase): response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprdA_to_roadmA(self): + def test_05_connect_xpdrA_to_roadmA(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1', @@ -78,7 +78,7 @@ class TransportOlmTesting(unittest.TestCase): 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) self.assertEqual(response['status_code'], requests.codes.ok) - def test_07_connect_xprdC_to_roadmC(self): + def test_07_connect_xpdrC_to_roadmC(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', @@ -469,7 +469,7 @@ class TransportOlmTesting(unittest.TestCase): # """to test case where SRG where the xpdr is connected to has no optical range data""" - def test_31_connect_xprdA_to_roadmA(self): + def test_31_connect_xpdrA_to_roadmA(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2', diff --git a/tests/transportpce_tests/2.2.1/test12_end2end.py b/tests/transportpce_tests/2.2.1/test12_end2end.py index c60c2d2a8..624f0930e 100644 --- a/tests/transportpce_tests/2.2.1/test12_end2end.py +++ b/tests/transportpce_tests/2.2.1/test12_end2end.py @@ -167,7 +167,7 @@ class TransportPCEFulltesting(unittest.TestCase): response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprdA_N1_to_roadmA_PP1(self): + def test_05_connect_xpdrA_N1_to_roadmA_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1', @@ -185,7 +185,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_07_connect_xprdC_xpdr1_N1_to_roadmC_PP1(self): + def test_07_connect_xpdrC_xpdr1_N1_to_roadmC_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', @@ -194,7 +194,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"]) time.sleep(2) - def test_08_connect_roadmC_PP1_to_xpdrC_xprd1_N1(self): + def test_08_connect_roadmC_PP1_to_xpdrC_xpdr1_N1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-rdm-xpdr-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', @@ -203,7 +203,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_09_connect_xprdA_N2_to_roadmA_PP2(self): + def test_09_connect_xpdrA_N2_to_roadmA_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2', @@ -221,7 +221,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_11_connect_xprdC_xpdr2_N1_to_roadmC_PP2(self): + def test_11_connect_xpdrC_xpdr2_N1_to_roadmC_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '2', 'network-num': '1', diff --git a/tests/transportpce_tests/hybrid/test01_device_change_notifications.py b/tests/transportpce_tests/hybrid/test01_device_change_notifications.py index 861667079..88347bf3d 100644 --- a/tests/transportpce_tests/hybrid/test01_device_change_notifications.py +++ b/tests/transportpce_tests/hybrid/test01_device_change_notifications.py @@ -113,7 +113,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprdA_N1_to_roadmA_PP1(self): + def test_05_connect_xpdrA_N1_to_roadmA_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', @@ -129,7 +129,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) - def test_07_connect_xprdC_N1_to_roadmC_PP1(self): + def test_07_connect_xpdrC_N1_to_roadmC_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', diff --git a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py index e6b55c27c..00bf86a73 100644 --- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py +++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py @@ -175,7 +175,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprda2_2_N1_to_roadma_PP2(self): + def test_05_connect_xpdra2_2_N1_to_roadma_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '2', 'network-num': '1', @@ -191,7 +191,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) - def test_07_connect_xprdc2_2_N1_to_roadmc_PP2(self): + def test_07_connect_xpdrc2_2_N1_to_roadmc_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '2', 'network-num': '1', @@ -1036,7 +1036,7 @@ class TransportPCEtesting(unittest.TestCase): links = response['network'][0]['ietf-network-topology:link'] self.assertEqual(22, len(links), 'Topology should contain 22 links') - def test_68_connect_xprda2_1_N1_to_roadma_PP2(self): + def test_68_connect_xpdra2_1_N1_to_roadma_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1', @@ -1052,7 +1052,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) - def test_70_connect_xprdc2_1_N1_to_roadmc_PP2(self): + def test_70_connect_xpdrc2_1_N1_to_roadmc_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1', diff --git a/tests/transportpce_tests/hybrid/test03_autonomous_reroute.py b/tests/transportpce_tests/hybrid/test03_autonomous_reroute.py index b3ee1a3bb..a7bca9592 100644 --- a/tests/transportpce_tests/hybrid/test03_autonomous_reroute.py +++ b/tests/transportpce_tests/hybrid/test03_autonomous_reroute.py @@ -726,7 +726,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_06_connect_xprda2_1_N1_to_roadma_PP1(self): + def test_06_connect_xpdra2_1_N1_to_roadma_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1', @@ -742,7 +742,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) - def test_08_connect_xprdc2_1_N1_to_roadmc_PP1(self): + def test_08_connect_xpdrc2_1_N1_to_roadmc_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1', @@ -926,7 +926,7 @@ class TransportPCEtesting(unittest.TestCase): def test_18_get_eth_service1(self): self.test_13_get_eth_service1() - def test_19_connect_xprda2_3_N1_to_roadma_PP2(self): + def test_19_connect_xpdra2_3_N1_to_roadma_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '3', 'network-num': '1', @@ -944,7 +944,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_21_connect_xprdc2_3_N1_to_roadmc_PP2(self): + def test_21_connect_xpdrc2_3_N1_to_roadmc_PP2(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '3', 'network-num': '1', diff --git a/tests/transportpce_tests/tapi/test01_abstracted_topology.py b/tests/transportpce_tests/tapi/test01_abstracted_topology.py index 3e3d99d00..f74f298f6 100644 --- a/tests/transportpce_tests/tapi/test01_abstracted_topology.py +++ b/tests/transportpce_tests/tapi/test01_abstracted_topology.py @@ -266,7 +266,7 @@ class TransportTapitesting(unittest.TestCase): self.assertEqual(1, len(response["output"]["topology"]["node"][0]["node-rule-group"]), 'node should contain 1 node rule group') - def test_11_connect_xprda_n1_to_roadma_pp1(self): + def test_11_connect_xpdra_n1_to_roadma_pp1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1', @@ -319,7 +319,7 @@ class TransportTapitesting(unittest.TestCase): response = test_utils.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_16_connect_xprdc_n1_to_roadmc_pp1(self): + def test_16_connect_xpdrc_n1_to_roadmc_pp1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', 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 47a3eb9a0..5da1194a5 100644 --- a/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py +++ b/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py @@ -161,7 +161,7 @@ class TransportPCEFulltesting(unittest.TestCase): response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprdA_N1_to_roadmA_PP1(self): + def test_05_connect_xpdrA_N1_to_roadmA_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1', @@ -179,7 +179,7 @@ class TransportPCEFulltesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_07_connect_xprdC_N1_to_roadmC_PP1(self): + def test_07_connect_xpdrC_N1_to_roadmC_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', diff --git a/tests/transportpce_tests/with_docker/test02_nbinotifications.py b/tests/transportpce_tests/with_docker/test02_nbinotifications.py index 41eb33b5f..c3ce3d6c1 100644 --- a/tests/transportpce_tests/with_docker/test02_nbinotifications.py +++ b/tests/transportpce_tests/with_docker/test02_nbinotifications.py @@ -130,7 +130,7 @@ class TransportNbiNotificationstesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprdA_N1_to_roadmA_PP1(self): + def test_05_connect_xpdrA_N1_to_roadmA_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1', @@ -148,7 +148,7 @@ class TransportNbiNotificationstesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_07_connect_xprdC_N1_to_roadmC_PP1(self): + def test_07_connect_xpdrC_N1_to_roadmC_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', diff --git a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py index 6b93e2173..1a82ceaba 100644 --- a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py +++ b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py @@ -200,7 +200,7 @@ class TransportNbiNotificationstesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) - def test_05_connect_xprdA_N1_to_roadmA_PP1(self): + def test_05_connect_xpdrA_N1_to_roadmA_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1', @@ -218,7 +218,7 @@ class TransportNbiNotificationstesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', response["output"]["result"]) time.sleep(2) - def test_07_connect_xprdC_N1_to_roadmC_PP1(self): + def test_07_connect_xpdrC_N1_to_roadmC_PP1(self): response = test_utils.transportpce_api_rpc_request( 'transportpce-networkutils', 'init-xpdr-rdm-links', {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',