From aed6a7354defdc5e7e61ef169a01b1196035be29 Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Thu, 1 Feb 2024 11:47:33 +0100 Subject: Fix integration tests After deletion of msb.k8s package integration tests needed to be refactored Issue-ID: TEST-404 Change-Id: I4ad558a7c6ccd83c84568c554c0a49fa91893ac4 Signed-off-by: Michal Jagiello --- integration_tests/test_10_k8s.py | 125 +++++++++++++++++++++++++++++++++++ integration_tests/test_10_msb_k8s.py | 125 ----------------------------------- 2 files changed, 125 insertions(+), 125 deletions(-) create mode 100644 integration_tests/test_10_k8s.py delete mode 100644 integration_tests/test_10_msb_k8s.py diff --git a/integration_tests/test_10_k8s.py b/integration_tests/test_10_k8s.py new file mode 100644 index 0000000..34b389e --- /dev/null +++ b/integration_tests/test_10_k8s.py @@ -0,0 +1,125 @@ +# Copyright 2022 Orange, Deutsche Telekom AG +# +# 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 logging +import os + +import pytest + +from onapsdk.k8s import ( + Definition, + Instance, + ConnectivityInfo) + +logger = logging.getLogger("") +logger.setLevel(logging.DEBUG) +fh = logging.StreamHandler() +fh_formatter = logging.Formatter('%(asctime)s %(levelname)s %(lineno)d:%(filename)s(%(process)d) - %(message)s') +fh.setFormatter(fh_formatter) +logger.addHandler(fh) + +RB_NAME = "test_definition" +RB_VERSION = "ver_1" +PROFILE_NAME = "test-profile" +PROFILE_NAMESPACE = "test" +PROFILE_K8S_VERSION = "1.0" +PROFILE_ARTIFACT_PATH = "artifacts\\profile.tar.gz" # FILL ME +TEMPLATE_NAME = "test_template" +TEMPLATE_DESCRIPTION = "test description" +CLOUD_REGION_ID = "k8s_region_test" # FILL ME +CLOUD_OWNER = "CloudOwner" +KUBECONFIG_PATH = "artifacts\\kubeconfig" # FILL ME +MYPATH = os.path.dirname(os.path.realpath(__file__)) + +pytest.INSTANCE_ID = "" + + +@pytest.mark.integration +def test_definition_create_upload_artifact(): + definition = Definition.create(RB_NAME, RB_VERSION) + definition.upload_artifact(b'definition_artifact_file') + + +@pytest.mark.integration +def test_definition_get_all(): + definitions = list(Definition.get_all()) + + +@pytest.mark.integration +def test_configuration_template(): + definition = Definition.get_definition_by_name_version(RB_NAME, + RB_VERSION) + definition.create_configuration_template(TEMPLATE_NAME, TEMPLATE_DESCRIPTION) + definition.get_all_configuration_templates() + definition.get_configuration_template_by_name(TEMPLATE_NAME) + + +@pytest.mark.integration +def test_profile_create_upload_artifact(): + definition = Definition.get_definition_by_name_version(RB_NAME, + RB_VERSION) + profile = definition.create_profile(PROFILE_NAME, + PROFILE_NAMESPACE, + PROFILE_K8S_VERSION) + profile.upload_artifact(b'profile_artifact_file') + + +@pytest.mark.integration +def test_profile_get_all(): + definition = Definition.get_definition_by_name_version(RB_NAME, + RB_VERSION) + profiles = list(definition.get_all_profiles()) + + +@pytest.mark.integration +def test_connectivity_info_create(): + conninfo = ConnectivityInfo.create(CLOUD_REGION_ID, + CLOUD_OWNER, + b'kubeconfig_content_test') + + +@pytest.mark.integration +def test_instance_create(): + definition = Definition.get_definition_by_name_version(RB_NAME, + RB_VERSION) + profile = definition.get_profile_by_name(PROFILE_NAME) + instance = Instance.create(CLOUD_REGION_ID, + profile.profile_name, + definition.rb_name, + definition.rb_version) + pytest.INSTANCE_ID = instance.instance_id + + +@pytest.mark.integration +def test_instance_get_all(): + instances = list(Instance.get_all()) + + +@pytest.mark.integration +def test_instance_delete(): + instance = Instance.get_by_id(pytest.INSTANCE_ID) + instance.delete() + + +@pytest.mark.integration +def test_connectivity_info_delete(): + conninfo = ConnectivityInfo.get_connectivity_info_by_region_id(CLOUD_REGION_ID) + conninfo.delete() + + +@pytest.mark.integration +def test_definition_profile_get_delete(): + definition = Definition.get_definition_by_name_version(RB_NAME, RB_VERSION) + profile = definition.get_profile_by_name(PROFILE_NAME) + profile.delete() + definition.delete() diff --git a/integration_tests/test_10_msb_k8s.py b/integration_tests/test_10_msb_k8s.py deleted file mode 100644 index 5b2c0ee..0000000 --- a/integration_tests/test_10_msb_k8s.py +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 2022 Orange, Deutsche Telekom AG -# -# 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 logging -import os - -import pytest - -from onapsdk.msb.k8s import ( - Definition, - Instance, - ConnectivityInfo) - -logger = logging.getLogger("") -logger.setLevel(logging.DEBUG) -fh = logging.StreamHandler() -fh_formatter = logging.Formatter('%(asctime)s %(levelname)s %(lineno)d:%(filename)s(%(process)d) - %(message)s') -fh.setFormatter(fh_formatter) -logger.addHandler(fh) - -RB_NAME = "test_definition" -RB_VERSION = "ver_1" -PROFILE_NAME = "test-profile" -PROFILE_NAMESPACE = "test" -PROFILE_K8S_VERSION = "1.0" -PROFILE_ARTIFACT_PATH = "artifacts\\profile.tar.gz" # FILL ME -TEMPLATE_NAME = "test_template" -TEMPLATE_DESCRIPTION = "test description" -CLOUD_REGION_ID = "k8s_region_test" # FILL ME -CLOUD_OWNER = "CloudOwner" -KUBECONFIG_PATH = "artifacts\\kubeconfig" # FILL ME -MYPATH = os.path.dirname(os.path.realpath(__file__)) - -pytest.INSTANCE_ID = "" - - -@pytest.mark.integration -def test_definition_create_upload_artifact(): - definition = Definition.create(RB_NAME, RB_VERSION) - definition.upload_artifact(b'definition_artifact_file') - - -@pytest.mark.integration -def test_definition_get_all(): - definitions = list(Definition.get_all()) - - -@pytest.mark.integration -def test_configuration_template(): - definition = Definition.get_definition_by_name_version(RB_NAME, - RB_VERSION) - definition.create_configuration_template(TEMPLATE_NAME, TEMPLATE_DESCRIPTION) - definition.get_all_configuration_templates() - definition.get_configuration_template_by_name(TEMPLATE_NAME) - - -@pytest.mark.integration -def test_profile_create_upload_artifact(): - definition = Definition.get_definition_by_name_version(RB_NAME, - RB_VERSION) - profile = definition.create_profile(PROFILE_NAME, - PROFILE_NAMESPACE, - PROFILE_K8S_VERSION) - profile.upload_artifact(b'profile_artifact_file') - - -@pytest.mark.integration -def test_profile_get_all(): - definition = Definition.get_definition_by_name_version(RB_NAME, - RB_VERSION) - profiles = list(definition.get_all_profiles()) - - -@pytest.mark.integration -def test_connectivity_info_create(): - conninfo = ConnectivityInfo.create(CLOUD_REGION_ID, - CLOUD_OWNER, - b'kubeconfig_content_test') - - -@pytest.mark.integration -def test_instance_create(): - definition = Definition.get_definition_by_name_version(RB_NAME, - RB_VERSION) - profile = definition.get_profile_by_name(PROFILE_NAME) - instance = Instance.create(CLOUD_REGION_ID, - profile.profile_name, - definition.rb_name, - definition.rb_version) - pytest.INSTANCE_ID = instance.instance_id - - -@pytest.mark.integration -def test_instance_get_all(): - instances = list(Instance.get_all()) - - -@pytest.mark.integration -def test_instance_delete(): - instance = Instance.get_by_id(pytest.INSTANCE_ID) - instance.delete() - - -@pytest.mark.integration -def test_connectivity_info_delete(): - conninfo = ConnectivityInfo.get_connectivity_info_by_region_id(CLOUD_REGION_ID) - conninfo.delete() - - -@pytest.mark.integration -def test_definition_profile_get_delete(): - definition = Definition.get_definition_by_name_version(RB_NAME, RB_VERSION) - profile = definition.get_profile_by_name(PROFILE_NAME) - profile.delete() - definition.delete() -- cgit 1.2.3-korg