From ded9ae3b507b9687a68cc00dfc75e13130be13ff Mon Sep 17 00:00:00 2001 From: Morgan Richomme Date: Tue, 13 Oct 2020 09:16:20 +0000 Subject: [PATCH] Revert "Create basic_cnf test leveraging onapsdk" This reverts commit 0123c525b0182a5d6f9cd1bee3830eb1956239c7. Reason for revert: Issue-ID: TEST-243 Change-Id: Iaf398a11b296b2c2bf55d9a25a588cd32e44077a Signed-off-by: Morgan Richomme --- .../configuration/basic_cnf_yaml_settings.py | 89 ----------- .../ubuntu16_multicloud_yaml_settings.py | 1 - .../ubuntu16_nomulticloud_settings.py | 1 - src/onaptests/scenario/basic_cnf.py | 47 ------ ...connect_service_subscription_to_cloud_region.py | 3 - .../steps/cloud/k8s_connectivity_info_create.py | 33 ----- src/onaptests/steps/cloud/register_cloud.py | 8 +- .../steps/instantiate/k8s_profile_create.py | 165 --------------------- .../steps/instantiate/service_ala_carte.py | 2 +- .../steps/instantiate/vf_module_ala_carte.py | 14 +- src/onaptests/steps/instantiate/vnf_ala_carte.py | 3 +- src/onaptests/templates/artifacts/k8sprof.tar.gz | Bin 199 -> 0 bytes .../templates/heat-files/basic_cnf/basic_cnf.zip | Bin 4005 -> 0 bytes .../templates/vnf-services/basic_cnf-service.yaml | 19 --- 14 files changed, 8 insertions(+), 377 deletions(-) delete mode 100644 src/onaptests/configuration/basic_cnf_yaml_settings.py delete mode 100644 src/onaptests/scenario/basic_cnf.py delete mode 100644 src/onaptests/steps/cloud/k8s_connectivity_info_create.py delete mode 100644 src/onaptests/steps/instantiate/k8s_profile_create.py delete mode 100644 src/onaptests/templates/artifacts/k8sprof.tar.gz delete mode 100644 src/onaptests/templates/heat-files/basic_cnf/basic_cnf.zip delete mode 100644 src/onaptests/templates/vnf-services/basic_cnf-service.yaml diff --git a/src/onaptests/configuration/basic_cnf_yaml_settings.py b/src/onaptests/configuration/basic_cnf_yaml_settings.py deleted file mode 100644 index cff8b05..0000000 --- a/src/onaptests/configuration/basic_cnf_yaml_settings.py +++ /dev/null @@ -1,89 +0,0 @@ -import os -import openstack -import sys -from yaml import load - -from .settings import * # pylint: disable=W0614 - -""" Specific basic_cnf with multicloud-k8s and yaml config scenario.""" - -# This scenario uses multicloud-k8s and not multicloud -# (no registration requested) -USE_MULTICLOUD = False -# Set ONLY_INSTANTIATE to true to run an instantiation without repeating -# onboarding and related AAI configuration (Cloud config) -ONLY_INSTANTIATE= False - -# if a yaml file is define, retrieve info from this yaml files -# if not declare the parameters in the settings -SERVICE_YAML_TEMPLATE = (sys.path[-1] + "/onaptests/templates/vnf-services/" + - "basic_cnf-service.yaml") - -try: - # Try to retrieve the SERVICE NAME from the yaml file - with open(SERVICE_YAML_TEMPLATE, "r") as yaml_template: - yaml_config_file = load(yaml_template) - SERVICE_NAME = next(iter(yaml_config_file.keys())) -except ValueError: - SERVICE_NAME = "" # Fill me - -CLEANUP_FLAG = True -# nb of seconds before cleanup in case cleanup option is set -CLEANUP_ACTIVITY_TIMER = 10 - -# Definition of k8s profile version -K8S_PROFILE_K8S_VERSION = "1.0" -# Relative path to k8s profile artifact in the python package (so under /src) -K8S_PROFILE_ARTIFACT_PATH = (sys.path[-1] + - "/onaptests/templates/artifacts/k8sprof.tar.gz") -# Relative path to config file to set k8s connectivity information -K8S_KUBECONFIG_FILE = (sys.path[-1] + - "/onaptests/templates/artifacts/config") - -VENDOR_NAME = "basicnf_vendor" - -CLOUD_REGION_CLOUD_OWNER = "basicnf-owner" # must not contain _ -CLOUD_REGION_ID = "k8sregion" -CLOUD_REGION_TYPE = "k8s" -CLOUD_REGION_VERSION = "1.0" -CLOUD_DOMAIN = "Default" -CLOUD_OWNER_DEFINED_TYPE = "t1" - -COMPLEX_PHYSICAL_LOCATION_ID = "lannion" -COMPLEX_DATA_CENTER_CODE = "1234-5" -AVAILABILITY_ZONE_NAME = "basicnf-availability-zone" -AVAILABILITY_ZONE_TYPE = "nova" - -GLOBAL_CUSTOMER_ID = "basicnf-customer" - -OWNING_ENTITY = "basicnf_owning_entity" -PROJECT = "basicnf_project" -LINE_OF_BUSINESS = "basicnf_lob" -PLATFORM = "basicnf_platform" - -SERVICE_INSTANCE_NAME = "basic_cnf_service_instance" - -# The cloud Part -# Assuming a cloud.yaml is available, use the openstack client -# to retrieve cloud info and avoid data duplication -TEST_CLOUD = os.getenv('OS_TEST_CLOUD') -try: - if TEST_CLOUD is not None: - cloud = openstack.connect(cloud=TEST_CLOUD) - VIM_USERNAME = cloud.config.auth['username'] - VIM_PASSWORD = cloud.config.auth['password'] - VIM_SERVICE_URL = cloud.config.auth['auth_url'] - TENANT_ID = cloud.config.auth['project_id'] - TENANT_NAME = cloud.config.auth['project_name'] - else: - raise KeyError -except KeyError: - # If you do not use the cloud.yaml as imput for your openstack - # put the input data here - # Note if 1 parameter is missing in the clouds.yaml, we fallback here - "Dummy definition - not used" - TENANT_ID = "123456" - TENANT_NAME = "dummy_test" - VIM_USERNAME = "dummy" - VIM_PASSWORD = "dummy123" - VIM_SERVICE_URL = "http://10.12.25.2:5000/v3" # Fill me diff --git a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py index abc56e6..341dc16 100644 --- a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py +++ b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py @@ -13,7 +13,6 @@ SERVICE_NAME = "ubuntu16test" # must be the same as in YAML CLOUD_REGION_CLOUD_OWNER = "sdktestsOwner" # must not contain _ CLOUD_REGION_ID = "RegionOne" # should be valid, as otherwise MultiCloud fails CLOUD_REGION_TYPE = "openstack" -CLOUD_OWNER_DEFINED_TYPE = "N/A" CLOUD_REGION_VERSION = "titanium_cloud" CLOUD_DOMAIN = "Default" diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py index 6e04992..c6c9e66 100644 --- a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py +++ b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py @@ -37,7 +37,6 @@ VSP_NAME = "basicvm_ubuntu_vsp" CLOUD_REGION_CLOUD_OWNER = "basicvm-cloud-owner" CLOUD_REGION_TYPE = "openstack" CLOUD_REGION_VERSION = "openstack" -CLOUD_OWNER_DEFINED_TYPE = "N/A" AVAILABILITY_ZONE_NAME = "basicvm-availability-zone" AVAILABILITY_ZONE_TYPE = "nova" diff --git a/src/onaptests/scenario/basic_cnf.py b/src/onaptests/scenario/basic_cnf.py deleted file mode 100644 index 6744781..0000000 --- a/src/onaptests/scenario/basic_cnf.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python -"""Basic CNF test case.""" -import logging -import time - -from xtesting.core import testcase -from onapsdk.configuration import settings -from onaptests.steps.instantiate.vf_module_ala_carte import YamlTemplateVfModuleAlaCarteInstantiateStep - -class BasicCNF(testcase.TestCase): - """Onboard then instantiate a simple CNF with ONAP.""" - - __logger = logging.getLogger(__name__) - - def __init__(self, **kwargs): - """Init BasicCNF.""" - if "case_name" not in kwargs: - kwargs["case_name"] = 'basic_cnf' - super(BasicCNF, self).__init__(**kwargs) - self.__logger.debug("BasicCNF init started") - self.test = YamlTemplateVfModuleAlaCarteInstantiateStep( - cleanup=settings.CLEANUP_FLAG) - self.start_time = None - self.stop_time = None - self.result = 0 - - def run(self): - """Run onap_tests with basic_cnf VM.""" - self.start_time = time.time() - self.__logger.debug("start time") - self.test.execute() - self.__logger.info("basic_cnf successfully created") - self.stop_time = time.time() - # The cleanup is part of the test, not only a teardown action - if settings.CLEANUP_FLAG: - self.__logger.info("basic_cnf cleanup called") - time.sleep(settings.CLEANUP_ACTIVITY_TIMER) - self.test.cleanup() - self.result = 100 - else: - self.__logger.info("No cleanup requested. Test completed.") - self.result = 100 - - - def clean(self): - """Clean Additional resources if needed.""" - pass diff --git a/src/onaptests/steps/cloud/connect_service_subscription_to_cloud_region.py b/src/onaptests/steps/cloud/connect_service_subscription_to_cloud_region.py index d48ff7c..636f8cd 100644 --- a/src/onaptests/steps/cloud/connect_service_subscription_to_cloud_region.py +++ b/src/onaptests/steps/cloud/connect_service_subscription_to_cloud_region.py @@ -6,7 +6,6 @@ from ..base import BaseStep from .customer_service_subscription_create import CustomerServiceSubscriptionCreateStep from .link_cloud_to_complex import LinkCloudRegionToComplexStep from .register_cloud import RegisterCloudRegionStep -from .k8s_connectivity_info_create import K8SConnectivityInfoStep class ConnectServiceSubToCloudRegionStep(BaseStep): @@ -22,8 +21,6 @@ class ConnectServiceSubToCloudRegionStep(BaseStep): """ super().__init__(cleanup=cleanup) - if settings.CLOUD_REGION_TYPE == "k8s": - self.add_step(K8SConnectivityInfoStep(cleanup=cleanup)) self.add_step(RegisterCloudRegionStep(cleanup=cleanup)) self.add_step(LinkCloudRegionToComplexStep(cleanup=cleanup)) self.add_step(CustomerServiceSubscriptionCreateStep(cleanup=cleanup)) diff --git a/src/onaptests/steps/cloud/k8s_connectivity_info_create.py b/src/onaptests/steps/cloud/k8s_connectivity_info_create.py deleted file mode 100644 index ef95876..0000000 --- a/src/onaptests/steps/cloud/k8s_connectivity_info_create.py +++ /dev/null @@ -1,33 +0,0 @@ -from onapsdk.configuration import settings -from onapsdk.msb.k8s import ConnectivityInfo - -from ..base import BaseStep - -class K8SConnectivityInfoStep(BaseStep): - """CreateConnnectivityInfoStep.""" - - @BaseStep.store_state - def execute(self): - """Creation k8s connectivity information - - Use settings values: - - CLOUD_REGION_ID, - - CLOUD_REGION_CLOUD_OWNER, - - K8S_KUBECONFIG_FILE. - """ - super().execute() - ######## Create Connectivity Info ######################################### - try: - ConnectivityInfo.get_connectivity_info_by_region_id(settings.CLOUD_REGION_ID) - except ValueError: - ConnectivityInfo.create(settings.CLOUD_REGION_ID, - settings.CLOUD_REGION_CLOUD_OWNER, - open(settings.K8S_KUBECONFIG_FILE, 'rb').read()) - - def cleanup(self) -> None: - """Cleanup K8S Connectivity information. - """ - self._logger.info("*Clean the k8s connectivity information *") - super().cleanup() - connectinfo = ConnectivityInfo.get_connectivity_info_by_region_id(settings.CLOUD_REGION_ID) - connectinfo.delete() diff --git a/src/onaptests/steps/cloud/register_cloud.py b/src/onaptests/steps/cloud/register_cloud.py index 0ab0dfb..6836b12 100644 --- a/src/onaptests/steps/cloud/register_cloud.py +++ b/src/onaptests/steps/cloud/register_cloud.py @@ -18,9 +18,6 @@ class RegisterCloudRegionStep(BaseStep): - CLOUD_REGION_CLOUD_OWNER, - CLOUD_REGION_ID, - CLOUD_DOMAIN, - - CLOUD_REGION_VERSION, - - CLOUD_OWNER_DEFINED_TYPE, - - COMPLEX_PHYSICAL_LOCATION_ID, - VIM_USERNAME, - VIM_PASSWORD, - VIM_SERVICE_URL, @@ -41,10 +38,7 @@ class RegisterCloudRegionStep(BaseStep): orchestration_disabled=False, in_maint=False, cloud_type=settings.CLOUD_REGION_TYPE, - cloud_region_version=settings.CLOUD_REGION_VERSION, - owner_defined_type=settings.CLOUD_OWNER_DEFINED_TYPE, - complex_name=settings.COMPLEX_PHYSICAL_LOCATION_ID - # cloud_extra_info=settings.CLOUD_EXTRA_INFO + cloud_region_version=settings.CLOUD_REGION_VERSION ) cloud_region.add_esr_system_info( esr_system_info_id=str(uuid4()), diff --git a/src/onaptests/steps/instantiate/k8s_profile_create.py b/src/onaptests/steps/instantiate/k8s_profile_create.py deleted file mode 100644 index 375aa2c..0000000 --- a/src/onaptests/steps/instantiate/k8s_profile_create.py +++ /dev/null @@ -1,165 +0,0 @@ -from typing import Iterable -from uuid import uuid4 -from yaml import load - -from onapsdk.aai.business import Customer, ServiceInstance, ServiceSubscription -from onapsdk.configuration import settings -from onapsdk.msb.k8s import Definition -from onapsdk.so.instantiation import VnfParameter - -from ..base import BaseStep -from .vnf_ala_carte import YamlTemplateVnfAlaCarteInstantiateStep - -class K8SProfileStep(BaseStep): - """CreateK8sProfileStep.""" - - def __init__(self, cleanup=False): - """Initialize step. - """ - super().__init__(cleanup=cleanup) - - self._yaml_template: dict = None - self._service_instance_name: str = None - self._service_instance: ServiceInstance = None - self.add_step(YamlTemplateVnfAlaCarteInstantiateStep(cleanup)) - - @property - def yaml_template(self) -> dict: - """Step YAML template. - - Load from file if it's a root step, get from parent otherwise. - - Returns: - dict: Step YAML template - - """ - if self.is_root: - if not self._yaml_template: - with open(settings.SERVICE_YAML_TEMPLATE, "r") as yaml_template: - self._yaml_template: dict = load(yaml_template) - return self._yaml_template - return self.parent.yaml_template - - @property - def service_name(self) -> str: - """Service name. - - Get from YAML template if it's a root step, get from parent otherwise. - - Returns: - str: Service name - - """ - if self.is_root: - return next(iter(self.yaml_template.keys())) - return self.parent.service_name - - @property - def service_instance_name(self) -> str: - """Service instance name. - - Generate using `service_name` and `uuid4()` function if it's a root step, - get from parent otherwise. - - Returns: - str: Service instance name - - """ - if self.is_root: - if not self._service_instance_name: - self._service_instance_name: str = f"{self.service_name}-{str(uuid4())}" - return self._service_instance_name - return self.parent.service_instance_name - - def get_vnf_parameters(self, vnf_name: str) -> Iterable[VnfParameter]: - """Get VNF parameters from YAML template. - - Args: - vnf_name (str): VNF name to get parameters for. - - Yields: - Iterator[Iterable[VnfParameter]]: VNF parameter - - """ - - # workaround, as VNF name differs from model name (added " 0") - vnf_name = vnf_name.split()[0] - for vnf in self.yaml_template[self.service_name]["vnfs"]: - if vnf["vnf_name"] == vnf_name: - for vnf_parameter in vnf["vnf_parameters"]: - yield VnfParameter( - name=vnf_parameter["name"], - value=vnf_parameter["value"] - ) - - @BaseStep.store_state - def execute(self): - """Creation of k8s profile for resource bundle definition - - Use settings values: - - GLOBAL_CUSTOMER_ID - - K8S_PROFILE_K8S_VERSION - - K8S_PROFILE_ARTIFACT_PATH. - """ - super().execute() - customer: Customer = Customer.get_by_global_customer_id(settings.GLOBAL_CUSTOMER_ID) - service_subscription: ServiceSubscription = customer.get_service_subscription_by_service_type(self.service_name) - self._service_instance: ServiceInstance = service_subscription.get_service_instance_by_name(self.service_instance_name) - - for vnf_instance in self._service_instance.vnf_instances: - # possible to have several modules for 1 VNF - for vf_module in vnf_instance.vnf.vf_modules: - # Define profile (rb_profile) for resource bundle definition - # Retrieve resource bundle definition (rbdef) corresponding to vf module - rbdef_name = vf_module.metadata["vfModuleModelInvariantUUID"] - rbdef_version = vf_module.metadata["vfModuleModelUUID"] - rbdef = Definition.get_definition_by_name_version(rbdef_name, rbdef_version) - # Get k8s profile name from yaml service template - vnf_parameters = self.get_vnf_parameters(vnf_instance.vnf.name) - k8s_profile_name = "" - k8s_profile_namespace = "" - for param in vnf_parameters: - if param.name == "k8s-rb-profile-name": - k8s_profile_name = param.value - if param.name == "k8s-rb-profile-namespace": - k8s_profile_namespace = param.value - if k8s_profile_name == "" or k8s_profile_namespace == "": - raise Exception("Vf module instantiation failed, missing rb profile information") - ######## Check profile for Definition ################################### - try: - rbdef.get_profile_by_name(k8s_profile_name) - except ValueError: - ######## Create profile for Definition ################################### - profile = rbdef.create_profile(k8s_profile_name, - k8s_profile_namespace, - settings.K8S_PROFILE_K8S_VERSION) - ####### Upload artifact for created profile ############################## - profile.upload_artifact(open(settings.K8S_PROFILE_ARTIFACT_PATH, 'rb').read()) - - def cleanup(self) -> None: - """Cleanup K8S profiles. - """ - self._logger.info("*Clean the k8s profile *") - for vnf_instance in self._service_instance.vnf_instances: - # possible to have several modules for 1 VNF - for vf_module in vnf_instance.vnf.vf_modules: - # Retrieve resource bundle definition (rbdef) corresponding to vf module - rbdef_name = vf_module.metadata["vfModuleModelInvariantUUID"] - rbdef_version = vf_module.metadata["vfModuleModelUUID"] - rbdef = Definition.get_definition_by_name_version(rbdef_name, rbdef_version) - # Get k8s profile name from yaml service template - vnf_parameters = self.get_vnf_parameters(vnf_instance.vnf.name) - k8s_profile_name = "" - for param in vnf_parameters: - if param.name == "k8s-rb-profile-name": - k8s_profile_name = param.value - if k8s_profile_name == "": - raise Exception("K8s profile deletion failed, missing rb profile name") - ######## Delete profile for Definition ################################### - try: - profile = rbdef.get_profile_by_name(k8s_profile_name) - profile.delete() - except ValueError: - self._logger.error("K8s profile deletion %s failed", k8s_profile_name) - raise Exception("K8s profile deletion failed") - super().cleanup() diff --git a/src/onaptests/steps/instantiate/service_ala_carte.py b/src/onaptests/steps/instantiate/service_ala_carte.py index 80473b7..b3b56c4 100644 --- a/src/onaptests/steps/instantiate/service_ala_carte.py +++ b/src/onaptests/steps/instantiate/service_ala_carte.py @@ -219,6 +219,7 @@ class YamlTemplateServiceAlaCarteInstantiateStep(YamlTemplateBaseStep): Exception: Service cleaning failed """ + super().cleanup() service_deletion = self._service_instance.delete() nb_try = 0 nb_try_max = 30 @@ -231,4 +232,3 @@ class YamlTemplateServiceAlaCarteInstantiateStep(YamlTemplateBaseStep): else: self._logger.error("Service deletion %s failed", self._service_instance_name) raise Exception("Service cleanup failed") - super().cleanup() diff --git a/src/onaptests/steps/instantiate/vf_module_ala_carte.py b/src/onaptests/steps/instantiate/vf_module_ala_carte.py index c1b2e23..14ef2d8 100644 --- a/src/onaptests/steps/instantiate/vf_module_ala_carte.py +++ b/src/onaptests/steps/instantiate/vf_module_ala_carte.py @@ -10,7 +10,6 @@ from onapsdk.so.instantiation import VnfParameter from ..base import YamlTemplateBaseStep from .vnf_ala_carte import YamlTemplateVnfAlaCarteInstantiateStep -from .k8s_profile_create import K8SProfileStep class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): """Instantiate vf module a'la carte using YAML template.""" @@ -26,12 +25,7 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): self._yaml_template: dict = None self._service_instance_name: str = None self._service_instance: ServiceInstance = None - if settings.CLOUD_REGION_TYPE == "k8s": - self.add_step(K8SProfileStep(cleanup)) - else: - self.add_step(YamlTemplateVnfAlaCarteInstantiateStep(cleanup)) - - + self.add_step(YamlTemplateVnfAlaCarteInstantiateStep(cleanup)) @property def yaml_template(self) -> dict: @@ -93,7 +87,7 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): """ # workaround, as VNF name differs from model name (added " 0") - vnf_name = vnf_name.split()[0] + vnf_name=vnf_name.split()[0] for vnf in self.yaml_template[self.service_name]["vnfs"]: if vnf["vnf_name"] == vnf_name: for vnf_parameter in vnf["vnf_parameters"]: @@ -131,7 +125,7 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): cloud_region, tenant, self._service_instance_name, - vnf_parameters=self.get_vnf_parameters(vnf_instance.vnf.name)) + vnf_parameters= self.get_vnf_parameters(vnf_instance.vnf.name)) while not vf_module_instantiation.finished: time.sleep(10) if vf_module_instantiation.failed: @@ -145,6 +139,7 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): Exception: Vf module cleaning failed """ + super().cleanup() for vnf_instance in self._service_instance.vnf_instances: self._logger.debug("VNF instance %s found in Service Instance ", vnf_instance.name) @@ -165,4 +160,3 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): else: self._logger.error("VfModule deletion %s failed", vf_module.name) raise Exception("Vf module cleanup failed") - super().cleanup() diff --git a/src/onaptests/steps/instantiate/vnf_ala_carte.py b/src/onaptests/steps/instantiate/vnf_ala_carte.py index 9fa7576..0ab498d 100644 --- a/src/onaptests/steps/instantiate/vnf_ala_carte.py +++ b/src/onaptests/steps/instantiate/vnf_ala_carte.py @@ -119,6 +119,8 @@ class YamlTemplateVnfAlaCarteInstantiateStep(YamlTemplateBaseStep): Exception: VNF cleaning failed """ + super().cleanup() + for vnf_instance in self._service_instance.vnf_instances: vnf_deletion = vnf_instance.delete() nb_try = 0 @@ -133,4 +135,3 @@ class YamlTemplateVnfAlaCarteInstantiateStep(YamlTemplateBaseStep): else: self._logger.error("VNF deletion %s failed", vnf_instance.name) raise Exception("VNF Cleanup failed") - super().cleanup() diff --git a/src/onaptests/templates/artifacts/k8sprof.tar.gz b/src/onaptests/templates/artifacts/k8sprof.tar.gz deleted file mode 100644 index fdfa8c89d87d48fe365b88e7a3c40beb896fce07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmV;&06702iwFREH)dS`1MSn_3W6{c$MIe7DTepPmUEUb6GAHlvv4Z-_E|y{6yEfQ z;QP5bV`s1f+wV}+<<5t8F%*YNe1;x5=PuP`slKlhmkE=kiLpsyjTPFAODmNA&^!;i z&=!qSqTYupbL-Wsb94Pa700pceG|%KovYr+b~yQ5D%BTN=R>Zd`smaLyH%Ouk00000000000002+*UlEE*rxy}000dq BU}OLQ diff --git a/src/onaptests/templates/heat-files/basic_cnf/basic_cnf.zip b/src/onaptests/templates/heat-files/basic_cnf/basic_cnf.zip deleted file mode 100644 index 6d6e81e8ab5d71b7fca47e18327c4c5c8978e0b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4005 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 diff --git a/src/onaptests/templates/vnf-services/basic_cnf-service.yaml b/src/onaptests/templates/vnf-services/basic_cnf-service.yaml deleted file mode 100644 index c3c701f..0000000 --- a/src/onaptests/templates/vnf-services/basic_cnf-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -basic_cnf: - tosca_file_from_SDC: service-basic_cnf-template - version: "1.0" - subscription_type: "basic_cnf" - vnfs: - - vnf_name: basic_cnf - heat_files_to_upload: onaptests/templates/heat-files/basic_cnf/basic_cnf.zip - vnf_parameters: [ - {"name": "dummy_name_0", - "value": "dummy_name" - }, - {"name": "k8s-rb-profile-name", - "value": "cnftest" - }, - {"name": "k8s-rb-profile-namespace", - "value": "k8s" - } - ] -- 2.16.6