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

Do not create *_auto_design.json by default

Browse Source 
It's a bad habit to write files into the source code repository. It will
also become impossible if gnpy is installed into a systemwide, possible
read-only location.

The old behavior can be reactivated by using an extra option to tell
GNPy where to put the generated file.

Change-Id: I9ad43890ca5886f516885de5938a4778870a06c5
This commit is contained in:
Jan Kundrát
2020-06-05 19:52:05 +02:00
parent c5c5b693f2
commit 754be7ca08
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gnpy/tools/cli_examples.py
View File

@@ -29,7 +29,7 @@ from gnpy.topology.request import (ResultElement, jsontocsv, compute_path_dsjctn
deduplicate_disjunctions, compute_path_with_disjunction,
PathRequest, compute_constrained_path, propagate2)
from gnpy.topology.spectrum_assignment import build_oms_list, pth_assign_spectrum
from gnpy.tools.json_io import load_equipment, load_network, load_json, load_requests, save_network, requests_from_json, disjunctions_from_json
from gnpy.tools.json_io import load_equipment, load_network, load_json, load_requests, save_network, requests_from_json, disjunctions_from_json
from gnpy.tools.plots import plot_baseline, plot_results
_logger = logging.getLogger(__name__)
@@ -98,6 +98,7 @@ def transmission_main_example(args=None):
default=_examples_dir / 'edfa_example_network.json')
parser.add_argument('source', nargs='?', help='source node')
parser.add_argument('destination', nargs='?', help='destination node')
parser.add_argument('--save-network', type=Path, help='Save the network as a JSON file')
args = parser.parse_args(args if args is not None else sys.argv[1:])
_setup_logging(args)
@@ -255,7 +256,8 @@ def transmission_main_example(args=None):
})
write_csv(result_dicts, 'simulation_result.csv')
save_network(args.filename, network)
if args.save_network is not None:
save_network(network, args.save_network)
if args.show_channels:
print('\nThe total SNR per channel at the end of the line is:')
@@ -317,6 +319,7 @@ def path_requests_run(args=None):
parser.add_argument('-v', '--verbose', action='count', default=0,
help='increases verbosity for each occurence')
parser.add_argument('-o', '--output', type=Path)
parser.add_argument('--save-network', type=Path, help='Save the network as a JSON file')
args = parser.parse_args(args if args is not None else sys.argv[1:])
_setup_logging(args)
@@ -336,7 +339,8 @@ def path_requests_run(args=None):
p_total_db = p_db + lin2db(automatic_nch(equipment['SI']['default'].f_min,
equipment['SI']['default'].f_max, equipment['SI']['default'].spacing))
build_network(network, equipment, p_db, p_total_db)
save_network(args.network_filename, network)
if args.save_network is not None:
save_network(network, args.save_network)
oms_list = build_oms_list(network, equipment)
try: