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

Update test_disjunction and test_automaticmodefeature

Browse Source 
Add bidir argument on load_requests calls

Signed-off-by: EstherLerouzic <esther.lerouzic@orange.com>
This commit is contained in:
EstherLerouzic
2019-09-13 17:37:25 +01:00
parent 898eada097
commit c009d28f7d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_automaticmodefeature.py
View File

@@ -35,7 +35,7 @@ eqpt_library_name = Path(__file__).parent.parent / 'tests/data/eqpt_config.json'
@pytest.mark.parametrize("serv",[service_file_name]) @pytest.mark.parametrize("serv",[service_file_name])
@pytest.mark.parametrize("expected_mode",[['16QAM', 'PS_SP64_1', 'PS_SP64_1', 'PS_SP64_1', 'mode 2 - fake', 'mode 2', 'PS_SP64_1', 'mode 3', 'PS_SP64_1', 'PS_SP64_1', '16QAM', 'mode 1', 'PS_SP64_1', 'PS_SP64_1', 'mode 1', 'mode 2', 'mode 1', 'mode 2', 'nok']]) @pytest.mark.parametrize("expected_mode",[['16QAM', 'PS_SP64_1', 'PS_SP64_1', 'PS_SP64_1', 'mode 2 - fake', 'mode 2', 'PS_SP64_1', 'mode 3', 'PS_SP64_1', 'PS_SP64_1', '16QAM', 'mode 1', 'PS_SP64_1', 'PS_SP64_1', 'mode 1', 'mode 2', 'mode 1', 'mode 2', 'nok']])
def test_automaticmodefeature(net,eqpt,serv,expected_mode): def test_automaticmodefeature(net,eqpt,serv,expected_mode):
data = load_requests(serv,eqpt) data = load_requests(serv, eqpt, bidir=False)
equipment = load_equipment(eqpt) equipment = load_equipment(eqpt)
network = load_network(net,equipment) network = load_network(net,equipment)

6
tests/test_disjunction.py
View File

@@ -29,7 +29,7 @@ eqpt_library_name = Path(__file__).parent.parent / 'tests/data/eqpt_config.json'
@pytest.mark.parametrize("eqpt", [eqpt_library_name]) @pytest.mark.parametrize("eqpt", [eqpt_library_name])
@pytest.mark.parametrize("serv",[service_file_name]) @pytest.mark.parametrize("serv",[service_file_name])
def test_disjunction(net,eqpt,serv): def test_disjunction(net,eqpt,serv):
data = load_requests(serv,eqpt) data = load_requests(serv, eqpt, bidir=False)
equipment = load_equipment(eqpt) equipment = load_equipment(eqpt)
network = load_network(net,equipment) network = load_network(net,equipment)
@@ -56,7 +56,7 @@ def test_disjunction(net,eqpt,serv):
rqs_id_list = [r.request_id for r in rqs] rqs_id_list = [r.request_id for r in rqs]
p1 = pths[rqs_id_list.index(e[0])][1:-1] p1 = pths[rqs_id_list.index(e[0])][1:-1]
p2 = pths[rqs_id_list.index(e[1])][1:-1] p2 = pths[rqs_id_list.index(e[1])][1:-1]
if isdisjoint(p1,p2) + isdisjoint(p1,find_reversed_path(p2, network)) > 0: if isdisjoint(p1, p2) + isdisjoint(p1, find_reversed_path(p2)) > 0:
test = False test = False
print(f'Computed path (roadms):{[e.uid for e in p1 if isinstance(e, Roadm)]}\n') print(f'Computed path (roadms):{[e.uid for e in p1 if isinstance(e, Roadm)]}\n')
print(f'Computed path (roadms):{[e.uid for e in p2 if isinstance(e, Roadm)]}\n') print(f'Computed path (roadms):{[e.uid for e in p2 if isinstance(e, Roadm)]}\n')
@@ -68,7 +68,7 @@ def test_disjunction(net,eqpt,serv):
@pytest.mark.parametrize("eqpt", [eqpt_library_name]) @pytest.mark.parametrize("eqpt", [eqpt_library_name])
@pytest.mark.parametrize("serv",[service_file_name]) @pytest.mark.parametrize("serv",[service_file_name])
def test_does_not_loop_back(net,eqpt,serv): def test_does_not_loop_back(net,eqpt,serv):
data = load_requests(serv,eqpt) data = load_requests(serv, eqpt, bidir=False)
equipment = load_equipment(eqpt) equipment = load_equipment(eqpt)
network = load_network(net,equipment) network = load_network(net,equipment)