diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-12-11 05:23:23 +0100 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-12-11 06:15:17 +0100 |
commit | 5f5833f4308322892893fb07aa1898bc1406a32d (patch) | |
tree | 865525876fd190b6b55f2aaac063ec468e715b0e /functest/opnfv_tests/vnf/ims/orchestra.yaml | |
parent | e3281b2175ca9983d79ce17de7e7497f749e650e (diff) |
Fix yaml format errors in vnf
All Rally yaml files are skipped because they leverage on jinja2.
Now last errors are in functest/api directories [1].
[1] https://jira.opnfv.org/browse/FUNCTEST-897
Change-Id: I4d6c9b3b7c1f3602bd51c9cf7e1c5babf581ab82
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/ims/orchestra.yaml')
-rw-r--r-- | functest/opnfv_tests/vnf/ims/orchestra.yaml | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra.yaml b/functest/opnfv_tests/vnf/ims/orchestra.yaml index 457ca90e..f81f55fb 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra.yaml +++ b/functest/opnfv_tests/vnf/ims/orchestra.yaml @@ -1,27 +1,32 @@ +--- tenant_images: orchestrator: - ubuntu-14.04-server-cloudimg-amd64-disk1: /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img + ubuntu-14.04-server-cloudimg-amd64-disk1: + /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img orchestra_openims: openims: /home/opnfv/functest/images/img orchestra_clearwaterims: - ubuntu-14.04-server-cloudimg-amd64-disk1: /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img + ubuntu-14.04-server-cloudimg-amd64-disk1: + /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img mano: name: OpenBaton version: '3.2.0' requirements: flavor: - name: openbaton - ram_min: 4096 - disk: 5 - vcpus: 2 + name: openbaton + ram_min: 4096 + disk: 5 + vcpus: 2 image: 'ubuntu-14.04-server-cloudimg-amd64-disk1' bootstrap: url: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap config: - url: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap-config-file + url: + http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap-config-file gvnfm: userdata: - url: https://raw.githubusercontent.com/openbaton/generic-vnfm/3.2.0/src/main/resources/user-data.sh + url: + https://raw.githubusercontent.com/openbaton/generic-vnfm/3.2.0/src/main/resources/user-data.sh credentials: username: admin password: openbaton @@ -29,13 +34,14 @@ mano: orchestra_openims: name: OpenIMS descriptor: - url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/OpenImsCore/3.2.0/json + url: + http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/OpenImsCore/3.2.0/json requirements: flavor: - name: m1.small - ram_min: 2048 - disk: 5 - vcpus: 2 + name: m1.small + ram_min: 2048 + disk: 5 + vcpus: 2 test: scscf: ports: [3870, 6060] @@ -51,11 +57,12 @@ orchestra_openims: orchestra_clearwaterims: name: Clearwater IMS descriptor: - url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json + url: + http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json requirements: flavor: - name: m1.small - ram_min: 2048 - disk: 5 - vcpus: 2 + name: m1.small + ram_min: 2048 + disk: 5 + vcpus: 2 test: |