fix superflous parenthesis pointed out by pylint

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ibe23741d5a18814575cd05f1590d7c5ce0379c92
(cherry picked from commit 3492e0ddd262c793fa03b1fcd8738ba9cded6ea5)

diff --git a/tests/transportpce_tests/1.2.1/test_pce.py b/tests/transportpce_tests/1.2.1/test_pce.py
index 4b8d6b2ca3182a2e52e1380cf46476af7e3b78a4..55aab56d999030189a8007bf74451cf72dffd679 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_pce.py
+++ b/tests/transportpce_tests/1.2.1/test_pce.py
@@ -191,9 +191,9 @@ class TransportPCEtesting(unittest.TestCase):
         for i in range(0, 15):
             atoz = res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
             ztoa = res['output']['response-parameters']['path-description']['zToA-direction']['zToA'][i]
-            if (atoz['id'] == '14'):
+            if atoz['id'] == '14':
                 self.assertEqual(atoz['resource']['tp-id'], 'SRG1-PP1-TX')
-            if (ztoa['id'] == '0'):
+            if ztoa['id'] == '0':
                 self.assertEqual(ztoa['resource']['tp-id'], 'SRG1-PP1-RX')
         time.sleep(5)
 
@@ -345,7 +345,7 @@ class TransportPCEtesting(unittest.TestCase):
         for i in range(0, nbElmPath):
             resource_i = (res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
                              ['resource'])
-            if(resource_i == link):
+            if resource_i == link:
                 find = True
         self.assertEqual(find, True)
         time.sleep(5)
@@ -375,7 +375,7 @@ class TransportPCEtesting(unittest.TestCase):
         for i in range(0, nbElmPath):
             resource_i = (res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
                              ['resource'])
-            if (resource_i == link):
+            if resource_i == link:
                 find = True
         self.assertNotEqual(find, True)
         time.sleep(5)

diff --git a/tests/transportpce_tests/1.2.1/test_topology.py b/tests/transportpce_tests/1.2.1/test_topology.py
index f35753872fca638f2544cab7043d16ee05ffe639..827a30c4af7b08787b3fc92481d7d743d8f631fd 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_topology.py
+++ b/tests/transportpce_tests/1.2.1/test_topology.py
@@ -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'},

diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py
index 99a50a287bdf6a265689b3bbb00829ae25842bd6..b26f8937a73369706c35e7dcdf6af3da461260cf 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_end2end.py
@@ -515,7 +515,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         for ele in liste_tp:
             if ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
-            elif (ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK'):
+            elif ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK':
                 self.assertIn(u'tail-equipment-id',
                               dict.keys(ele[u'org-openroadm-network-topology:xpdr-network-attributes']))
                 self.assertNotIn('wavelength', dict.keys(

diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
index 2d2e4f46d9a3458c164ea31552b39b1ac9bd805f..ee0e0d1092ee0f042bcde90763fcf9c7e6eb7d93 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
@@ -517,10 +517,10 @@ class TransportPCEtesting(unittest.TestCase):
         response = test_utils.get_otn_topo_request()
         res = response.json()
         for node in res['network'][0]['node']:
-            if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'):
+            if node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
-                    if (tp['tp-id'] == 'XPDR1-NETWORK1'):
+                    if tp['tp-id'] == 'XPDR1-NETWORK1':
                         xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                         self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 80)
                         self.assertEqual(len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80)
@@ -757,10 +757,10 @@ class TransportPCEtesting(unittest.TestCase):
         response = test_utils.get_otn_topo_request()
         res = response.json()
         for node in res['network'][0]['node']:
-            if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'):
+            if node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
-                    if (tp['tp-id'] == 'XPDR1-NETWORK1'):
+                    if tp['tp-id'] == 'XPDR1-NETWORK1':
                         xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                         self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 72)
                         tsPoolList = [i for i in range(1, 9)]
@@ -822,7 +822,7 @@ class TransportPCEtesting(unittest.TestCase):
             if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'):
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
-                    if (tp['tp-id'] == 'XPDR1-NETWORK1'):
+                    if tp['tp-id'] == 'XPDR1-NETWORK1':
                         xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                         self.assertEqual(len(xpdrTpPortConAt['ts-pool']), 80)
                         self.assertEqual(len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80)
@@ -853,10 +853,10 @@ class TransportPCEtesting(unittest.TestCase):
         response = test_utils.get_otn_topo_request()
         res = response.json()
         for node in res['network'][0]['node']:
-            if (node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1'):
+            if node['node-id'] == 'SPDR-SA1-XPDR1' or 'SPDR-SC1-XPDR1':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
-                    if (tp['tp-id'] == 'XPDR1-NETWORK1'):
+                    if tp['tp-id'] == 'XPDR1-NETWORK1':
                         xpdrTpPortConAt = tp['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                         self.assertNotIn('ts-pool', dict.keys(xpdrTpPortConAt))
                         self.assertNotIn('odtu-tpn-pool', dict.keys(xpdrTpPortConAt))

diff --git a/tests/transportpce_tests/2.2.1/test_otn_topology.py b/tests/transportpce_tests/2.2.1/test_otn_topology.py
index c420efa02811d33c2b1e844911aee6d9631d2e75..751e9399fa921509abcd567d3913f0bb7eeec4d5 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py
@@ -82,14 +82,14 @@ class TransportPCEtesting(unittest.TestCase):
         # Tests related to nodes
         self.assertEqual(response.status_code, requests.codes.ok)
         self.assertIn('node', res['network'][0])
-        if ('node' in res['network'][0]):
+        if 'node' in res['network'][0]:
             nbNode = len(res['network'][0]['node'])
             self.assertEqual(nbNode, 2)
             listNode = ['SPDR-SA1-XPDR1', 'SPDR-SA1-XPDR2']
             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 == 'SPDR-SA1-XPDR1'):
+                if nodeId == 'SPDR-SA1-XPDR1':
                     self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'SPDR-SA1'},
                                   res['network'][0]['node'][i]['supporting-node'])
                     self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeSA'},
