diff --git a/src/tests/eucnc24/Dockerfile b/src/tests/eucnc24/Dockerfile index 956d54b74b38bc433ac03f79170125a800b51506..c46100fff94ad0c08ea6da44f4efcddc997ba832 100644 --- a/src/tests/eucnc24/Dockerfile +++ b/src/tests/eucnc24/Dockerfile @@ -82,7 +82,7 @@ source /var/teraflow/tfs_runtime_env_vars.sh export PYTHONPATH=/var/teraflow pytest --verbose --log-level=INFO /var/teraflow/tests/eucnc24/tests/test_functional_bootstrap.py --junitxml=/opt/results/report_bootstrap.xml pytest --verbose --log-level=INFO /var/teraflow/tests/eucnc24/tests/test_functional_service_tfs.py --junitxml=/opt/results/report_service_tfs.xml -#pytest --verbose --log-level=INFO /var/teraflow/tests/eucnc24/tests/test_functional_service_ietf.py --junitxml=/opt/results/report_service_ietf.xml +pytest --verbose --log-level=INFO /var/teraflow/tests/eucnc24/tests/test_functional_service_ietf.py --junitxml=/opt/results/report_service_ietf.xml pytest --verbose --log-level=INFO /var/teraflow/tests/eucnc24/tests/test_functional_cleanup.py --junitxml=/opt/results/report_cleanup.xml EOF RUN chmod ug+x ./run_tests.sh diff --git a/src/tests/eucnc24/tests/Fixtures.py b/src/tests/eucnc24/tests/Fixtures.py new file mode 100644 index 0000000000000000000000000000000000000000..a9d2ceb24488dbd5b3775c958358df419dec4172 --- /dev/null +++ b/src/tests/eucnc24/tests/Fixtures.py @@ -0,0 +1,43 @@ +# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import pytest +from context.client.ContextClient import ContextClient +from device.client.DeviceClient import DeviceClient +from monitoring.client.MonitoringClient import MonitoringClient +from service.client.ServiceClient import ServiceClient + +@pytest.fixture(scope='session') +def context_client(): + _client = ContextClient() + yield _client + _client.close() + +@pytest.fixture(scope='session') +def device_client(): + _client = DeviceClient() + yield _client + _client.close() + +@pytest.fixture(scope='session') +def monitoring_client(): + _client = MonitoringClient() + yield _client + _client.close() + +@pytest.fixture(scope='session') +def service_client(): + _client = ServiceClient() + yield _client + _client.close() diff --git a/src/tests/eucnc24/tests/test_functional_bootstrap.py b/src/tests/eucnc24/tests/test_functional_bootstrap.py index 38040a3081302f946a5759fed10337f255c3267b..5222a4c871997410c874b884ff70a215d090c1a9 100644 --- a/src/tests/eucnc24/tests/test_functional_bootstrap.py +++ b/src/tests/eucnc24/tests/test_functional_bootstrap.py @@ -19,7 +19,7 @@ from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_lo from common.tools.object_factory.Context import json_context_id from context.client.ContextClient import ContextClient from device.client.DeviceClient import DeviceClient -from tests.Fixtures import context_client, device_client # pylint: disable=unused-import +from .Fixtures import context_client, device_client # pylint: disable=unused-import LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.DEBUG) diff --git a/src/tests/eucnc24/tests/test_functional_cleanup.py b/src/tests/eucnc24/tests/test_functional_cleanup.py index 1adf8f2b97294e51b94b06e72b4c62d370542612..7cfed0caf295af9dd5f66fd263339e37a7c887a0 100644 --- a/src/tests/eucnc24/tests/test_functional_cleanup.py +++ b/src/tests/eucnc24/tests/test_functional_cleanup.py @@ -19,7 +19,7 @@ from common.tools.descriptor.Loader import DescriptorLoader, validate_empty_scen from common.tools.object_factory.Context import json_context_id from context.client.ContextClient import ContextClient from device.client.DeviceClient import DeviceClient -from tests.Fixtures import context_client, device_client # pylint: disable=unused-import +from .Fixtures import context_client, device_client # pylint: disable=unused-import LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.DEBUG) diff --git a/src/tests/eucnc24/tests/test_functional_service_ietf.py b/src/tests/eucnc24/tests/test_functional_service_ietf.py index 4b9e69bb04869759afa7533e8f4f90f1d7ce2ab9..70d3988732502ac16d4bf1a61560740d37d00220 100644 --- a/src/tests/eucnc24/tests/test_functional_service_ietf.py +++ b/src/tests/eucnc24/tests/test_functional_service_ietf.py @@ -19,7 +19,7 @@ from common.proto.context_pb2 import ContextId, ServiceStatusEnum, ServiceTypeEn from common.tools.grpc.Tools import grpc_message_to_json_string from common.tools.object_factory.Context import json_context_id from context.client.ContextClient import ContextClient -from tests.Fixtures import context_client # pylint: disable=unused-import +from .Fixtures import context_client # pylint: disable=unused-import from .Tools import do_rest_delete_request, do_rest_get_request, do_rest_post_request diff --git a/src/tests/eucnc24/tests/test_functional_service_tfs.py b/src/tests/eucnc24/tests/test_functional_service_tfs.py index 596da9a49321df2fd25d3760f95c9286e38d40a8..f66047db3ce5295f860ac69b425cd660f77aed34 100644 --- a/src/tests/eucnc24/tests/test_functional_service_tfs.py +++ b/src/tests/eucnc24/tests/test_functional_service_tfs.py @@ -23,7 +23,7 @@ from common.tools.object_factory.Service import json_service_id from context.client.ContextClient import ContextClient from device.client.DeviceClient import DeviceClient from service.client.ServiceClient import ServiceClient -from tests.Fixtures import context_client, device_client, service_client # pylint: disable=unused-import +from .Fixtures import context_client, device_client, service_client # pylint: disable=unused-import LOGGER = logging.getLogger(__name__) LOGGER.setLevel(logging.DEBUG)