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

fix: Refactor the methods to avoid returning the same value

Browse Source 
equipment being a dict, no need to use 'return' to have the changes
applied.

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
Change-Id: Ic5a4247bbaa0b4af3fca5b6cb0a74a2f434b1b6a
This commit is contained in:
EstherLerouzic
2024-12-16 21:34:36 +01:00
parent e55f7a5d4c
commit ccab4835fc
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gnpy/tools/json_io.py
View File

@@ -439,14 +439,14 @@ def load_initial_spectrum(filename: Path) -> dict:
return _spectrum_from_json(json_data['spectrum']) return _spectrum_from_json(json_data['spectrum'])
def _update_dual_stage(equipment: dict) -> dict: def _update_dual_stage(equipment: dict):
"""Update attributes of all dual stage amps with the preamp and booster attributes """Update attributes of all dual stage amps with the preamp and booster attributes
(defined in the equipment dictionary) (defined in the equipment dictionary)
Returns the updated equiment dictionary Returns the updated equiment dictionary
""" """
if 'Edfa' not in equipment: if 'Edfa' not in equipment:
return equipment return
edfa_dict = equipment['Edfa'] edfa_dict = equipment['Edfa']
for edfa in edfa_dict.values(): for edfa in edfa_dict.values():
if edfa.type_def == 'dual_stage': if edfa.type_def == 'dual_stage':
@@ -465,11 +465,11 @@ def _update_dual_stage(equipment: dict) -> dict:
return equipment return equipment
def _update_band(equipment: dict) -> dict: def _update_band(equipment: dict):
"""Creates a list of bands for this amplifier, and remove other parameters which are not applicable """Creates a list of bands for this amplifier, and remove other parameters which are not applicable
""" """
if 'Edfa' not in equipment: if 'Edfa' not in equipment:
return equipment return
amp_dict = equipment['Edfa'] amp_dict = equipment['Edfa']
for amplifier in amp_dict.values(): for amplifier in amp_dict.values():
if amplifier.type_def != 'multi_band': if amplifier.type_def != 'multi_band':
@@ -489,8 +489,6 @@ def _update_band(equipment: dict) -> dict:
'nf_fit_coeff', 'nf_ripple', 'dgt', 'gain_ripple']: 'nf_fit_coeff', 'nf_ripple', 'dgt', 'gain_ripple']:
delattr(amplifier, key) delattr(amplifier, key)
return equipment
def _roadm_restrictions_sanity_check(equipment: dict): def _roadm_restrictions_sanity_check(equipment: dict):
"""verifies that booster and preamp restrictions specified in roadm equipment are listed in the edfa.""" """verifies that booster and preamp restrictions specified in roadm equipment are listed in the edfa."""
@@ -567,8 +565,8 @@ def _equipment_from_json(json_data: dict, extra_configs: Dict[str, Path]) -> dic
else: else:
raise EquipmentConfigError(f'Unrecognized network element type "{key}"') raise EquipmentConfigError(f'Unrecognized network element type "{key}"')
_check_fiber_vs_raman_fiber(equipment) _check_fiber_vs_raman_fiber(equipment)
equipment = _update_dual_stage(equipment) _update_dual_stage(equipment)
equipment = _update_band(equipment) _update_band(equipment)
_roadm_restrictions_sanity_check(equipment) _roadm_restrictions_sanity_check(equipment)
_si_sanity_check(equipment) _si_sanity_check(equipment)
return equipment return equipment