X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_olm.py;h=96778f5acc2598c88d64bf1a01116954c4458323;hb=c834356f10cb8bc04c8b0a9eb2a438b2e9c50632;hp=c40da05d7baea3c6ca32278a92645cbf6377547b;hpb=9c75bfdd06f39def37a4e2c17cca9ed13d1e9c54;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test_olm.py b/tests/transportpce_tests/1.2.1/test_olm.py index c40da05d7..96778f5ac 100644 --- a/tests/transportpce_tests/1.2.1/test_olm.py +++ b/tests/transportpce_tests/1.2.1/test_olm.py @@ -9,24 +9,33 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################# +# pylint: disable=no-member +# pylint: disable=too-many-public-methods + import unittest import time -import json import requests -from common import test_utils +import sys +sys.path.append('transportpce_tests/common/') +import test_utils class TransportOlmTesting(unittest.TestCase): processes = None + NODE_VERSION = '1.2.1' @classmethod def setUpClass(cls): cls.processes = test_utils.start_tpce() - cls.processes = test_utils.start_sims(['xpdra', 'roadma-full', 'roadmc-full', 'xpdrc']) + cls.processes = test_utils.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) print("all processes killed") @@ -36,19 +45,19 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(1) def test_01_xpdrA_device_connected(self): - response = test_utils.mount_device("XPDRA01", 'xpdra') + response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_02_xpdrC_device_connected(self): - response = test_utils.mount_device("XPDRC01", 'xpdrc') + response = test_utils.mount_device("XPDRC01", ('xpdrc', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) def test_03_rdmA_device_connected(self): - response = test_utils.mount_device("ROADMA01", 'roadma-full') + 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) def test_04_rdmC_device_connected(self): - response = test_utils.mount_device("ROADMC01", 'roadmc-full') + 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): @@ -80,28 +89,14 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_09_create_OTS_ROADMA(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms" - data = { - "input": { - "node-id": "ROADMA01", - "logical-connection-point": "DEG1-TTP-TXRX" - } - } - response = test_utils.post_request(url, data) + response = test_utils.create_ots_oms_request("ROADMA01", "DEG1-TTP-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADMA01', res["output"]["result"]) def test_10_create_OTS_ROADMC(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms" - data = { - "input": { - "node-id": "ROADMC01", - "logical-connection-point": "DEG2-TTP-TXRX" - } - } - response = test_utils.post_request(url, data) + response = test_utils.create_ots_oms_request("ROADMC01", "DEG2-TTP-TXRX") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADMC01', @@ -223,38 +218,17 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual(5.7, res['org-openroadm-optical-transport-interfaces:ots']['span-loss-receive']) def test_17_servicePath_create_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "create", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK1", - "src-tp": "XPDR1-CLIENT1", - "node-id": "XPDRA01" - }, - { - "dest-tp": "DEG1-TTP-TXRX", - "src-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMA01" - }, - { - "dest-tp": "SRG1-PP1-TXRX", - "src-tp": "DEG2-TTP-TXRX", - "node-id": "ROADMC01" - }, - { - "dest-tp": "XPDR1-CLIENT1", - "src-tp": "XPDR1-NETWORK1", - "node-id": "XPDRC01" - } - ] - } - } - response = test_utils.post_request(url, data) + 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('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -262,38 +236,17 @@ class TransportOlmTesting(unittest.TestCase): time.sleep(10) def test_18_servicePath_create_ZToA(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "create", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK1", - "src-tp": "XPDR1-CLIENT1", - "node-id": "XPDRC01" - }, - { - "dest-tp": "DEG2-TTP-TXRX", - "src-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMC01" - }, - { - "src-tp": "DEG1-TTP-TXRX", - "dest-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMA01" - }, - { - "src-tp": "XPDR1-NETWORK1", - "dest-tp": "XPDR1-CLIENT1", - "node-id": "XPDRA01" - } - ] - } - } - response = test_utils.post_request(url, data) + 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('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -327,7 +280,13 @@ class TransportOlmTesting(unittest.TestCase): "src-tp": "XPDR1-NETWORK1", "node-id": "XPDRC01" } - ] + ], + "center-freq": 196.1, + "width": 40, + "min-freq": 196.075, + "max-freq": 196.125, + "lower-spectral-slot-number": 761, + "higher-spectral-slot-number": 768 } } response = test_utils.post_request(url, data) @@ -338,21 +297,21 @@ class TransportOlmTesting(unittest.TestCase): def test_20_get_interface_XPDRA_XPDR1_NETWORK1(self): response = test_utils.check_netconf_node_request( "XPDRA01", - "interface/XPDR1-NETWORK1-1/org-openroadm-optical-channel-interfaces:och") + "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']) def test_21_get_roadmconnection_ROADMA(self): - response = test_utils.check_netconf_node_request("ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-1") + 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']) def test_22_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") + 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']) @@ -384,7 +343,13 @@ class TransportOlmTesting(unittest.TestCase): "dest-tp": "XPDR1-CLIENT1", "node-id": "XPDRA01" } - ] + ], + "center-freq": 196.1, + "width": 40, + "min-freq": 196.075, + "max-freq": 196.125, + "lower-spectral-slot-number": 761, + "higher-spectral-slot-number": 768 } } response = test_utils.post_request(url, data) @@ -395,14 +360,14 @@ class TransportOlmTesting(unittest.TestCase): def test_24_get_interface_XPDRC_XPDR1_NETWORK1(self): response = test_utils.check_netconf_node_request( "XPDRC01", - "interface/XPDR1-NETWORK1-1/org-openroadm-optical-channel-interfaces:och") + "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']) def test_25_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-1") + 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']) @@ -435,104 +400,69 @@ class TransportOlmTesting(unittest.TestCase): "src-tp": "XPDR1-NETWORK1", "node-id": "XPDRC01" } - ] + ], + "center-freq": 196.1, + "width": 40, + "min-freq": 196.075, + "max-freq": 196.125, + "lower-spectral-slot-number": 761, + "higher-spectral-slot-number": 768 } } response = test_utils.post_request(url, data) + print(response.json()) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() 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-1") + 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']) def test_28_get_roadmconnection_ROADMC(self): - response = test_utils.check_netconf_node_request("ROADMC01", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP1-TXRX-1") + 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']) def test_29_servicePath_delete_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "delete", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK1", - "src-tp": "XPDR1-CLIENT1", - "node-id": "XPDRA01" - }, - { - "dest-tp": "DEG1-TTP-TXRX", - "src-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMA01" - }, - { - "dest-tp": "SRG1-PP1-TXRX", - "src-tp": "DEG2-TTP-TXRX", - "node-id": "ROADMC01" - }, - { - "dest-tp": "XPDR1-CLIENT1", - "src-tp": "XPDR1-NETWORK1", - "node-id": "XPDRC01" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"]) time.sleep(10) def test_30_servicePath_delete_ZToA(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "delete", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK1", - "src-tp": "XPDR1-CLIENT1", - "node-id": "XPDRC01" - }, - { - "dest-tp": "DEG2-TTP-TXRX", - "src-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMC01" - }, - { - "src-tp": "DEG1-TTP-TXRX", - "dest-tp": "SRG1-PP1-TXRX", - "node-id": "ROADMA01" - }, - { - "src-tp": "XPDR1-NETWORK1", - "dest-tp": "XPDR1-CLIENT1", - "node-id": "XPDRA01" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"]) time.sleep(10) - """to test case where SRG where the xpdr is connected to has no optical range data""" + #"""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", @@ -549,28 +479,13 @@ class TransportOlmTesting(unittest.TestCase): self.assertIn('Roadm Xponder links created successfully', res["output"]["result"]) def test_33_servicePath_create_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test2", - "wave-number": "2", - "modulation-format": "qpsk", - "operation": "create", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK2", - "src-tp": "XPDR1-CLIENT2", - "node-id": "XPDRA01" - }, - { - "dest-tp": "DEG1-TTP-TXRX", - "src-tp": "SRG1-PP2-TXRX", - "node-id": "ROADMA01" - } - ] - } - } - response = test_utils.post_request(url, data) + 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('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -580,35 +495,20 @@ class TransportOlmTesting(unittest.TestCase): def test_34_get_interface_XPDRA_XPDR1_NETWORK2(self): response = test_utils.check_netconf_node_request( "XPDRA01", - "interface/XPDR1-NETWORK2-2/org-openroadm-optical-channel-interfaces:och") + "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']) def test_35_servicePath_delete_AToZ(self): - url = "{}/operations/transportpce-device-renderer:service-path" - data = { - "input": { - "service-name": "test", - "wave-number": "1", - "modulation-format": "qpsk", - "operation": "delete", - "nodes": [ - { - "dest-tp": "XPDR1-NETWORK2", - "src-tp": "XPDR1-CLIENT2", - "node-id": "XPDRA01" - }, - { - "dest-tp": "DEG1-TTP-TXRX", - "src-tp": "SRG1-PP2-TXRX", - "node-id": "ROADMA01" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"])