[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 <morgan.richomme@orange.com>
Change-Id: I69f573354c87c44c10581861450d48244db0c7df

1 files changed, 0 insertions, 41 deletions

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"
-              }
-          ]