Fix more and more pylint warnings

JIRA: TRNSPRTPCE-320
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I018b69e8b73abba2faac4a1e5ae332010b13e9b3

diff --git a/tests/transportpce_tests/1.2.1/test03_topology.py b/tests/transportpce_tests/1.2.1/test03_topology.py
index 850867cbf323e0a151b50ee3f00876c3ee3662e0..d3050f16efc868478d04cddf1be04ce7be7ce0f3 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test03_topology.py
+++ b/tests/transportpce_tests/1.2.1/test03_topology.py
@@ -161,8 +161,8 @@ class TransportPCETopologyTesting(unittest.TestCase):
                 (check_list[linkType]).remove(linkId)
             else:
                 self.assertFalse(True)
-        for link_type in check_list:
-            self.assertEqual(len(check_list[link_type]), 0)
+        for val in check_list.values():
+            self.assertEqual(len(val), 0)
 
     def test_05_getNodes_OpenRoadmTopology(self):
         # pylint: disable=redundant-unittest-assert
@@ -323,8 +323,8 @@ class TransportPCETopologyTesting(unittest.TestCase):
                 (check_list[linkType]).remove(linkId)
             else:
                 self.assertFalse(True)
-        for link_type in check_list:
-            self.assertEqual(len(check_list[link_type]), 0)
+        for val in check_list.values():
+            self.assertEqual(len(val), 0)
 
     def test_13_connect_ROADMC(self):
         response = test_utils.mount_device("ROADMC01", ('roadmc', self.NODE_VERSION))
@@ -437,8 +437,8 @@ class TransportPCETopologyTesting(unittest.TestCase):
                 (check_list[linkType]).remove(linkId)
             else:
                 self.assertFalse(True)
-        for link_type in check_list:
-            self.assertEqual(len(check_list[link_type]), 0)
+        for val in check_list.values():
+            self.assertEqual(len(val), 0)
 
     def test_19_getLinkOmsAttributesOpenRoadmTopology(self):
         response = test_utils.get_ordm_topo_request("")
@@ -846,8 +846,8 @@ class TransportPCETopologyTesting(unittest.TestCase):
                 (check_list[linkType]).remove(linkId)
             else:
                 roadmtoroadmLink += 1
-        for link_type in check_list:
-            self.assertEqual(len(check_list[link_type]), 0)
+        for val in check_list.values():
+            self.assertEqual(len(val), 0)
         self.assertEqual(roadmtoroadmLink, 6)
         for i in range(0, nbLink):
             self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]

diff --git a/tests/transportpce_tests/2.2.1/test03_topology.py b/tests/transportpce_tests/2.2.1/test03_topology.py
index d61526cc5e75d455f45e501dbaf9ade9013df274..43bdbd6731bcf60b2625ebb3a49a7b9a86f3630c 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test03_topology.py
+++ b/tests/transportpce_tests/2.2.1/test03_topology.py
@@ -163,8 +163,8 @@ class TransportPCEtesting(unittest.TestCase):
                 (check_list[linkType]).remove(linkId)
             else:
                 self.assertFalse(True)
-        for link_type in check_list:
-            self.assertEqual(len(check_list[link_type]), 0)
+        for val in check_list.values():
+            self.assertEqual(len(val), 0)
 
     def test_05_getNodes_OpenRoadmTopology(self):
         # pylint: disable=redundant-unittest-assert
@@ -323,8 +323,8 @@ class TransportPCEtesting(unittest.TestCase):
                 (check_list[linkType]).remove(linkId)
             else:
                 self.assertFalse(True)
-        for link_type in check_list:
-            self.assertEqual(len(check_list[link_type]), 0)
+        for val in check_list.values():
+            self.assertEqual(len(val), 0)
 
     def test_13_connect_ROADMC(self):
         response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
@@ -438,8 +438,8 @@ class TransportPCEtesting(unittest.TestCase):
                 (check_list[linkType]).remove(linkId)
             else:
                 self.assertFalse(True)
-        for link_type in check_list:
-            self.assertEqual(len(check_list[link_type]), 0)
+        for val in check_list.values():
+            self.assertEqual(len(val), 0)
 
     def test_19_getLinkOmsAttributesOpenRoadmTopology(self):
         response = test_utils.get_ordm_topo_request("")
@@ -850,8 +850,8 @@ class TransportPCEtesting(unittest.TestCase):
                 (check_list[linkType]).remove(linkId)
             else:
                 roadmtoroadmLink += 1
-        for link_type in check_list:
-            self.assertEqual(len(check_list[link_type]), 0)
+        for val in check_list.values():
+            self.assertEqual(len(val), 0)
         self.assertEqual(roadmtoroadmLink, 6)
         for i in range(0, nbLink):
             self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]

diff --git a/tests/transportpce_tests/2.2.1/test05_flex_grid.py b/tests/transportpce_tests/2.2.1/test05_flex_grid.py
index 1fc4a37240c277519039dfba7699920d86fa5d19..73411e7952c95203ac6d45acd9b90d2da240a2c4 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test05_flex_grid.py
+++ b/tests/transportpce_tests/2.2.1/test05_flex_grid.py
@@ -9,6 +9,8 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+# pylint: disable=no-member
+
 import unittest
 import time
 import requests
