Update HEAT-file for ubuntu20 used for basic_vm_macro test

Issue-ID: TEST-361

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I662945ec980bd100c7b3279a2fa97a1e8889f92c

diff --git a/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
index bd15d47..bb65587 100644 (file)
Binary files a/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip and b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip differ

diff --git a/src/onaptests/templates/vnf-services/basic_vm-service.yaml b/src/onaptests/templates/vnf-services/basic_vm-service.yaml
index 4609bae..227ec48 100644 (file)
--- a/src/onaptests/templates/vnf-services/basic_vm-service.yaml
+++ b/src/onaptests/templates/vnf-services/basic_vm-service.yaml
@@ -5,7 +5,7 @@ basic_vm:
           heat_files_to_upload: onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
           vnf_parameters: [
               {"name": "ubuntu20_image_name",
-               "value": "ubuntu-agent"
+               "value": "ubuntu-20.04"
               },
               {"name": "ubuntu20_key_name",
                "value": "cleouverte"
@@ -19,7 +19,7 @@ h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\
 t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
               },
               {"name": "ubuntu20_flavor_name",
-               "value": "m1.smaller"
+               "value": "m1.small"
               },
               {"name": "VM_name",
                "value": "ubuntu20agent-VM-01"

diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml
index a129d41..00f66d5 100644 (file)
--- a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml
+++ b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml
@@ -18,7 +18,7 @@ basic_vm_macro:
               - vf_module_name: base_ubuntu20
                 parameters: [
                     {"name": "ubuntu20_image_name",
-                     "value": "Ubuntu_2004"
+                     "value": "ubuntu-20.04"
                     },
                     {"name": "ubuntu20_key_name",
                      "value": "cleouverte"
@@ -32,7 +32,7 @@ basic_vm_macro:
   t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
                     },
                     {"name": "ubuntu20_flavor_name",
-                     "value": "m1.smaller"
+                     "value": "m1.small"
                     },
                     {"name": "VM_name",
                      "value": "ubuntu20agent-VM-01"

diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml
index fd56a37..62170bd 100644 (file)
--- a/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml
+++ b/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml
@@ -18,7 +18,7 @@ basic_vm_macro:
               - vf_module_name: base_ubuntu20
                 parameters: [
                     {"name": "ubuntu20_image_name",
-                     "value": "Ubuntu_2004"
+                     "value": "ubuntu-20.04"
                     },
                     {"name": "ubuntu20_key_name",
                      "value": "cleouverte"
@@ -32,7 +32,7 @@ basic_vm_macro:
   t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
                     },
                     {"name": "ubuntu20_flavor_name",
-                     "value": "m1.smaller"
+                     "value": "m1.small"
                     },
                     {"name": "VM_name",
                      "value": "ubuntu20agent-VM-01"