From 7acfd968a1302ea9c57d7e75ba72fed715ed1754 Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Thu, 18 Jan 2024 18:35:39 +0000 Subject: [PATCH] NBI component - Debug API - Updated test descriptor file - Updated test --- src/nbi/tests/data/debug_api_dummy.json | 8 ++++---- src/nbi/tests/data/debug_api_dummy.txt | 6 ++++++ src/nbi/tests/test_debug_api.py | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 src/nbi/tests/data/debug_api_dummy.txt diff --git a/src/nbi/tests/data/debug_api_dummy.json b/src/nbi/tests/data/debug_api_dummy.json index 2e0d75559..1b5491bfb 100644 --- a/src/nbi/tests/data/debug_api_dummy.json +++ b/src/nbi/tests/data/debug_api_dummy.json @@ -8,12 +8,12 @@ {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}} ], "service_ids": [ - {"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "admin"}}, - {"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "admin"}}, - {"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "admin"}} + {"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "SVC:R1/200==R2/200"}}, + {"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "SVC:R1/200==R3/200"}}, + {"context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "SVC:R2/200==R3/200"}} ], "slice_ids": [ - {"context_id": {"context_uuid": {"uuid": "admin"}}, "slice_uuid": {"uuid": "admin"}} + {"context_id": {"context_uuid": {"uuid": "admin"}}, "slice_uuid": {"uuid": "SLC:R1-R2-R3"}} ] } ], diff --git a/src/nbi/tests/data/debug_api_dummy.txt b/src/nbi/tests/data/debug_api_dummy.txt new file mode 100644 index 000000000..bb8b1f113 --- /dev/null +++ b/src/nbi/tests/data/debug_api_dummy.txt @@ -0,0 +1,6 @@ +add: +context_client.SetService(Service(**SERVICE_R1_R2)) +context_client.SetService(Service(**SERVICE_R1_R3)) +context_client.SetService(Service(**SERVICE_R2_R3)) +context_client.SetSlice(Slice(**SLICE_R1_R3)) +context_client.SetConnection(Connection(**CONNECTION_R1_R3)) diff --git a/src/nbi/tests/test_debug_api.py b/src/nbi/tests/test_debug_api.py index 1618b3242..5af660ac3 100644 --- a/src/nbi/tests/test_debug_api.py +++ b/src/nbi/tests/test_debug_api.py @@ -53,8 +53,8 @@ def test_prepare_environment(context_client : ContextClient) -> None: # pylint: # Verify the scenario has no services/slices response = context_client.GetContext(ADMIN_CONTEXT_ID) assert len(response.topology_ids) == 1 - assert len(response.service_ids ) == 0 - assert len(response.slice_ids ) == 0 + assert len(response.service_ids ) == 3 + assert len(response.slice_ids ) == 1 # ----- Context -------------------------------------------------------------------------------------------------------- @@ -203,8 +203,8 @@ def test_cleanup_environment(context_client : ContextClient) -> None: # pylint: # Verify the scenario has no services/slices response = context_client.GetContext(ADMIN_CONTEXT_ID) assert len(response.topology_ids) == 1 - assert len(response.service_ids ) == 0 - assert len(response.slice_ids ) == 0 + assert len(response.service_ids ) == 3 + assert len(response.slice_ids ) == 1 # Load descriptors and validate the base scenario descriptor_loader = DescriptorLoader(descriptors_file=DESCRIPTOR_FILE, context_client=context_client) -- GitLab