From 90b8e7922a42defb3e571a0a8e81306e9abc0fe3 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 4 Dec 2017 20:01:22 +0100 Subject: Create a tox env to check yaml files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It also fixes all testcases config files. Change-Id: I81a6ffb8b7acf4239c79129dc842e283d3d32b35 Signed-off-by: Cédric Ollivier --- docker/components/testcases.yaml | 7 +++--- docker/features/testcases.yaml | 16 ++++++------ docker/healthcheck/testcases.yaml | 6 +++-- docker/parser/testcases.yaml | 3 ++- docker/smoke/testcases.yaml | 15 ++++++----- docker/vnf/testcases.yaml | 11 +++++--- functest/ci/testcases.yaml | 53 ++++++++++++++++++++++----------------- test-requirements.txt | 1 + tox.ini | 14 +++++++++++ upper-constraints.txt | 1 + 10 files changed, 81 insertions(+), 46 deletions(-) diff --git a/docker/components/testcases.yaml b/docker/components/testcases.yaml index 20fff90a4..e9cea8421 100644 --- a/docker/components/testcases.yaml +++ b/docker/components/testcases.yaml @@ -1,9 +1,10 @@ +--- tiers: - name: components order: 3 ci_loop: 'weekly' - description : >- + description: >- Extensive testing of OpenStack API. testcases: - @@ -28,8 +29,8 @@ tiers: criteria: 90 blocking: false description: >- - This test case runs the full suite of scenarios of the OpenStack - Rally suite using several threads and iterations. + This test case runs the full suite of scenarios of the + OpenStack Rally suite using several threads and iterations. dependencies: installer: '^((?!netvirt).)*$' scenario: '' diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index 68522e4a3..7a30c6d9a 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -1,9 +1,10 @@ +--- tiers: - name: features order: 2 ci_loop: '(daily)|(weekly)' - description : >- + description: >- Test suites from feature projects integrated in functest testcases: @@ -43,7 +44,8 @@ tiers: criteria: 100 blocking: false description: >- - Test suite for odl-sfc to test two chains with one SF and one chain with two SFs + Test suite for odl-sfc to test two chains with one SF and + one chain with two SFs dependencies: installer: '' scenario: 'odl.*sfc' @@ -66,8 +68,8 @@ tiers: installer: 'apex' scenario: 'bar' run: - module: 'baro_tests.barometer' - class: 'BarometerCollectd' + module: 'baro_tests.barometer' + class: 'BarometerCollectd' - case_name: fds @@ -75,9 +77,9 @@ tiers: criteria: 100 blocking: false description: >- - Test Suite for the OpenDaylight SDN Controller when GBP features are - installed. It integrates some test suites from upstream using - Robot as the test framework. + Test Suite for the OpenDaylight SDN Controller when GBP + features are installed. It integrates some test suites from + upstream using Robot as the test framework. dependencies: installer: 'apex' scenario: 'odl.*-fdio' diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index ea2053f2f..b631e84fe 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -1,9 +1,10 @@ +--- tiers: - name: healthcheck order: 0 ci_loop: '(daily)|(weekly)' - description : >- + description: >- First tier to be executed to verify the basic operations in the VIM. testcases: @@ -22,7 +23,8 @@ tiers: installer: '^((?!netvirt).)*$' scenario: '' run: - module: 'functest.opnfv_tests.openstack.snaps.connection_check' + module: + 'functest.opnfv_tests.openstack.snaps.connection_check' class: 'ConnectionCheck' - diff --git a/docker/parser/testcases.yaml b/docker/parser/testcases.yaml index 45ccb0beb..556c94540 100644 --- a/docker/parser/testcases.yaml +++ b/docker/parser/testcases.yaml @@ -1,9 +1,10 @@ +--- tiers: - name: features order: 2 ci_loop: '(daily)|(weekly)' - description : >- + description: >- Test suites from feature projects integrated in functest testcases: diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 2839949e5..5b1f56a9d 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -1,9 +1,10 @@ +--- tiers: - name: smoke order: 1 ci_loop: '(daily)|(weekly)' - description : >- + description: >- Set of basic Functional tests to validate the OPNFV scenarios. testcases: - @@ -12,9 +13,9 @@ tiers: criteria: 100 blocking: true description: >- - This test case verifies: 1) SSH to an instance using floating - IPs over the public network. 2) Connectivity between 2 instances - over a private network. + This test case verifies: 1) SSH to an instance using + floating IPs over the public network. 2) Connectivity + between 2 instances over a private network. dependencies: installer: '' scenario: '^((?!odl_l3|odl-bgpvpn|gluon).)*$' @@ -34,7 +35,8 @@ tiers: installer: '' scenario: '^((?!lxd).)*$' run: - module: 'functest.opnfv_tests.openstack.vping.vping_userdata' + module: + 'functest.opnfv_tests.openstack.vping.vping_userdata' class: 'VPingUserdata' - @@ -81,7 +83,8 @@ tiers: installer: '' scenario: '' run: - module: 'functest.opnfv_tests.openstack.refstack_client.refstack_client' + module: + 'functest.opnfv_tests.openstack.refstack_client.refstack_client' class: 'RefstackClient' - diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index eccabbe5e..d235c1df9 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -1,9 +1,10 @@ +--- tiers: - name: vnf order: 4 ci_loop: '(daily)|(weekly)' - description : >- + description: >- Collection of VNF test cases. testcases: - @@ -12,8 +13,9 @@ tiers: criteria: 80 blocking: false description: >- - This test case deploys an OpenSource vIMS solution from Clearwater - using the Cloudify orchestrator. It also runs some signaling traffic. + This test case deploys an OpenSource vIMS solution from + Clearwater using the Cloudify orchestrator. It also runs + some signaling traffic. dependencies: installer: '' scenario: 'os-nosdn-nofeature-ha' @@ -60,5 +62,6 @@ tiers: installer: '' scenario: 'os-nosdn-nofeature-ha' run: - module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims' + module: + 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims' class: 'ClearwaterImsVnf' diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 0759fc0ef..7ea03e159 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -1,9 +1,10 @@ +--- tiers: - name: healthcheck order: 0 ci_loop: '(daily)|(weekly)' - description : >- + description: >- First tier to be executed to verify the basic operations in the VIM. testcases: @@ -22,7 +23,8 @@ tiers: installer: '^((?!netvirt).)*$' scenario: '' run: - module: 'functest.opnfv_tests.openstack.snaps.connection_check' + module: + 'functest.opnfv_tests.openstack.snaps.connection_check' class: 'ConnectionCheck' - @@ -64,7 +66,7 @@ tiers: name: smoke order: 1 ci_loop: '(daily)|(weekly)' - description : >- + description: >- Set of basic Functional tests to validate the OPNFV scenarios. testcases: - @@ -73,9 +75,9 @@ tiers: criteria: 100 blocking: true description: >- - This test case verifies: 1) SSH to an instance using floating - IPs over the public network. 2) Connectivity between 2 instances - over a private network. + This test case verifies: 1) SSH to an instance using + floating IPs over the public network. 2) Connectivity + between 2 instances over a private network. dependencies: installer: '' scenario: '^((?!odl_l3|odl-bgpvpn|gluon).)*$' @@ -95,7 +97,8 @@ tiers: installer: '' scenario: '^((?!lxd).)*$' run: - module: 'functest.opnfv_tests.openstack.vping.vping_userdata' + module: + 'functest.opnfv_tests.openstack.vping.vping_userdata' class: 'VPingUserdata' - @@ -142,7 +145,8 @@ tiers: installer: '' scenario: '' run: - module: 'functest.opnfv_tests.openstack.refstack_client.refstack_client' + module: + 'functest.opnfv_tests.openstack.refstack_client.refstack_client' class: 'RefstackClient' - @@ -212,7 +216,7 @@ tiers: name: features order: 2 ci_loop: '(daily)|(weekly)' - description : >- + description: >- Test suites from feature projects integrated in functest testcases: @@ -252,7 +256,8 @@ tiers: criteria: 100 blocking: false description: >- - Test suite for odl-sfc to test two chains with one SF and one chain with two SFs + Test suite for odl-sfc to test two chains with one SF and + one chain with two SFs dependencies: installer: '' scenario: 'odl.*sfc' @@ -275,8 +280,8 @@ tiers: installer: 'apex' scenario: 'bar' run: - module: 'baro_tests.barometer' - class: 'BarometerCollectd' + module: 'baro_tests.barometer' + class: 'BarometerCollectd' - case_name: fds @@ -284,9 +289,9 @@ tiers: criteria: 100 blocking: false description: >- - Test Suite for the OpenDaylight SDN Controller when GBP features are - installed. It integrates some test suites from upstream using - Robot as the test framework. + Test Suite for the OpenDaylight SDN Controller when GBP + features are installed. It integrates some test suites from + upstream using Robot as the test framework. dependencies: installer: 'apex' scenario: 'odl.*-fdio' @@ -295,13 +300,13 @@ tiers: class: 'ODLTests' args: suites: - - /src/fds/testing/robot + - /src/fds/testing/robot - name: components order: 3 ci_loop: 'weekly' - description : >- + description: >- Extensive testing of OpenStack API. testcases: - @@ -326,8 +331,8 @@ tiers: criteria: 90 blocking: false description: >- - This test case runs the full suite of scenarios of the OpenStack - Rally suite using several threads and iterations. + This test case runs the full suite of scenarios of the + OpenStack Rally suite using several threads and iterations. dependencies: installer: '^((?!netvirt).)*$' scenario: '' @@ -339,7 +344,7 @@ tiers: name: vnf order: 4 ci_loop: '(daily)|(weekly)' - description : >- + description: >- Collection of VNF test cases. testcases: - @@ -348,8 +353,9 @@ tiers: criteria: 80 blocking: false description: >- - This test case deploys an OpenSource vIMS solution from Clearwater - using the Cloudify orchestrator. It also runs some signaling traffic. + This test case deploys an OpenSource vIMS solution from + Clearwater using the Cloudify orchestrator. It also runs + some signaling traffic. dependencies: installer: '' scenario: 'os-nosdn-nofeature-ha' @@ -396,5 +402,6 @@ tiers: installer: '' scenario: 'os-nosdn-nofeature-ha' run: - module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims' + module: + 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims' class: 'ClearwaterImsVnf' diff --git a/test-requirements.txt b/test-requirements.txt index 372e9ce46..569b80c3d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,3 +7,4 @@ nose # LGPL flake8<2.6.0,>=2.5.4 # MIT pylint==1.4.5 # GPLv2 sphinx>=1.6.2 # BSD +yamllint diff --git a/tox.ini b/tox.ini index ea87583e8..7299a1d33 100644 --- a/tox.ini +++ b/tox.ini @@ -42,6 +42,20 @@ commands = tee pylint.out | sed -ne '/Raw metrics/,//p'" pylint --disable=locally-disabled --reports=n {[testenv:pylint]modules} +[testenv:yamllint] +basepython = python2.7 +files = + docker/components/testcases.yaml + docker/healthcheck/testcases.yaml + docker/smoke/testcases.yaml + docker/parser/testcases.yaml + docker/features/testcases.yaml + docker/vnf/testcases.yaml + functest/ci/testcases.yaml +commands = + yamllint {[testenv:yamllint]files} + - yamllint functest + [testenv:py35] dirs = functest/tests/unit/core diff --git a/upper-constraints.txt b/upper-constraints.txt index 4bd83c4a7..a453fc6c3 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -18,3 +18,4 @@ robotframework-sshlibrary===2.1.3;python_version=='2.7' IPy===0.83 ansible===2.3.2.0 flasgger===0.6.6 +yamllint===1.10.0 -- cgit 1.2.3-korg