fix superflous parenthesis pointed out by pylint
[transportpce.git] / tests / transportpce_tests / 1.2.1 / test_topology.py
index f35753872fca638f2544cab7043d16ee05ffe639..827a30c4af7b08787b3fc92481d7d743d8f631fd 100644 (file)
@@ -185,10 +185,10 @@ 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:
@@ -206,7 +206,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'},
@@ -219,20 +219,20 @@ class TransportPCETopologyTesting(unittest.TestCase):
                     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)
@@ -243,7 +243,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)
@@ -254,7 +254,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'},
@@ -264,7 +264,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'},
@@ -313,23 +313,23 @@ 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 == '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)
@@ -381,7 +381,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')
@@ -399,17 +399,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')
@@ -448,27 +448,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)
@@ -492,14 +492,14 @@ class TransportPCETopologyTesting(unittest.TestCase):
                    'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX']
         for i in range(0, nbLink):
             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 != None) & (length != None):
                     find = True
                 self.assertTrue(find)
                 R2RLink.remove(link_id)
@@ -519,7 +519,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')
@@ -530,14 +530,14 @@ class TransportPCETopologyTesting(unittest.TestCase):
                 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'):
+                    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'},
@@ -548,7 +548,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'},
@@ -559,7 +559,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'])
@@ -569,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'], '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'])
@@ -579,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 == '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'},
@@ -590,7 +590,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'])
@@ -600,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'], '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'])
@@ -680,9 +680,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')
@@ -759,13 +759,13 @@ class TransportPCETopologyTesting(unittest.TestCase):
                    'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX']
         for i in range(0, nbLink):
             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 != None) & (length != None):
                     find = True
                 self.assertTrue(find)
                 R2RLink.remove(link_id)
@@ -798,14 +798,14 @@ 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]
@@ -815,7 +815,7 @@ class TransportPCETopologyTesting(unittest.TestCase):
                 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)
@@ -826,7 +826,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)
@@ -837,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-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'},
@@ -847,7 +847,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'},
@@ -919,7 +919,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)
@@ -928,7 +928,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)
@@ -937,7 +937,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'},
@@ -945,7 +945,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'},