sys.path.append('transportpce_tests/common/')
# pylint: disable=wrong-import-position
# pylint: disable=import-error
-import test_utils_rfc8040 # nopep8
+import test_utils # nopep8
class TransportPCETopologyTesting(unittest.TestCase):
@classmethod
def setUpClass(cls):
- cls.processes = test_utils_rfc8040.start_tpce()
- cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION), ('roadma', cls.NODE_VERSION),
- ('roadmb', cls.NODE_VERSION), ('roadmc', cls.NODE_VERSION)])
+ cls.processes = test_utils.start_tpce()
+ cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION), ('roadma', cls.NODE_VERSION),
+ ('roadmb', cls.NODE_VERSION), ('roadmc', cls.NODE_VERSION)])
@classmethod
def tearDownClass(cls):
# pylint: disable=not-an-iterable
for process in cls.processes:
- test_utils_rfc8040.shutdown_process(process)
+ test_utils.shutdown_process(process)
print("all processes killed")
def setUp(self):
- time.sleep(5)
+ time.sleep(2)
def test_01_connect_ROADMA(self):
- response = test_utils_rfc8040.mount_device("ROADMA01", ('roadma', self.NODE_VERSION))
- self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+ response = test_utils.mount_device("ROADMA01", ('roadma', self.NODE_VERSION))
+ self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
def test_02_getClliNetwork(self):
- response = test_utils_rfc8040.get_ietf_network_request('clli-network', 'config')
+ response = test_utils.get_ietf_network_request('clli-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(response['network'][0]['node'][0]['node-id'], 'NodeA')
self.assertEqual(response['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA')
def test_03_getOpenRoadmNetwork(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-network', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(response['network'][0]['node'][0]['node-id'], 'ROADMA01')
self.assertEqual(response['network'][0]['node'][0]['supporting-node'][0]['network-ref'], 'clli-network')
self.assertEqual(response['network'][0]['node'][0]['org-openroadm-network:model'], '2')
def test_04_getLinks_OpenroadmTopology(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-topology', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
# Tests related to links
self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 10)
'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')
+ response = test_utils.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)
def test_06_connect_XPDRA(self):
- response = test_utils_rfc8040.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION))
- self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+ response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION))
+ self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
def test_07_getClliNetwork(self):
- response = test_utils_rfc8040.get_ietf_network_request('clli-network', 'config')
+ response = test_utils.get_ietf_network_request('clli-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(response['network'][0]['node'][0]['node-id'], 'NodeA')
self.assertEqual(response['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA')
def test_08_getOpenRoadmNetwork(self):
# pylint: disable=redundant-unittest-assert
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-network', 'config')
+ response = test_utils.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)
def test_09_getNodes_OpenRoadmTopology(self):
# pylint: disable=redundant-unittest-assert
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-topology', 'config')
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['org-openroadm-common-network:associated-connection-map-tp'], ['XPDR1-CLIENT3'])
elif tpId == 'XPDR1-CLIENT3':
- self.assertEqual(val2['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2')
+ self.assertEqual(
+ tp['org-openroadm-common-network:associated-connection-map-tp'], ['XPDR1-NETWORK2'])
self.assertTrue(client == 4)
self.assertTrue(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']), 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)
# 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_rfc8040.connect_xpdr_to_rdm_request(
- {'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)
+ response = test_utils.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_rfc8040.connect_rdm_to_xpdr_request(
- {'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)
+ response = test_utils.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')
+ response = test_utils.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']), 12)
check_list = {'EXPRESS-LINK': ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
'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))
- self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+ response = test_utils.mount_device("ROADMC01", ('roadmc', self.NODE_VERSION))
+ self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
def test_14_omsAttributes_ROADMA_ROADMC(self):
# Config ROADMA01-ROADMC01 oms-attributes
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils_rfc8040.add_oms_attr_request(
+ response = test_utils.add_oms_attr_request(
"ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils_rfc8040.add_oms_attr_request(
+ response = test_utils.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')
+ response = test_utils.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)
def test_17_getOpenRoadmNetwork(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-network', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 3)
listNode = ['XPDRA01', 'ROADMA01', 'ROADMC01']
'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)
def test_18_getROADMLinkOpenRoadmTopology(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.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']), 20)
check_list = {'EXPRESS-LINK': ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
'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')
+ response = test_utils.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']), 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)
def test_20_getNodes_OpenRoadmTopology(self):
# pylint: disable=redundant-unittest-assert
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-topology', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 8)
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':
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)
self.assertEqual(len(listNode), 0)
def test_21_connect_ROADMB(self):
- response = test_utils_rfc8040.mount_device("ROADMB01", ('roadmb', self.NODE_VERSION))
- self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
+ response = test_utils.mount_device("ROADMB01", ('roadmb', self.NODE_VERSION))
+ self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
def test_22_omsAttributes_ROADMA_ROADMB(self):
# Config ROADMA01-ROADMB01 oms-attributes
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils_rfc8040.add_oms_attr_request(
+ response = test_utils.add_oms_attr_request(
"ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils_rfc8040.add_oms_attr_request(
+ response = test_utils.add_oms_attr_request(
"ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils_rfc8040.add_oms_attr_request(
+ response = test_utils.add_oms_attr_request(
"ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX", data)
self.assertEqual(response.status_code, requests.codes.created)
"fiber-type": "smf",
"SRLG-length": 100000,
"pmd": 0.5}]}}
- response = test_utils_rfc8040.add_oms_attr_request(
+ response = test_utils.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')
+ response = test_utils.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)
def test_27_verifyDegree(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-topology', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
listR2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX',
'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX',
'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)
self.assertEqual(len(listR2RLink), 0)
def test_28_verifyOppositeLinkTopology(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.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
- res_oppLink = test_utils_rfc8040.get_ietf_network_link_request('openroadm-topology', oppLink_id, 'config')
+ res_oppLink = test_utils.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(oppLink_type, CHECK_DICT[link_type])
def test_29_getLinkOmsAttributesOpenRoadmTopology(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-topology', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX',
'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX',
'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)
def test_30_disconnect_ROADMB(self):
# Delete in the topology-netconf
- response = test_utils_rfc8040.unmount_device("ROADMB01")
+ response = test_utils.unmount_device("ROADMB01")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
# Delete in the clli-network
- response = test_utils_rfc8040.del_ietf_network_node_request('clli-network', 'NodeB', 'config')
+ response = test_utils.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")
+ response = test_utils.unmount_device("ROADMC01")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
# Delete in the clli-network
- response = test_utils_rfc8040.del_ietf_network_node_request('clli-network', 'NodeC', 'config')
+ response = test_utils.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
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-topology', 'config')
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')
+ response = test_utils.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')
+ response = test_utils.get_ietf_network_request('clli-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 1)
self.assertNotEqual(response['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeC')
def test_35_disconnect_XPDRA(self):
- response = test_utils_rfc8040.unmount_device("XPDRA01")
+ response = test_utils.unmount_device("XPDRA01")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
def test_36_getClliNetwork(self):
- response = test_utils_rfc8040.get_ietf_network_request('clli-network', 'config')
+ response = test_utils.get_ietf_network_request('clli-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 1)
self.assertEqual(response['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA')
def test_37_getOpenRoadmNetwork(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-network', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertEqual(len(response['network'][0]['node']), 1)
self.assertNotEqual(response['network'][0]['node'][0]['node-id'], 'XPDRA01')
def test_38_getNodes_OpenRoadmTopology(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.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)
def test_39_disconnect_ROADM_XPDRA_link(self):
# Link-1
- response = test_utils_rfc8040.del_ietf_network_link_request(
+ response = test_utils.del_ietf_network_link_request(
'openroadm-topology',
'XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX',
'config')
# Link-2
- response2 = test_utils_rfc8040.del_ietf_network_link_request(
+ response2 = test_utils.del_ietf_network_link_request(
'openroadm-topology',
'ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1',
'config')
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')
+ response = test_utils.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']), 16)
check_list = {'EXPRESS-LINK': ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX',
'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")
+ response = test_utils.unmount_device("ROADMA01")
self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
# Delete in the clli-network
- response = test_utils_rfc8040.del_ietf_network_node_request('clli-network', 'NodeA', 'config')
+ response = test_utils.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')
+ response = test_utils.get_ietf_network_request('clli-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertNotIn('node', response['network'][0])
def test_43_getOpenRoadmNetwork(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-network', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-network', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertNotIn('node', response['network'][0])
def test_44_check_roadm2roadm_link_persistence(self):
- response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+ response = test_utils.get_ietf_network_request('openroadm-topology', 'config')
self.assertEqual(response['status_code'], requests.codes.ok)
self.assertNotIn('node', response['network'][0])
self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 6)
Code Review / transportpce.git / blobdiff