@@ -101,14 +101,14 @@ class TransportPCEtesting(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 == 0)
                     self.assertTrue(network == 1)
                     listNode.remove(nodeId)
-                elif (nodeId == 'SPDR-SA1-XPDR2'):
+                elif nodeId == 'SPDR-SA1-XPDR2':
                     self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'SPDR-SA1'},
                                   res['network'][0]['node'][i]['supporting-node'])
                     self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeSA'},
@@ -120,9 +120,9 @@ class TransportPCEtesting(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 == 0)
                     self.assertTrue(network == 4)
@@ -146,7 +146,7 @@ class TransportPCEtesting(unittest.TestCase):
         listNode = ['SPDR-SA1-XPDR1', 'SPDR-SA1-XPDR2']
         for i in range(0, nbNode):
             nodeId = res['network'][0]['node'][i]['node-id']
-            if(nodeId == 'SPDR-SA1-XPDR1'):
+            if nodeId == 'SPDR-SA1-XPDR1':
                 nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type']
                 self.assertEqual(nodeType, 'MUXPDR')
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'SPDR-SA1'},
@@ -164,7 +164,7 @@ class TransportPCEtesting(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
                         self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]
                                              ['org-openroadm-otn-network-topology:tp-supported-interfaces']
@@ -174,7 +174,7 @@ class TransportPCEtesting(unittest.TestCase):
                                              ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                                              ['rate']),
                                          'org-openroadm-otn-common-types:ODU2e')
-                    elif (tpType == 'XPONDER-NETWORK'):
+                    elif tpType == 'XPONDER-NETWORK':
                         network += 1
                         self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]
                                              ['org-openroadm-otn-network-topology:tp-supported-interfaces']
@@ -199,13 +199,13 @@ class TransportPCEtesting(unittest.TestCase):
                 for k in range(0, nbNbl):
                     nbl = (res['network'][0]['node'][i]['org-openroadm-otn-network-topology:switching-pools']
                               ['odu-switching-pools'][0]['non-blocking-list'][k])
-                    if (nbl['nbl-number'] == 1):
+                    if nbl['nbl-number'] == 1:
                         self.assertEqual(nbl['available-interconnect-bandwidth'], 10)
                         self.assertEqual(nbl['interconnect-bandwidth-unit'], 1000000000)
                         self.assertIn('XPDR1-NETWORK1', nbl['tp-list'])
                         self.assertIn('XPDR1-CLIENT1', nbl['tp-list'])
                         self.assertNotIn('XPDR1-CLIENT2', nbl['tp-list'])
-            elif(nodeId == 'SPDR-SA1-XPDR2'):
+            elif nodeId == 'SPDR-SA1-XPDR2':
                 nodeType = res['network'][0]['node'][i]['org-openroadm-common-network:node-type']
                 self.assertEqual(nodeType, 'SWITCH')
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'SPDR-SA1'},
@@ -223,7 +223,7 @@ class TransportPCEtesting(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
                         self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]
                                           ['org-openroadm-otn-network-topology:tp-supported-interfaces']
