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

chore: refactor json_io

Browse Source 
Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
Change-Id: If764ba7b520a060deb855c0b55e17c78fa22f841
This commit is contained in:
EstherLerouzic
2024-04-25 14:41:46 +02:00
parent a59db8fd12
commit fce9d1d293
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gnpy/tools/json_io.py
View File

@@ -692,24 +692,27 @@ def requests_from_json(json_data: dict, equipment: dict) -> List[PathRequest]:
for req in json_data['path-request']: for req in json_data['path-request']:
# init all params from request # init all params from request
params = {} trx_type = req['path-constraints']['te-bandwidth']['trx_type']
params['request_id'] = f'{req["request-id"]}' trx_mode = req['path-constraints']['te-bandwidth'].get('trx_mode', None)
params['source'] = req['source'] if trx_type is None:
params['bidir'] = req['bidirectional']
params['destination'] = req['destination']
params['trx_type'] = req['path-constraints']['te-bandwidth']['trx_type']
if params['trx_type'] is None:
msg = f'Request {req["request-id"]} has no transceiver type defined.' msg = f'Request {req["request-id"]} has no transceiver type defined.'
raise ServiceError(msg) raise ServiceError(msg)
params['trx_mode'] = req['path-constraints']['te-bandwidth'].get('trx_mode', None)
params['format'] = params['trx_mode']
params['spacing'] = req['path-constraints']['te-bandwidth']['spacing']
try: try:
nd_list = sorted(req['explicit-route-objects']['route-object-include-exclude'], key=lambda x: x['index']) nd_list = sorted(req['explicit-route-objects']['route-object-include-exclude'], key=lambda x: x['index'])
except KeyError: except KeyError:
nd_list = [] nd_list = []
params['nodes_list'] = [n['num-unnum-hop']['node-id'] for n in nd_list] params = {
params['loose_list'] = [n['num-unnum-hop']['hop-type'] for n in nd_list] 'request_id': f'{req["request-id"]}',
'source': req['source'],
'destination': req['destination'],
'bidir': req['bidirectional'],
'trx_type': trx_type,
'trx_mode': trx_mode,
'format': trx_mode,
'spacing': req['path-constraints']['te-bandwidth']['spacing'],
'nodes_list': [n['num-unnum-hop']['node-id'] for n in nd_list],
'loose_list': [n['num-unnum-hop']['hop-type'] for n in nd_list]
}
# recover trx physical param (baudrate, ...) from type and mode # recover trx physical param (baudrate, ...) from type and mode
# nb_channel is computed based on min max frequency and spacing # nb_channel is computed based on min max frequency and spacing
try: try: