From dab8abe2f5cece597566b843c168a7e31a9ac5bc Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 14 Mar 2022 11:54:07 +0100 Subject: [PATCH] Migrate OLM functional tests to RFC8040 step 1 - migrate functions used by OLM tests already in new test_utils_rfc8040 - clean up a few pieces of code JIRA: TRNSPRTPCE-567 TRNSPRTPCE-591 Signed-off-by: guillaume.lambert Change-Id: I74b899dc5935753af75a5891e1ba30f35ce22d90 --- tests/transportpce_tests/1.2.1/test05_olm.py | 411 ++++++++++-------- tests/transportpce_tests/2.2.1/test09_olm.py | 407 +++++++++-------- .../common/test_utils_rfc8040.py | 14 + 3 files changed, 456 insertions(+), 376 deletions(-) diff --git a/tests/transportpce_tests/1.2.1/test05_olm.py b/tests/transportpce_tests/1.2.1/test05_olm.py index 500ae5571..e8299ea0b 100644 --- a/tests/transportpce_tests/1.2.1/test05_olm.py +++ b/tests/transportpce_tests/1.2.1/test05_olm.py @@ -21,6 +21,7 @@ sys.path.append('transportpce_tests/common/') # pylint: disable=wrong-import-position # pylint: disable=import-error import test_utils # nopep8 +import test_utils_rfc8040 # nopep8 class TransportOlmTesting(unittest.TestCase): @@ -30,17 +31,17 @@ class TransportOlmTesting(unittest.TestCase): @classmethod def setUpClass(cls): - cls.processes = test_utils.start_tpce() - cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION), - ('roadma-full', cls.NODE_VERSION), - ('roadmc-full', cls.NODE_VERSION), - ('xpdrc', cls.NODE_VERSION)]) + cls.processes = test_utils_rfc8040.start_tpce() + cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION), + ('roadma-full', cls.NODE_VERSION), + ('roadmc-full', cls.NODE_VERSION), + ('xpdrc', cls.NODE_VERSION)]) @classmethod def tearDownClass(cls): # pylint: disable=not-an-iterable for process in cls.processes: - test_utils.shutdown_process(process) + test_utils_rfc8040.shutdown_process(process) print("all processes killed") def setUp(self): @@ -49,48 +50,44 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(1) def test_01_xpdrA_device_connected(self): - response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_02_xpdrC_device_connected(self): - response = test_utils.mount_device("XPDRC01", ('xpdrc', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("XPDRC01", ('xpdrc', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_03_rdmA_device_connected(self): - response = test_utils.mount_device("ROADMA01", ('roadma-full', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("ROADMA01", ('roadma-full', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_04_rdmC_device_connected(self): - 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) + response = test_utils_rfc8040.mount_device("ROADMC01", ('roadmc-full', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_05_connect_xprdA_to_roadmA(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "1", - "ROADMA01", "1", "SRG1-PP1-TXRX") + response = test_utils_rfc8040.connect_xpdr_to_rdm_request( + {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_06_connect_roadmA_to_xpdrA(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1", - "ROADMA01", "1", "SRG1-PP1-TXRX") + response = test_utils_rfc8040.connect_rdm_to_xpdr_request( + {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_07_connect_xprdC_to_roadmC(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDRC01", "1", "1", - "ROADMC01", "1", "SRG1-PP1-TXRX") + response = test_utils_rfc8040.connect_xpdr_to_rdm_request( + {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMC01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_08_connect_roadmC_to_xpdrC(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDRC01", "1", "1", - "ROADMC01", "1", "SRG1-PP1-TXRX") + response = test_utils_rfc8040.connect_rdm_to_xpdr_request( + {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMC01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_09_create_OTS_ROADMA(self): response = test_utils.create_ots_oms_request("ROADMA01", "DEG1-TTP-TXRX") @@ -204,57 +201,73 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_15_get_OTS_DEG1_TTP_TXRX_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADMA01", - "interface/OTS-DEG1-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(5.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) - self.assertEqual(15.1, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'ROADMA01', 'interface', 'OTS-DEG1-TTP-TXRX', 'org-openroadm-optical-transport-interfaces:ots') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']), 5.7) + self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']), 15.1) + # FIXME test_utils_rfc8040.check_node_attribute2_request retrives values in config DS + # but values are different (6 and 15) in nonconfig/operational DS and should not + # Honeynode simulator bug ? + # Reopen similar issues found in RSPN tests at TRNSPRTPCE-591 def test_16_get_OTS_DEG2_TTP_TXRX_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADMC01", - "interface/OTS-DEG2-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(15.1, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) - self.assertEqual(5.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'ROADMC01', 'interface', 'OTS-DEG2-TTP-TXRX', 'org-openroadm-optical-transport-interfaces:ots') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']), 15.1) + self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']), 5.7) def test_17_servicePath_create_AToZ(self): - response = test_utils.service_path_request("create", "test", "1", - [{"node-id": "XPDRA01", - "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, - {"node-id": "ROADMA01", - "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, - {"node-id": "ROADMC01", - "dest-tp": "SRG1-PP1-TXRX", "src-tp": "DEG2-TTP-TXRX"}, - {"node-id": "XPDRC01", - "dest-tp": "XPDR1-CLIENT1", "src-tp": "XPDR1-NETWORK1"}], - 196.1, 40, 196.075, 196.125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Interfaces created successfully for nodes', res["output"]["result"]) - # time.sleep(40) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test', + 'wave-number': '1', + 'modulation-format': 'dp-qpsk', + 'operation': 'create', + 'nodes': + [{'node-id': 'XPDRA01', + 'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'}, + {'node-id': 'ROADMA01', + 'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'ROADMC01', + 'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG2-TTP-TXRX'}, + {'node-id': 'XPDRC01', + 'dest-tp': 'XPDR1-CLIENT1', 'src-tp': 'XPDR1-NETWORK1'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + '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']) time.sleep(10) def test_18_servicePath_create_ZToA(self): - response = test_utils.service_path_request("create", "test", "1", - [{"node-id": "XPDRC01", - "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, - {"node-id": "ROADMC01", - "dest-tp": "DEG2-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, - {"node-id": "ROADMA01", - "src-tp": "DEG1-TTP-TXRX", "dest-tp": "SRG1-PP1-TXRX"}, - {"node-id": "XPDRA01", - "src-tp": "XPDR1-NETWORK1", "dest-tp": "XPDR1-CLIENT1"}], - 196.1, 40, 196.075, 196.125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Interfaces created successfully for nodes', res["output"]["result"]) - # time.sleep(40) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test', + 'wave-number': '1', + 'modulation-format': 'dp-qpsk', + 'operation': 'create', + 'nodes': + [{'node-id': 'XPDRC01', + 'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'}, + {'node-id': 'ROADMC01', + 'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'ROADMA01', + 'src-tp': 'DEG1-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'XPDRA01', + 'src-tp': 'XPDR1-NETWORK1', 'dest-tp': 'XPDR1-CLIENT1'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + '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']) time.sleep(10) def test_19_service_power_setup_XPDRA_XPDRC(self): @@ -299,28 +312,24 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_20_get_interface_XPDRA_XPDR1_NETWORK1(self): - response = test_utils.check_netconf_node_request( - "XPDRA01", - "interface/XPDR1-NETWORK1-761:768/org-openroadm-optical-channel-interfaces:och") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(0, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) - self.assertEqual(1, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'XPDRA01', 'interface', 'XPDR1-NETWORK1-761:768', 'org-openroadm-optical-channel-interfaces:och') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), 0) + self.assertEqual(int(response['org-openroadm-optical-channel-interfaces:och']['wavelength-number']), 1) def test_21_get_roadmconnection_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) - self.assertEqual(-3.3, res['roadm-connections'][0]['target-output-power']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADMA01', 'roadm-connections', 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("gainLoss", response['roadm-connections'][0]['opticalControlMode']) + self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), -3.3) def test_22_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADMC01", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP1-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("power", res['roadm-connections'][0]['opticalControlMode']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADMC01', 'roadm-connections', 'DEG2-TTP-TXRX-SRG1-PP1-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("power", response['roadm-connections'][0]['opticalControlMode']) def test_23_service_power_setup_XPDRC_XPDRA(self): url = "{}/operations/transportpce-olm:service-power-setup" @@ -364,21 +373,18 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_24_get_interface_XPDRC_XPDR1_NETWORK1(self): - response = test_utils.check_netconf_node_request( - "XPDRC01", - "interface/XPDR1-NETWORK1-761:768/org-openroadm-optical-channel-interfaces:och") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(0, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) - self.assertEqual(1, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'XPDRC01', 'interface', 'XPDR1-NETWORK1-761:768', 'org-openroadm-optical-channel-interfaces:och') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), 0) + self.assertEqual(int(response['org-openroadm-optical-channel-interfaces:och']['wavelength-number']), 1) def test_25_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) - self.assertEqual(-0.63, res['roadm-connections'][0]['target-output-power']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADMC01', 'roadm-connections', 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("gainLoss", response['roadm-connections'][0]['opticalControlMode']) + self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), -0.63) def test_26_service_power_turndown_XPDRA_XPDRC(self): url = "{}/operations/transportpce-olm:service-power-turndown" @@ -423,113 +429,142 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_27_get_roadmconnection_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) - self.assertEqual(-60, res['roadm-connections'][0]['target-output-power']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADMA01', 'roadm-connections', 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("off", response['roadm-connections'][0]['opticalControlMode']) + self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), -60) def test_28_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADMC01", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP1-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADMC01', 'roadm-connections', 'DEG2-TTP-TXRX-SRG1-PP1-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("off", response['roadm-connections'][0]['opticalControlMode']) def test_29_servicePath_delete_AToZ(self): - response = test_utils.service_path_request("delete", "test", "1", - [{"node-id": "XPDRA01", - "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, - {"node-id": "ROADMA01", - "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, - {"node-id": "ROADMC01", - "dest-tp": "SRG1-PP1-TXRX", "src-tp": "DEG2-TTP-TXRX"}, - {"node-id": "XPDRC01", - "dest-tp": "XPDR1-CLIENT1", "src-tp": "XPDR1-NETWORK1"}], - 196.1, 40, 196.075, 196.125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Request processed', res["output"]["result"]) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test', + 'wave-number': '1', + 'modulation-format': 'dp-qpsk', + 'operation': 'delete', + 'nodes': + [{'node-id': 'XPDRA01', + 'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'}, + {'node-id': 'ROADMA01', + 'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'ROADMC01', + 'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG2-TTP-TXRX'}, + {'node-id': 'XPDRC01', + 'dest-tp': 'XPDR1-CLIENT1', 'src-tp': 'XPDR1-NETWORK1'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + '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']) time.sleep(10) def test_30_servicePath_delete_ZToA(self): - response = test_utils.service_path_request("delete", "test", "1", - [{"node-id": "XPDRC01", - "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, - {"node-id": "ROADMC01", - "dest-tp": "DEG2-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, - {"node-id": "ROADMA01", - "src-tp": "DEG1-TTP-TXRX", "dest-tp": "SRG1-PP1-TXRX"}, - {"node-id": "XPDRA01", - "src-tp": "XPDR1-NETWORK1", "dest-tp": "XPDR1-CLIENT1"}], - 196.1, 40, 196.075, 196.125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Request processed', res["output"]["result"]) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test', + 'wave-number': '1', + 'modulation-format': 'dp-qpsk', + 'operation': 'delete', + 'nodes': + [{'node-id': 'XPDRC01', + 'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'}, + {'node-id': 'ROADMC01', + 'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'ROADMA01', + 'src-tp': 'DEG1-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'XPDRA01', + 'src-tp': 'XPDR1-NETWORK1', 'dest-tp': 'XPDR1-CLIENT1'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + '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']) time.sleep(10) #"""to test case where SRG where the xpdr is connected to has no optical range data""" def test_31_connect_xprdA_to_roadmA(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "2", - "ROADMA01", "1", "SRG1-PP2-TXRX") + response = test_utils_rfc8040.connect_xpdr_to_rdm_request( + {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2', + 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_32_connect_roadmA_to_xpdrA(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "2", - "ROADMA01", "1", "SRG1-PP2-TXRX") + response = test_utils_rfc8040.connect_rdm_to_xpdr_request( + {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2', + 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_33_servicePath_create_AToZ(self): - response = test_utils.service_path_request("create", "test2", "2", - [{"node-id": "XPDRA01", - "dest-tp": "XPDR1-NETWORK2", "src-tp": "XPDR1-CLIENT2"}, - {"node-id": "ROADMA01", - "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP2-TXRX"}], - 196.05, 40, 196.025, 196.075, 753, - 760) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Interfaces created successfully for nodes', res["output"]["result"]) - # time.sleep(40) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test2', + 'wave-number': '2', + 'modulation-format': 'dp-qpsk', + 'operation': 'create', + 'nodes': + [{'node-id': 'XPDRA01', + 'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'}, + {'node-id': 'ROADMA01', + 'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}], + 'center-freq': 196.05, + 'nmc-width': 40, + 'min-freq': 196.025, + 'max-freq': 196.075, + 'lower-spectral-slot-number': 753, + 'higher-spectral-slot-number': 760 + }) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Interfaces created successfully for nodes', response['output']['result']) time.sleep(10) def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self): - response = test_utils.check_netconf_node_request( - "XPDRA01", - "interface/XPDR1-NETWORK2-753:760/org-openroadm-optical-channel-interfaces:och") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) - self.assertEqual(2, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'XPDRA01', 'interface', 'XPDR1-NETWORK2-753:760', 'org-openroadm-optical-channel-interfaces:och') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), -5) + self.assertEqual(int(response['org-openroadm-optical-channel-interfaces:och']['wavelength-number']), 2) def test_35_servicePath_delete_AToZ(self): - response = test_utils.service_path_request("delete", "test", "1", - [{"node-id": "XPDRA01", - "dest-tp": "XPDR1-NETWORK2", "src-tp": "XPDR1-CLIENT2"}, - {"node-id": "ROADMA01", - "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP2-TXRX"}], - 196.1, 40, 196.075, 196.125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Request processed', res["output"]["result"]) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test2', + 'wave-number': '2', + 'modulation-format': 'dp-qpsk', + 'operation': 'delete', + 'nodes': + [{'node-id': 'XPDRA01', + 'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'}, + {'node-id': 'ROADMA01', + 'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}], + 'center-freq': 196.05, + 'nmc-width': 40, + 'min-freq': 196.025, + 'max-freq': 196.075, + 'lower-spectral-slot-number': 753, + 'higher-spectral-slot-number': 760 + }) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Request processed', response['output']['result']) time.sleep(10) def test_36_xpdrA_device_disconnected(self): - response = test_utils.unmount_device("XPDRA01") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("XPDRA01") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_37_xpdrC_device_disconnected(self): - response = test_utils.unmount_device("XPDRC01") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("XPDRC01") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_38_calculate_span_loss_current(self): url = "{}/operations/transportpce-olm:calculate-spanloss-current" @@ -541,12 +576,12 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_39_rdmA_device_disconnected(self): - response = test_utils.unmount_device("ROADMA01") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("ROADMA01") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_40_rdmC_device_disconnected(self): - response = test_utils.unmount_device("ROADMC01") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("ROADMC01") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) if __name__ == "__main__": diff --git a/tests/transportpce_tests/2.2.1/test09_olm.py b/tests/transportpce_tests/2.2.1/test09_olm.py index a72c10b10..a34d94391 100644 --- a/tests/transportpce_tests/2.2.1/test09_olm.py +++ b/tests/transportpce_tests/2.2.1/test09_olm.py @@ -21,6 +21,7 @@ sys.path.append('transportpce_tests/common/') # pylint: disable=wrong-import-position # pylint: disable=import-error import test_utils # nopep8 +import test_utils_rfc8040 # nopep8 class TransportOlmTesting(unittest.TestCase): @@ -30,17 +31,17 @@ class TransportOlmTesting(unittest.TestCase): @classmethod def setUpClass(cls): - cls.processes = test_utils.start_tpce() - cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION), - ('roadma', cls.NODE_VERSION), - ('roadmc', cls.NODE_VERSION), - ('xpdrc', cls.NODE_VERSION)]) + cls.processes = test_utils_rfc8040.start_tpce() + cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION), + ('roadma', cls.NODE_VERSION), + ('roadmc', cls.NODE_VERSION), + ('xpdrc', cls.NODE_VERSION)]) @classmethod def tearDownClass(cls): # pylint: disable=not-an-iterable for process in cls.processes: - test_utils.shutdown_process(process) + test_utils_rfc8040.shutdown_process(process) print("all processes killed") def setUp(self): @@ -49,48 +50,44 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(1) def test_01_xpdrA_device_connected(self): - response = test_utils.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_02_xpdrC_device_connected(self): - 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) + response = test_utils_rfc8040.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_03_rdmA_device_connected(self): - response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION)) - self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) + response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_04_rdmC_device_connected(self): - 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) + response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION)) + self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201) def test_05_connect_xprdA_to_roadmA(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1", - "ROADM-A1", "1", "SRG1-PP1-TXRX") + response = test_utils_rfc8040.connect_xpdr_to_rdm_request( + {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_06_connect_roadmA_to_xpdrA(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1", - "ROADM-A1", "1", "SRG1-PP1-TXRX") + response = test_utils_rfc8040.connect_rdm_to_xpdr_request( + {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_07_connect_xprdC_to_roadmC(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1", - "ROADM-C1", "1", "SRG1-PP1-TXRX") + response = test_utils_rfc8040.connect_xpdr_to_rdm_request( + {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_08_connect_roadmC_to_xpdrC(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1", - "ROADM-C1", "1", "SRG1-PP1-TXRX") + response = test_utils_rfc8040.connect_rdm_to_xpdr_request( + {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_09_create_OTS_ROADMA(self): response = test_utils.create_ots_oms_request("ROADM-A1", "DEG1-TTP-TXRX") @@ -205,57 +202,69 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_15_get_OTS_DEG2_TTP_TXRX_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADM-A1", - "interface/OTS-DEG2-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(17.6, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) - self.assertEqual(25.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'ROADM-A1', 'interface', 'OTS-DEG2-TTP-TXRX', 'org-openroadm-optical-transport-interfaces:ots') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']), 17.6) + self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']), 25.7) def test_16_get_OTS_DEG1_TTP_TXRX_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADM-C1", - "interface/OTS-DEG1-TTP-TXRX/org-openroadm-optical-transport-interfaces:ots") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(25.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']) - self.assertEqual(17.6, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'ROADM-C1', 'interface', 'OTS-DEG1-TTP-TXRX', 'org-openroadm-optical-transport-interfaces:ots') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-transmit']), 25.7) + self.assertEqual(float(response['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']), 17.6) def test_17_servicePath_create_AToZ(self): - response = test_utils.service_path_request("create", "test", "1", - [{"node-id": "XPDR-A1", - "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, - {"node-id": "ROADM-A1", - "dest-tp": "DEG2-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, - {"node-id": "ROADM-C1", - "dest-tp": "SRG1-PP1-TXRX", "src-tp": "DEG1-TTP-TXRX"}, - {"node-id": "XPDR-C1", - "dest-tp": "XPDR1-CLIENT1", "src-tp": "XPDR1-NETWORK1"}], - 196.1, 40, 196.075, 196.125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Interfaces created successfully for nodes', res["output"]["result"]) - # time.sleep(40) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test', + 'wave-number': '1', + 'modulation-format': 'dp-qpsk', + 'operation': 'create', + 'nodes': + [{'node-id': 'XPDR-A1', + 'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'}, + {'node-id': 'ROADM-A1', + 'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'ROADM-C1', + 'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG1-TTP-TXRX'}, + {'node-id': 'XPDR-C1', + 'dest-tp': 'XPDR1-CLIENT1', 'src-tp': 'XPDR1-NETWORK1'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + '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']) time.sleep(10) def test_18_servicePath_create_ZToA(self): - response = test_utils.service_path_request("create", "test", "1", - [{"node-id": "XPDR-C1", - "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, - {"node-id": "ROADM-C1", - "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, - {"node-id": "ROADM-A1", - "src-tp": "DEG2-TTP-TXRX", "dest-tp": "SRG1-PP1-TXRX"}, - {"node-id": "XPDR-A1", - "src-tp": "XPDR1-NETWORK1", "dest-tp": "XPDR1-CLIENT1"}], - 196.1, 40, 196.075, 196.125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Interfaces created successfully for nodes', res["output"]["result"]) - # time.sleep(40) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test', + 'wave-number': '1', + 'modulation-format': 'dp-qpsk', + 'operation': 'create', + 'nodes': + [{'node-id': 'XPDR-C1', + 'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'}, + {'node-id': 'ROADM-C1', + 'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'ROADM-A1', + 'src-tp': 'DEG2-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'XPDR-A1', + 'src-tp': 'XPDR1-NETWORK1', 'dest-tp': 'XPDR1-CLIENT1'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + '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']) time.sleep(10) def test_19_service_power_setup_XPDRA_XPDRC(self): @@ -296,28 +305,24 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_20_get_interface_XPDRA_XPDR1_NETWORK1(self): - response = test_utils.check_netconf_node_request( - "XPDR-A1", - "interface/XPDR1-NETWORK1-761:768/org-openroadm-optical-channel-interfaces:och") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) - self.assertEqual(196.1, res['org-openroadm-optical-channel-interfaces:och']['frequency']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'XPDR-A1', 'interface', 'XPDR1-NETWORK1-761:768', 'org-openroadm-optical-channel-interfaces:och') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), -5) + self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['frequency']), 196.1) def test_21_get_roadmconnection_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) - self.assertEqual(0.21, res['roadm-connections'][0]['target-output-power']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADM-A1', 'roadm-connections', 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("gainLoss", response['roadm-connections'][0]['opticalControlMode']) + self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), 0.21) def test_22_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADM-C1", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP1-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("power", res['roadm-connections'][0]['opticalControlMode']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADM-C1', 'roadm-connections', 'DEG1-TTP-TXRX-SRG1-PP1-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("power", response['roadm-connections'][0]['opticalControlMode']) def test_23_service_power_setup_XPDRC_XPDRA(self): url = "{}/operations/transportpce-olm:service-power-setup" @@ -357,21 +362,18 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_24_get_interface_XPDRC_XPDR1_NETWORK1(self): - response = test_utils.check_netconf_node_request( - "XPDR-C1", - "interface/XPDR1-NETWORK1-761:768/org-openroadm-optical-channel-interfaces:och") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) - self.assertEqual(196.1, res['org-openroadm-optical-channel-interfaces:och']['frequency']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'XPDR-C1', 'interface', 'XPDR1-NETWORK1-761:768', 'org-openroadm-optical-channel-interfaces:och') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), -5) + self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['frequency']), 196.1) def test_25_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("gainLoss", res['roadm-connections'][0]['opticalControlMode']) - self.assertEqual(2.0, res['roadm-connections'][0]['target-output-power']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADM-C1', 'roadm-connections', 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("gainLoss", response['roadm-connections'][0]['opticalControlMode']) + self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), 2.0) def test_26_service_power_turndown_XPDRA_XPDRC(self): url = "{}/operations/transportpce-olm:service-power-turndown" @@ -411,113 +413,142 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Success', res["output"]["result"]) def test_27_get_roadmconnection_ROADMA(self): - response = test_utils.check_netconf_node_request( - "ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) - self.assertEqual(-60, res['roadm-connections'][0]['target-output-power']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADM-A1', 'roadm-connections', 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("off", response['roadm-connections'][0]['opticalControlMode']) + self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), -60) def test_28_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request( - "ROADM-C1", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP1-TXRX-761:768") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual("off", res['roadm-connections'][0]['opticalControlMode']) + response = test_utils_rfc8040.check_node_attribute_request( + 'ROADM-C1', 'roadm-connections', 'DEG1-TTP-TXRX-SRG1-PP1-TXRX-761:768') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual("off", response['roadm-connections'][0]['opticalControlMode']) def test_29_servicePath_delete_AToZ(self): - response = test_utils.service_path_request("delete", "test", "1", - [{"node-id": "XPDR-A1", - "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, - {"node-id": "ROADM-A1", - "dest-tp": "DEG2-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, - {"node-id": "ROADM-C1", - "dest-tp": "SRG1-PP1-TXRX", "src-tp": "DEG1-TTP-TXRX"}, - {"node-id": "XPDR-C1", - "dest-tp": "XPDR1-CLIENT1", "src-tp": "XPDR1-NETWORK1"}], - 196.1, 40, 196.075, 196.125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Request processed', res["output"]["result"]) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test', + 'wave-number': '1', + 'modulation-format': 'dp-qpsk', + 'operation': 'delete', + 'nodes': + [{'node-id': 'XPDR-A1', + 'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'}, + {'node-id': 'ROADM-A1', + 'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'ROADM-C1', + 'dest-tp': 'SRG1-PP1-TXRX', 'src-tp': 'DEG1-TTP-TXRX'}, + {'node-id': 'XPDR-C1', + 'dest-tp': 'XPDR1-CLIENT1', 'src-tp': 'XPDR1-NETWORK1'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + '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']) time.sleep(10) def test_30_servicePath_delete_ZToA(self): - response = test_utils.service_path_request("delete", "test", "1", - [{"node-id": "XPDR-C1", - "dest-tp": "XPDR1-NETWORK1", "src-tp": "XPDR1-CLIENT1"}, - {"node-id": "ROADM-C1", - "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP1-TXRX"}, - {"node-id": "ROADM-A1", - "src-tp": "DEG2-TTP-TXRX", "dest-tp": "SRG1-PP1-TXRX"}, - {"node-id": "XPDR-A1", - "src-tp": "XPDR1-NETWORK1", "dest-tp": "XPDR1-CLIENT1"}], - 196.053125, 40, 196.025, 196.08125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Request processed', res["output"]["result"]) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test', + 'wave-number': '1', + 'modulation-format': 'dp-qpsk', + 'operation': 'delete', + 'nodes': + [{'node-id': 'XPDR-C1', + 'dest-tp': 'XPDR1-NETWORK1', 'src-tp': 'XPDR1-CLIENT1'}, + {'node-id': 'ROADM-C1', + 'dest-tp': 'DEG1-TTP-TXRX', 'src-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'ROADM-A1', + 'src-tp': 'DEG2-TTP-TXRX', 'dest-tp': 'SRG1-PP1-TXRX'}, + {'node-id': 'XPDR-A1', + 'src-tp': 'XPDR1-NETWORK1', 'dest-tp': 'XPDR1-CLIENT1'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + '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']) time.sleep(10) #"""to test case where SRG where the xpdr is connected to has no optical range data""" def test_31_connect_xprdA_to_roadmA(self): - response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "2", - "ROADM-A1", "1", "SRG1-PP2-TXRX") + response = test_utils_rfc8040.connect_xpdr_to_rdm_request( + {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2', + 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"]) def test_32_connect_roadmA_to_xpdrA(self): - response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "2", - "ROADM-A1", "1", "SRG1-PP2-TXRX") + response = test_utils_rfc8040.connect_rdm_to_xpdr_request( + {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2', + 'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}) self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_33_servicePath_create_AToZ(self): - response = test_utils.service_path_request("create", "test2", "2", - [{"node-id": "XPDR-A1", - "dest-tp": "XPDR1-NETWORK2", "src-tp": "XPDR1-CLIENT2"}, - {"node-id": "ROADM-A1", - "dest-tp": "DEG2-TTP-TXRX", "src-tp": "SRG1-PP2-TXRX"}], - 196.1, 40, 196.075, 196.125, 753, - 760) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Interfaces created successfully for nodes', res["output"]["result"]) - # time.sleep(40) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test2', + 'wave-number': '2', + 'modulation-format': 'dp-qpsk', + 'operation': 'create', + 'nodes': + [{'node-id': 'XPDR-A1', + 'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'}, + {'node-id': 'ROADM-A1', + 'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + 'max-freq': 196.125, + 'lower-spectral-slot-number': 753, + 'higher-spectral-slot-number': 760 + }) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Interfaces created successfully for nodes', response['output']['result']) time.sleep(10) def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self): - response = test_utils.check_netconf_node_request( - "XPDR-A1", - "interface/XPDR1-NETWORK2-753:760/org-openroadm-optical-channel-interfaces:och") - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual(-5, res['org-openroadm-optical-channel-interfaces:och']['transmit-power']) -# self.assertEqual(2, res['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) + response = test_utils_rfc8040.check_node_attribute2_request( + 'XPDR-A1', 'interface', 'XPDR1-NETWORK2-753:760', 'org-openroadm-optical-channel-interfaces:och') + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertEqual(float(response['org-openroadm-optical-channel-interfaces:och']['transmit-power']), -5) +# self.assertEqual(2, response['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_35_servicePath_delete_AToZ(self): - response = test_utils.service_path_request("delete", "test", "1", - [{"node-id": "XPDR-A1", - "dest-tp": "XPDR1-NETWORK2", "src-tp": "XPDR1-CLIENT2"}, - {"node-id": "ROADM-A1", - "dest-tp": "DEG2-TTP-TXRX", "src-tp": "SRG1-PP2-TXRX"}], - 196.053125, 40, 196.025, 196.08125, 761, - 768) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Request processed', res["output"]["result"]) + response = test_utils_rfc8040.device_renderer_service_path_request({ + 'service-name': 'test2', + 'wave-number': '2', + 'modulation-format': 'dp-qpsk', + 'operation': 'delete', + 'nodes': + [{'node-id': 'XPDR-A1', + 'dest-tp': 'XPDR1-NETWORK2', 'src-tp': 'XPDR1-CLIENT2'}, + {'node-id': 'ROADM-A1', + 'dest-tp': 'DEG2-TTP-TXRX', 'src-tp': 'SRG1-PP2-TXRX'}], + 'center-freq': 196.1, + 'nmc-width': 40, + 'min-freq': 196.075, + 'max-freq': 196.125, + 'lower-spectral-slot-number': 753, + 'higher-spectral-slot-number': 760 + }) + self.assertEqual(response['status_code'], requests.codes.ok) + self.assertIn('Request processed', response['output']['result']) time.sleep(10) def test_36_xpdrA_device_disconnected(self): - response = test_utils.unmount_device("XPDR-A1") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("XPDR-A1") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_37_xpdrC_device_disconnected(self): - response = test_utils.unmount_device("XPDR-C1") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("XPDR-C1") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_38_calculate_span_loss_current(self): url = "{}/operations/transportpce-olm:calculate-spanloss-current" @@ -529,12 +560,12 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_39_rdmA_device_disconnected(self): - response = test_utils.unmount_device("ROADM-A1") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("ROADM-A1") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_40_rdmC_device_disconnected(self): - response = test_utils.unmount_device("ROADM-C1") - self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200) + response = test_utils_rfc8040.unmount_device("ROADM-C1") + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) if __name__ == "__main__": diff --git a/tests/transportpce_tests/common/test_utils_rfc8040.py b/tests/transportpce_tests/common/test_utils_rfc8040.py index 3522d1097..85b3e01cc 100644 --- a/tests/transportpce_tests/common/test_utils_rfc8040.py +++ b/tests/transportpce_tests/common/test_utils_rfc8040.py @@ -334,6 +334,20 @@ def check_node_attribute_request(node: str, attribute: str, attribute_value: str attribute: response_attribute} +def check_node_attribute2_request(node: str, attribute: str, attribute_value: str, attribute2: str): + # pylint: disable=line-too-long + url = {'rfc8040': '{}/data/network-topology:network-topology/topology=topology-netconf/node={}/yang-ext:mount/org-openroadm-device:org-openroadm-device/{}={}/{}?content=config', # nopep8 + 'draft-bierman02': '{}/config/network-topology:network-topology/topology/topology-netconf/node/{}/yang-ext:mount/org-openroadm-device:org-openroadm-device/{}/{}/{}'} # nopep8 + response = get_request(url[RESTCONF_VERSION].format('{}', node, attribute, attribute_value, attribute2)) + res = response.json() + if attribute2 in res.keys(): + response_attribute = res[attribute2] + else: + response_attribute = res['errors']['error'][0] + return {'status_code': response.status_code, + attribute2: response_attribute} + + def del_node_attribute_request(node: str, attribute: str, attribute_value: str): # pylint: disable=line-too-long url = {'rfc8040': '{}/data/network-topology:network-topology/topology=topology-netconf/node={}/yang-ext:mount/org-openroadm-device:org-openroadm-device/{}={}', # nopep8 -- 2.36.6