fix some pylint issues

[transportpce.git] / tests / transportpce_tests / 2.2.1 / test_otn_topology.py

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..bc2c28a901014c22e419add735a2d36a0cdca4ec 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_topology.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py
@@ -30,6 +30,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     @classmethod
     def tearDownClass(cls):
+        # pylint: disable=not-an-iterable
         for process in cls.processes:
             test_utils.shutdown_process(process)
         print("all processes killed")
@@ -77,19 +78,20 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertNotIn('ietf-network-topology:link', res['network'][0])
 
     def test_05_getNodes_OpenRoadmTopology(self):
+        # pylint: disable=redundant-unittest-assert
         response = test_utils.get_ordm_topo_request("")
         res = response.json()
         # Tests related to nodes
         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 +103,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 +122,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)
@@ -138,6 +140,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertNotIn('ietf-network-topology:link', res['network'][0])
 
     def test_07_getNodes_OtnTopology(self):
+        # pylint: disable=redundant-unittest-assert
         response = test_utils.get_otn_topo_request()
         res = response.json()
         self.assertEqual(response.status_code, requests.codes.ok)
@@ -146,7 +149,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 +167,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 +177,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 +202,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 +226,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 +236,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']