Fix remaining pylint warnings apart fixme & dup

[transportpce.git] / tests / transportpce_tests / 1.2.1 / test06_end2end.py

diff --git a/tests/transportpce_tests/1.2.1/test06_end2end.py b/tests/transportpce_tests/1.2.1/test06_end2end.py
index c8f4eac61a76ce552fb7e2d1fd6259e0cfea38c5..a9f84435c421c1f3dd358b4c396b412f8f8ee1ab 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test06_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test06_end2end.py
@@ -309,9 +309,9 @@ class TransportPCEFulltesting(unittest.TestCase):
                 self.assertEqual({'frequency': 196.1,
                                   'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-            if ele['tp-id'] == 'XPDR1-CLIENT2' or ele['tp-id'] == 'XPDR1-CLIENT1':
+            elif ele['tp-id'] in ('XPDR1-CLIENT2', 'XPDR1-CLIENT1'):
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
-            if ele['tp-id'] == 'XPDR1-NETWORK2':
+            elif ele['tp-id'] == 'XPDR1-NETWORK2':
                 self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
         time.sleep(3)
 
@@ -330,7 +330,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                     ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-            if ele['tp-id'] == 'SRG1-PP2-TXRX':
+            elif ele['tp-id'] == 'SRG1-PP2-TXRX':
                 self.assertNotIn('avail-freq-maps', dict.keys(ele))
         time.sleep(3)
 
@@ -349,7 +349,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                     ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-            if ele['tp-id'] == 'DEG2-TTP-TXRX':
+            elif ele['tp-id'] == 'DEG2-TTP-TXRX':
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
@@ -448,11 +448,11 @@ class TransportPCEFulltesting(unittest.TestCase):
                 self.assertEqual({'frequency': 196.1,
                                   'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-            if ele['tp-id'] == 'XPDR1-NETWORK2':
+            elif ele['tp-id'] == 'XPDR1-NETWORK2':
                 self.assertEqual({'frequency': 196.05,
                                   'width': 40},
                                  ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-            if ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT2':
+            elif ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT2'):
                 self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
         time.sleep(10)
 
@@ -473,13 +473,13 @@ class TransportPCEFulltesting(unittest.TestCase):
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
                 self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
-            if ele['tp-id'] == 'SRG1-PP2-TXRX':
+            elif ele['tp-id'] == 'SRG1-PP2-TXRX':
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
                 self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-            if ele['tp-id'] == 'SRG1-PP3-TXRX':
+            elif ele['tp-id'] == 'SRG1-PP3-TXRX':
                 self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
         time.sleep(10)
 
@@ -500,7 +500,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
                 self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-            if ele['tp-id'] == 'DEG2-TTP-TXRX':
+            elif ele['tp-id'] == 'DEG2-TTP-TXRX':
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]
@@ -567,15 +567,12 @@ class TransportPCEFulltesting(unittest.TestCase):
         res = response.json()
         liste_tp = res['node'][0]['ietf-network-topology:termination-point']
         for ele in liste_tp:
-            if ((ele['org-openroadm-common-network:tp-type'] ==
-                 'XPONDER-CLIENT')
-                    and (ele['tp-id'] == 'XPDR1-CLIENT1' or ele[
-                        'tp-id'] == 'XPDR1-CLIENT3')):
+            if (ele['org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT'
+                    and ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT3')):
                 self.assertNotIn(
                     'org-openroadm-network-topology:xpdr-client-attributes',
                     dict.keys(ele))
-            elif (ele['org-openroadm-common-network:tp-type'] ==
-                  'XPONDER-NETWORK'):
+            elif ele['org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK':
                 self.assertIn('tail-equipment-id', dict.keys(
                     ele['org-openroadm-network-topology:'
                         'xpdr-network-attributes']))
@@ -628,7 +625,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                 freq_map_array = [int(x) for x in freq_map]
                 self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
                 self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
-            if ele['tp-id'] == 'DEG2-TTP-TXRX':
+            elif ele['tp-id'] == 'DEG2-TTP-TXRX':
                 freq_map = base64.b64decode(
                     ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                 freq_map_array = [int(x) for x in freq_map]