'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX',
'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-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):
# pylint: disable=redundant-unittest-assert
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 4)
listNode = ['ROADM-A1-SRG1', 'ROADM-A1-SRG3', 'ROADM-A1-DEG1', 'ROADM-A1-DEG2']
- for val in response['network'][0]['node']:
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, 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': 'ROADM-A1'}, 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']), 5)
- 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': 'ROADM-A1'}, val['supporting-node'])
+ self.assertEqual(len(node['ietf-network-topology:termination-point']), 5)
+ 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': 'ROADM-A1'}, node['supporting-node'])
listNode.remove(nodeId)
self.assertEqual(len(listNode), 0)
self.assertEqual(response['status_code'], requests.codes.ok)
nbNode = len(response['network'][0]['node'])
self.assertEqual(nbNode, 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 == 'XPDR-A1':
- self.assertEqual(val['org-openroadm-common-network:node-type'], 'XPONDER')
+ self.assertEqual(node['org-openroadm-common-network:node-type'], 'XPONDER')
elif nodeId == 'ROADM-A1':
- self.assertEqual(val['org-openroadm-common-network:node-type'], 'ROADM')
+ self.assertEqual(node['org-openroadm-common-network:node-type'], 'ROADM')
else:
self.assertFalse(True)
continue
- self.assertEqual(val['org-openroadm-network:model'], 'model2')
+ self.assertEqual(node['org-openroadm-network:model'], 'model2')
def test_09_getNodes_OpenRoadmTopology(self):
# pylint: disable=redundant-unittest-assert
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 5)
listNode = ['XPDR-A1-XPDR1', 'ROADM-A1-SRG1', 'ROADM-A1-SRG3', 'ROADM-A1-DEG1', 'ROADM-A1-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 == 'XPDR-A1-XPDR1':
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, val['supporting-node'])
- self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, val['supporting-node'])
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, 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-CLIENT2')
+ self.assertEqual(tp['transportpce-topology:associated-connection-map-port'], 'XPDR1-CLIENT2')
if tpId == 'XPDR1-CLIENT2':
- self.assertEqual(val2['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2')
+ self.assertEqual(tp['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2')
self.assertEqual(client, 2)
self.assertEqual(network, 2)
listNode.remove(nodeId)
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']), 5)
- 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': 'ROADM-A1'}, val['supporting-node'])
+ self.assertEqual(len(node['ietf-network-topology:termination-point']), 5)
+ 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': 'ROADM-A1'}, node['supporting-node'])
listNode.remove(nodeId)
else:
self.assertFalse(True)
'XPONDER-INPUT': ['ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1'],
'XPONDER-OUTPUT': ['XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-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("ROADM-C1", ('roadmc', self.NODE_VERSION))
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)
'ROADM-A1': {'node-ref': 'NodeA', 'node-type': 'ROADM'},
'ROADM-C1': {'node-ref': 'NodeC', 'node-type': 'ROADM'}
}
- 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']
if nodeId in CHECK_LIST:
- self.assertEqual(val['supporting-node'][0]['node-ref'], CHECK_LIST[nodeId]['node-ref'])
- self.assertEqual(val['org-openroadm-common-network:node-type'], CHECK_LIST[nodeId]['node-type'])
+ self.assertEqual(node['supporting-node'][0]['node-ref'], CHECK_LIST[nodeId]['node-ref'])
+ self.assertEqual(node['org-openroadm-common-network:node-type'], CHECK_LIST[nodeId]['node-type'])
listNode.remove(nodeId)
else:
self.assertFalse(True)
continue
- self.assertEqual(val['org-openroadm-network:model'], 'model2')
+ self.assertEqual(node['org-openroadm-network:model'], 'model2')
self.assertEqual(len(listNode), 0)
def test_18_getROADMLinkOpenRoadmTopology(self):
'XPONDER-INPUT': ['ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1'],
'XPONDER-OUTPUT': ['XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-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')
self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 20)
R2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX',
'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-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)
'ROADM-A1-SRG1', 'ROADM-A1-SRG3', 'ROADM-A1-DEG1', 'ROADM-A1-DEG2',
'ROADM-C1-SRG1', 'ROADM-C1-DEG1', 'ROADM-C1-DEG2']
# Tests related to XPDRA nodes
- 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']
if nodeId == 'XPDR-A1-XPDR1':
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, val['supporting-node'])
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, node['supporting-node'])
self.assertEqual(nodeType, 'XPONDER')
- nbTps = len(val['ietf-network-topology:termination-point'])
+ nbTps = len(node['ietf-network-topology:termination-point'])
self.assertTrue(nbTps >= 4)
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':
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']), 5)
- 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': 'ROADM-A1'}, 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']), 5)
+ 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': 'ROADM-A1'}, node['supporting-node'])
+ self.assertEqual(node['org-openroadm-common-network:node-type'], self.CHECK_DICT1[nodeId]['node_type'])
listNode.remove(nodeId)
# Tests related to ROADMA 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']), 5)
- 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': 'ROADM-C1'}, 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']), 5)
+ 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': 'ROADM-C1'}, node['supporting-node'])
+ self.assertEqual(node['org-openroadm-common-network:node-type'], self.CHECK_DICT2[nodeId]['node_type'])
listNode.remove(nodeId)
self.assertEqual(len(listNode), 0)
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)
'ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX',
'ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX',
'ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-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)
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']), 30)
- 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
res_oppLink = test_utils_rfc8040.get_ietf_network_link_request('openroadm-topology', oppLink_id, 'config')
self.assertEqual(res_oppLink['status_code'], requests.codes.ok)
'ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX',
'ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX',
'ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-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)
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 5)
listNode = ['XPDR-A1-XPDR1', 'ROADM-A1-SRG1', 'ROADM-A1-SRG3', 'ROADM-A1-DEG1', 'ROADM-A1-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 == 'XPDR-A1-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')
elif 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']),
'ROADM-A1-SRG1--SRG1-PP1-TXRX')
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, val['supporting-node'])
+ self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, 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']), 5)
- 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': 'ROADM-A1'}, val['supporting-node'])
+ self.assertEqual(len(node['ietf-network-topology:termination-point']), 5)
+ 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': 'ROADM-A1'}, 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'], 'ROADM-C1-SRG1')
- self.assertNotEqual(val['node-id'], 'ROADM-C1-DEG1')
- self.assertNotEqual(val['node-id'], 'ROADM-C1-DEG2')
+ for node in response['network'][0]['node']:
+ self.assertNotEqual(node['node-id'], 'ROADM-C1-SRG1')
+ self.assertNotEqual(node['node-id'], 'ROADM-C1-DEG1')
+ self.assertNotEqual(node['node-id'], 'ROADM-C1-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)
nbNode = len(response['network'][0]['node'])
self.assertEqual(nbNode, 2)
- for val in response['network'][0]['node']:
- self.assertNotEqual(val['node-id'], 'ROADM-C1')
- self.assertNotEqual(val['node-id'], 'ROADM-B1')
+ for node in response['network'][0]['node']:
+ self.assertNotEqual(node['node-id'], 'ROADM-C1')
+ self.assertNotEqual(node['node-id'], 'ROADM-B1')
def test_34_getClliNetwork(self):
response = test_utils_rfc8040.get_ietf_network_request('clli-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 4)
listNode = ['ROADM-A1-SRG1', 'ROADM-A1-SRG3', 'ROADM-A1-DEG1', 'ROADM-A1-DEG2']
- for val in response['network'][0]['node']:
- self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, 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': 'ROADM-A1'}, 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']), 5)
- 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': 'ROADM-A1'}, val['supporting-node'])
+ self.assertEqual(len(node['ietf-network-topology:termination-point']), 5)
+ 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': 'ROADM-A1'}, node['supporting-node'])
listNode.remove(nodeId)
self.assertEqual(len(listNode), 0)
'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-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("ROADM-A1")
Code Review / transportpce.git / blobdiff