X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest09_olm.py;h=c76ba76cd9dd5fe232b50a218b6dba55da5f6872;hb=refs%2Fchanges%2F46%2F100646%2F27;hp=b19f14efef3e87ce65275aaed8f800a048c99c76;hpb=6dc56e813eefe81ce293823936c500869b841e0a;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test09_olm.py b/tests/transportpce_tests/2.2.1/test09_olm.py index b19f14efe..c76ba76cd 100644 --- a/tests/transportpce_tests/2.2.1/test09_olm.py +++ b/tests/transportpce_tests/2.2.1/test09_olm.py @@ -65,51 +65,67 @@ class TransportOlmTesting(unittest.TestCase): 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_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) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'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) def test_06_connect_roadmA_to_xpdrA(self): - 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) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'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) def test_07_connect_xprdC_to_roadmC(self): - 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) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'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) def test_08_connect_roadmC_to_xpdrC(self): - 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) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'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) def test_09_create_OTS_ROADMA(self): - response = test_utils_rfc8040.device_renderer_create_ots_oms_request('ROADM-A1', 'DEG1-TTP-TXRX') - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'create-ots-oms', + { + 'node-id': 'ROADM-A1', + 'logical-connection-point': 'DEG1-TTP-TXRX' + }) + self.assertEqual(response['status_code'], requests.codes.ok) def test_10_create_OTS_ROADMC(self): - response = test_utils_rfc8040.device_renderer_create_ots_oms_request('ROADM-C1', 'DEG2-TTP-TXRX') - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'create-ots-oms', + { + 'node-id': 'ROADM-C1', + 'logical-connection-point': 'DEG2-TTP-TXRX' + }) + self.assertEqual(response['status_code'], requests.codes.ok) def test_11_get_PM_ROADMA(self): - response = test_utils_rfc8040.olm_get_pm_request({ - 'node-id': 'ROADM-A1', - 'resource-type': 'interface', - 'granularity': '15min', - 'resource-identifier': { - 'resource-name': 'OTS-DEG2-TTP-TXRX' - } + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-olm', 'get-pm', + { + 'node-id': 'ROADM-A1', + 'resource-type': 'interface', + 'granularity': '15min', + 'resource-identifier': { + 'resource-name': 'OTS-DEG2-TTP-TXRX' + } - }) + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn({ 'pmparameter-name': 'OpticalPowerOutput', - 'pmparameter-value': '2.5' + 'pmparameter-value': '2.50' }, response['output']['measurements']) self.assertIn({ 'pmparameter-name': 'OpticalReturnLoss', @@ -117,37 +133,41 @@ class TransportOlmTesting(unittest.TestCase): }, response['output']['measurements']) self.assertIn({ 'pmparameter-name': 'OpticalPowerInput', - 'pmparameter-value': '-21.1' + 'pmparameter-value': '-21.10' }, response['output']['measurements']) def test_12_get_PM_ROADMC(self): - response = test_utils_rfc8040.olm_get_pm_request({ - 'node-id': 'ROADM-C1', - 'resource-type': 'interface', - 'granularity': '15min', - 'resource-identifier': { - 'resource-name': 'OTS-DEG1-TTP-TXRX' - } - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-olm', 'get-pm', + { + 'node-id': 'ROADM-C1', + 'resource-type': 'interface', + 'granularity': '15min', + 'resource-identifier': { + 'resource-name': 'OTS-DEG1-TTP-TXRX' + } + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn({ 'pmparameter-name': 'OpticalPowerOutput', - 'pmparameter-value': '4.6' + 'pmparameter-value': '4.60' }, response['output']['measurements']) self.assertIn({ 'pmparameter-name': 'OpticalReturnLoss', - 'pmparameter-value': '49.1' + 'pmparameter-value': '49.10' }, response['output']['measurements']) self.assertIn({ 'pmparameter-name': 'OpticalPowerInput', - 'pmparameter-value': '-15.1' + 'pmparameter-value': '-15.10' }, response['output']['measurements']) def test_13_calculate_span_loss_base_ROADMA_ROADMC(self): - response = test_utils_rfc8040.olm_calculate_spanloss_base_request({ - 'src-type': 'link', - 'link-id': 'ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX' - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-olm', 'calculate-spanloss-base', + { + 'src-type': 'link', + 'link-id': 'ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX' + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Success', response['output']['result']) @@ -158,9 +178,11 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(5) def test_14_calculate_span_loss_base_all(self): - response = test_utils_rfc8040.olm_calculate_spanloss_base_request({ - 'src-type': 'all' - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-olm', 'calculate-spanloss-base', + { + 'src-type': 'all' + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Success', response['output']['result']) @@ -189,86 +211,92 @@ class TransportOlmTesting(unittest.TestCase): 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_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 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'service-path', + { + '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_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 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'service-path', + { + '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): - response = test_utils_rfc8040.olm_service_power_setup_request({ - 'service-name': 'test', - 'wave-number': 1, - 'nodes': [ - { - 'dest-tp': 'XPDR1-NETWORK1', - 'src-tp': 'XPDR1-CLIENT1', - 'node-id': 'XPDR-A1' - }, - { - 'dest-tp': 'DEG2-TTP-TXRX', - 'src-tp': 'SRG1-PP1-TXRX', - 'node-id': 'ROADM-A1' - }, - { - 'dest-tp': 'SRG1-PP1-TXRX', - 'src-tp': 'DEG1-TTP-TXRX', - 'node-id': 'ROADM-C1' - }, - { - 'dest-tp': 'XPDR1-CLIENT1', - 'src-tp': 'XPDR1-NETWORK1', - 'node-id': 'XPDR-C1' - } - ], - 'lower-spectral-slot-number': 761, - 'higher-spectral-slot-number': 768 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-olm', 'service-power-setup', + { + 'service-name': 'test', + 'wave-number': 1, + 'nodes': [ + { + 'dest-tp': 'XPDR1-NETWORK1', + 'src-tp': 'XPDR1-CLIENT1', + 'node-id': 'XPDR-A1' + }, + { + 'dest-tp': 'DEG2-TTP-TXRX', + 'src-tp': 'SRG1-PP1-TXRX', + 'node-id': 'ROADM-A1' + }, + { + 'dest-tp': 'SRG1-PP1-TXRX', + 'src-tp': 'DEG1-TTP-TXRX', + 'node-id': 'ROADM-C1' + }, + { + 'dest-tp': 'XPDR1-CLIENT1', + 'src-tp': 'XPDR1-NETWORK1', + 'node-id': 'XPDR-C1' + } + ], + 'lower-spectral-slot-number': 761, + 'higher-spectral-slot-number': 768 + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Success', response['output']['result']) @@ -293,34 +321,36 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual("power", response['roadm-connections'][0]['opticalControlMode']) def test_23_service_power_setup_XPDRC_XPDRA(self): - response = test_utils_rfc8040.olm_service_power_setup_request({ - 'service-name': 'test', - 'wave-number': 1, - 'nodes': [ - { - 'dest-tp': 'XPDR1-NETWORK1', - 'src-tp': 'XPDR1-CLIENT1', - 'node-id': 'XPDR-C1' - }, - { - 'dest-tp': 'DEG1-TTP-TXRX', - 'src-tp': 'SRG1-PP1-TXRX', - 'node-id': 'ROADM-C1' - }, - { - 'src-tp': 'DEG2-TTP-TXRX', - 'dest-tp': 'SRG1-PP1-TXRX', - 'node-id': 'ROADM-A1' - }, - { - 'src-tp': 'XPDR1-NETWORK1', - 'dest-tp': 'XPDR1-CLIENT1', - 'node-id': 'XPDR-A1' - } - ], - 'lower-spectral-slot-number': 761, - 'higher-spectral-slot-number': 768 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-olm', 'service-power-setup', + { + 'service-name': 'test', + 'wave-number': 1, + 'nodes': [ + { + 'dest-tp': 'XPDR1-NETWORK1', + 'src-tp': 'XPDR1-CLIENT1', + 'node-id': 'XPDR-C1' + }, + { + 'dest-tp': 'DEG1-TTP-TXRX', + 'src-tp': 'SRG1-PP1-TXRX', + 'node-id': 'ROADM-C1' + }, + { + 'src-tp': 'DEG2-TTP-TXRX', + 'dest-tp': 'SRG1-PP1-TXRX', + 'node-id': 'ROADM-A1' + }, + { + 'src-tp': 'XPDR1-NETWORK1', + 'dest-tp': 'XPDR1-CLIENT1', + 'node-id': 'XPDR-A1' + } + ], + 'lower-spectral-slot-number': 761, + 'higher-spectral-slot-number': 768 + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Success', response['output']['result']) @@ -339,34 +369,36 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual(float(response['roadm-connections'][0]['target-output-power']), 2.0) def test_26_service_power_turndown_XPDRA_XPDRC(self): - response = test_utils_rfc8040.olm_service_power_turndown_request({ - 'service-name': 'test', - 'wave-number': 1, - 'nodes': [ - { - 'dest-tp': 'XPDR1-NETWORK1', - 'src-tp': 'XPDR1-CLIENT1', - 'node-id': 'XPDR-A1' - }, - { - 'dest-tp': 'DEG2-TTP-TXRX', - 'src-tp': 'SRG1-PP1-TXRX', - 'node-id': 'ROADM-A1' - }, - { - 'dest-tp': 'SRG1-PP1-TXRX', - 'src-tp': 'DEG1-TTP-TXRX', - 'node-id': 'ROADM-C1' - }, - { - 'dest-tp': 'XPDR1-CLIENT1', - 'src-tp': 'XPDR1-NETWORK1', - 'node-id': 'XPDR-C1' - } - ], - 'lower-spectral-slot-number': 761, - 'higher-spectral-slot-number': 768 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-olm', 'service-power-turndown', + { + 'service-name': 'test', + 'wave-number': 1, + 'nodes': [ + { + 'dest-tp': 'XPDR1-NETWORK1', + 'src-tp': 'XPDR1-CLIENT1', + 'node-id': 'XPDR-A1' + }, + { + 'dest-tp': 'DEG2-TTP-TXRX', + 'src-tp': 'SRG1-PP1-TXRX', + 'node-id': 'ROADM-A1' + }, + { + 'dest-tp': 'SRG1-PP1-TXRX', + 'src-tp': 'DEG1-TTP-TXRX', + 'node-id': 'ROADM-C1' + }, + { + 'dest-tp': 'XPDR1-CLIENT1', + 'src-tp': 'XPDR1-NETWORK1', + 'node-id': 'XPDR-C1' + } + ], + 'lower-spectral-slot-number': 761, + 'higher-spectral-slot-number': 768 + }) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Success', response['output']['result']) @@ -384,53 +416,57 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual("off", response['roadm-connections'][0]['opticalControlMode']) def test_29_servicePath_delete_AToZ(self): - 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 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'service-path', + { + '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_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 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'service-path', + { + '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) @@ -438,35 +474,39 @@ 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): - 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) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'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) def test_32_connect_roadmA_to_xpdrA(self): - 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) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'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) def test_33_servicePath_create_AToZ(self): - 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 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'service-path', + { + '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) @@ -479,23 +519,25 @@ class TransportOlmTesting(unittest.TestCase): # self.assertEqual(2, response['org-openroadm-optical-channel-interfaces:och']['wavelength-number']) def test_35_servicePath_delete_AToZ(self): - 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 - }) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-device-renderer', 'service-path', + { + '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) @@ -509,7 +551,9 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_38_calculate_span_loss_current(self): - response = test_utils_rfc8040.olm_calculate_spanloss_current_request() + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-olm', 'calculate-spanloss-current', + None) self.assertEqual(response['status_code'], requests.codes.ok) self.assertIn('Success', response["output"]["result"])