From 57f264bedb951a1fd1ddccc917b179e5d7dcef0c Mon Sep 17 00:00:00 2001 From: EstherLerouzic Date: Fri, 13 Sep 2019 13:58:22 +0100 Subject: [PATCH] Change name of br and pw variables to brate and pwr To conform to [a-z_][a-z0-9_]{2,30}$ Signed-off-by: EstherLerouzic --- gnpy/core/request.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnpy/core/request.py b/gnpy/core/request.py index c08a5d6d..b9965477 100644 --- a/gnpy/core/request.py +++ b/gnpy/core/request.py @@ -549,8 +549,8 @@ def jsontocsv(json_data, equipment, fileout): rosnr = '' rsnr = '' rsnrb = '' - br = '' - pw = '' + brate = '' + pwr = '' pth = '' revosnr = '' revsnr = '' @@ -581,8 +581,8 @@ def jsontocsv(json_data, equipment, fileout): rosnr = round(output_osnr, 2) rsnr = round(output_snr, 2) rsnrb = round(output_snrbandwidth, 2) - br = round(baud_rate * 1e-9, 2) - pw = round(lin2db(power) + 30, 2) + brate = round(baud_rate * 1e-9, 2) + pwr = round(lin2db(power) + 30, 2) if 'z-a-path-metric' in pth_el['no-path']['path-properties'].keys(): output_snr, output_snrbandwidth, output_osnr, power, path_bandwidth = \ 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) rsnr = round(output_snr, 2) rsnrb = round(output_snrbandwidth, 2) - br = round(baud_rate * 1e-9, 2) - pw = round(lin2db(power) + 30, 2) + brate = round(baud_rate * 1e-9, 2) + pwr = round(lin2db(power) + 30, 2) total_cost = nb_tsp * cost if 'z-a-path-metric' in pth_el['path-properties'].keys(): output_snr, output_snrbandwidth, output_osnr, power, path_bandwidth = \ @@ -640,8 +640,8 @@ def jsontocsv(json_data, equipment, fileout): rosnr, rsnr, rsnrb, - br, - pw, + brate, + pwr, pth, sptrm, revosnr,