From 5f5833f4308322892893fb07aa1898bc1406a32d Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 11 Dec 2017 05:23:23 +0100 Subject: Fix yaml format errors in vnf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- functest/opnfv_tests/vnf/ims/cloudify_ims.yaml | 28 +++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'functest/opnfv_tests/vnf/ims/cloudify_ims.yaml') diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml index ad7fa70a..e1a7bf31 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.yaml @@ -1,13 +1,16 @@ +--- tenant_images: - ubuntu_14.04: /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img - cloudify_manager_4.0: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2 + ubuntu_14.04: + /home/opnfv/functest/images/trusty-server-cloudimg-amd64-disk1.img + cloudify_manager_4.0: + /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2 orchestrator: name: cloudify version: '4.0' requirements: flavor: - name: m1.medium - ram_min: 4096 + name: m1.medium + ram_min: 4096 os_image: 'cloudify_manager_4.0' vnf: name: clearwater @@ -15,19 +18,20 @@ vnf: descriptor: file_name: openstack-blueprint.yaml name: clearwater-opnfv - url: https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/archive/master.zip + url: + https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater/archive/master.zip version: '122' requirements: flavor: - name: m1.small - ram_min: 2048 + name: m1.small + ram_min: 2048 compute_quotas: - cores: 50 - instances: 15 + cores: 50 + instances: 15 network_quotas: - security_group: 20 - security_group_rule: 100 - port: 50 + security_group: 20 + security_group_rule: 100 + port: 50 inputs: image_id: 'ubuntu_14.04' flavor_id: 'm1.small' -- cgit 1.2.3-korg