scottk/oopt-gnpy
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy.git synced 2025-11-01 18:47:48 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix case where there are multiple multiband amps matching the sub amp type

Browse Source 
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
Change-Id: Ibe86499866f2f9e3dfd70b51a33b919d584b812b
This commit is contained in:
EstherLerouzic
2024-10-25 16:12:16 +02:00
parent 94a6f922cd
commit e593b8c9ec
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gnpy/core/equipment.py
View File

@@ -85,7 +85,7 @@ def trx_mode_params(equipment, trx_type_variety='', trx_mode='', error_message=F
return trx_params return trx_params
def find_type_variety(amps: List[str], equipment: dict) -> str: def find_type_variety(amps: List[str], equipment: dict) -> List[str]:
"""Returns the multiband type_variety associated with a list of single band type_varieties """Returns the multiband type_variety associated with a list of single band type_varieties
Args: Args:
amps (List[str]): A list of single band type_varieties. amps (List[str]): A list of single band type_varieties.
@@ -106,7 +106,7 @@ def find_type_variety(amps: List[str], equipment: dict) -> str:
if not _found_type: if not _found_type:
msg = f'{amps} amps do not belong to the same amp type {listes}' msg = f'{amps} amps do not belong to the same amp type {listes}'
raise ConfigurationError(msg) raise ConfigurationError(msg)
return _found_type[0] return _found_type
def find_type_varieties(amps: List[str], equipment: dict) -> List[List[str]]: def find_type_varieties(amps: List[str], equipment: dict) -> List[List[str]]:

2
gnpy/core/network.py
View File

@@ -961,7 +961,7 @@ def set_egress_amplifier(network: DiGraph, this_node: Union[elements.Roadm, elem
deviation_db=deviation_db[band_name], tilt_target=tilt_target[band_name]) deviation_db=deviation_db[band_name], tilt_target=tilt_target[band_name])
amps_type_varieties = [a.type_variety for a in node.amplifiers.values()] amps_type_varieties = [a.type_variety for a in node.amplifiers.values()]
try: try:
node.type_variety = find_type_variety(amps_type_varieties, equipment) node.type_variety = find_type_variety(amps_type_varieties, equipment)[0]
except ConfigurationError as e: except ConfigurationError as e:
# should never come here... only for debugging # should never come here... only for debugging
msg = f'In {node.uid}: {e}' msg = f'In {node.uid}: {e}'

2
gnpy/tools/json_io.py
View File

@@ -580,7 +580,7 @@ def network_from_json(json_data: dict, equipment: dict) -> DiGraph:
except ConfigurationError as e: except ConfigurationError as e:
msg = f'Node {el_config["uid"]}: {e}' msg = f'Node {el_config["uid"]}: {e}'
raise ConfigurationError(msg) raise ConfigurationError(msg)
if variety is not None and variety != multiband_type_variety: if variety is not None and variety not in multiband_type_variety:
raise ConfigurationError(f'In node {el_config["uid"]}: multiband amplifier type_variety is not ' raise ConfigurationError(f'In node {el_config["uid"]}: multiband amplifier type_variety is not '
+ 'consistent with its amps type varieties.') + 'consistent with its amps type varieties.')
if not amps and extra_params is not None: if not amps and extra_params is not None: