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

reorganization: move JSON-specific bits from path_requests_run to tools.json_io

Browse Source 
Change-Id: I03cf4e298300387ee5d56251e2e552e111b59f65
This commit is contained in:
Jan Kundrát
2020-05-23 20:24:40 +02:00
parent 2b473d26d3
commit 7da4ec08d8
6 changed files with 134 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_parser.py
View File

@@ -29,10 +29,9 @@ from gnpy.topology.request import (jsontocsv, requests_aggregation, compute_path
ResultElement, PathRequest)
from gnpy.topology.spectrum_assignment import build_oms_list, pth_assign_spectrum
from gnpy.tools.convert import convert_file
from gnpy.tools.json_io import load_network, save_network, load_equipment
from gnpy.tools.json_io import load_network, save_network, load_equipment, requests_from_json, disjunctions_from_json
from gnpy.tools.service_sheet import convert_service_sheet, correct_xls_route_list
from examples.path_requests_run import (requests_from_json, disjunctions_from_json,
correct_disjn, compute_path_with_disjunction)
from examples.path_requests_run import correct_disjn, compute_path_with_disjunction
TEST_DIR = Path(__file__).parent
DATA_DIR = TEST_DIR / 'data'