run autopep8 on functional tests suite

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I84e213e4e8cc3ea623eafe08f9b3a1a3c3d1b861

diff --git a/tests/transportpce_tests/1.2.1/test_portmapping.py b/tests/transportpce_tests/1.2.1/test_portmapping.py
index 04acca17dfd425f5fdf8b1c73e6772a17e400395..301d745580541369f8c41242f6cfd5a6e97951a5 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test_portmapping.py
@@ -312,7 +312,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              'supporting-circuit-pack-name': '1/0/C3-PLUG-CLIENT',
              'logical-connection-point': 'XPDR1-CLIENT3',
              'connection-map-lcp': 'XPDR1-NETWORK2', 'port-direction': 'bidirectional',
-             'port-qual': 'xpdr-client' , 'lcp-hash-val': '64b8effe7ba72211420bf267d0ca1ae7'},
+             'port-qual': 'xpdr-client', 'lcp-hash-val': '64b8effe7ba72211420bf267d0ca1ae7'},
             res['mapping'])
 
     def test_15_xpdr_portmapping_CLIENT4(self):
@@ -328,7 +328,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
             {'supporting-port': 'C4',
              'supporting-circuit-pack-name': '1/0/C4-PLUG-CLIENT',
              'logical-connection-point': 'XPDR1-CLIENT4', 'port-direction': 'bidirectional',
-             'port-qual': 'xpdr-client' , 'lcp-hash-val': '64b8effe7ba72211420bf267d0ca1ae0'},
+             'port-qual': 'xpdr-client', 'lcp-hash-val': '64b8effe7ba72211420bf267d0ca1ae0'},
             res['mapping'])
 
     def test_16_xpdr_device_disconnected(self):

diff --git a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
index 46b957419591c339e1cad6f5b0a1b14a58603357..37bbfabaa6e65a62e115ae3d241d79f56637dbfa 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test_renderer_service_path_nominal.py
@@ -136,18 +136,18 @@ class TransportPCERendererTesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         self.assertIn(
-             {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
-              'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional',
-              'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network',
-              'lcp-hash-val': '3b3ab304d2a6eb3c3623e52746dbb7aa'},
-             res['nodes'][0]['mapping'])
+            {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
+             'logical-connection-point': 'XPDR1-NETWORK1', 'port-direction': 'bidirectional',
+             'connection-map-lcp': 'XPDR1-CLIENT1', 'port-qual': 'xpdr-network',
+             'lcp-hash-val': '3b3ab304d2a6eb3c3623e52746dbb7aa'},
+            res['nodes'][0]['mapping'])
         self.assertIn(
-             {'supporting-port': 'C1',
-              'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
-              'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
-              'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client',
-              'lcp-hash-val': '64b8effe7ba72211420bf267d0ca1ae5'},
-             res['nodes'][0]['mapping'])
+            {'supporting-port': 'C1',
+             'supporting-circuit-pack-name': '1/0/C1-PLUG-CLIENT',
+             'logical-connection-point': 'XPDR1-CLIENT1', 'port-direction': 'bidirectional',
+             'connection-map-lcp': 'XPDR1-NETWORK1', 'port-qual': 'xpdr-client',
+             'lcp-hash-val': '64b8effe7ba72211420bf267d0ca1ae5'},
+            res['nodes'][0]['mapping'])
 
     def test_05_service_path_create(self):
         url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl)

diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
index 0ca2613b3e2c565b868a7c07ba7a5694a04b8584..27f09cd006740c47ae6f109c9b3e2a45d65b47d7 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py
@@ -105,9 +105,9 @@ class TransportPCEtesting(unittest.TestCase):
              'supporting-port': 'CP1-SFP4-P1',
              'supporting-circuit-pack-name': 'CP1-SFP4',
              'logical-connection-point': 'XPDR1-CLIENT1',
-              'port-direction': 'bidirectional',
+             'port-direction': 'bidirectional',
              'port-qual': 'xpdr-client',
-              'lcp-hash-val': '8b3efff522736722500b5e68fb6e696e'},
+             'lcp-hash-val': '8b3efff522736722500b5e68fb6e696e'},
             res['mapping'])
 
     def test_03_get_portmapping_NETWORK1(self):
