X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F2.2.1%2Ftest_renderer_service_path_nominal.py;h=432ae129413efbe5468af56d0ba2f92288c57f81;hb=15197bf3dcde69a90f01963ffa524fbf6354555c;hp=adb7a89a168cc6ad74f4724807e8596d62acbd4e;hpb=82ae34c05bd194c26ef4e30b2bdf1cf19093e19b;p=transportpce.git diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py index adb7a89a1..432ae1294 100644 --- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py @@ -29,6 +29,7 @@ class TransportPCERendererTesting(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") @@ -47,11 +48,13 @@ class TransportPCERendererTesting(unittest.TestCase): res = response.json() self.assertIn( {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0', - 'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional'}, + 'logical-connection-point': 'DEG1-TTP-TXRX', 'port-direction': 'bidirectional', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) self.assertIn( {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0', - 'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional'}, + 'logical-connection-point': 'SRG1-PP3-TXRX', 'port-direction': 'bidirectional', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) def test_04_xpdr_portmapping(self): @@ -63,7 +66,8 @@ class TransportPCERendererTesting(unittest.TestCase): 'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'logical-connection-point': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-network', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-CLIENT1', - 'lcp-hash-val': 'AMkDwQ7xTmRI'}, + 'lcp-hash-val': 'AMkDwQ7xTmRI', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) self.assertIn( {'supported-interface-capability': ['org-openroadm-port-types:if-100GE'], @@ -71,7 +75,8 @@ class TransportPCERendererTesting(unittest.TestCase): 'supporting-circuit-pack-name': '1/0/1-PLUG-CLIENT', 'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional', 'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client', - 'lcp-hash-val': 'AJUUr6I5fALj'}, + 'lcp-hash-val': 'AJUUr6I5fALj', + 'port-admin-state': 'InService', 'port-oper-state': 'InService'}, res['nodes'][0]['mapping']) def test_05_service_path_create(self): @@ -81,19 +86,21 @@ class TransportPCERendererTesting(unittest.TestCase): "renderer:dest-tp": "DEG1-TTP-TXRX"}, {"renderer:node-id": "XPDR-A1", "renderer:src-tp": "XPDR1-CLIENT1", - "renderer:dest-tp": "XPDR1-NETWORK1"}]) + "renderer:dest-tp": "XPDR1-NETWORK1"}], + 195.8, 40, 195.775, 195.825, 713, + 720) self.assertEqual(response.status_code, requests.codes.ok) res = response.json() self.assertIn('Roadm-connection successfully created for nodes: ROADM-A1', res["output"]["result"]) def test_06_service_path_create_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-713:720") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'name': 'DEG1-TTP-TXRX-nmc-7', + 'name': 'DEG1-TTP-TXRX-nmc-713:720', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/0', 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', @@ -106,7 +113,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']) def test_07_service_path_create_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-713:720") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 @@ -125,13 +132,13 @@ class TransportPCERendererTesting(unittest.TestCase): res['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']) def test_08_service_path_create_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-713:720") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'name': 'SRG1-PP3-TXRX-nmc-7', + 'name': 'SRG1-PP3-TXRX-nmc-713:720', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '3/0', 'type': 'org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint', @@ -145,7 +152,7 @@ class TransportPCERendererTesting(unittest.TestCase): # -mc supporting interfaces must not be created for SRG, only degrees def test_09_service_path_create_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-713:720") self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn( @@ -154,32 +161,32 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_10_service_path_create_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "roadm-connections/SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-7', + 'connection-name': 'SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720', 'opticalControlMode': 'off' }, **res['roadm-connections'][0]), res['roadm-connections'][0] ) self.assertDictEqual( - {'src-if': 'SRG1-PP3-TXRX-nmc-7'}, + {'src-if': 'SRG1-PP3-TXRX-nmc-713:720'}, res['roadm-connections'][0]['source']) self.assertDictEqual( - {'dst-if': 'DEG1-TTP-TXRX-nmc-7'}, + {'dst-if': 'DEG1-TTP-TXRX-nmc-713:720'}, res['roadm-connections'][0]['destination']) def test_11_service_path_create_xpdr_check(self): - response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-7") + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-713:720") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2 self.assertDictEqual( dict({ - 'name': 'XPDR1-NETWORK1-7', + 'name': 'XPDR1-NETWORK1-713:720', 'administrative-state': 'inService', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET', 'type': 'org-openroadm-interfaces:opticalChannel', @@ -281,13 +288,15 @@ class TransportPCERendererTesting(unittest.TestCase): "renderer:dest-tp": "DEG1-TTP-TXRX"}, {"renderer:node-id": "XPDR-A1", "renderer:src-tp": "XPDR1-CLIENT1", - "renderer:dest-tp": "XPDR1-NETWORK1"}]) + "renderer:dest-tp": "XPDR1-NETWORK1"}], + 195.8, 40, 195.775, 195.825, 713, + 720) self.assertEqual(response.status_code, requests.codes.ok) self.assertEqual(response.json(), { 'output': {'result': 'Request processed', 'success': True}}) def test_18_service_path_delete_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-mc-713:720") self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn( @@ -296,7 +305,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_19_service_path_delete_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/DEG1-TTP-TXRX-nmc-713:720") self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn( @@ -305,7 +314,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_20_service_path_delete_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-mc-713:720") self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn({ @@ -315,7 +324,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_21_service_path_delete_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-nmc-713:720") self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn({ @@ -325,7 +334,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_22_service_path_delete_rdm_check(self): - response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-DEG1-TTP-TXRX-7") + response = test_utils.check_netconf_node_request("ROADM-A1", "interface/SRG1-PP3-TXRX-DEG1-TTP-TXRX-713:720") self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn({ @@ -335,7 +344,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['errors']['error']) def test_23_service_path_delete_xpdr_check(self): - response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-7") + response = test_utils.check_netconf_node_request("XPDR-A1", "interface/XPDR1-NETWORK1-713:720") self.assertEqual(response.status_code, requests.codes.conflict) res = response.json() self.assertIn({