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

Merge pull request #188 from Orange-OpenSource/tsp_min_spacing

Browse Source 
Tsp min spacing
This commit is contained in:
James
2019-01-22 10:04:03 -05:00
committed by GitHub
parent 7e6d557d01 96f3d5a805
commit 38727d6203
8 changed files with 146 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
examples/path_requests_run.py
View File

@@ -69,42 +69,19 @@ def requests_from_json(json_data,equipment):
# nb_channel is computed based on min max frequency and spacing
trx_params = trx_mode_params(equipment,params['trx_type'],params['trx_mode'],True)
params.update(trx_params)
print(trx_params['tx_osnr'])
# print(trx_params['min_spacing'])
# optical power might be set differently in the request. if it is indicated then the
# params['power'] is updated
if req['path-constraints']['te-bandwidth']['output-power']:
params['power'] = req['path-constraints']['te-bandwidth']['output-power']
# same process for nb-channel
fmin = trx_params['frequency']['min']
fmax = trx_params['frequency']['max']
fmin = params['frequency']['min']
fmax = params['frequency']['max']
if req['path-constraints']['te-bandwidth']['max-nb-of-channel'] is not None :
# check if requested nb_channels is consistant with baudrate and min-max frequencies
if trx_params['baud_rate'] is not None:
min_recommanded_spacing = automatic_spacing(trx_params['baud_rate'])
# needed for printing - else argument with quote are making errors in the print
temp = params['baud_rate']*1e-9
else:
min_recommanded_spacing = params['spacing']
temp = 'undetermined baudrate'
max_recommanded_nb_channels = automatic_nch(fmin,fmax,
min_recommanded_spacing)
if req['path-constraints']['te-bandwidth']['max-nb-of-channel'] <= max_recommanded_nb_channels :
params['nb_channel'] = req['path-constraints']['te-bandwidth']['max-nb-of-channel']
else:
msg = dedent(f'''
Requested channel number is not consistent with frequency range:
{fmin*1e-12} THz, {fmax*1e-12} THz and baud rate: {temp} GHz
min recommanded spacing is {min_recommanded_spacing}
max recommanded nb of channels is {max_recommanded_nb_channels}
Computation stopped.''')
logger.critical(msg)
exit()
params['nb_channel'] = req['path-constraints']['te-bandwidth']['max-nb-of-channel']
else :
params['nb_channel'] = automatic_nch(fmin,fmax,params['spacing'])
consitency_check(params)
try :
params['path_bandwidth'] = req['path-constraints']['te-bandwidth']['path_bandwidth']
except KeyError:
@@ -112,6 +89,30 @@ def requests_from_json(json_data,equipment):
requests_list.append(Path_request(**params))
return requests_list
def consitency_check(params):
fmin = params['frequency']['min']
fmax = params['frequency']['max']
max_recommanded_nb_channels = automatic_nch(fmin,fmax,
params['spacing'])
if params['baud_rate'] is not None:
#implicitely means that a mode is defined with min_spacing
if params['min_spacing']>params['spacing'] :
msg = f'Request {params["request_id"]} has spacing below transponder {params["trx_type"]}'+\
f' {params["trx_mode"]} min spacing value {params["min_spacing"]*1e-9}GHz.\n'+\
'Computation stopped'
print(msg)
logger.critical(msg)
exit()
if params['nb_channel']>max_recommanded_nb_channels:
msg = dedent(f'''
Requested channel number {params["nb_channel"]}, baud rate {params["baud_rate"]} GHz and requested spacing {params["spacing"]*1e-9}GHz
is not consistent with frequency range {fmin*1e-12} THz, {fmax*1e-12} THz, min recommanded spacing {params["min_spacing"]*1e-9}GHz.
max recommanded nb of channels is {max_recommanded_nb_channels}
Computation stopped.''')
logger.critical(msg)
exit()
def disjunctions_from_json(json_data):
disjunctions_list = []