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/router/cloudify_vrouter.yaml | 12 +++++++----- functest/opnfv_tests/vnf/router/test_scenario.yaml | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'functest/opnfv_tests/vnf/router') diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml b/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml index c09477ab..58bdb66a 100644 --- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml +++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.yaml @@ -1,5 +1,7 @@ +--- tenant_images: - cloudify_manager_4.0: /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2 + cloudify_manager_4.0: + /home/opnfv/functest/images/cloudify-manager-premium-4.0.1.qcow2 vyos1.1.7: /home/opnfv/functest/images/vyos-1.1.7.img test_data: url: 'https://github.com/oolorg/opnfv-vnf-data.git' @@ -9,8 +11,8 @@ orchestrator: 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: vyos1.1.7 @@ -21,8 +23,8 @@ vnf: version: 'master' requirements: flavor: - name: m1.medium - ram_min: 2048 + name: m1.medium + ram_min: 2048 inputs: external_network_name: admin_floating_net region: RegionOne diff --git a/functest/opnfv_tests/vnf/router/test_scenario.yaml b/functest/opnfv_tests/vnf/router/test_scenario.yaml index 03185592..8bdaf06a 100644 --- a/functest/opnfv_tests/vnf/router/test_scenario.yaml +++ b/functest/opnfv_tests/vnf/router/test_scenario.yaml @@ -1,3 +1,4 @@ +--- test_scenario_list: - test_type: 'function_test' -- cgit 1.2.3-korg