X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_olm.py;h=4a5e97b48ed6368e88baa094889a5f192f36f7ae;hb=6fe500a1bf557eb44d22584ac6bf7c924f12c47f;hp=f892a23299722b8f2d40ff47fac1d79bbe7f1258;hpb=9c75bfdd06f39def37a4e2c17cca9ed13d1e9c54;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_olm.py b/tests/transportpce_tests/2.2.1/test_olm.py index f892a2329..4a5e97b48 100644 --- a/tests/transportpce_tests/2.2.1/test_olm.py +++ b/tests/transportpce_tests/2.2.1/test_olm.py @@ -9,9 +9,11 @@ # 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 @@ -27,6 +29,7 @@ class TransportOlmTesting(unittest.TestCase): @classmethod def tearDownClass(cls): + # pylint: disable=not-an-iterable for process in cls.processes: test_utils.shutdown_process(process) print("all processes killed") @@ -80,14 +83,7 @@ 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": "ROADM-A1", - "logical-connection-point": "DEG1-TTP-TXRX" - } - } - response = test_utils.post_request(url, data) + response = test_utils.create_ots_oms_request("ROADM-A1", "DEG1-TTP-TXRX") time.sleep(10) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -95,14 +91,7 @@ class TransportOlmTesting(unittest.TestCase): res["output"]["result"]) def test_10_create_OTS_ROADMC(self): - url = "{}/operations/transportpce-device-renderer:create-ots-oms" - data = { - "input": { - "node-id": "ROADM-C1", - "logical-connection-point": "DEG2-TTP-TXRX" - } - } - response = test_utils.post_request(url, data) + response = test_utils.create_ots_oms_request("ROADM-C1", "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 ROADM-C1', @@ -224,38 +213,15 @@ class TransportOlmTesting(unittest.TestCase): self.assertEqual(17.6, 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": "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" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -263,38 +229,15 @@ 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": "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" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -458,82 +401,36 @@ class TransportOlmTesting(unittest.TestCase): 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": "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" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"}]) 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": "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" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"}]) 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("XPDR-A1", "1", "2", @@ -550,28 +447,11 @@ 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": "XPDR-A1" - }, - { - "dest-tp": "DEG2-TTP-TXRX", - "src-tp": "SRG1-PP2-TXRX", - "node-id": "ROADM-A1" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes', res["output"]["result"]) @@ -588,28 +468,11 @@ class TransportOlmTesting(unittest.TestCase): # 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": "XPDR-A1" - }, - { - "dest-tp": "DEG2-TTP-TXRX", - "src-tp": "SRG1-PP2-TXRX", - "node-id": "ROADM-A1" - } - ] - } - } - response = test_utils.post_request(url, data) + 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"}]) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Request processed', res["output"]["result"])