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

Change name of br and pw variables to brate and pwr

Browse Source 
To conform to [a-z_][a-z0-9_]{2,30}$

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
This commit is contained in:
EstherLerouzic
2019-09-13 13:58:22 +01:00
parent fbe4fa3cf0
commit 57f264bedb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gnpy/core/request.py
View File

@@ -549,8 +549,8 @@ def jsontocsv(json_data, equipment, fileout):
rosnr = '' rosnr = ''
rsnr = '' rsnr = ''
rsnrb = '' rsnrb = ''
br = '' brate = ''
pw = '' pwr = ''
pth = '' pth = ''
revosnr = '' revosnr = ''
revsnr = '' revsnr = ''
@@ -581,8 +581,8 @@ def jsontocsv(json_data, equipment, fileout):
rosnr = round(output_osnr, 2) rosnr = round(output_osnr, 2)
rsnr = round(output_snr, 2) rsnr = round(output_snr, 2)
rsnrb = round(output_snrbandwidth, 2) rsnrb = round(output_snrbandwidth, 2)
br = round(baud_rate * 1e-9, 2) brate = round(baud_rate * 1e-9, 2)
pw = round(lin2db(power) + 30, 2) pwr = round(lin2db(power) + 30, 2)
if 'z-a-path-metric' in pth_el['no-path']['path-properties'].keys(): if 'z-a-path-metric' in pth_el['no-path']['path-properties'].keys():
output_snr, output_snrbandwidth, output_osnr, power, path_bandwidth = \ output_snr, output_snrbandwidth, output_osnr, power, path_bandwidth = \
jsontopath_metric(pth_el['no-path']['path-properties']['z-a-path-metric']) jsontopath_metric(pth_el['no-path']['path-properties']['z-a-path-metric'])
@@ -615,8 +615,8 @@ def jsontocsv(json_data, equipment, fileout):
rosnr = round(output_osnr, 2) rosnr = round(output_osnr, 2)
rsnr = round(output_snr, 2) rsnr = round(output_snr, 2)
rsnrb = round(output_snrbandwidth, 2) rsnrb = round(output_snrbandwidth, 2)
br = round(baud_rate * 1e-9, 2) brate = round(baud_rate * 1e-9, 2)
pw = round(lin2db(power) + 30, 2) pwr = round(lin2db(power) + 30, 2)
total_cost = nb_tsp * cost total_cost = nb_tsp * cost
if 'z-a-path-metric' in pth_el['path-properties'].keys(): if 'z-a-path-metric' in pth_el['path-properties'].keys():
output_snr, output_snrbandwidth, output_osnr, power, path_bandwidth = \ output_snr, output_snrbandwidth, output_osnr, power, path_bandwidth = \
@@ -640,8 +640,8 @@ def jsontocsv(json_data, equipment, fileout):
rosnr, rosnr,
rsnr, rsnr,
rsnrb, rsnrb,
br, brate,
pw, pwr,
pth, pth,
sptrm, sptrm,
revosnr, revosnr,