@@ -204,7 +204,7 @@ class TransportPCEtesting(unittest.TestCase):
         '''
         self.assertDictEqual(input_dict,
                              extract_a_from_b(input_dict,
-                                  res['interface'][0])
+                                              res['interface'][0])
                              )
         self.assertDictEqual(
             {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G',
@@ -278,16 +278,16 @@ class TransportPCEtesting(unittest.TestCase):
         res = response.json()
         self.assertIn(
             {"logical-connection-point": "XPDR1-NETWORK1",
-            "supporting-port": "CP1-CFP0-P1",
-            "supported-interface-capability": [
-                "org-openroadm-port-types:if-OCH-OTU4-ODU4"
-            ],
-            "port-direction": "bidirectional",
-            "port-qual": "xpdr-network",
-            "supporting-circuit-pack-name": "CP1-CFP0",
-            "xponder-type": "mpdr",
-            "supporting-odu4": "XPDR1-NETWORK1-ODU4",
-             "lcp-hash-val": "1021db8d2affe7386705c438c67ea21f"
+             "supporting-port": "CP1-CFP0-P1",
+             "supported-interface-capability": [
+                 "org-openroadm-port-types:if-OCH-OTU4-ODU4"
+             ],
+                "port-direction": "bidirectional",
+                "port-qual": "xpdr-network",
+                "supporting-circuit-pack-name": "CP1-CFP0",
+                "xponder-type": "mpdr",
+                "supporting-odu4": "XPDR1-NETWORK1-ODU4",
+                "lcp-hash-val": "1021db8d2affe7386705c438c67ea21f"
              },
             res['mapping'])
 
@@ -314,7 +314,7 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(input_dict_2,
                              extract_a_from_b(input_dict_2,
                                               res['interface'][0][
-                                                'org-openroadm-otn-odu-interfaces:odu'])
+                                                  'org-openroadm-otn-odu-interfaces:odu'])
 
                              )
         '''
@@ -408,16 +408,16 @@ class TransportPCEtesting(unittest.TestCase):
                         'type': 'org-openroadm-interfaces:otnOdu',
                         'supporting-port': 'CP1-SFP4-P1'}
         input_dict_2 = {
-          'odu-function': 'org-openroadm-otn-common-types:ODU-TTP-CTP',
-          'rate': 'org-openroadm-otn-common-types:ODU2e',
-          'monitoring-mode': 'terminated'}
+            'odu-function': 'org-openroadm-otn-common-types:ODU-TTP-CTP',
+            'rate': 'org-openroadm-otn-common-types:ODU2e',
+            'monitoring-mode': 'terminated'}
 
         self.assertDictEqual(input_dict_1, extract_a_from_b(input_dict_1,
-                                                          res['interface'][0])
+                                                            res['interface'][0])
                              )
         self.assertDictEqual(input_dict_2,
                              extract_a_from_b(input_dict_2, res['interface'][0][
-                               'org-openroadm-otn-odu-interfaces:odu'])
+                                 'org-openroadm-otn-odu-interfaces:odu'])
                              )
 
         '''
@@ -451,9 +451,9 @@ class TransportPCEtesting(unittest.TestCase):
                         'type': 'org-openroadm-interfaces:otnOdu',
                         'supporting-port': 'CP1-CFP0-P1'}
         input_dict_2 = {
-          'odu-function': 'org-openroadm-otn-common-types:ODU-CTP',
-          'rate': 'org-openroadm-otn-common-types:ODU2e',
-          'monitoring-mode': 'monitored'}
+            'odu-function': 'org-openroadm-otn-common-types:ODU-CTP',
+            'rate': 'org-openroadm-otn-common-types:ODU2e',
+            'monitoring-mode': 'monitored'}
 
         input_dict_3 = {'trib-port-number': 1}
 
@@ -464,14 +464,14 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertDictEqual(input_dict_2,
                              extract_a_from_b(input_dict_2,
                                               res['interface'][0][
-                                                'org-openroadm-otn-odu-interfaces:odu']
+                                                  'org-openroadm-otn-odu-interfaces:odu']
                                               ))
 
         self.assertDictEqual(input_dict_3,
                              extract_a_from_b(input_dict_3,
                                               res['interface'][0][
-                                                'org-openroadm-otn-odu-interfaces:odu'][
-                                                'parent-odu-allocation']))
+                                                  'org-openroadm-otn-odu-interfaces:odu'][
+                                                  'parent-odu-allocation']))
 
         '''
         self.assertDictContainsSubset({'name': 'XPDR1-NETWORK1-ODU2e-service1', 'administrative-state': 'inService',
@@ -489,8 +489,8 @@ class TransportPCEtesting(unittest.TestCase):
         '''
         self.assertIn(1,
                       res['interface'][0][
-                        'org-openroadm-otn-odu-interfaces:odu'][
-                        'parent-odu-allocation']['trib-slots'])
+                          'org-openroadm-otn-odu-interfaces:odu'][
+                          'parent-odu-allocation']['trib-slots'])
 
     def test_15_check_ODU2E_connection(self):
         url = ("{}/config/network-topology:network-topology/topology/topology-netconf/"
@@ -503,9 +503,9 @@ class TransportPCEtesting(unittest.TestCase):
         self.assertEqual(response.status_code, requests.codes.ok)
         res = response.json()
         input_dict_1 = {
-          'connection-name':
+            'connection-name':
             'XPDR1-CLIENT1-ODU2e-service1-x-XPDR1-NETWORK1-ODU2e-service1',
-          'direction': 'bidirectional'
+            'direction': 'bidirectional'
         }
 
         self.assertDictEqual(input_dict_1,