diff options
| author |   Thierry Hardy <thierry.hardy@orange.com> | 2020-09-29 12:27:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-09-29 12:27:40 +0000 |
| commit | 7d24eda2deefdc9b1f6dc1555f45573d4b2e2873 (patch) | |
| tree | fc9e2764dd04023189d70a85136767cf3dd4fe87 | |
| parent | c566322e03b2833c805743f4dc3d072b251e3cfd (diff) | |
| parent | 4fb55c5339986eb2e8e1c5b078744228bcfcf1d8 (diff) | |
Merge "Add heat zip files"
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/onaptests/configuration/ubuntu16_nomulticloud_settings.py | 2 | ||||
| -rw-r--r-- | src/onaptests/templates/heat-files/clearwater_ims/clearwater_ims.zip | bin | 0 -> 24519 bytes | |||
| -rw-r--r-- | src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip | bin | 0 -> 1641 bytes | |||
| -rw-r--r-- | src/onaptests/templates/vnf-services/ubuntu16test-service.yaml | 2 |
5 files changed, 3 insertions, 4 deletions
@@ -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 Binary files differnew file mode 100644 index 0000000..6acee5b --- /dev/null +++ b/src/onaptests/templates/heat-files/clearwater_ims/clearwater_ims.zip diff --git a/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip b/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip Binary files differnew file mode 100644 index 0000000..9a98baa --- /dev/null +++ b/src/onaptests/templates/heat-files/ubuntu16/ubuntu16.zip 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" |