From 00a4637bc8bfadb99f9211992eac05765d8a321b Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 15 Nov 2023 09:56:43 +0000
Subject: [PATCH] PathComp - FrontEnd component:
- Fixed unitary tests fixtures
- Fixed assertions in pathcomp-forecaster tests
---
src/pathcomp/frontend/tests/test_unitary.py | 3 ++-
.../frontend/tests/test_unitary_pathcomp_forecaster.py | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/pathcomp/frontend/tests/test_unitary.py b/src/pathcomp/frontend/tests/test_unitary.py
index a5bed8679..4d5b3549b 100644
--- a/src/pathcomp/frontend/tests/test_unitary.py
+++ b/src/pathcomp/frontend/tests/test_unitary.py
@@ -56,7 +56,8 @@ os.environ['PATHCOMP_BACKEND_PORT'] = os.environ.get('PATHCOMP_BACKEND_PORT', ba
from .PrepareTestScenario import ( # pylint: disable=unused-import
# be careful, order of symbols is important here!
- mock_service, context_client, monitoring_client, pathcomp_service, pathcomp_client)
+ mock_service, context_client, monitoring_client,
+ forecaster_service, forecaster_client, pathcomp_service, pathcomp_client)
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
diff --git a/src/pathcomp/frontend/tests/test_unitary_pathcomp_forecaster.py b/src/pathcomp/frontend/tests/test_unitary_pathcomp_forecaster.py
index d7624da75..ea617b1e1 100644
--- a/src/pathcomp/frontend/tests/test_unitary_pathcomp_forecaster.py
+++ b/src/pathcomp/frontend/tests/test_unitary_pathcomp_forecaster.py
@@ -130,9 +130,11 @@ def test_request_service_shortestpath_forecast(
endpoint_id_a = json_endpoint_id(json_device_id('pt1.pt'), 'client:1')
endpoint_id_z = json_endpoint_id(json_device_id('gr1.gr'), 'client:3')
+ context_uuid = DEFAULT_CONTEXT_NAME
service_uuid = get_service_uuid(endpoint_id_a, endpoint_id_z)
request_service = json_service_l3nm_planned(
service_uuid,
+ context_uuid=context_uuid,
endpoint_ids=[endpoint_id_a, endpoint_id_z],
constraints=[
json_constraint_sla_capacity(25.0),
@@ -159,7 +161,8 @@ def test_request_service_shortestpath_forecast(
}
# Assert requested service has a reply
# It permits having other services not requested (i.e., sub-services)
- assert service_uuid in reply_service_ids
+ context_service_uuid = '{:s}/{:s}'.format(context_uuid, service_uuid)
+ assert context_service_uuid in reply_service_ids
reply_connection_service_ids = {
'{:s}/{:s}'.format(
--
GitLab