X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_otn_sh_renderer.py;h=4d583c8c5cda90c1d1ee9217df9e912dd37fbfe8;hb=c834356f10cb8bc04c8b0a9eb2a438b2e9c50632;hp=95586d1d01e8cabf0c5535141a324acfe03889e2;hpb=d81a3d491cbc1566f4bf93a4c28438be19687dbc;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py index 95586d1d0..4d583c8c5 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py @@ -9,23 +9,31 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +# pylint: disable=no-member +# pylint: disable=too-many-public-methods + import unittest import time import requests -from common import test_utils +import sys +sys.path.append('transportpce_tests/common/') +import test_utils class TransportPCEtesting(unittest.TestCase): processes = None + NODE_VERSION = '2.2.1' @classmethod def setUpClass(cls): cls.processes = test_utils.start_tpce() - cls.processes = test_utils.start_sims(['spdra', 'spdrc']) + cls.processes = test_utils.start_sims([('spdra', cls.NODE_VERSION), + ('spdrc', 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") @@ -34,13 +42,12 @@ class TransportPCEtesting(unittest.TestCase): time.sleep(5) def test_01_connect_SPDR_SA1(self): - response = test_utils.mount_device("SPDR-SA1", 'spdra') + response = test_utils.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) time.sleep(10) - url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/SPDR-SA1" - response = test_utils.get_request(url) + response = test_utils.get_netconf_oper_request("SPDR-SA1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -48,13 +55,12 @@ class TransportPCEtesting(unittest.TestCase): 'connected') def test_02_connect_SPDR_SC1(self): - response = test_utils.mount_device("SPDR-SC1", 'spdrc') + response = test_utils.mount_device("SPDR-SC1", ('spdrc', self.NODE_VERSION)) self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201) time.sleep(10) - url = "{}/operational/network-topology:network-topology/topology/topology-netconf/node/SPDR-SC1" - response = test_utils.get_request(url) + response = test_utils.get_netconf_oper_request("SPDR-SC1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertEqual( @@ -93,17 +99,33 @@ class TransportPCEtesting(unittest.TestCase): "id": "0", "resource": { "tp-node-id": "SPDR-SA1-XPDR1", - "tp-id": "XPDR1-NETWORK1" + "tp-id": "" } }, { "id": "1", + "resource": { + "tp-node-id": "SPDR-SA1-XPDR1", + "tp-id": "XPDR1-NETWORK1" + } + }, + { + "id": "2", "resource": { "tp-node-id": "SPDR-SC1-XPDR1", "tp-id": "XPDR1-NETWORK1" } + }, + { + "id": "3", + "resource": { + "tp-node-id": "SPDR-SC1-XPDR1", + "tp-id": "" + } } - ] + ], + "transportpce-renderer:aToZ-min-frequency": 196.075, + "transportpce-renderer:aToZ-max-frequency": 196.125 }, "transportpce-renderer:zToA-direction": { "transportpce-renderer:zToA-wavelength-number": "1", @@ -114,23 +136,40 @@ class TransportPCEtesting(unittest.TestCase): "id": "0", "resource": { "tp-node-id": "SPDR-SC1-XPDR1", - "tp-id": "XPDR1-NETWORK1" + "tp-id": "" } }, { "id": "1", + "resource": { + "tp-node-id": "SPDR-SC1-XPDR1", + "tp-id": "XPDR1-NETWORK1" + } + }, + { + "id": "2", "resource": { "tp-node-id": "SPDR-SA1-XPDR1", "tp-id": "XPDR1-NETWORK1" } + }, + { + "id": "3", + "resource": { + "tp-node-id": "SPDR-SA1-XPDR1", + "tp-id": "" + } } - ] + ], + "transportpce-renderer:zToA-min-frequency": 196.075, + "transportpce-renderer:zToA-max-frequency": 196.125 } } } } response = test_utils.post_request(url, data) time.sleep(3) + print(response.json()) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Operation Successful', @@ -138,10 +177,10 @@ class TransportPCEtesting(unittest.TestCase): # Test OCH-OTU interfaces on SPDR-A1 def test_04_check_interface_och(self): - response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1") + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-761:768") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1', + self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-761:768', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'type': 'org-openroadm-interfaces:opticalChannel', @@ -151,7 +190,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_05_check_interface_OTU(self): @@ -181,7 +220,7 @@ class TransportPCEtesting(unittest.TestCase): # Test OCH-OTU interfaces on SPDR-C1 def test_06_check_interface_och(self): - response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-1") + response = test_utils.check_netconf_node_request("SPDR-SC1", "interface/XPDR1-NETWORK1-761:768") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertDictEqual(dict({'name': 'XPDR1-NETWORK1-1', @@ -194,7 +233,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_07_check_interface_OTU(self): @@ -254,6 +293,13 @@ class TransportPCEtesting(unittest.TestCase): "aToZ-direction": { "rate": 100, "aToZ": [ + { + "id": "0", + "resource": { + "tp-node-id": "SPDR-SA1-XPDR1", + "tp-id": "" + } + }, { "id": "1", "resource": { @@ -267,12 +313,26 @@ class TransportPCEtesting(unittest.TestCase): "tp-node-id": "SPDR-SC1-XPDR1", "tp-id": "XPDR1-NETWORK1" } + }, + { + "id": "3", + "resource": { + "tp-node-id": "SPDR-SC1-XPDR1", + "tp-id": "" + } } ] }, "transportpce-renderer:zToA-direction": { "transportpce-renderer:rate": "100", "zToA": [ + { + "id": "0", + "resource": { + "tp-node-id": "SPDR-SC1-XPDR1", + "tp-id": "" + } + }, { "id": "1", "resource": { @@ -286,6 +346,13 @@ class TransportPCEtesting(unittest.TestCase): "tp-node-id": "SPDR-SA1-XPDR1", "tp-id": "XPDR1-NETWORK1" } + }, + { + "id": "3", + "resource": { + "tp-node-id": "SPDR-SA1-XPDR1", + "tp-id": "" + } } ] } @@ -373,7 +440,6 @@ class TransportPCEtesting(unittest.TestCase): "transportpce-renderer:service-rate": "10", "transportpce-renderer:clli": "nodeSA", "transportpce-renderer:node-id": "SPDR-SA1" - }, "transportpce-renderer:service-z-end": { "transportpce-renderer:service-format": "Ethernet", @@ -384,6 +450,8 @@ class TransportPCEtesting(unittest.TestCase): "transportpce-renderer:path-description": { "aToZ-direction": { "rate": 10, + "trib-port-number": 1, + "trib-slot-number": 1, "aToZ": [ { "id": "0", @@ -417,7 +485,9 @@ class TransportPCEtesting(unittest.TestCase): ] }, "transportpce-renderer:zToA-direction": { - "transportpce-renderer:rate": "10", + "rate": "10", + "trib-port-number": 1, + "trib-slot-number": 1, "zToA": [ { "id": "0",