X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftransportpce_tests%2F1.2.1%2Ftest_topology.py;h=e088b6d7f7e80ec1f97c64f45bc0a2fbfa3a6ebe;hb=6fe500a1bf557eb44d22584ac6bf7c924f12c47f;hp=ab9419def459e1fc99eed77afc69cc22fd41bee7;hpb=2fed85bc6d6a85d36982368cf47387cfc7ecc751;p=transportpce.git diff --git a/tests/transportpce_tests/1.2.1/test_topology.py b/tests/transportpce_tests/1.2.1/test_topology.py index ab9419def..e088b6d7f 100644 --- a/tests/transportpce_tests/1.2.1/test_topology.py +++ b/tests/transportpce_tests/1.2.1/test_topology.py @@ -9,7 +9,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -import json +# pylint: disable=no-member +# pylint: disable=too-many-public-methods +# pylint: disable=too-many-lines + import time import unittest import requests @@ -27,6 +30,7 @@ class TransportPCETopologyTesting(unittest.TestCase): @classmethod def tearDownClass(cls): + # pylint: disable=not-an-iterable for process in cls.processes: test_utils.shutdown_process(process) print("all processes killed") @@ -56,6 +60,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:model'], '2') def test_04_getLinks_OpenroadmTopology(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -64,21 +69,28 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbLink, 10) expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', - 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] + addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] for i in range(0, nbLink): linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK': + if (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK'): find = linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ADD-LINK': + elif (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'ADD-LINK'): find = linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'DROP-LINK': + elif (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'DROP-LINK'): find = linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) @@ -89,6 +101,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(dropLink), 0) def test_05_getNodes_OpenRoadmTopology(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes @@ -167,6 +180,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'], 'NodeA') def test_08_getOpenRoadmNetwork(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -176,16 +190,17 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['network-ref'], 'clli-network') self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'], 'NodeA') nodeId = res['network'][0]['node'][i]['node-id'] - if(nodeId == 'XPDRA01'): + if nodeId == 'XPDRA01': self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '1') - elif(nodeId == 'ROADMA01'): + elif nodeId == 'ROADMA01': self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '2') else: self.assertFalse(True) def test_09_getNodes_OpenRoadmTopology(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes @@ -197,7 +212,7 @@ class TransportPCETopologyTesting(unittest.TestCase): nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId = res['network'][0]['node'][i]['node-id'] # Tests related to XPDRA nodes - if(nodeId == 'XPDRA01-XPDR1'): + if nodeId == 'XPDRA01-XPDR1': self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, res['network'][0]['node'][i]['supporting-node']) self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'}, @@ -207,22 +222,23 @@ class TransportPCETopologyTesting(unittest.TestCase): client = 0 network = 0 for j in range(0, nbTps): - tpType = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] + tpType = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j][ + 'org-openroadm-common-network:tp-type'] tpId = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] - if (tpType == 'XPONDER-CLIENT'): + if tpType == 'XPONDER-CLIENT': client += 1 - elif (tpType == 'XPONDER-NETWORK'): + elif tpType == 'XPONDER-NETWORK': network += 1 - if (tpId == 'XPDR1-NETWORK2'): + if tpId == 'XPDR1-NETWORK2': self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'] [j]['transportpce-topology:associated-connection-map-port'], 'XPDR1-CLIENT3') - if (tpId == 'XPDR1-CLIENT3'): + if tpId == 'XPDR1-CLIENT3': self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'] [j]['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2') self.assertTrue(client == 4) self.assertTrue(network == 2) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-SRG1'): + elif nodeId == 'ROADMA01-SRG1': # Test related to SRG1 self.assertEqual(nodeType, 'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) @@ -233,7 +249,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-SRG3'): + elif nodeId == 'ROADMA01-SRG3': # Test related to SRG1 self.assertEqual(nodeType, 'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) @@ -244,7 +260,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-DEG1'): + elif nodeId == 'ROADMA01-DEG1': # Test related to DEG1 self.assertEqual(nodeType, 'DEGREE') self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, @@ -254,7 +270,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-DEG2'): + elif nodeId == 'ROADMA01-DEG2': # Test related to DEG2 self.assertEqual(nodeType, 'DEGREE') self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, @@ -282,6 +298,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok) def test_12_getLinks_OpenRoadmTopology(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -290,32 +307,36 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbLink, 12) expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', - 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] + addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] XPDR_IN = ['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'] XPDR_OUT = ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX'] for i in range(0, nbLink): nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if(nodeType == 'EXPRESS-LINK'): + if nodeType == 'EXPRESS-LINK': find = linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif(nodeType == 'ADD-LINK'): + elif nodeType == 'ADD-LINK': find = linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif(nodeType == 'DROP-LINK'): + elif nodeType == 'DROP-LINK': find = linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) - elif(nodeType == 'XPONDER-INPUT'): + elif nodeType == 'XPONDER-INPUT': find = linkId in XPDR_IN self.assertEqual(find, True) XPDR_IN.remove(linkId) - elif(nodeType == 'XPONDER-OUTPUT'): + elif nodeType == 'XPONDER-OUTPUT': find = linkId in XPDR_OUT self.assertEqual(find, True) XPDR_OUT.remove(linkId) @@ -367,7 +388,7 @@ class TransportPCETopologyTesting(unittest.TestCase): nodeId = res['network'][0]['node'][i]['node-id'] find = nodeId in listNode self.assertEqual(find, True) - if(nodeId == 'NodeA'): + if nodeId == 'NodeA': self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeA') else: self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC') @@ -376,6 +397,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_17_getOpenRoadmNetwork(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_net_request() self.assertEqual(response.status_code, requests.codes.ok) res = response.json() @@ -385,17 +407,17 @@ class TransportPCETopologyTesting(unittest.TestCase): for i in range(0, nbNode): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['network-ref'], 'clli-network') nodeId = res['network'][0]['node'][i]['node-id'] - if(nodeId == 'XPDRA01'): + if nodeId == 'XPDRA01': self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'], 'NodeA') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '1') listNode.remove(nodeId) - elif(nodeId == 'ROADMA01'): + elif nodeId == 'ROADMA01': self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'], 'NodeA') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '2') listNode.remove(nodeId) - elif(nodeId == 'ROADMC01'): + elif nodeId == 'ROADMC01': self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'], 'NodeC') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'], '2') @@ -405,20 +427,29 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(listNode), 0) def test_18_getROADMLinkOpenRoadmTopology(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") self.assertEqual(response.status_code, requests.codes.ok) res = response.json() # Tests related to links nbLink = len(res['network'][0]['ietf-network-topology:link']) self.assertEqual(nbLink, 20) - expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', - 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX', 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX', 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', - 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', - 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX', 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX'] + expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX', + 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX'] + addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX', + 'ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX', + 'ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX'] R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX'] XPDR_IN = ['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'] @@ -426,27 +457,27 @@ class TransportPCETopologyTesting(unittest.TestCase): for i in range(0, nbLink): nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if(nodeType == 'EXPRESS-LINK'): + if nodeType == 'EXPRESS-LINK': find = linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif(nodeType == 'ADD-LINK'): + elif nodeType == 'ADD-LINK': find = linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif(nodeType == 'DROP-LINK'): + elif nodeType == 'DROP-LINK': find = linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) - elif(nodeType == 'ROADM-TO-ROADM'): + elif nodeType == 'ROADM-TO-ROADM': find = linkId in R2RLink self.assertEqual(find, True) R2RLink.remove(linkId) - elif(nodeType == 'XPONDER-INPUT'): + elif nodeType == 'XPONDER-INPUT': find = linkId in XPDR_IN self.assertEqual(find, True) XPDR_IN.remove(linkId) - elif(nodeType == 'XPONDER-OUTPUT'): + elif nodeType == 'XPONDER-OUTPUT': find = linkId in XPDR_OUT self.assertEqual(find, True) XPDR_OUT.remove(linkId) @@ -469,21 +500,22 @@ class TransportPCETopologyTesting(unittest.TestCase): R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX'] for i in range(0, nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if(link_id in R2RLink): + if link_id in R2RLink: find = False - spanLoss = res['network'][0]['ietf-network-topology:link'][i][ - 'org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"] - length = res['network'][0]['ietf-network-topology:link'][i][ - 'org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] - if((spanLoss != None) & (length != None)): + spanLoss = (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"]) + length = (res['network'][0]['ietf-network-topology:link'][i] + ['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) R2RLink.remove(link_id) self.assertEqual(len(R2RLink), 0) def test_20_getNodes_OpenRoadmTopology(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes @@ -497,7 +529,7 @@ class TransportPCETopologyTesting(unittest.TestCase): for i in range(0, nbNode): nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId = res['network'][0]['node'][i]['node-id'] - if(nodeId == 'XPDRA01-XPDR1'): + if nodeId == 'XPDRA01-XPDR1': self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, res['network'][0]['node'][i]['supporting-node']) self.assertEqual(nodeType, 'XPONDER') @@ -506,15 +538,16 @@ class TransportPCETopologyTesting(unittest.TestCase): client = 0 network = 0 for j in range(0, nbTps): - tpType = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] - if (tpType == 'XPONDER-CLIENT'): + tpType = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j][ + 'org-openroadm-common-network:tp-type'] + if tpType == 'XPONDER-CLIENT': client += 1 - elif (tpType == 'XPONDER-NETWORK'): + elif tpType == 'XPONDER-NETWORK': network += 1 self.assertTrue(client == 4) self.assertTrue(network == 2) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-SRG1'): + elif nodeId == 'ROADMA01-SRG1': # Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, @@ -525,7 +558,7 @@ class TransportPCETopologyTesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'SRG') listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-SRG3'): + elif nodeId == 'ROADMA01-SRG3': # Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, @@ -536,7 +569,7 @@ class TransportPCETopologyTesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'SRG') listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-DEG1'): + elif nodeId == 'ROADMA01-DEG1': # Test related to DEG1 self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) @@ -546,7 +579,7 @@ class TransportPCETopologyTesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE') listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-DEG2'): + elif nodeId == 'ROADMA01-DEG2': # Test related to DEG2 self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) @@ -556,7 +589,7 @@ class TransportPCETopologyTesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE') listNode.remove(nodeId) - elif(nodeId == 'ROADMC01-SRG1'): + elif nodeId == 'ROADMC01-SRG1': # Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, @@ -567,7 +600,7 @@ class TransportPCETopologyTesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'SRG') listNode.remove(nodeId) - elif(nodeId == 'ROADMC01-DEG1'): + elif nodeId == 'ROADMC01-DEG1': # Test related to DEG1 self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) @@ -577,7 +610,7 @@ class TransportPCETopologyTesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'], 'DEGREE') listNode.remove(nodeId) - elif(nodeId == 'ROADMC01-DEG2'): + elif nodeId == 'ROADMC01-DEG2': # Test related to DEG2 self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) @@ -657,9 +690,9 @@ class TransportPCETopologyTesting(unittest.TestCase): nodeId = res['network'][0]['node'][i]['node-id'] find = nodeId in listNode self.assertEqual(find, True) - if(nodeId == 'NodeA'): + if nodeId == 'NodeA': self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeA') - elif(nodeId == 'NodeB'): + elif nodeId == 'NodeB': self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeB') else: self.assertEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC') @@ -672,11 +705,15 @@ class TransportPCETopologyTesting(unittest.TestCase): res = response.json() # Tests related to links nbLink = len(res['network'][0]['ietf-network-topology:link']) - listR2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX', - 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-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'] + listR2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', + 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX', + 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-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 i in range(0, nbLink): - if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM': + if (res['network'][0]['ietf-network-topology:link'][i] + ['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in listR2RLink self.assertEqual(find, True) @@ -695,7 +732,8 @@ class TransportPCETopologyTesting(unittest.TestCase): link_type = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_src = res['network'][0]['ietf-network-topology:link'][i]['source']['source-node'] link_dest = res['network'][0]['ietf-network-topology:link'][i]['destination']['dest-node'] - oppLink_id = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:opposite-link'] + oppLink_id = (res['network'][0]['ietf-network-topology:link'][i] + ['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) @@ -730,15 +768,14 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', 'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] for i in range(0, nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if(link_id in R2RLink): + if link_id in R2RLink: find = False spanLoss = res['network'][0]['ietf-network-topology:link'][i][ 'org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"] length = res['network'][0]['ietf-network-topology:link'][i][ 'org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] - if((spanLoss != None) & (length != None)): + if (spanLoss is not None) & (length is not None): find = True self.assertTrue(find) R2RLink.remove(link_id) @@ -760,6 +797,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.ok) def test_32_getNodes_OpenRoadmTopology(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes @@ -771,23 +809,24 @@ class TransportPCETopologyTesting(unittest.TestCase): nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId = res['network'][0]['node'][i]['node-id'] # Tests related to XPDRA nodes - if(nodeId == 'XPDRA01-XPDR1'): + if nodeId == 'XPDRA01-XPDR1': nbTp = len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']) for j in range(0, nbTp): tpid = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] - if (tpid == 'XPDR1-CLIENT1'): + if tpid == 'XPDR1-CLIENT1': self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] ['org-openroadm-common-network:tp-type'], 'XPONDER-CLIENT') - if (tpid == 'XPDR1-NETWORK1'): + if tpid == 'XPDR1-NETWORK1': self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] ['org-openroadm-common-network:tp-type'], 'XPONDER-NETWORK') self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'], + ['org-openroadm-network-topology:xpdr-network-attributes'] + ['tail-equipment-id'], 'ROADMA01-SRG1--SRG1-PP1-TXRX') self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-SRG1'): + elif nodeId == 'ROADMA01-SRG1': # Test related to SRG1 self.assertEqual(nodeType, 'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) @@ -798,7 +837,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-SRG3'): + elif nodeId == 'ROADMA01-SRG3': # Test related to SRG1 self.assertEqual(nodeType, 'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) @@ -809,7 +848,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-DEG1'): + elif nodeId == 'ROADMA01-DEG1': # Test related to DEG1 self.assertEqual(nodeType, 'DEGREE') self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, @@ -819,7 +858,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-DEG2'): + elif nodeId == 'ROADMA01-DEG2': # Test related to DEG2 self.assertEqual(nodeType, 'DEGREE') self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, @@ -855,7 +894,7 @@ class TransportPCETopologyTesting(unittest.TestCase): nbNode = len(res['network'][0]['node']) self.assertEqual(nbNode, 1) for i in range(0, nbNode-1): - self.assertNotEqual(res['network'][0]['node'][1]['org-openroadm-clli-network:clli'], 'NodeC') + self.assertNotEqual(res['network'][0]['node'][i]['org-openroadm-clli-network:clli'], 'NodeC') def test_35_disconnect_XPDRA(self): response = test_utils.unmount_device("XPDRA01") @@ -879,6 +918,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'], 'XPDRA01') def test_38_getNodes_OpenRoadmTopology(self): + # pylint: disable=redundant-unittest-assert response = test_utils.get_ordm_topo_request("") res = response.json() # Tests related to nodes @@ -891,7 +931,7 @@ class TransportPCETopologyTesting(unittest.TestCase): res['network'][0]['node'][i]['supporting-node']) nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId = res['network'][0]['node'][i]['node-id'] - if(nodeId == 'ROADMA01-SRG1'): + if nodeId == 'ROADMA01-SRG1': # Test related to SRG1 self.assertEqual(nodeType, 'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) @@ -900,7 +940,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-SRG3'): + elif nodeId == 'ROADMA01-SRG3': # Test related to SRG1 self.assertEqual(nodeType, 'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 17) @@ -909,7 +949,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-DEG1'): + elif nodeId == 'ROADMA01-DEG1': # Test related to DEG1 self.assertEqual(nodeType, 'DEGREE') self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, @@ -917,7 +957,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) - elif(nodeId == 'ROADMA01-DEG2'): + elif nodeId == 'ROADMA01-DEG2': # Test related to DEG2 self.assertEqual(nodeType, 'DEGREE') self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, @@ -945,23 +985,30 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbLink, 16) expressLink = ['ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX'] - addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', - 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] - dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', - 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] + addLink = ['ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX', + 'ROADMA01-SRG3-SRG3-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX'] + dropLink = ['ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX', + 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX', + 'ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] roadmtoroadmLink = 0 for i in range(0, nbLink): - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] + == 'EXPRESS-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in expressLink self.assertEqual(find, True) expressLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] + == 'ADD-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in addLink self.assertEqual(find, True) addLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] + == 'DROP-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find = link_id in dropLink self.assertEqual(find, True)