X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest03_topology.py;h=1600fe200b2286e4aea8ed8c697ec83777fe8cb9;hb=a73caa64baff02b32924e30d29214e3400a49c40;hp=032c662192a790f5cf8ec14f2187ed5fe3709e5d;hpb=2665436ed0ebfd207e55264f87b9c40fcb1db75c;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test03_topology.py b/tests/transportpce_tests/1.2.1/test03_topology.py index 032c66219..1600fe200 100644 --- a/tests/transportpce_tests/1.2.1/test03_topology.py +++ b/tests/transportpce_tests/1.2.1/test03_topology.py @@ -21,7 +21,6 @@ import sys sys.path.append('transportpce_tests/common/') # pylint: disable=wrong-import-position # pylint: disable=import-error -import test_utils # nopep8 import test_utils_rfc8040 # nopep8 @@ -148,33 +147,33 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] } - for val in response['network'][0]['ietf-network-topology:link']: - linkId = val['link-id'] - linkType = val['org-openroadm-common-network:link-type'] + for link in response['network'][0]['ietf-network-topology:link']: + linkId = link['link-id'] + linkType = link['org-openroadm-common-network:link-type'] self.assertIn(linkType, check_list) find = linkId in check_list[linkType] self.assertEqual(find, True) (check_list[linkType]).remove(linkId) - for val in check_list.values(): - self.assertEqual(len(val), 0) + for link in check_list.values(): + self.assertEqual(len(link), 0) def test_05_getNodes_OpenRoadmTopology(self): response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config') self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(len(response['network'][0]['node']), 4) listNode = ['ROADMA01-SRG1', 'ROADMA01-SRG3', 'ROADMA01-DEG1', 'ROADMA01-DEG2'] - for val in response['network'][0]['node']: - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, val['supporting-node']) - nodeType = val['org-openroadm-common-network:node-type'] - nodeId = val['node-id'] + for node in response['network'][0]['node']: + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, node['supporting-node']) + nodeType = node['org-openroadm-common-network:node-type'] + nodeId = node['node-id'] self.assertIn(nodeId, self.CHECK_DICT1) self.assertEqual(nodeType, self.CHECK_DICT1[nodeId]['node_type']) if self.CHECK_DICT1[nodeId]['node_type'] == 'SRG': - self.assertEqual(len(val['ietf-network-topology:termination-point']), 17) - for item in self.CHECK_DICT1[nodeId]['checks_tp']: - self.assertIn(item, val['ietf-network-topology:termination-point']) - self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, val['supporting-node']) - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, val['supporting-node']) + self.assertEqual(len(node['ietf-network-topology:termination-point']), 17) + for tp in self.CHECK_DICT1[nodeId]['checks_tp']: + self.assertIn(tp, node['ietf-network-topology:termination-point']) + self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, node['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, node['supporting-node']) listNode.remove(nodeId) self.assertEqual(len(listNode), 0) @@ -194,16 +193,16 @@ class TransportPCETopologyTesting(unittest.TestCase): response = test_utils_rfc8040.get_ietf_network_request('openroadm-network', 'config') self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(len(response['network'][0]['node']), 2) - for val in response['network'][0]['node']: - self.assertEqual(val['supporting-node'][0]['network-ref'], 'clli-network') - self.assertEqual(val['supporting-node'][0]['node-ref'], 'NodeA') - nodeId = val['node-id'] + for node in response['network'][0]['node']: + self.assertEqual(node['supporting-node'][0]['network-ref'], 'clli-network') + self.assertEqual(node['supporting-node'][0]['node-ref'], 'NodeA') + nodeId = node['node-id'] if nodeId == 'XPDRA01': - self.assertEqual(val['org-openroadm-common-network:node-type'], 'XPONDER') - self.assertEqual(val['org-openroadm-network:model'], '1') + self.assertEqual(node['org-openroadm-common-network:node-type'], 'XPONDER') + self.assertEqual(node['org-openroadm-network:model'], '1') elif nodeId == 'ROADMA01': - self.assertEqual(val['org-openroadm-common-network:node-type'], 'ROADM') - self.assertEqual(val['org-openroadm-network:model'], '2') + self.assertEqual(node['org-openroadm-common-network:node-type'], 'ROADM') + self.assertEqual(node['org-openroadm-network:model'], '2') else: self.assertFalse(True) @@ -213,27 +212,27 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(len(response['network'][0]['node']), 5) listNode = ['XPDRA01-XPDR1', 'ROADMA01-SRG1', 'ROADMA01-SRG3', 'ROADMA01-DEG1', 'ROADMA01-DEG2'] - for val in response['network'][0]['node']: - nodeType = val['org-openroadm-common-network:node-type'] - nodeId = val['node-id'] + for node in response['network'][0]['node']: + nodeType = node['org-openroadm-common-network:node-type'] + nodeId = node['node-id'] # Tests related to XPDRA nodes if nodeId == 'XPDRA01-XPDR1': - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, val['supporting-node']) - self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, val['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, node['supporting-node']) + self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, node['supporting-node']) self.assertEqual(nodeType, 'XPONDER') client = 0 network = 0 - for val2 in val['ietf-network-topology:termination-point']: - tpType = val2['org-openroadm-common-network:tp-type'] - tpId = val2['tp-id'] + for tp in node['ietf-network-topology:termination-point']: + tpType = tp['org-openroadm-common-network:tp-type'] + tpId = tp['tp-id'] if tpType == 'XPONDER-CLIENT': client += 1 elif tpType == 'XPONDER-NETWORK': network += 1 if tpId == 'XPDR1-NETWORK2': - self.assertEqual(val2['transportpce-topology:associated-connection-map-port'], 'XPDR1-CLIENT3') + self.assertEqual(tp['transportpce-topology:associated-connection-map-port'], 'XPDR1-CLIENT3') elif tpId == 'XPDR1-CLIENT3': - self.assertEqual(val2['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2') + self.assertEqual(tp['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2') self.assertTrue(client == 4) self.assertTrue(network == 2) listNode.remove(nodeId) @@ -241,11 +240,11 @@ class TransportPCETopologyTesting(unittest.TestCase): elif nodeId in self.CHECK_DICT1: self.assertEqual(nodeType, self.CHECK_DICT1[nodeId]['node_type']) if self.CHECK_DICT1[nodeId]['node_type'] == 'SRG': - self.assertEqual(len(val['ietf-network-topology:termination-point']), 17) - for item in self.CHECK_DICT1[nodeId]['checks_tp']: - self.assertIn(item, val['ietf-network-topology:termination-point']) - self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, val['supporting-node']) - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, val['supporting-node']) + self.assertEqual(len(node['ietf-network-topology:termination-point']), 17) + for tp in self.CHECK_DICT1[nodeId]['checks_tp']: + self.assertIn(tp, node['ietf-network-topology:termination-point']) + self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, node['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, node['supporting-node']) listNode.remove(nodeId) else: self.assertFalse(True) @@ -254,15 +253,19 @@ class TransportPCETopologyTesting(unittest.TestCase): # Connect the tail XPDRA to ROADMA and vice versa def test_10_connect_tail_xpdr_rdm(self): # Connect the tail: XPDRA to ROADMA - response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "1", - "ROADMA01", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-xpdr-rdm-links', + {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) def test_11_connect_tail_rdm_xpdr(self): # Connect the tail: ROADMA to XPDRA - response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1", - "ROADMA01", "1", "SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.transportpce_api_rpc_request( + 'transportpce-networkutils', 'init-rdm-xpdr-links', + {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1', + 'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}}) + self.assertEqual(response['status_code'], requests.codes.ok) def test_12_getLinks_OpenRoadmTopology(self): response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config') @@ -281,15 +284,15 @@ class TransportPCETopologyTesting(unittest.TestCase): 'XPONDER-INPUT': ['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'], 'XPONDER-OUTPUT': ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX'] } - for val in response['network'][0]['ietf-network-topology:link']: - linkId = val['link-id'] - linkType = val['org-openroadm-common-network:link-type'] + for link in response['network'][0]['ietf-network-topology:link']: + linkId = link['link-id'] + linkType = link['org-openroadm-common-network:link-type'] self.assertIn(linkType, check_list) find = linkId in check_list[linkType] self.assertEqual(find, True) (check_list[linkType]).remove(linkId) - for val in check_list.values(): - self.assertEqual(len(val), 0) + for link in check_list.values(): + self.assertEqual(len(link), 0) def test_13_connect_ROADMC(self): response = test_utils_rfc8040.mount_device("ROADMC01", ('roadmc', self.NODE_VERSION)) @@ -305,7 +308,8 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = test_utils.add_oms_attr_request("ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX", data) + response = test_utils_rfc8040.add_oms_attr_request( + "ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_15_omsAttributes_ROADMC_ROADMA(self): @@ -318,17 +322,18 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = test_utils.add_oms_attr_request("ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX", data) + response = test_utils_rfc8040.add_oms_attr_request( + "ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_16_getClliNetwork(self): response = test_utils_rfc8040.get_ietf_network_request('clli-network', 'config') self.assertEqual(response['status_code'], requests.codes.ok) listNode = ['NodeA', 'NodeC'] - for val in response['network'][0]['node']: - nodeId = val['node-id'] + for node in response['network'][0]['node']: + nodeId = node['node-id'] self.assertIn(nodeId, listNode) - self.assertEqual(val['org-openroadm-clli-network:clli'], nodeId) + self.assertEqual(node['org-openroadm-clli-network:clli'], nodeId) listNode.remove(nodeId) self.assertEqual(len(listNode), 0) @@ -341,15 +346,15 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMA01': {'node-ref': 'NodeA', 'node-type': 'ROADM', 'model': '2'}, 'ROADMC01': {'node-ref': 'NodeC', 'node-type': 'ROADM', 'model': '2'} } - for val in response['network'][0]['node']: - self.assertEqual(val['supporting-node'][0]['network-ref'], 'clli-network') - nodeId = val['node-id'] + for node in response['network'][0]['node']: + self.assertEqual(node['supporting-node'][0]['network-ref'], 'clli-network') + nodeId = node['node-id'] self.assertIn(nodeId, CHECK_LIST) - self.assertEqual(val['supporting-node'][0]['node-ref'], + self.assertEqual(node['supporting-node'][0]['node-ref'], CHECK_LIST[nodeId]['node-ref']) - self.assertEqual(val['org-openroadm-common-network:node-type'], + self.assertEqual(node['org-openroadm-common-network:node-type'], CHECK_LIST[nodeId]['node-type']) - self.assertEqual(val['org-openroadm-network:model'], + self.assertEqual(node['org-openroadm-network:model'], CHECK_LIST[nodeId]['model']) listNode.remove(nodeId) self.assertEqual(len(listNode), 0) @@ -379,15 +384,15 @@ class TransportPCETopologyTesting(unittest.TestCase): 'XPONDER-INPUT': ['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'], 'XPONDER-OUTPUT': ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX'] } - for val in response['network'][0]['ietf-network-topology:link']: - linkId = val['link-id'] - linkType = val['org-openroadm-common-network:link-type'] + for link in response['network'][0]['ietf-network-topology:link']: + linkId = link['link-id'] + linkType = link['org-openroadm-common-network:link-type'] self.assertIn(linkType, check_list) find = linkId in check_list[linkType] self.assertEqual(find, True) (check_list[linkType]).remove(linkId) - for val in check_list.values(): - self.assertEqual(len(val), 0) + for link in check_list.values(): + self.assertEqual(len(link), 0) def test_19_getLinkOmsAttributesOpenRoadmTopology(self): response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config') @@ -395,13 +400,13 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 20) R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX'] - for val in response['network'][0]['ietf-network-topology:link']: - link_id = val['link-id'] + for link in response['network'][0]['ietf-network-topology:link']: + link_id = link['link-id'] if link_id in R2RLink: find = False - spanLoss = val['org-openroadm-network-topology:OMS-attributes']['span']['engineered-spanloss'] + spanLoss = link['org-openroadm-network-topology:OMS-attributes']['span']['engineered-spanloss'] # pylint: disable=line-too-long - length = val['org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] + length = link['org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] if (spanLoss is not None) & (length is not None): find = True self.assertTrue(find) @@ -416,18 +421,18 @@ class TransportPCETopologyTesting(unittest.TestCase): listNode = ['XPDRA01-XPDR1', 'ROADMA01-SRG1', 'ROADMA01-SRG3', 'ROADMA01-DEG1', 'ROADMA01-DEG2', 'ROADMC01-SRG1', 'ROADMC01-DEG1', 'ROADMC01-DEG2'] - for val in response['network'][0]['node']: - nodeType = val['org-openroadm-common-network:node-type'] - nodeId = val['node-id'] + for node in response['network'][0]['node']: + nodeType = node['org-openroadm-common-network:node-type'] + nodeId = node['node-id'] # Tests related to XPDRA nodes if nodeId == 'XPDRA01-XPDR1': - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, val['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, node['supporting-node']) self.assertEqual(nodeType, 'XPONDER') - self.assertEqual(len(val['ietf-network-topology:termination-point']), 6) + self.assertEqual(len(node['ietf-network-topology:termination-point']), 6) client = 0 network = 0 - for val2 in val['ietf-network-topology:termination-point']: - tpType = val2['org-openroadm-common-network:tp-type'] + for tp in node['ietf-network-topology:termination-point']: + tpType = tp['org-openroadm-common-network:tp-type'] if tpType == 'XPONDER-CLIENT': client += 1 elif tpType == 'XPONDER-NETWORK': @@ -439,23 +444,23 @@ class TransportPCETopologyTesting(unittest.TestCase): elif nodeId in self.CHECK_DICT1: self.assertEqual(nodeType, self.CHECK_DICT1[nodeId]['node_type']) if self.CHECK_DICT1[nodeId]['node_type'] == 'SRG': - self.assertEqual(len(val['ietf-network-topology:termination-point']), 17) - for item in self.CHECK_DICT1[nodeId]['checks_tp']: - self.assertIn(item, val['ietf-network-topology:termination-point']) - self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, val['supporting-node']) - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, val['supporting-node']) - self.assertEqual(val['org-openroadm-common-network:node-type'], self.CHECK_DICT1[nodeId]['node_type']) + self.assertEqual(len(node['ietf-network-topology:termination-point']), 17) + for tp in self.CHECK_DICT1[nodeId]['checks_tp']: + self.assertIn(tp, node['ietf-network-topology:termination-point']) + self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, node['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, node['supporting-node']) + self.assertEqual(node['org-openroadm-common-network:node-type'], self.CHECK_DICT1[nodeId]['node_type']) listNode.remove(nodeId) # Tests related to ROADMC nodes elif nodeId in self.CHECK_DICT2: self.assertEqual(nodeType, self.CHECK_DICT2[nodeId]['node_type']) if self.CHECK_DICT2[nodeId]['node_type'] == 'SRG': - self.assertEqual(len(val['ietf-network-topology:termination-point']), 17) - for item in self.CHECK_DICT2[nodeId]['checks_tp']: - self.assertIn(item, val['ietf-network-topology:termination-point']) - self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeC'}, val['supporting-node']) - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'}, val['supporting-node']) - self.assertEqual(val['org-openroadm-common-network:node-type'], self.CHECK_DICT2[nodeId]['node_type']) + self.assertEqual(len(node['ietf-network-topology:termination-point']), 17) + for tp in self.CHECK_DICT2[nodeId]['checks_tp']: + self.assertIn(tp, node['ietf-network-topology:termination-point']) + self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeC'}, node['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'}, node['supporting-node']) + self.assertEqual(node['org-openroadm-common-network:node-type'], self.CHECK_DICT2[nodeId]['node_type']) listNode.remove(nodeId) else: self.assertFalse(True) @@ -475,7 +480,8 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = test_utils.add_oms_attr_request("ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX", data) + response = test_utils_rfc8040.add_oms_attr_request( + "ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_23_omsAttributes_ROADMB_ROADMA(self): @@ -488,7 +494,8 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = test_utils.add_oms_attr_request("ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX", data) + response = test_utils_rfc8040.add_oms_attr_request( + "ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_24_omsAttributes_ROADMB_ROADMC(self): @@ -501,7 +508,8 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = test_utils.add_oms_attr_request("ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX", data) + response = test_utils_rfc8040.add_oms_attr_request( + "ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_25_omsAttributes_ROADMC_ROADMB(self): @@ -514,17 +522,18 @@ class TransportPCETopologyTesting(unittest.TestCase): "fiber-type": "smf", "SRLG-length": 100000, "pmd": 0.5}]}} - response = test_utils.add_oms_attr_request("ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX", data) + response = test_utils_rfc8040.add_oms_attr_request( + "ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX", data) self.assertEqual(response.status_code, requests.codes.created) def test_26_getClliNetwork(self): response = test_utils_rfc8040.get_ietf_network_request('clli-network', 'config') self.assertEqual(response['status_code'], requests.codes.ok) listNode = ['NodeA', 'NodeB', 'NodeC'] - for val in response['network'][0]['node']: - nodeId = val['node-id'] + for node in response['network'][0]['node']: + nodeId = node['node-id'] self.assertIn(nodeId, listNode) - self.assertEqual(val['org-openroadm-clli-network:clli'], nodeId) + self.assertEqual(node['org-openroadm-clli-network:clli'], nodeId) listNode.remove(nodeId) self.assertEqual(len(listNode), 0) @@ -537,9 +546,9 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX', 'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', 'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] - for val in response['network'][0]['ietf-network-topology:link']: - if val['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM': - link_id = val['link-id'] + for link in response['network'][0]['ietf-network-topology:link']: + if link['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM': + link_id = link['link-id'] find = link_id in listR2RLink self.assertEqual(find, True) listR2RLink.remove(link_id) @@ -549,21 +558,19 @@ class TransportPCETopologyTesting(unittest.TestCase): response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config') self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 34) - for val in response['network'][0]['ietf-network-topology:link']: - link_id = val['link-id'] - link_type = val['org-openroadm-common-network:link-type'] - link_src = val['source']['source-node'] - link_dest = val['destination']['dest-node'] - oppLink_id = val['org-openroadm-common-network:opposite-link'] + for link in response['network'][0]['ietf-network-topology:link']: + link_id = link['link-id'] + link_type = link['org-openroadm-common-network:link-type'] + link_src = link['source']['source-node'] + link_dest = link['destination']['dest-node'] + oppLink_id = link['org-openroadm-common-network:opposite-link'] # Find the opposite link - response_oppLink = test_utils.get_ordm_topo_request("ietf-network-topology:link/"+oppLink_id) - self.assertEqual(response_oppLink.status_code, requests.codes.ok) - res_oppLink = response_oppLink.json() - self.assertEqual(res_oppLink['ietf-network-topology:link'][0] - ['org-openroadm-common-network:opposite-link'], link_id) - self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['source']['source-node'], link_dest) - self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['destination']['dest-node'], link_src) - oppLink_type = res_oppLink['ietf-network-topology:link'][0]['org-openroadm-common-network:link-type'] + res_oppLink = test_utils_rfc8040.get_ietf_network_link_request('openroadm-topology', oppLink_id, 'config') + self.assertEqual(res_oppLink['status_code'], requests.codes.ok) + self.assertEqual(res_oppLink['link']['org-openroadm-common-network:opposite-link'], link_id) + self.assertEqual(res_oppLink['link']['source']['source-node'], link_dest) + self.assertEqual(res_oppLink['link']['destination']['dest-node'], link_src) + oppLink_type = res_oppLink['link']['org-openroadm-common-network:link-type'] CHECK_DICT = {'ADD-LINK': 'DROP-LINK', 'DROP-LINK': 'ADD-LINK', 'EXPRESS-LINK': 'EXPRESS-LINK', 'ROADM-TO-ROADM': 'ROADM-TO-ROADM', 'XPONDER-INPUT': 'XPONDER-OUTPUT', 'XPONDER-OUTUT': 'XPONDER-INPUT'} @@ -579,13 +586,13 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX', 'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', 'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] - for val in response['network'][0]['ietf-network-topology:link']: - link_id = val['link-id'] + for link in response['network'][0]['ietf-network-topology:link']: + link_id = link['link-id'] if link_id in R2RLink: find = False - spanLoss = val['org-openroadm-network-topology:OMS-attributes']['span']['engineered-spanloss'] + spanLoss = link['org-openroadm-network-topology:OMS-attributes']['span']['engineered-spanloss'] # pylint: disable=line-too-long - length = val['org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] + length = link['org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] if (spanLoss is not None) & (length is not None): find = True self.assertTrue(find) @@ -597,15 +604,15 @@ class TransportPCETopologyTesting(unittest.TestCase): response = test_utils_rfc8040.unmount_device("ROADMB01") self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) # Delete in the clli-network - response = test_utils.del_node_request("NodeB") - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.del_ietf_network_node_request('clli-network', 'NodeB', 'config') + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_31_disconnect_ROADMC(self): response = test_utils_rfc8040.unmount_device("ROADMC01") self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) # Delete in the clli-network - response = test_utils.del_node_request("NodeC") - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.del_ietf_network_node_request('clli-network', 'NodeC', 'config') + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_32_getNodes_OpenRoadmTopology(self): # pylint: disable=redundant-unittest-assert @@ -613,48 +620,48 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(len(response['network'][0]['node']), 5) listNode = ['XPDRA01-XPDR1', 'ROADMA01-SRG1', 'ROADMA01-SRG3', 'ROADMA01-DEG1', 'ROADMA01-DEG2'] - for val in response['network'][0]['node']: - nodeType = val['org-openroadm-common-network:node-type'] - nodeId = val['node-id'] + for node in response['network'][0]['node']: + nodeType = node['org-openroadm-common-network:node-type'] + nodeId = node['node-id'] # Tests related to XPDRA nodes if nodeId == 'XPDRA01-XPDR1': - for val2 in val['ietf-network-topology:termination-point']: - tpid = val2['tp-id'] + for tp in node['ietf-network-topology:termination-point']: + tpid = tp['tp-id'] if tpid == 'XPDR1-CLIENT1': - self.assertEqual(val2['org-openroadm-common-network:tp-type'], 'XPONDER-CLIENT') + self.assertEqual(tp['org-openroadm-common-network:tp-type'], 'XPONDER-CLIENT') if tpid == 'XPDR1-NETWORK1': - self.assertEqual(val2['org-openroadm-common-network:tp-type'], 'XPONDER-NETWORK') + self.assertEqual(tp['org-openroadm-common-network:tp-type'], 'XPONDER-NETWORK') # pylint: disable=line-too-long - self.assertEqual(val2['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'], + self.assertEqual(tp['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'], 'ROADMA01-SRG1--SRG1-PP1-TXRX') - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, val['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, node['supporting-node']) listNode.remove(nodeId) # Tests related to ROADMA nodes elif nodeId in self.CHECK_DICT1: self.assertEqual(nodeType, self.CHECK_DICT1[nodeId]['node_type']) if self.CHECK_DICT1[nodeId]['node_type'] == 'SRG': - self.assertEqual(len(val['ietf-network-topology:termination-point']), 17) - for item in self.CHECK_DICT1[nodeId]['checks_tp']: - self.assertIn(item, val['ietf-network-topology:termination-point']) - self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, val['supporting-node']) - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, val['supporting-node']) + self.assertEqual(len(node['ietf-network-topology:termination-point']), 17) + for tp in self.CHECK_DICT1[nodeId]['checks_tp']: + self.assertIn(tp, node['ietf-network-topology:termination-point']) + self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, node['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, node['supporting-node']) listNode.remove(nodeId) else: self.assertFalse(True) self.assertEqual(len(listNode), 0) # Test related to SRG1 of ROADMC - for val in response['network'][0]['node']: - self.assertNotEqual(val['node-id'], 'ROADMC01-SRG1') - self.assertNotEqual(val['node-id'], 'ROADMC01-DEG1') - self.assertNotEqual(val['node-id'], 'ROADMC01-DEG2') + for node in response['network'][0]['node']: + self.assertNotEqual(node['node-id'], 'ROADMC01-SRG1') + self.assertNotEqual(node['node-id'], 'ROADMC01-DEG1') + self.assertNotEqual(node['node-id'], 'ROADMC01-DEG2') def test_33_getOpenRoadmNetwork(self): response = test_utils_rfc8040.get_ietf_network_request('openroadm-network', 'config') self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(len(response['network'][0]['node']), 2) - for val in response['network'][0]['node']: - self.assertNotEqual(val['node-id'], 'ROADMC01') - self.assertNotEqual(val['node-id'], 'ROADMB01') + for node in response['network'][0]['node']: + self.assertNotEqual(node['node-id'], 'ROADMC01') + self.assertNotEqual(node['node-id'], 'ROADMB01') def test_34_getClliNetwork(self): response = test_utils_rfc8040.get_ietf_network_request('clli-network', 'config') @@ -683,28 +690,34 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response['status_code'], requests.codes.ok) self.assertEqual(len(response['network'][0]['node']), 4) listNode = ['ROADMA01-SRG1', 'ROADMA01-SRG3', 'ROADMA01-DEG1', 'ROADMA01-DEG2'] - for val in response['network'][0]['node']: - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, val['supporting-node']) - nodeType = val['org-openroadm-common-network:node-type'] - nodeId = val['node-id'] + for node in response['network'][0]['node']: + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, node['supporting-node']) + nodeType = node['org-openroadm-common-network:node-type'] + nodeId = node['node-id'] self.assertIn(nodeId, self.CHECK_DICT1) self.assertEqual(nodeType, self.CHECK_DICT1[nodeId]['node_type']) if self.CHECK_DICT1[nodeId]['node_type'] == 'SRG': - self.assertEqual(len(val['ietf-network-topology:termination-point']), 17) - for item in self.CHECK_DICT1[nodeId]['checks_tp']: - self.assertIn(item, val['ietf-network-topology:termination-point']) - self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, val['supporting-node']) - self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, val['supporting-node']) + self.assertEqual(len(node['ietf-network-topology:termination-point']), 17) + for tp in self.CHECK_DICT1[nodeId]['checks_tp']: + self.assertIn(tp, node['ietf-network-topology:termination-point']) + self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, node['supporting-node']) + self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, node['supporting-node']) listNode.remove(nodeId) self.assertEqual(len(listNode), 0) def test_39_disconnect_ROADM_XPDRA_link(self): # Link-1 - response = test_utils.del_link_request("XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX") - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.del_ietf_network_link_request( + 'openroadm-topology', + 'XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX', + 'config') # Link-2 - response = test_utils.del_link_request("ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1") - self.assertEqual(response.status_code, requests.codes.ok) + response2 = test_utils_rfc8040.del_ietf_network_link_request( + 'openroadm-topology', + 'ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1', + 'config') + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) + self.assertIn(response2.status_code, (requests.codes.ok, requests.codes.no_content)) def test_40_getLinks_OpenRoadmTopology(self): response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config') @@ -722,28 +735,28 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] } roadmtoroadmLink = 0 - for val in response['network'][0]['ietf-network-topology:link']: - linkId = val['link-id'] - linkType = val['org-openroadm-common-network:link-type'] + for link in response['network'][0]['ietf-network-topology:link']: + linkId = link['link-id'] + linkType = link['org-openroadm-common-network:link-type'] if linkType in check_list: find = linkId in check_list[linkType] self.assertEqual(find, True) (check_list[linkType]).remove(linkId) else: roadmtoroadmLink += 1 - for val in check_list.values(): - self.assertEqual(len(val), 0) + for link in check_list.values(): + self.assertEqual(len(link), 0) self.assertEqual(roadmtoroadmLink, 6) - for val in response['network'][0]['ietf-network-topology:link']: - self.assertNotEqual(val['org-openroadm-common-network:link-type'], 'XPONDER-OUTPUT') - self.assertNotEqual(val['org-openroadm-common-network:link-type'], 'XPONDER-INPUT') + for link in response['network'][0]['ietf-network-topology:link']: + self.assertNotEqual(link['org-openroadm-common-network:link-type'], 'XPONDER-OUTPUT') + self.assertNotEqual(link['org-openroadm-common-network:link-type'], 'XPONDER-INPUT') def test_41_disconnect_ROADMA(self): response = test_utils_rfc8040.unmount_device("ROADMA01") self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) # Delete in the clli-network - response = test_utils.del_node_request("NodeA") - self.assertEqual(response.status_code, requests.codes.ok) + response = test_utils_rfc8040.del_ietf_network_node_request('clli-network', 'NodeA', 'config') + self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content)) def test_42_getClliNetwork(self): response = test_utils_rfc8040.get_ietf_network_request('clli-network', 'config')