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

diff --git a/.gitignore b/.gitignore
index f5c2699..c3fd147 100644 (file)
--- 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 (file)
--- 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 (file)
index 0000000..6acee5b
Binary files /dev/null and b/src/onaptests/templates/heat-files/clearwater_ims/clearwater_ims.zip 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 (file)
index 0000000..9a98baa
Binary files /dev/null and b/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip 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 (file)
--- 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"