@@ -32,6 +34,7 @@ class TransportPCEPortMappingTesting(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")

diff --git a/tests/transportpce_tests/2.2.1/test10_tapi.py b/tests/transportpce_tests/2.2.1/test10_tapi.py
index 2faec1bd12b72e816015df463b764c27dee886a1..6b5ef4b41b3898b666619b5a08a51a8438deb709 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test10_tapi.py
+++ b/tests/transportpce_tests/2.2.1/test10_tapi.py
@@ -775,8 +775,8 @@ def find_object_with_key(list_dicts, key, value):
 
 def count_object_with_double_key(list_dicts, key1, key2, value):
     nb = 0
-    for dict in list_dicts:
-        if dict[key1][0][key2] == value:
+    for dictio in list_dicts:
+        if dictio[key1][0][key2] == value:
             nb += 1
     return nb
 

diff --git a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
index 5237668f1d4390f2c48265e325173f365dd3a0da..9d6bcd84b6efe67fdd52275c87977655d6246d57 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test11_otn_end2end.py
@@ -566,7 +566,7 @@ 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 node['node-id'] == 'SPDR-SC1-XPDR1':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR1-NETWORK1':
@@ -816,7 +816,7 @@ 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 node['node-id'] == 'SPDR-SC1-XPDR1':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR1-NETWORK1':
@@ -886,7 +886,7 @@ 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 node['node-id'] == 'SPDR-SC1-XPDR1':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR1-NETWORK1':
@@ -922,7 +922,7 @@ 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 node['node-id'] == 'SPDR-SC1-XPDR1':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR1-NETWORK1':
@@ -1372,7 +1372,7 @@ 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-XPDR3' or 'SPDR-SC1-XPDR3':
+            if node['node-id'] == 'SPDR-SA1-XPDR3' or node['node-id'] == 'SPDR-SC1-XPDR3':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR3-NETWORK1':
@@ -1442,7 +1442,7 @@ 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-XPDR3' or 'SPDR-SC1-XPDR3'):
+            if node['node-id'] == 'SPDR-SA1-XPDR3' or node['node-id'] == 'SPDR-SC1-XPDR3':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR3-NETWORK1':

diff --git a/tests/transportpce_tests/2.2.1/test13_tapi_full_multi_layer.py b/tests/transportpce_tests/2.2.1/test13_tapi_full_multi_layer.py
index 8987dedb2f2cdd3c3e74a4efcfd484cd0c588f81..75225611032bc4e5c1457cc2b87e1ab4d22c0088 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test13_tapi_full_multi_layer.py
+++ b/tests/transportpce_tests/2.2.1/test13_tapi_full_multi_layer.py
@@ -85,6 +85,7 @@ class TransportPCEtesting(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
+        # pylint: disable=unsubscriptable-object
         cls.init_failed = False
         os.environ['JAVA_MIN_MEM'] = '1024M'
         os.environ['JAVA_MAX_MEM'] = '4096M'

diff --git a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
index b6d2612ec63c3d989ac819e75d7e0946136cfdc1..988d4240802477832f749df31e76dadb2c2f42ce 100644 (file)
--- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
+++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
@@ -589,7 +589,7 @@ 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'] == 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2':
+            if node['node-id'] == 'XPDR-A2-XPDR2' or node['node-id'] == 'XPDR-C2-XPDR2':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR2-NETWORK1':
@@ -845,7 +845,7 @@ 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'] == 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2':
+            if node['node-id'] == 'XPDR-A2-XPDR2' or node['node-id'] == 'XPDR-C2-XPDR2':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR2-NETWORK1':
@@ -919,7 +919,7 @@ 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'] == 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2':
+            if node['node-id'] == 'XPDR-A2-XPDR2' or node['node-id'] == 'XPDR-C2-XPDR2':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR2-NETWORK1':
@@ -997,7 +997,7 @@ 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'] == 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2'):
+            if node['node-id'] == 'XPDR-A2-XPDR2' or node['node-id'] == 'XPDR-C2-XPDR2':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR2-NETWORK1':
@@ -1033,7 +1033,7 @@ 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'] == 'XPDR-A2-XPDR2' or 'XPDR-C2-XPDR2':
+            if node['node-id'] == 'XPDR-A2-XPDR2' or node['node-id'] == 'XPDR-C2-XPDR2':
                 tpList = node['ietf-network-topology:termination-point']
                 for tp in tpList:
                     if tp['tp-id'] == 'XPDR2-NETWORK1':

diff --git a/tests/transportpce_tests/pce/test02_pce_400G.py b/tests/transportpce_tests/pce/test02_pce_400G.py
index d4f05705aa49b75b39a1052cf592d4e79be36738..afe3b9a157d59da771791b95f8d3ad387118f5e7 100644 (file)
--- a/tests/transportpce_tests/pce/test02_pce_400G.py
+++ b/tests/transportpce_tests/pce/test02_pce_400G.py
@@ -32,6 +32,7 @@ class TransportPCE400Gtesting(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
+        # pylint: disable=bare-except
         try:
             sample_files_parsed = False
             TOPO_BI_DIR_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)),

diff --git a/tests/transportpce_tests/with_docker/test02_nbinotifications.py b/tests/transportpce_tests/with_docker/test02_nbinotifications.py
index a5be915c28da2e667c69eeb4c3bb0c485bc0e9f3..235f75ef742936ce2e5e8bab49a9dc23bbcb4c72 100644 (file)
--- a/tests/transportpce_tests/with_docker/test02_nbinotifications.py
+++ b/tests/transportpce_tests/with_docker/test02_nbinotifications.py
@@ -120,6 +120,7 @@ class TransportNbiNotificationstesting(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
+        # pylint: disable=unsubscriptable-object
         # TODO: for lighty manage the activation of NBI notification feature
         cls.init_failed = False
         cls.processes = test_utils.start_tpce()