From 35de8279757ad23d7dbc38ddce5e01083ec26d08 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Mon, 1 Feb 2021 17:26:42 +0100 Subject: [TESTS] cleanup tests and remove reference to ubuntu16 the basic_vm test was historically called ubuntu16... as we are now delaing more with ubuntu18 or ubuntu20, the reference to the version16 is a bit old - Replace ubuntu16 by basic_vm - Use ubuntu20 instead of Ubuntu16 - Replace onap.small by m1.small to be natively compatible with any Openstack (default flavor) Issue-ID: TEST-299 Signed-off-by: mrichomme Change-Id: I69f573354c87c44c10581861450d48244db0c7df (cherry picked from commit ba1faac52b28f752516ab075a5bda56058548e49) --- .../basic_network_nomulticloud_settings.py | 4 +- .../basic_vm_multicloud_yaml_settings.py | 43 ++++++ src/onaptests/configuration/basic_vm_settings.py | 72 ++++++++++ .../ubuntu16_multicloud_yaml_settings.py | 43 ------ .../ubuntu16_nomulticloud_settings.py | 72 ---------- src/onaptests/scenario/basic_vm.py | 3 +- .../templates/heat-files/ubuntu16/ubuntu16.zip | Bin 1641 -> 0 bytes .../heat-files/ubuntu18/base_ubuntu18.env | 19 --- .../heat-files/ubuntu18/base_ubuntu18.yaml | 153 --------------------- .../heat-files/ubuntu18/ubuntu18agent.zip | Bin 2496 -> 2495 bytes .../heat-files/ubuntu20/ubuntu20agent.zip | Bin 0 -> 2492 bytes .../vnf-services/basic_onboard-service.yaml.j2 | 3 +- .../templates/vnf-services/basic_vm-service.yaml | 39 ++++++ .../vnf-services/ubuntu16test-service.yaml | 41 ------ .../vnf-services/ubuntu18agent-service.yaml | 2 +- 15 files changed, 160 insertions(+), 334 deletions(-) create mode 100644 src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py create mode 100644 src/onaptests/configuration/basic_vm_settings.py delete mode 100644 src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py delete mode 100644 src/onaptests/configuration/ubuntu16_nomulticloud_settings.py delete mode 100644 src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip delete mode 100644 src/onaptests/templates/heat-files/ubuntu18/base_ubuntu18.env delete mode 100644 src/onaptests/templates/heat-files/ubuntu18/base_ubuntu18.yaml create mode 100644 src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip create mode 100644 src/onaptests/templates/vnf-services/basic_vm-service.yaml delete mode 100644 src/onaptests/templates/vnf-services/ubuntu16test-service.yaml (limited to 'src') diff --git a/src/onaptests/configuration/basic_network_nomulticloud_settings.py b/src/onaptests/configuration/basic_network_nomulticloud_settings.py index fd7c561..cc22601 100644 --- a/src/onaptests/configuration/basic_network_nomulticloud_settings.py +++ b/src/onaptests/configuration/basic_network_nomulticloud_settings.py @@ -6,11 +6,11 @@ from yaml import load import onaptests.utils.exceptions as onap_test_exceptions from .settings import * # pylint: disable=W0614 -""" Specific ubuntu16 without multicloud.""" +""" Specific Basic Network without multicloud.""" # pylint: disable=bad-whitespace # The ONAP part -SERVICE_DETAILS="Onboarding, distribution and instanitation of asic Network using à la carte" +SERVICE_DETAILS="Onboarding, distribution and instantiation of Basic Network using à la carte" SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC" USE_MULTICLOUD = False # Set ONLY_INSTANTIATE to true to run an instantiation without repeating diff --git a/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py b/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py new file mode 100644 index 0000000..437bd13 --- /dev/null +++ b/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py @@ -0,0 +1,43 @@ +import sys +from .settings import * # pylint: disable=W0614 + +""" Specific Basic VM with multicloud and yaml config scenario.""" +SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a VM" + + "using à la carte and Multicloud module") +SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC, Multicloud" + +USE_MULTICLOUD = True +# Set ONLY_INSTANTIATE to true to run an instantiation without repeating +# onboarding and related AAI configuration (Cloud config) +ONLY_INSTANTIATE= False +VENDOR_NAME = "sdktests_vendor" +SERVICE_NAME = "basicvmtest" # 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" + +COMPLEX_PHYSICAL_LOCATION_ID = "sdktests_complex_physical_location_id" +COMPLEX_DATA_CENTER_CODE = "sdktests_complex_data_center_code" + +GLOBAL_CUSTOMER_ID = "sdktests_global_customer_id" +TENANT_ID = "" # Fill me in your custom settings +TENANT_NAME= "" # Fill me in your custom settings +AVAILABILITY_ZONE_NAME = "" # Fill me in your custom settings +AVAILABILITY_ZONE_TYPE = "nova" + +VIM_USERNAME = "" # Fill me in your custom settings +VIM_PASSWORD = "" # Fill me in your custom settings +VIM_SERVICE_URL = "" # Fill me in your custom settings + +OWNING_ENTITY = "sdktests_owning_entity" +PROJECT = "sdktests_project" +LINE_OF_BUSINESS = "sdktests_line_of_business" +PLATFORM = "sdktests_platform" + +SERVICE_INSTANCE_NAME = "sdktests_service_instance_name" + +SERVICE_YAML_TEMPLATE = sys.path[-1] + "/onaptests/templates/vnf-services/basic_vm-service.yaml" diff --git a/src/onaptests/configuration/basic_vm_settings.py b/src/onaptests/configuration/basic_vm_settings.py new file mode 100644 index 0000000..a62e0b1 --- /dev/null +++ b/src/onaptests/configuration/basic_vm_settings.py @@ -0,0 +1,72 @@ +import os +import openstack +import sys +from yaml import load + +import onaptests.utils.exceptions as onap_test_exceptions +from .settings import * # pylint: disable=W0614 + +""" Specific basic_vm without multicloud.""" + +# pylint: disable=bad-whitespace +# The ONAP part +SERVICE_DETAILS="Onboarding, distribution and instanitation of an Ubuntu VM using à la carte" +SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC" + +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_vm-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 (FileNotFoundError, ValueError): + raise onap_test_exceptions.TestConfigurationException + +CLEANUP_FLAG = True +CLEANUP_ACTIVITY_TIMER = 10 # nb of seconds before cleanup in case cleanup option is set +VENDOR_NAME = "basicvm_vendor" + +VF_NAME = "basicvm_ubuntu_vf" +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" +COMPLEX_PHYSICAL_LOCATION_ID = "lannion" +COMPLEX_DATA_CENTER_CODE = "1234-5" + +GLOBAL_CUSTOMER_ID = "basicvm-customer" + +OWNING_ENTITY = "basicvm-oe" +PROJECT = "basicvm-project" +LINE_OF_BUSINESS = "basicvm-lob" +PLATFORM = "basicvm-platform" + +SERVICE_INSTANCE_NAME = "basic_vm_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') +TEST_CLOUD = os.getenv('OS_TEST_CLOUD') +cloud = openstack.connect(cloud=TEST_CLOUD) +VIM_USERNAME = cloud.config.auth.get('username','Fill me') +VIM_PASSWORD = cloud.config.auth.get('password','Fill me') +VIM_SERVICE_URL = cloud.config.auth.get('auth_url','Fill me') +TENANT_ID = cloud.config.auth.get('project_id','Fill me') +TENANT_NAME = cloud.config.auth.get('project_name','Fill me') +CLOUD_REGION_ID = cloud.config.auth.get('region_name','RegionOne') +CLOUD_DOMAIN = cloud.config.auth.get('project_domain_name','Default') diff --git a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py deleted file mode 100644 index 5036ed8..0000000 --- a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py +++ /dev/null @@ -1,43 +0,0 @@ -import sys -from .settings import * # pylint: disable=W0614 - -""" Specific ubuntu16 with multicloud and yaml config scenario.""" -SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a VM" + - "using à la carte and Multicloud module") -SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC, Multicloud" - -USE_MULTICLOUD = True -# Set ONLY_INSTANTIATE to true to run an instantiation without repeating -# onboarding and related AAI configuration (Cloud config) -ONLY_INSTANTIATE= False -VENDOR_NAME = "sdktests_vendor" -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" - -COMPLEX_PHYSICAL_LOCATION_ID = "sdktests_complex_physical_location_id" -COMPLEX_DATA_CENTER_CODE = "sdktests_complex_data_center_code" - -GLOBAL_CUSTOMER_ID = "sdktests_global_customer_id" -TENANT_ID = "" # Fill me in your custom settings -TENANT_NAME= "" # Fill me in your custom settings -AVAILABILITY_ZONE_NAME = "" # Fill me in your custom settings -AVAILABILITY_ZONE_TYPE = "nova" - -VIM_USERNAME = "" # Fill me in your custom settings -VIM_PASSWORD = "" # Fill me in your custom settings -VIM_SERVICE_URL = "" # Fill me in your custom settings - -OWNING_ENTITY = "sdktests_owning_entity" -PROJECT = "sdktests_project" -LINE_OF_BUSINESS = "sdktests_line_of_business" -PLATFORM = "sdktests_platform" - -SERVICE_INSTANCE_NAME = "sdktests_service_instance_name" - -SERVICE_YAML_TEMPLATE = sys.path[-1] + "/onaptests/templates/vnf-services/ubuntu16test-service.yaml" diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py deleted file mode 100644 index 24686af..0000000 --- a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py +++ /dev/null @@ -1,72 +0,0 @@ -import os -import openstack -import sys -from yaml import load - -import onaptests.utils.exceptions as onap_test_exceptions -from .settings import * # pylint: disable=W0614 - -""" Specific ubuntu16 without multicloud.""" - -# pylint: disable=bad-whitespace -# The ONAP part -SERVICE_DETAILS="Onboarding, distribution and instanitation of an Ubuntu VM using à la carte" -SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC" - -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/" + - "ubuntu16test-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 (FileNotFoundError, ValueError): - raise onap_test_exceptions.TestConfigurationException - -CLEANUP_FLAG = True -CLEANUP_ACTIVITY_TIMER = 10 # nb of seconds before cleanup in case cleanup option is set -VENDOR_NAME = "basicvm_vendor" - -VF_NAME = "basicvm_ubuntu_vf" -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" -COMPLEX_PHYSICAL_LOCATION_ID = "lannion" -COMPLEX_DATA_CENTER_CODE = "1234-5" - -GLOBAL_CUSTOMER_ID = "basicvm-customer" - -OWNING_ENTITY = "basicvm-oe" -PROJECT = "basicvm-project" -LINE_OF_BUSINESS = "basicvm-lob" -PLATFORM = "basicvm-platform" - -SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_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') -TEST_CLOUD = os.getenv('OS_TEST_CLOUD') -cloud = openstack.connect(cloud=TEST_CLOUD) -VIM_USERNAME = cloud.config.auth.get('username','Fill me') -VIM_PASSWORD = cloud.config.auth.get('password','Fill me') -VIM_SERVICE_URL = cloud.config.auth.get('auth_url','Fill me') -TENANT_ID = cloud.config.auth.get('project_id','Fill me') -TENANT_NAME = cloud.config.auth.get('project_name','Fill me') -CLOUD_REGION_ID = cloud.config.auth.get('region_name','RegionOne') -CLOUD_DOMAIN = cloud.config.auth.get('project_domain_name','Default') diff --git a/src/onaptests/scenario/basic_vm.py b/src/onaptests/scenario/basic_vm.py index cbf9b7c..ff432db 100644 --- a/src/onaptests/scenario/basic_vm.py +++ b/src/onaptests/scenario/basic_vm.py @@ -16,7 +16,6 @@ class BasicVm(testcase.TestCase): def __init__(self, **kwargs): """Init BasicVM.""" - # import ubuntu16_nomulticloud_settings needed if "case_name" not in kwargs: kwargs["case_name"] = 'basic_vm' super(BasicVm, self).__init__(**kwargs) @@ -28,7 +27,7 @@ class BasicVm(testcase.TestCase): self.result = 0 def run(self): - """Run onap_tests with ubuntu16 VM.""" + """Run Basic VM onap test.""" self.start_time = time.time() self.__logger.debug("start time") try: diff --git a/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip b/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip deleted file mode 100644 index 9a98baa..0000000 Binary files a/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip and /dev/null differ diff --git a/src/onaptests/templates/heat-files/ubuntu18/base_ubuntu18.env b/src/onaptests/templates/heat-files/ubuntu18/base_ubuntu18.env deleted file mode 100644 index 062468a..0000000 --- a/src/onaptests/templates/heat-files/ubuntu18/base_ubuntu18.env +++ /dev/null @@ -1,19 +0,0 @@ -parameters: -# Metadata required by ONAP - vnf_id: Ubuntu18-VNF - vf_module_id: Ubuntu18-VF-module - vnf_name: Ubuntu18-VNF-name - -# Server parameters, naming required by ONAP - ubuntu18_image_name: ubuntu-18.04-daily - ubuntu18_flavor_name: onap.small - ubuntu18_pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3dbqgymZVpu2cIWqzlKNxnOy2Qjt07NZxaXtQyu9dr0kbmursTE5N0IW0qg/rsCXgw2vjjdPOxU6jtrTbyzbAmo9F6LtS9oqvct9LmLjDNyiQFuCPETIBGy43daDVgw3hrg3f9ihN88V/JwnI9n3ZFn8Wy15KV6XCHn3MASV31YnbkjruUtj7rZm5V8NUwAteZ91k5T7WBpywt483rrkeQjEzyKiVSmmOhHWNSmbnko9XzO7QDUHfVIk5qCf/aBES7hcE0YiqX5lfLamSyCqOGANnv+AN2opDEakUeCyJHZrsk3Nkk7A9p+CNlq42sUEKtrO0xiH63viMA6eBYSiaQPzckdq/T52naozx/Oj9ITCgX/6XjldMUF99afIydpC6+kymflTYA8P/9u1Ih93+Vjg1Bf2e4lJaf9z9frXcB9F+ZRDq6feN+XQ93Q8xQ9blu9Gq8BZUbPvAQxW0UaryeuzhCKx4QA33qqYA+tmWVXTsaG0uow6f0hm7z+pkYCM= master@Utilisateur-PC - ubuntu18_name_0: ubuntu18 - -# Network parameters, naming required by ONAP - admin_plane_net_name: admin - -# APP/USER_DATA - dcae_collector_ip: 10.4.2.166 - # 30417 is https node port to VES - dcae_collector_port: 30417 diff --git a/src/onaptests/templates/heat-files/ubuntu18/base_ubuntu18.yaml b/src/onaptests/templates/heat-files/ubuntu18/base_ubuntu18.yaml deleted file mode 100644 index 73612a0..0000000 --- a/src/onaptests/templates/heat-files/ubuntu18/base_ubuntu18.yaml +++ /dev/null @@ -1,153 +0,0 @@ -heat_template_version: 2013-05-23 - -description: Heat template to deploy ubuntu VM Closed Loop for ONAP - -parameters: - # Metadata required by ONAP - vnf_name: - type: string - label: VM name - description: The VM name - vnf_id: - type: string - label: VNF ID - description: The VNF ID is provided by ONAP - vf_module_id: - type: string - label: VF module ID - description: The VF Module ID is provided by ONAP - -# Server parameters, naming required by ONAP - ubuntu18_image_name: - type: string - label: Image name or ID - description: Image to be used for compute instance - ubuntu18_flavor_name: - type: string - label: Flavor - description: Type of instance (flavor) to be used - ubuntu18_pub_key: - type: string - label: Public key - description: Public key to be installed on the compute instance - ubuntu18_name_0: - type: string - label: VM name - description: The VM name - -# Network parameters, naming required by ONAP - admin_plane_net_name: - type: string - label: management network - description: The external management network - -# DCAE parameters - dcae_collector_ip: - type: string - label: DCAE collector IP address - description: IP address of the DCAE collector - dcae_collector_port: - type: string - label: DCAE collector port - description: Port of the DCAE collector - -resources: - random-str: - type: OS::Heat::RandomString - properties: - length: 4 - - ubuntu18_instantiated_key_name: - type: OS::Nova::KeyPair - properties: - name: - str_replace: - template: pre_base_rand - params: - pre: key_ - base: { get_param: vnf_name } - rand: { get_resource: random-str } - public_key: { get_param: ubuntu18_pub_key } - save_private_key: false - - ubuntu18_admin_security_group: - type: OS::Neutron::SecurityGroup - properties: - description: security group - name: - str_replace: - template: pre_base_rand - params: - pre: sg_ - base: { get_param: vnf_name } - rand: { get_resource: random-str } - rules: [ - {remote_ip_prefix: 0.0.0.0/0, protocol: tcp, port_range_min: 22, port_range_max: 22}, - {remote_ip_prefix: 0.0.0.0/0, protocol: icmp}] - - ubuntu18_0_admin_plane_port_0: - type: OS::Neutron::Port - properties: - name: - str_replace: - template: pre_base_rand - params: - pre: port_ - base: { get_param: vnf_name } - rand: { get_resource: random-str } - network: { get_param: admin_plane_net_name } - security_groups: [{ get_resource: ubuntu18_admin_security_group }] - - ubuntu18_VM_settings: - type: OS::Heat::SoftwareConfig - properties: - config: | - #!/bin/bash - sudo apt-get update - - ubuntu18_server_0: - type: OS::Nova::Server - properties: - image: { get_param: ubuntu18_image_name } - flavor: { get_param: ubuntu18_flavor_name } - name: { get_param: ubuntu18_name_0 } - metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }, vnf_name: { get_param: vnf_name }} - key_name: { get_resource: ubuntu18_instantiated_key_name } - networks: - - port: { get_resource: ubuntu18_0_admin_plane_port_0 } - user_data_format: RAW - user_data: - str_replace: - params: - __dcae_collector_ip__: { get_param: dcae_collector_ip } - __dcae_collector_port__: { get_param: dcae_collector_port } - template: | - #!/bin/bash - - # Create configuration files - sudo mkdir /opt/config - echo __dcae_collector_ip__ > /opt/config/dcae_collector_ip.txt - echo __dcae_collector_port__ > /opt/config/dcae_collector_port.txt - cd /opt - sudo apt-get update - sudo apt-get install --allow-unauthenticated -y make gcc rpl - sudo apt-get update && sudo apt-get -y upgrade - sudo apt-get install -y libcurl4-openssl-dev - sudo git clone https://github.com/onap/vnfsdk-ves-agent.git - sudo cp -r vnfsdk-ves-agent/veslibrary/ves_clibrary/ /opt - sudo rm -rf /opt/vnfsdk-ves-agent/ - sudo chmod +x /opt/ves_clibrary/evel/evel-library/code/VESreporting_vFW/go-client.sh - cd /opt/ves_clibrary/evel/evel-library/bldjobs/ - sudo mv ../code/VESreporting_vFW ../code/VESreporting - # choose HTTPS - sudo rpl "0, /* HTTPS?" "1, /* HTTPS?" ../code/VESreporting/vpp_measurement_reporter.c - sudo make clean - sudo make all - sudo sleep 1 - cd /opt/ves_clibrary/evel/evel-library/libs/x86_64 - sudo cp libevel.so /usr/lib - sudo ldconfig - # Start VES client - cd /opt/ves_clibrary/evel/evel-library/code/VESreporting/ - ./go-client.sh &>/dev/null &disown - #get_resource: ubuntu18_VM_settings diff --git a/src/onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip b/src/onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip index 90b07e7..aa32f85 100644 Binary files a/src/onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip and b/src/onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip differ diff --git a/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip new file mode 100644 index 0000000..49f9b71 Binary files /dev/null and b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip differ diff --git a/src/onaptests/templates/vnf-services/basic_onboard-service.yaml.j2 b/src/onaptests/templates/vnf-services/basic_onboard-service.yaml.j2 index c45745e..6c91994 100644 --- a/src/onaptests/templates/vnf-services/basic_onboard-service.yaml.j2 +++ b/src/onaptests/templates/vnf-services/basic_onboard-service.yaml.j2 @@ -19,7 +19,7 @@ h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\ t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" }, {"name": "ubuntu18_flavor_name", - "value": "onap.small" + "value": "m1.smaller" }, {"name": "VM_name", "value": "ubuntu18agent-VM-01" @@ -37,3 +37,4 @@ t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" "value": "admin" } ] + diff --git a/src/onaptests/templates/vnf-services/basic_vm-service.yaml b/src/onaptests/templates/vnf-services/basic_vm-service.yaml new file mode 100644 index 0000000..4609bae --- /dev/null +++ b/src/onaptests/templates/vnf-services/basic_vm-service.yaml @@ -0,0 +1,39 @@ +--- +basic_vm: + vnfs: + - vnf_name: basic_vm + heat_files_to_upload: onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip + vnf_parameters: [ + {"name": "ubuntu20_image_name", + "value": "ubuntu-agent" + }, + {"name": "ubuntu20_key_name", + "value": "cleouverte" + }, + {"name": "ubuntu20_pub_key", + "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\ +BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\ +ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\ +utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\ +h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\ +t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" + }, + {"name": "ubuntu20_flavor_name", + "value": "m1.smaller" + }, + {"name": "VM_name", + "value": "ubuntu20agent-VM-01" + }, + {"name": "vnf_id", + "value": "ubuntu20agent-VNF-instance" + }, + {"name": "vf_module_id", + "value": "ubuntu20agent-vfmodule-instance" + }, + {"name": "vnf_name", + "value": "ubuntu20agent-VNF" + }, + {"name": "admin_plane_net_name", + "value": "admin" + } + ] diff --git a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml deleted file mode 100644 index 708991a..0000000 --- a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -ubuntu16test: - tosca_file_from_SDC: service-Ubuntu16tha-template - version: "1.0" - vnfs: - - vnf_name: ubuntu16test - heat_files_to_upload: onaptests/templates/heat-files/ubuntu16/ubuntu16.zip - vnf_parameters: [ - {"name": "ubuntu16_image_name", - "value": "ubuntu-16.04-daily" - }, - {"name": "ubuntu16_key_name", - "value": "cleouverte" - }, - {"name": "ubuntu16_pub_key", - "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\ -BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\ -ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\ -utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\ -h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\ -t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" - }, - {"name": "ubuntu16_flavor_name", - "value": "m1.small" - }, - {"name": "VM_name", - "value": "ubuntu16test-VM-01" - }, - {"name": "vnf_id", - "value": "ubuntu16test-VNF-instance" - }, - {"name": "vf_module_id", - "value": "ubuntu16test-vfmodule-instance" - }, - {"name": "vnf_name", - "value": "ubuntu16test-VNF" - }, - {"name": "admin_plane_net_name", - "value": "admin" - } - ] diff --git a/src/onaptests/templates/vnf-services/ubuntu18agent-service.yaml b/src/onaptests/templates/vnf-services/ubuntu18agent-service.yaml index baf804e..9d01696 100644 --- a/src/onaptests/templates/vnf-services/ubuntu18agent-service.yaml +++ b/src/onaptests/templates/vnf-services/ubuntu18agent-service.yaml @@ -19,7 +19,7 @@ h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\ t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" }, {"name": "ubuntu18_flavor_name", - "value": "onap.small" + "value": "m1.smaller" }, {"name": "VM_name", "value": "ubuntu18agent-VM-01" -- cgit 1.2.3-korg