8 files changed, 15 insertions, 189 deletions
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
--- a/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip
+++ /dev/null
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
--- a/src/onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip
+++ b/src/onaptests/templates/heat-files/ubuntu18/ubuntu18agent.zip
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
--- /dev/null
+++ b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
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..db84783 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"
diff --git a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml b/src/onaptests/templates/vnf-services/basic_vm-service.yaml
index 708991a..4609bae 100644
--- a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
+++ b/src/onaptests/templates/vnf-services/basic_vm-service.yaml
@@ -1,18 +1,16 @@
 ---
-ubuntu16test:
-    tosca_file_from_SDC: service-Ubuntu16tha-template
-    version: "1.0"
+basic_vm:
     vnfs:
-        - vnf_name: ubuntu16test
-          heat_files_to_upload: onaptests/templates/heat-files/ubuntu16/ubuntu16.zip
+        - vnf_name: basic_vm
+          heat_files_to_upload: onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
           vnf_parameters: [
-              {"name": "ubuntu16_image_name",
-               "value": "ubuntu-16.04-daily"
+              {"name": "ubuntu20_image_name",
+               "value": "ubuntu-agent"
               },
-              {"name": "ubuntu16_key_name",
+              {"name": "ubuntu20_key_name",
                "value": "cleouverte"
               },
-              {"name": "ubuntu16_pub_key",
+              {"name": "ubuntu20_pub_key",
                "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\
 BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\
 ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\
@@ -20,20 +18,20 @@ utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\
 h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\
 t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
               },
-              {"name": "ubuntu16_flavor_name",
-               "value": "m1.small"
+              {"name": "ubuntu20_flavor_name",
+               "value": "m1.smaller"
               },
               {"name": "VM_name",
-               "value": "ubuntu16test-VM-01"
+               "value": "ubuntu20agent-VM-01"
               },
               {"name": "vnf_id",
-               "value": "ubuntu16test-VNF-instance"
+               "value": "ubuntu20agent-VNF-instance"
               },
               {"name": "vf_module_id",
-               "value": "ubuntu16test-vfmodule-instance"
+               "value": "ubuntu20agent-vfmodule-instance"
               },
               {"name": "vnf_name",
-               "value": "ubuntu16test-VNF"
+               "value": "ubuntu20agent-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 94f45fe..f5fe653 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"