Feat: Use a reference channel per OMS instead of total power for design

Correctly uses the oms band and spacing for computing the nb of channel
and total power for design per band.
In order to keep the SI values as reference, introduce a new parameter
in SI to indicate wether to use this feature or not.

If "use_si_channel_count_for_design": true, then the f_min, f_max and spacing
from SI are used for all OMSes
else, the f_min, f_max, spacing defined per OMS (design_bands) is used.

This impacts tests where the artificial C-band boudaries were hardcoded, and
it also has an impact on performances when SI's defined nb of channels is larger
than the one defined per OMS. In this case the design was considering a larger
total power than the one finally propagated which resulted in reduced performance.
This feature now corrects this case (if "use_si_channel_count_for_design": false
which is the default setting). Overall autodesign are thus improved.

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

tous les test marche et les jeu de tests aussi.

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

tests/test_path_computation_functions.py

@@ -16,8 +16,8 @@ test path computation functions
 from pathlib import Path
 import pytest
 from gnpy.core.network import build_network
-from gnpy.core.utils import lin2db, automatic_nch
-from gnpy.topology.request import explicit_path
+from gnpy.core.utils import automatic_nch, dbm2watt
+from gnpy.topology.request import explicit_path, PathRequest
 from gnpy.topology.spectrum_assignment import build_oms_list
 from gnpy.tools.json_io import load_equipment, load_network, requests_from_json
 
@@ -32,6 +32,40 @@ EXTRA_CONFIGS = {"std_medium_gain_advanced_config.json": DATA_DIR / "std_medium_
 equipment = load_equipment(EQPT_FILENAME, EXTRA_CONFIGS)
 
 
+def pathrequest(pch_dbm, nb_channels):
+    """create ref channel for defined power settings
+    """
+    params = {
+        "power": dbm2watt(pch_dbm),
+        "tx_power": dbm2watt(pch_dbm),
+        "nb_channel": nb_channels,
+        'request_id': None,
+        'trx_type': None,
+        'trx_mode': None,
+        'source': None,
+        'destination': None,
+        'bidir': False,
+        'nodes_list': [],
+        'loose_list': [],
+        'format': '',
+        'baud_rate': None,
+        'bit_rate': None,
+        'roll_off': None,
+        'OSNR': None,
+        'penalties': None,
+        'path_bandwidth': None,
+        'effective_freq_slot': None,
+        'f_min': None,
+        'f_max': None,
+        'spacing': None,
+        'min_spacing': None,
+        'cost': None,
+        'equalization_offset_db': None,
+        'tx_osnr': None
+    }
+    return PathRequest(**params)
+
+
 @pytest.fixture()
 def setup_without_oms():
     """ common setup for tests: builds network, equipment and oms only once
@@ -39,8 +73,8 @@ def setup_without_oms():
     network = load_network(NETWORK_FILENAME, equipment)
     spectrum = equipment['SI']['default']
     p_db = spectrum.power_dbm
-    p_total_db = p_db + lin2db(automatic_nch(spectrum.f_min, spectrum.f_max, spectrum.spacing))
-    build_network(network, equipment, p_db, p_total_db)
+    nb_channels = automatic_nch(spectrum.f_min, spectrum.f_max, spectrum.spacing)
+    build_network(network, equipment, pathrequest(p_db, nb_channels))
     return network