aboutsummaryrefslogtreecommitdiffstats
path: root/src/onaptests/templates
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2020-09-29 16:08:46 +0200
committermrichomme <morgan.richomme@orange.com>2020-09-29 16:36:40 +0200
commit3e390f1d45785bca5beb1f5c2fa57ef59f6736e9 (patch)
treec39f0a993fa5e609aeb3303189e3f55b8fcd82b3 /src/onaptests/templates
parent7d24eda2deefdc9b1f6dc1555f45573d4b2e2873 (diff)
Update path management
In case a yaml file is defined the zip was referenced in 2 places consider only the yaml param if the yaml file is defined Add the python path to simplify the integration in CI a,d avoid overwritting any configuration only the 2 ENV parameters + the openstack cloud + the hosts are needed to run any pythonsdk-test Issue-ID: TEST-240 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: I57bf303b497e4d2b1dd740286f07beb3783222b1 Signed-off-by: mrichomme <morgan.richomme@orange.com>
Diffstat (limited to 'src/onaptests/templates')
-rw-r--r--src/onaptests/templates/vnf-services/clearwater-ims-service.yaml11
-rw-r--r--src/onaptests/templates/vnf-services/ubuntu16test-service.yaml2
2 files changed, 4 insertions, 9 deletions
diff --git a/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml
index 51543da..78bd4f3 100644
--- a/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml
+++ b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml
@@ -2,10 +2,10 @@
clearwater_ims:
vnfs:
- vnf_name: clearwater_ims_vnf
- heat_files_to_upload: templates/heat_files/clearwater_ims/clearwater_ims.zip
+ heat_files_to_upload: onaptests/templates/heat_files/clearwater_ims/clearwater_ims.zip
vnf_parameters: [
{"name": "public_net_id",
- "value": "8b0fb448-0daf-4344-a958-74852c5a0530"},
+ "value": "FILL ME"},
{"name": "bono_image_name",
"value": "ubuntu-16.04-daily"},
{"name": "dime_image_name",
@@ -25,12 +25,7 @@ clearwater_ims:
{"name": "dns_ip",
"value": "8.8.8.8"},
{"name": "clearwater_pub_key",
- "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\
-BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\
-ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\
-utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\
-h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\
-t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
+ "value": "FILL ME"
},
{"name": "clearwater_key_name",
"value": "cleouverte"}]
diff --git a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
index a7e55e3..708991a 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: onaptests/templates/heat-files/ubuntu16/ubuntu16.zip
vnf_parameters: [
{"name": "ubuntu16_image_name",
"value": "ubuntu-16.04-daily"