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

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

View File

@@ -22,8 +22,8 @@ from gnpy.core.exceptions import SpectrumError
from gnpy.topology.request import compute_path_dsjctn, find_reversed_path
from gnpy.topology.spectrum_assignment import (build_oms_list, align_grids, nvalue_to_frequency,
bitmap_sum, Bitmap, spectrum_selection, pth_assign_spectrum)
from gnpy.tools.json_io import load_equipment, load_network
from examples.path_requests_run import requests_from_json, disjunctions_from_json, correct_disjn
from gnpy.tools.json_io import load_equipment, load_network, requests_from_json, disjunctions_from_json
from examples.path_requests_run import correct_disjn
TEST_DIR = Path(__file__).parent
DATA_DIR = TEST_DIR / 'data'