@@ -233,7 +233,7 @@ class TransportPCEtesting(unittest.TestCase):
                                              ['org-openroadm-otn-network-topology:xpdr-tp-port-connection-attributes']
                                              ['rate']),
                                          'org-openroadm-otn-common-types:ODU4')
-                    elif (tpType == 'XPONDER-NETWORK'):
+                    elif tpType == 'XPONDER-NETWORK':
                         network += 1
                         self.assertEqual((res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]
                                              ['org-openroadm-otn-network-topology:tp-supported-interfaces']

diff --git a/tests/transportpce_tests/2.2.1/test_topoPortMapping.py b/tests/transportpce_tests/2.2.1/test_topoPortMapping.py
index f92aefdb82fd10a9d47c489ed1f731b863c20e29..d74b42d1982ba5319c8dbf50ede8a9bb4eb9caef 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_topoPortMapping.py
+++ b/tests/transportpce_tests/2.2.1/test_topoPortMapping.py
@@ -61,10 +61,10 @@ class TransportPCEtesting(unittest.TestCase):
             nbMapCurrent = 0
             for j in range(0, nbTp):
                 tpId = resTopo['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id']
-                if((not "CP" in tpId) and (not "CTP" in tpId)):
+                if (not "CP" in tpId) and (not "CTP" in tpId):
                     responseMap = test_utils.portmapping_request(nodeMapId+"/mapping/"+tpId)
                     self.assertEqual(responseMap.status_code, requests.codes.ok)
-                    if(responseMap.status_code == requests.codes.ok):
+                    if responseMap.status_code == requests.codes.ok:
                         nbMapCurrent += 1
             nbMapCumul += nbMapCurrent
         nbMappings -= nbMapCurrent

diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py
index c30f9151548ba5c26a9c6fb4e33b0f2f7f3f4583..7ec1885b823860d270c9578dbbba90199fe77ca7 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_topology.py
@@ -112,7 +112,7 @@ class TransportPCEtesting(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 == 'ROADM-A1-SRG1'):
+            if nodeId == 'ROADM-A1-SRG1':
                 # Test related to SRG1
                 self.assertEqual(nodeType, 'SRG')
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
@@ -125,7 +125,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-SRG3'):
+            elif nodeId == 'ROADM-A1-SRG3':
                 # Test related to SRG1
                 self.assertEqual(nodeType, 'SRG')
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
@@ -138,7 +138,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-DEG1'):
+            elif nodeId == 'ROADM-A1-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'},
@@ -150,7 +150,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-DEG2'):
+            elif nodeId == 'ROADM-A1-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'},
@@ -187,10 +187,10 @@ class TransportPCEtesting(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 == 'XPDR-A1'):
+            if nodeId == 'XPDR-A1':
                 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'], 'model2')
-            elif(nodeId == 'ROADM-A1'):
+            elif nodeId == 'ROADM-A1':
                 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'], 'model2')
             else:
