aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Jagiello <michal.jagiello@t-mobile.pl>2021-09-08 13:55:11 +0000
committerGerrit Code Review <gerrit@onap.org>2021-09-08 13:55:11 +0000
commitdb6084c0f425055ba35dc17dbc5baeaa68065c67 (patch)
treee9ca157cefb0ffa587ba9d0032ae7e2af1bfbf36
parent2f2cb2b3d3f923b2e4766ba2be11f0116a5b0dc4 (diff)
parenta50ae412e492b5bc60c1c27f7d2e17dfebe37c38 (diff)
Merge "Update HEAT-file for ubuntu20 used for basic_vm_macro test Issue-ID: TEST-361"
-rw-r--r--src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zipbin2719 -> 2716 bytes
-rw-r--r--src/onaptests/templates/vnf-services/basic_vm-service.yaml4
-rw-r--r--src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml4
-rw-r--r--src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
index bd15d47..bb65587 100644
--- a/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
+++ b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip
Binary files 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
--- 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
--- 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
--- 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"