fix flake8 issues

In order to start with a clean state, correct all flake8 issues.

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
Change-Id: I77095c6c6ef0ac246aa406102052468274c7a195

Author: EstherLerouzic

gnpy/core/elements.py

@@ -1204,8 +1204,8 @@ def to_json(self):
     def __str__(self):
         if hasattr(self, "estimated_gain"):
             return super().__str__() + f'\n  reference gain (dB):         {round(self.estimated_gain, 2)}' \
-                + f'\n  actual gain (dB):            {round(self.actual_raman_gain, 2)}'
-        return super().__str__() + f'\n  actual gain (dB):            {round(self.actual_raman_gain, 2)}'
+                + f'\n  actual gain (dB):            {round(self.actual_raman_gain, 2)}'    # noqa E241
+        return super().__str__() + f'\n  actual gain (dB):            {round(self.actual_raman_gain, 2)}'    # noqa E241
 
     def propagate(self, spectral_info: SpectralInformation):
         """Modifies the spectral information computing the attenuation, the non-linear interference generation,

gnpy/core/network.py

@@ -1921,17 +1921,17 @@ def split_fiber(network, fiber, bounds, target_length):
     ypos = [prev_node.lat + (next_node.lat - prev_node.lat) * (n + 0.5) / n_spans for n in range(n_spans)]
     for span, lng, lat in zip(range(n_spans), xpos, ypos):
         new_span = elements.Fiber(
-            uid=f'{fiber.uid}_({span+1}/{n_spans})',
-            type_variety=fiber.type_variety,
-            metadata={
+            uid=f'{fiber.uid}_({span + 1}/{n_spans})',
+            type_variety=fiber.type_variety,   # noqa E226
+            metadata={    # noqa E226
                 'location': {
                     'latitude': lat,
                     'longitude': lng,
                     'city': fiber.loc.city,
                     'region': fiber.loc.region,
                 }
             },
-            params=fiber.params.asdict())
+            params=fiber.params.asdict())    # noqa E226
         if isinstance(prev_node, elements.Fiber):
             edgeweight = prev_node.params.length
         else:

gnpy/tools/cli_examples.py

@@ -159,7 +159,7 @@ def _add_common_options(parser: argparse.ArgumentParser, network_default: Path):
                         metavar=_help_fname_json,
                         help='List of additional config files as referenced in equipment files with '
                              '"advanced_config_from_json" or "default_config_from_json".'
-                             f'Existing configs:\n{_default_config_files}')
+                             f'Existing configs: \n{_default_config_files}')
 
 
 def _infer_trx(target_roadm_uid: str, all_roadms: Dict, network: DiGraph):
@@ -333,7 +333,7 @@ def _get_rq_from_service(service: Path, route_id: str, network, equipment,
             baud_rate_ghz = rqs[0].baud_rate * 1e-9  # Convert to GHz
             spacing_ghz = rqs[0].spacing * 1e-9  # Convert to GHz
             msg = 'Choosing first compatible mode.' \
-                + f'Selected mode: {mode_name}, Baud rate: {baud_rate_ghz:.2f} GHz, Spacing: {spacing_ghz:.2f} GHz'
+                + f'Selected mode: {mode_name}, Baud rate: {baud_rate_ghz:.2f} GHz, Spacing: {spacing_ghz:.2f} GHz'  # noqa E231
             _logger.warning(msg)
 
         else:
@@ -616,13 +616,13 @@ def path_requests_run(args=None):
         _, propagatedpths, reversed_propagatedpths, rqs, dsjn, result = \
             planning(network, equipment, data, redesign=args.redesign_per_request, user_policy=user_policy)
     except exceptions.NetworkTopologyError as e:
-        print(f'{ansi_escapes.red}Invalid network definition:{ansi_escapes.reset} {e}')
+        print(f'{ansi_escapes.red}Invalid network definition: {ansi_escapes.reset}{e}')
         sys.exit(1)
     except exceptions.ConfigurationError as e:
-        print(f'{ansi_escapes.red}Configuration error:{ansi_escapes.reset} {e}')
+        print(f'{ansi_escapes.red}Configuration error: {ansi_escapes.reset}{e}')
         sys.exit(1)
     except exceptions.DisjunctionError as this_e:
-        print(f'{ansi_escapes.red}Disjunction error:{ansi_escapes.reset} {this_e}')
+        print(f'{ansi_escapes.red}Disjunction error: {ansi_escapes.reset}{this_e}')
         sys.exit(1)
     except exceptions.ServiceError as e:
         print(f'Service error: {e}')
@@ -667,18 +667,18 @@ def path_requests_run(args=None):
         try:
             id_request = rqs[i].request_id[0:min(30, len(rqs[i].request_id))]
             if rqs[i].blocking_reason in BLOCKING_NOPATH:
-                line = [f'{id_request}', f' {rqs[i].source} to {rqs[i].destination} :',
+                line = [f'{id_request}', f' {rqs[i].source} to {rqs[i].destination}: ',
                         '-', '-', '-', f'{rqs[i].tsp_mode}', f'{round(rqs[i].path_bandwidth * 1e-9, 2)}',
                         '-', '{rqs[i].blocking_reason}']
             else:
-                line = [f'{id_request}', f' {rqs[i].source} to {rqs[i].destination} : ', psnrb,
+                line = [f'{id_request}', f' {rqs[i].source} to {rqs[i].destination}: ', psnrb,
                         psnr, posnrb, posnr, '-', f'{rqs[i].tsp_mode}', f'{round(rqs[i].path_bandwidth * 1e-9, 2)}',
                         '-', f'{rqs[i].blocking_reason}']
         except AttributeError:
-            line = [f'{id_request}', f' {rqs[i].source} to {rqs[i].destination} : ', psnrb,
+            line = [f'{id_request}', f' {rqs[i].source} to {rqs[i].destination}: ', psnrb,
                     psnr, posnrb, posnr, f'{rqs[i].OSNR + equipment["SI"]["default"].sys_margins}',
                     f'{rqs[i].tsp_mode}', f'{round(rqs[i].path_bandwidth * 1e-9, 2)}',
-                    f'{ceil(rqs[i].path_bandwidth / rqs[i].bit_rate)}', f'({rqs[i].N},{rqs[i].M})']
+                    f'{ceil(rqs[i].path_bandwidth / rqs[i].bit_rate)}', f'({rqs[i].N},{rqs[i].M})']  # noqa E231
         data.append(line)
 
     df = pd.DataFrame(data, columns=header)

gnpy/topology/request.py

@@ -584,7 +584,7 @@ def jsontocsv(json_data, equipment, fileout):
     nb_tsp_field = 'nb of tsp pairs'
     rev_path_metric_fields = ('reversed path OSNR-0.1nm (average)', 'reversed path SNR-0.1nm (average)',
                               'reversed path SNR-bandwidth (average)', 'reversed path SNR-0.1nm (min)',
-                              'reversed path SNR-0.1nm (max)','reversed path PDL_penalty', 'reversed path CD_penalty',
+                              'reversed path SNR-0.1nm (max)', 'reversed path PDL_penalty', 'reversed path CD_penalty',
                               'reversed path PMD_penalty')
     path_metric_fields = ('OSNR-0.1nm (average)', 'SNR-0.1nm (average)', 'SNR-bandwidth (average)',
                           'SNR-0.1nm (min)', 'SNR-0.1nm (max)', 'PDL_penalty', 'CD_penalty', 'PMD_penalty',
@@ -616,8 +616,8 @@ def jsontocsv(json_data, equipment, fileout):
                 # - label (N,M)
                 # - transponder for source and destination only
                 # as spectrum assignment is not performed for blocked demands: there is no label object in the answer
-                # so the hop_attribute with trx_type and mode is second object or last object, while id of hop is first and
-                # penultimate
+                # so the hop_attribute with trx_type and mode is second object or last object, while id of hop is first
+                # and penultimate
                 no_path_properties = pth_el['no-path']['path-properties']
                 values['source'], values['destination'], values['transponder-type'], values['transponder-mode'] = \
                     _get_srce_dest_trx(no_path_properties['path-route-objects'], 1, -2)
@@ -1171,7 +1171,7 @@ def compute_path_with_disjunction(network, equipment, pathreqlist, pathlist, red
                 min_ind = argmin(snr01nm_with_penalty)
                 if round(snr01nm_with_penalty[min_ind], 2) < pathreq.OSNR + equipment['SI']['default'].sys_margins:
                     msg = f'\tWarning! Request {pathreq.request_id} computed path from' \
-                          + f' {pathreq.source} to {pathreq.destination} does not pass with {pathreq.tsp_mode}'
+                        + f' {pathreq.source} to {pathreq.destination} does not pass with {pathreq.tsp_mode}'
                     msg = penalty_msg(total_path[-1], msg, min_ind, pathreq.OSNR,
                                       equipment["SI"]["default"].sys_margins)
                     LOGGER.warning(msg)
@@ -1220,7 +1220,7 @@ def compute_path_with_disjunction(network, equipment, pathreqlist, pathlist, red
                 min_ind = argmin(snr01nm_with_penalty)
                 if round(snr01nm_with_penalty[min_ind], 2) < pathreq.OSNR + equipment['SI']['default'].sys_margins:
                     msg = f'\tWarning! Request {pathreq.request_id} computed path from' \
-                          + f' {pathreq.destination} to {pathreq.source} does not pass with {pathreq.tsp_mode}'
+                        + f' {pathreq.destination} to {pathreq.source} does not pass with {pathreq.tsp_mode}'
                     msg = penalty_msg(rev_p[-1], msg, min_ind, pathreq.OSNR, equipment["SI"]["default"].sys_margins)
                     LOGGER.warning(msg)
                     # TODO selection of mode should also be on reversed direction !!

gnpy/topology/spectrum_assignment.py

@@ -73,7 +73,8 @@ def __init__(self, f_min, f_max, grid, guardband=DEFAULT_GUARDBAND, bitmap=None)
         elif len(bitmap) == len(self.freq_index):
             self.bitmap = bitmap
         else:
-            raise SpectrumError(f'bitmap is not consistant with f_min{f_min} - n: {n_min} and f_max{f_max} - n:{n_max}')
+            raise SpectrumError(
+                f'bitmap is not consistant with f_min{f_min} - n: {n_min} and f_max{f_max} - n: {n_max}')
 
     def getn(self, i):
         """converts the n (itu grid) into a local index"""

tests/invocation/path_requests_run

@@ -125,16 +125,16 @@
 	loose-list:	[]
 ]
 Result summary
-+----------+--------------------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------+
-|  req id  |                demand                |  GSNR@bandwidth  |  GSNR@0.1nm  |  OSNR@bandwidth  |  OSNR@0.1nm  |  Receiver  |  mode  |  Gbit/s  |   nb of     |      N,M or       |
-|          |                                      |    A-Z (Z-A)     |  A-Z (Z-A)   |    A-Z (Z-A)     |  A-Z (Z-A)   |  minOSNR   |        |          |  tsp pairs  |  blocking reason  |
-|----------+--------------------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------|
-|    0     | trx Lorient_KMA to trx Vannes_KBE :  |      24.83       |    28.92     |      24.83       |    28.92     |     14     | mode 1 |   100    |      1      |   ([-284],[4])    |
-|    1     |  trx Brest_KLA to trx Vannes_KBE :   |      17.73       |    21.81     |      18.56       |    22.65     |     14     | mode 1 |   200    |      2      |   ([-272],[8])    |
-|    3     | trx Lannion_CAS to trx Rennes_STA :  |      22.18       |    26.26     |      25.14       |    29.23     |     13     | mode 1 |    60    |      1      |   ([-284],[4])    |
-|    4     | trx Rennes_STA to trx Lannion_CAS :  |      16.04       |    23.27     |      16.58       |    23.81     |     17     | mode 2 |   150    |      1      |   ([-258],[6])    |
-|    5     | trx Rennes_STA to trx Lannion_CAS :  |      20.27       |     27.5     |      22.65       |    29.88     |     17     | mode 2 |    20    |      1      |   ([-274],[6])    |
-|  7 | 6   | trx Lannion_CAS to trx Lorient_KMA : |      19.52       |     23.6     |       19.8       |    23.89     |     14     | mode 1 |   700    |      7      |   ([-224],[28])   |
-|    7b    | trx Lannion_CAS to trx Lorient_KMA : |      19.61       |    23.69     |      19.81       |    23.89     |     14     | mode 1 |   400    |      4      |   ([-172],[24])   |
-+----------+--------------------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------+
++----------+-------------------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------+
+|  req id  |               demand                |  GSNR@bandwidth  |  GSNR@0.1nm  |  OSNR@bandwidth  |  OSNR@0.1nm  |  Receiver  |  mode  |  Gbit/s  |   nb of     |      N,M or       |
+|          |                                     |    A-Z (Z-A)     |  A-Z (Z-A)   |    A-Z (Z-A)     |  A-Z (Z-A)   |  minOSNR   |        |          |  tsp pairs  |  blocking reason  |
+|----------+-------------------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------|
+|    0     | trx Lorient_KMA to trx Vannes_KBE:  |      24.83       |    28.92     |      24.83       |    28.92     |     14     | mode 1 |   100    |      1      |   ([-284],[4])    |
+|    1     |  trx Brest_KLA to trx Vannes_KBE:   |      17.73       |    21.81     |      18.56       |    22.65     |     14     | mode 1 |   200    |      2      |   ([-272],[8])    |
+|    3     | trx Lannion_CAS to trx Rennes_STA:  |      22.18       |    26.26     |      25.14       |    29.23     |     13     | mode 1 |    60    |      1      |   ([-284],[4])    |
+|    4     | trx Rennes_STA to trx Lannion_CAS:  |      16.04       |    23.27     |      16.58       |    23.81     |     17     | mode 2 |   150    |      1      |   ([-258],[6])    |
+|    5     | trx Rennes_STA to trx Lannion_CAS:  |      20.27       |     27.5     |      22.65       |    29.88     |     17     | mode 2 |    20    |      1      |   ([-274],[6])    |
+|  7 | 6   | trx Lannion_CAS to trx Lorient_KMA: |      19.52       |     23.6     |       19.8       |    23.89     |     14     | mode 1 |   700    |      7      |   ([-224],[28])   |
+|    7b    | trx Lannion_CAS to trx Lorient_KMA: |      19.61       |    23.69     |      19.81       |    23.89     |     14     | mode 1 |   400    |      4      |   ([-172],[24])   |
++----------+-------------------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------+
 Result summary shows mean GSNR and OSNR (average over all channels)

tests/invocation/path_requests_run_CD_PMD_PDL_missing

@@ -17,10 +17,10 @@
 	loose-list:	[]
 ]
 Result summary
-+----------+-----------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------+
-|  req id  |           demand            |  GSNR@bandwidth  |  GSNR@0.1nm  |  OSNR@bandwidth  |  OSNR@0.1nm  |  Receiver  |  mode  |  Gbit/s  |   nb of     |      N,M or       |
-|          |                             |    A-Z (Z-A)     |  A-Z (Z-A)   |    A-Z (Z-A)     |  A-Z (Z-A)   |  minOSNR   |        |          |  tsp pairs  |  blocking reason  |
-|----------+-----------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------|
-|    0     | trx Abilene to trx Albany : |       8.92       |    14.39     |       9.64       |    15.11     |     -      | mode 3 |   100    |      -      | MODE_NOT_FEASIBLE |
-+----------+-----------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------+
++----------+----------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------+
+|  req id  |           demand           |  GSNR@bandwidth  |  GSNR@0.1nm  |  OSNR@bandwidth  |  OSNR@0.1nm  |  Receiver  |  mode  |  Gbit/s  |   nb of     |      N,M or       |
+|          |                            |    A-Z (Z-A)     |  A-Z (Z-A)   |    A-Z (Z-A)     |  A-Z (Z-A)   |  minOSNR   |        |          |  tsp pairs  |  blocking reason  |
+|----------+----------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------|
+|    0     | trx Abilene to trx Albany: |       8.92       |    14.39     |       9.64       |    15.11     |     -      | mode 3 |   100    |      -      | MODE_NOT_FEASIBLE |
++----------+----------------------------+------------------+--------------+------------------+--------------+------------+--------+----------+-------------+-------------------+
 Result summary shows mean GSNR and OSNR (average over all channels)

tests/invocation/path_requests_run_extra_equipment

@@ -17,10 +17,10 @@
 	loose-list:	[]
 ]
 Result summary
-+----------+------------------------------------+------------------+--------------+------------------+--------------+------------+-----------+----------+-------------+-------------------+
-|  req id  |               demand               |  GSNR@bandwidth  |  GSNR@0.1nm  |  OSNR@bandwidth  |  OSNR@0.1nm  |  Receiver  |   mode    |  Gbit/s  |   nb of     |      N,M or       |
-|          |                                    |    A-Z (Z-A)     |  A-Z (Z-A)   |    A-Z (Z-A)     |  A-Z (Z-A)   |  minOSNR   |           |          |  tsp pairs  |  blocking reason  |
-|----------+------------------------------------+------------------+--------------+------------------+--------------+------------+-----------+----------+-------------+-------------------|
-|    0     | trx Brest_KLA to trx Lannion_CAS : |      21.29       |    28.12     |      21.48       |    28.31     |     26     | SFF-ID:70 |   400    |      1      |   ([-280],[8])    |
-+----------+------------------------------------+------------------+--------------+------------------+--------------+------------+-----------+----------+-------------+-------------------+
++----------+-----------------------------------+------------------+--------------+------------------+--------------+------------+-----------+----------+-------------+-------------------+
+|  req id  |              demand               |  GSNR@bandwidth  |  GSNR@0.1nm  |  OSNR@bandwidth  |  OSNR@0.1nm  |  Receiver  |   mode    |  Gbit/s  |   nb of     |      N,M or       |
+|          |                                   |    A-Z (Z-A)     |  A-Z (Z-A)   |    A-Z (Z-A)     |  A-Z (Z-A)   |  minOSNR   |           |          |  tsp pairs  |  blocking reason  |
+|----------+-----------------------------------+------------------+--------------+------------------+--------------+------------+-----------+----------+-------------+-------------------|
+|    0     | trx Brest_KLA to trx Lannion_CAS: |      21.29       |    28.12     |      21.48       |    28.31     |     26     | SFF-ID:70 |   400    |      1      |   ([-280],[8])    |
++----------+-----------------------------------+------------------+--------------+------------------+--------------+------------+-----------+----------+-------------+-------------------+
 Result summary shows mean GSNR and OSNR (average over all channels)

tests/test_automaticmodefeature.py

@@ -16,7 +16,6 @@
 
 from logging import INFO
 from pathlib import Path
-from logging import INFO
 from numpy.testing import assert_allclose
 import pytest
 

tests/test_invocation.py

@@ -19,7 +19,7 @@
 
 SRC_ROOT = Path(__file__).parent.parent
 
-
+# flake8: noqa: E501
 @pytest.mark.parametrize("output, log, handler, args", (
     ('transmission_main_example', None, transmission_main_example, []),
     ('transmission_saturated', 'logs_transmission_saturated', transmission_main_example,