@@ -208,7 +208,7 @@ class TransportPCEtesting(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 == 'XPDR-A1-XPDR1'):
+            if nodeId == 'XPDR-A1-XPDR1':
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 self.assertIn({'network-ref': 'clli-network', 'node-ref': 'NodeA'},
@@ -221,21 +221,21 @@ class TransportPCEtesting(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-CLIENT2')
-                    if (tpId == 'XPDR1-CLIENT2'):
+                    if tpId == 'XPDR1-CLIENT2':
                         self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]
                                          ['transportpce-topology:associated-connection-map-port'], 'XPDR1-NETWORK2')
 
                 self.assertTrue(client == 2)
                 self.assertTrue(network == 2)
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-SRG1'):
+            elif nodeId == 'ROADM-A1-SRG1':
                 # Test related to SRG1
                 self.assertEqual(nodeType, 'SRG')
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
@@ -246,7 +246,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-SRG3'):
+            elif nodeId == 'ROADM-A1-SRG3':
                 # Test related to SRG1
                 self.assertEqual(nodeType, 'SRG')
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
@@ -257,7 +257,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-DEG1'):
+            elif nodeId == 'ROADM-A1-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'},
@@ -267,7 +267,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-DEG2'):
+            elif nodeId == 'ROADM-A1-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'},
@@ -315,23 +315,23 @@ class TransportPCEtesting(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)
@@ -384,7 +384,7 @@ class TransportPCEtesting(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')
@@ -401,17 +401,17 @@ class TransportPCEtesting(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 == 'XPDR-A1'):
+            if nodeId == 'XPDR-A1':
                 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'], 'model2')
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1'):
+            elif nodeId == 'ROADM-A1':
                 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'], 'model2')
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-C1'):
+            elif nodeId == 'ROADM-C1':
                 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'], 'model2')
@@ -450,27 +450,27 @@ class TransportPCEtesting(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)
@@ -494,13 +494,13 @@ class TransportPCEtesting(unittest.TestCase):
                    'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-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)
@@ -520,7 +520,7 @@ class TransportPCEtesting(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 == 'XPDR-A1-XPDR1'):
+            if nodeId == 'XPDR-A1-XPDR1':
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 self.assertEqual(nodeType, 'XPONDER')
@@ -531,14 +531,14 @@ class TransportPCEtesting(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 == 2)
                 self.assertTrue(network == 2)
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-SRG1'):
+            elif nodeId == 'ROADM-A1-SRG1':
                 # Test related to SRG1
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
                 self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'},
@@ -549,7 +549,7 @@ class TransportPCEtesting(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 == 'ROADM-A1-SRG3'):
+            elif nodeId == 'ROADM-A1-SRG3':
                 # Test related to SRG1
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
                 self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'},
@@ -560,7 +560,7 @@ class TransportPCEtesting(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 == 'ROADM-A1-DEG1'):
+            elif nodeId == 'ROADM-A1-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'])
@@ -570,7 +570,7 @@ class TransportPCEtesting(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 == 'ROADM-A1-DEG2'):
+            elif nodeId == 'ROADM-A1-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'])
@@ -580,7 +580,7 @@ class TransportPCEtesting(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 == 'ROADM-C1-SRG1'):
+            elif nodeId == 'ROADM-C1-SRG1':
                 # Test related to SRG1
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
                 self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'},
@@ -591,7 +591,7 @@ class TransportPCEtesting(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 == 'ROADM-C1-DEG1'):
+            elif nodeId == 'ROADM-C1-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'])
@@ -601,7 +601,7 @@ class TransportPCEtesting(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 == 'ROADM-C1-DEG2'):
+            elif nodeId == 'ROADM-C1-DEG2':
                 # Test related to DEG1
                 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'])
@@ -687,9 +687,9 @@ class TransportPCEtesting(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')
@@ -766,13 +766,13 @@ class TransportPCEtesting(unittest.TestCase):
                    'ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-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)
@@ -870,14 +870,14 @@ class TransportPCEtesting(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 == 'XPDR-A1-XPDR1'):
+            if nodeId == 'XPDR-A1-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]
@@ -887,7 +887,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-SRG1'):
+            elif nodeId == 'ROADM-A1-SRG1':
                 # Test related to SRG1
                 self.assertEqual(nodeType, 'SRG')
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
@@ -898,7 +898,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-SRG3'):
+            elif nodeId == 'ROADM-A1-SRG3':
                 # Test related to SRG1
                 self.assertEqual(nodeType, 'SRG')
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
@@ -909,7 +909,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-DEG1'):
+            elif nodeId == 'ROADM-A1-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'},
@@ -919,7 +919,7 @@ class TransportPCEtesting(unittest.TestCase):
                 self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'},
                               res['network'][0]['node'][i]['supporting-node'])
                 listNode.remove(nodeId)
-            elif(nodeId == 'ROADM-A1-DEG2'):
+            elif nodeId == 'ROADM-A1-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'},
@@ -991,7 +991,7 @@ class TransportPCEtesting(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 == 'ROADM-A1-SRG1'):
+            if nodeId == 'ROADM-A1-SRG1':
                 # Test related to SRG1
                 self.assertEqual(nodeType, 'SRG')
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
@@ -1000,7 +1000,7 @@ class TransportPCEtesting(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 == 'ROADM-A1-SRG3'):
+            elif nodeId == 'ROADM-A1-SRG3':
                 # Test related to SRG1
                 self.assertEqual(nodeType, 'SRG')
                 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']), 5)
@@ -1009,7 +1009,7 @@ class TransportPCEtesting(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 == 'ROADM-A1-DEG1'):
+            elif nodeId == 'ROADM-A1-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'},
@@ -1017,7 +1017,7 @@ class TransportPCEtesting(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 == 'ROADM-A1-DEG2'):
+            elif nodeId == 'ROADM-A1-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'},