aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2020-09-29 10:27:29 +0200
committermrichomme <morgan.richomme@orange.com>2020-09-29 10:27:29 +0200
commit4fb55c5339986eb2e8e1c5b078744228bcfcf1d8 (patch)
treecb57c7d61a43d402133af2dd0ec869d5f939fb5d
parentd73266541638d1034818d4806c34f68787bd373d (diff)
Add heat zip files
due to the gitignore, the heat files for basic_vm and clearwater_ims were not available Issue-ID: TEST-240 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: Ia87999fbf28d0f1037227150fc247fae128d80d7
-rw-r--r--.gitignore3
-rw-r--r--src/onaptests/configuration/ubuntu16_nomulticloud_settings.py2
-rw-r--r--src/onaptests/templates/heat-files/clearwater_ims/clearwater_ims.zipbin0 -> 24519 bytes
-rw-r--r--src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zipbin0 -> 1641 bytes
-rw-r--r--src/onaptests/templates/vnf-services/ubuntu16test-service.yaml2
5 files changed, 3 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index f5c2699..c3fd147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ env.properties
.vagrant
/archives/
*.jar
-*.zip
*.tar
*.log
.vagrant
@@ -31,4 +30,4 @@ csit/
*.csar
benchmark/
.tox/
-**/__pycache__/ \ No newline at end of file
+**/__pycache__/
diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
index 360a8bf..e9f1bf6 100644
--- a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
+++ b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
@@ -45,7 +45,7 @@ PLATFORM = "basicvm-platform"
SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance"
-VSP_FILE_PATH = "src/onaptests/templates/templates/heat_files/ubuntu16/ubuntu16.zip"
+VSP_FILE_PATH = "src/onaptests/templates/templates/heat-files/ubuntu16/ubuntu16.zip"
# The cloud Part
diff --git a/src/onaptests/templates/heat-files/clearwater_ims/clearwater_ims.zip b/src/onaptests/templates/heat-files/clearwater_ims/clearwater_ims.zip
new file mode 100644
index 0000000..6acee5b
--- /dev/null
+++ b/src/onaptests/templates/heat-files/clearwater_ims/clearwater_ims.zip
Binary files differ
diff --git a/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip b/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip
new file mode 100644
index 0000000..9a98baa
--- /dev/null
+++ b/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip
Binary files differ
diff --git a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
index 08485c9..a7e55e3 100644
--- a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
+++ b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
@@ -4,7 +4,7 @@ ubuntu16test:
version: "1.0"
vnfs:
- vnf_name: ubuntu16test
- heat_files_to_upload: src/onaptests/templates/heat_files/ubuntu16/ubuntu16.zip
+ heat_files_to_upload: src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip
vnf_parameters: [
{"name": "ubuntu16_image_name",
"value": "ubuntu-16.04-daily"