X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_otn_renderer.py;h=8c2cec49f57ca0f3cb9e40ae5dde2aea61024491;hb=15197bf3dcde69a90f01963ffa524fbf6354555c;hp=a854d11fa16f0b927c14da4675ce7b00ebe9832d;hpb=53c5b508d518a7d5ce972f5e96723558523a964a;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py index a854d11fa..8c2cec49f 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -9,8 +9,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +# pylint: disable=no-member +# pylint: disable=too-many-public-methods + import unittest -import json import time import requests from common import test_utils @@ -27,6 +29,7 @@ class TransportPCEtesting(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") @@ -46,24 +49,21 @@ class TransportPCEtesting(unittest.TestCase): res['node'][0]['netconf-node-topology:connection-status'], 'connected') - def test_02_get_portmapping_CLIENT1(self): - response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-CLIENT1") + def test_02_get_portmapping_CLIENT4(self): + response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-CLIENT4") self.assertEqual(response.status_code, requests.codes.ok) res_mapping = (response.json())['mapping'][0] - self.assertSetEqual({'org-openroadm-port-types:if-10GE-ODU2e', - 'org-openroadm-port-types:if-10GE-ODU2', - 'org-openroadm-port-types:if-10GE'}, - set(res_mapping['supported-interface-capability'])) - self.assertDictEqual( - dict( - {'supporting-port': 'CP1-SFP4-P1', - 'supporting-circuit-pack-name': 'CP1-SFP4', - 'logical-connection-point': 'XPDR1-CLIENT1', - 'port-direction': 'bidirectional', - 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'FqlcrxV7p30='}, - **res_mapping), - res_mapping) + self.assertEqual('CP1-SFP4-P1', res_mapping['supporting-port']) + self.assertEqual('CP1-SFP4', res_mapping['supporting-circuit-pack-name']) + self.assertEqual('XPDR1-CLIENT4', res_mapping['logical-connection-point']) + self.assertEqual('bidirectional', res_mapping['port-direction']) + self.assertEqual('xpdr-client', res_mapping['port-qual']) + self.assertEqual('FqlcrxV7p3g=', res_mapping['lcp-hash-val']) + self.assertEqual('InService', res_mapping['port-admin-state']) + self.assertEqual('InService', res_mapping['port-oper-state']) + self.assertIn('org-openroadm-port-types:if-10GE-ODU2e', res_mapping['supported-interface-capability']) + self.assertIn('org-openroadm-port-types:if-10GE-ODU2', res_mapping['supported-interface-capability']) + self.assertIn('org-openroadm-port-types:if-10GE', res_mapping['supported-interface-capability']) def test_03_get_portmapping_NETWORK1(self): response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-NETWORK1") @@ -79,12 +79,16 @@ class TransportPCEtesting(unittest.TestCase): "port-qual": "xpdr-network", "supporting-circuit-pack-name": "CP1-CFP0", "xponder-type": "mpdr", - 'lcp-hash-val': 'Swfw02qXGyI='}, - res['mapping']) + 'lcp-hash-val': 'Swfw02qXGyI=', + 'port-admin-state': 'InService', + 'port-oper-state': 'InService'}, + res['mapping']) def test_04_service_path_create_OCH_OTU4(self): response = test_utils.service_path_request("create", "service_OCH_OTU4", "1", - [{"node-id": "SPDR-SA1", "dest-tp": "XPDR1-NETWORK1"}]) + [{"node-id": "SPDR-SA1", "dest-tp": "XPDR1-NETWORK1"}], + 196.1, 40, 196.075, 196.125, 761, + 768) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -93,7 +97,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertIn( {'node-id': 'SPDR-SA1', 'otu-interface-id': ['XPDR1-NETWORK1-OTU'], - 'och-interface-id': ['XPDR1-NETWORK1-1']}, res["output"]['node-interface']) + 'och-interface-id': ['XPDR1-NETWORK1-761:768']}, res["output"]['node-interface']) def test_05_get_portmapping_NETWORK1(self): response = test_utils.portmapping_request("SPDR-SA1/mapping/XPDR1-NETWORK1") @@ -109,15 +113,17 @@ class TransportPCEtesting(unittest.TestCase): "port-qual": "xpdr-network", "supporting-circuit-pack-name": "CP1-CFP0", "xponder-type": "mpdr", - "lcp-hash-val": "Swfw02qXGyI="}, + "lcp-hash-val": "Swfw02qXGyI=", + "port-admin-state": "InService", + "port-oper-state": "InService"}, res['mapping']) def test_06_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(res['interface'][0], **{'name': 'XPDR1-NETWORK1-1', + self.assertDictEqual(dict(res['interface'][0], **{'name': 'XPDR1-NETWORK1-761:768', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', 'type': 'org-openroadm-interfaces:opticalChannel', @@ -137,7 +143,7 @@ class TransportPCEtesting(unittest.TestCase): input_dict_1 = {'name': 'XPDR1-NETWORK1-OTU', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-CFP0', - 'supporting-interface': 'XPDR1-NETWORK1-1', + 'supporting-interface': 'XPDR1-NETWORK1-761:768', 'type': 'org-openroadm-interfaces:otnOtu', 'supporting-port': 'CP1-CFP0-P1' } @@ -183,7 +189,9 @@ class TransportPCEtesting(unittest.TestCase): "supporting-circuit-pack-name": "CP1-CFP0", "xponder-type": "mpdr", "supporting-odu4": "XPDR1-NETWORK1-ODU4", - "lcp-hash-val": "Swfw02qXGyI=" + "lcp-hash-val": "Swfw02qXGyI=", + "port-admin-state": "InService", + "port-oper-state": "InService" }, res['mapping']) @@ -215,25 +223,27 @@ class TransportPCEtesting(unittest.TestCase): def test_11_otn_service_path_create_10GE(self): response = test_utils.otn_service_path_request("create", "service1", "10G", "Ethernet", - [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT1", + [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT4", "network-tp": "XPDR1-NETWORK1"}], - {"ethernet-encoding": "eth encode", "trib-slot": ["1"], "trib-port-number": "1"}) + {"ethernet-encoding": "eth encode", + "trib-slot": ["1"], "trib-port-number": "1"}) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Otn Service path was set up successfully for node :SPDR-SA1', res["output"]["result"]) self.assertTrue(res["output"]["success"]) - self.assertIn( - {'node-id': 'SPDR-SA1', - 'connection-id': ['XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1'], - 'odu-interface-id': ['XPDR1-NETWORK1-ODU2e-service1', 'XPDR1-CLIENT1-ODU2e-service1'], - 'eth-interface-id': ['XPDR1-CLIENT1-ETHERNET10G']}, res["output"]['node-interface']) + self.assertEqual('SPDR-SA1', res["output"]['node-interface'][0]['node-id']) + self.assertIn('XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1', + res["output"]['node-interface'][0]['connection-id']) + self.assertIn('XPDR1-CLIENT4-ETHERNET10G', res["output"]['node-interface'][0]['eth-interface-id']) + self.assertIn('XPDR1-NETWORK1-ODU2e-service1', res["output"]['node-interface'][0]['odu-interface-id']) + self.assertIn('XPDR1-CLIENT4-ODU2e-service1', res["output"]['node-interface'][0]['odu-interface-id']) def test_12_check_interface_10GE_CLIENT(self): - response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G") + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT4-ETHERNET10G") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G', + input_dict = {'name': 'XPDR1-CLIENT4-ETHERNET10G', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', 'type': 'org-openroadm-interfaces:ethernetCsmacd', @@ -246,14 +256,14 @@ class TransportPCEtesting(unittest.TestCase): res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']) def test_13_check_interface_ODU2E_CLIENT(self): - response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1") + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT4-ODU2e-service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() - input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e-service1', + input_dict_1 = {'name': 'XPDR1-CLIENT4-ODU2e-service1', 'administrative-state': 'inService', 'supporting-circuit-pack-name': 'CP1-SFP4', - 'supporting-interface': 'XPDR1-CLIENT1-ETHERNET10G', + 'supporting-interface': 'XPDR1-CLIENT4-ETHERNET10G', 'type': 'org-openroadm-interfaces:otnOdu', 'supporting-port': 'CP1-SFP4-P1'} input_dict_2 = { @@ -304,12 +314,12 @@ class TransportPCEtesting(unittest.TestCase): def test_15_check_ODU2E_connection(self): response = test_utils.check_netconf_node_request( "SPDR-SA1", - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1") + "odu-connection/XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() input_dict_1 = { 'connection-name': - 'XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1', + 'XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1', 'direction': 'bidirectional' } @@ -317,14 +327,15 @@ class TransportPCEtesting(unittest.TestCase): res['odu-connection'][0]) self.assertDictEqual({u'dst-if': u'XPDR1-NETWORK1-ODU2e-service1'}, res['odu-connection'][0]['destination']) - self.assertDictEqual({u'src-if': u'XPDR1-CLIENT1-ODU2e-service1'}, + self.assertDictEqual({u'src-if': u'XPDR1-CLIENT4-ODU2e-service1'}, res['odu-connection'][0]['source']) def test_16_otn_service_path_delete_10GE(self): response = test_utils.otn_service_path_request("delete", "service1", "10G", "Ethernet", - [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT1", + [{"node-id": "SPDR-SA1", "client-tp": "XPDR1-CLIENT4", "network-tp": "XPDR1-NETWORK1"}], - {"ethernet-encoding": "eth encode", "trib-slot": ["1"], "trib-port-number": "1"}) + {"ethernet-encoding": "eth encode", + "trib-slot": ["1"], "trib-port-number": "1"}) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -334,20 +345,20 @@ class TransportPCEtesting(unittest.TestCase): def test_17_check_no_ODU2E_connection(self): response = test_utils.check_netconf_node_request( "SPDR-SA1", - "odu-connection/XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1") - self.assertEqual(response.status_code, requests.codes.not_found) + "odu-connection/XPDR1-CLIENT4-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1") + self.assertEqual(response.status_code, requests.codes.conflict) def test_18_check_no_interface_ODU2E_NETWORK(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e-service1") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_19_check_no_interface_ODU2E_CLIENT(self): - response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e-service1") - self.assertEqual(response.status_code, requests.codes.not_found) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT4-ODU2e-service1") + self.assertEqual(response.status_code, requests.codes.conflict) def test_20_check_no_interface_10GE_CLIENT(self): - response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G") - self.assertEqual(response.status_code, requests.codes.not_found) + response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-CLIENT4-ETHERNET10G") + self.assertEqual(response.status_code, requests.codes.conflict) def test_21_otn_service_path_delete_ODU4(self): response = test_utils.otn_service_path_request("delete", "service_ODU4", "100G", "ODU", @@ -360,11 +371,13 @@ class TransportPCEtesting(unittest.TestCase): def test_22_check_no_interface_ODU4(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_23_service_path_delete_OCH_OTU4(self): response = test_utils.service_path_request("delete", "service_OCH_OTU4", "1", - [{"node-id": "SPDR-SA1", "dest-tp": "XPDR1-NETWORK1"}]) + [{"node-id": "SPDR-SA1", "dest-tp": "XPDR1-NETWORK1"}], + 196.1, 40, 196.075, 196.125, 761, + 768) time.sleep(3) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -373,11 +386,11 @@ class TransportPCEtesting(unittest.TestCase): def test_24_check_no_interface_OTU4(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-OTU") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_25_check_no_interface_OCH(self): response = test_utils.check_netconf_node_request("SPDR-SA1", "interface/XPDR1-NETWORK1-1") - self.assertEqual(response.status_code, requests.codes.not_found) + self.assertEqual(response.status_code, requests.codes.conflict) def test_26_disconnect_SPDR_SA1(self): response = test_utils.unmount_device("SPDR-SA1")