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=f7155e8bc1624e2507f2d3d64e7548fec2f569a7;hpb=6fe500a1bf557eb44d22584ac6bf7c924f12c47f;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 f7155e8bc..96778f5ac 100644 --- a/tests/transportpce_tests/1.2.1/test_olm.py +++ b/tests/transportpce_tests/1.2.1/test_olm.py @@ -15,17 +15,23 @@ import unittest import time 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): @@ -39,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): @@ -220,7 +226,9 @@ class TransportOlmTesting(unittest.TestCase): {"node-id": "ROADMC01", "dest-tp": "SRG1-PP1-TXRX", "src-tp": "DEG2-TTP-TXRX"}, {"node-id": "XPDRC01", - "dest-tp": "XPDR1-CLIENT1", "src-tp": "XPDR1-NETWORK1"}]) + "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"]) @@ -236,7 +244,9 @@ class TransportOlmTesting(unittest.TestCase): {"node-id": "ROADMA01", "src-tp": "DEG1-TTP-TXRX", "dest-tp": "SRG1-PP1-TXRX"}, {"node-id": "XPDRA01", - "src-tp": "XPDR1-NETWORK1", "dest-tp": "XPDR1-CLIENT1"}]) + "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"]) @@ -270,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) @@ -281,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']) @@ -327,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) @@ -338,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']) @@ -378,23 +400,30 @@ 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']) @@ -408,7 +437,9 @@ class TransportOlmTesting(unittest.TestCase): {"node-id": "ROADMC01", "dest-tp": "SRG1-PP1-TXRX", "src-tp": "DEG2-TTP-TXRX"}, {"node-id": "XPDRC01", - "dest-tp": "XPDR1-CLIENT1", "src-tp": "XPDR1-NETWORK1"}]) + "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"]) @@ -423,7 +454,9 @@ class TransportOlmTesting(unittest.TestCase): {"node-id": "ROADMA01", "src-tp": "DEG1-TTP-TXRX", "dest-tp": "SRG1-PP1-TXRX"}, {"node-id": "XPDRA01", - "src-tp": "XPDR1-NETWORK1", "dest-tp": "XPDR1-CLIENT1"}]) + "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"]) @@ -450,7 +483,9 @@ class TransportOlmTesting(unittest.TestCase): [{"node-id": "XPDRA01", "dest-tp": "XPDR1-NETWORK2", "src-tp": "XPDR1-CLIENT2"}, {"node-id": "ROADMA01", - "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP2-TXRX"}]) + "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"]) @@ -460,7 +495,7 @@ 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']) @@ -471,7 +506,9 @@ class TransportOlmTesting(unittest.TestCase): [{"node-id": "XPDRA01", "dest-tp": "XPDR1-NETWORK2", "src-tp": "XPDR1-CLIENT2"}, {"node-id": "ROADMA01", - "dest-tp": "DEG1-TTP-TXRX", "src-tp": "SRG1-PP2-TXRX"}]) + "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"])