From 4151722a50e5cd821113183bf4a88d1e8c0ee877 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 2 Sep 2018 14:09:42 +0200 Subject: Update Xtesting to 0.60 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xtesting leverages on stevedore [1] which will bring much more flexibility (discovery, module or class renaming, etc). OPNFV Features have to be updated as well: - https://gerrit.opnfv.org/gerrit/61713 - https://gerrit.opnfv.org/gerrit/61715 - https://gerrit.opnfv.org/gerrit/61717 - https://gerrit.opnfv.org/gerrit/61719 [1] https://docs.openstack.org/stevedore/latest/ Change-Id: I0ce45eb6c9af66546c2c020eb962fa457f6c7e1a Signed-off-by: Cédric Ollivier --- docker/components/testcases.yaml | 9 +++------ docker/features/testcases.yaml | 21 +++++++------------- docker/healthcheck/testcases.yaml | 41 +++++++++++++-------------------------- docker/smoke/testcases.yaml | 39 ++++++++++++------------------------- docker/vnf/testcases.yaml | 15 +++++--------- 5 files changed, 40 insertions(+), 85 deletions(-) (limited to 'docker') diff --git a/docker/components/testcases.yaml b/docker/components/testcases.yaml index 6292d339c..150d097c9 100644 --- a/docker/components/testcases.yaml +++ b/docker/components/testcases.yaml @@ -17,8 +17,7 @@ tiers: the OpenStack deployment. https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L83 run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.api)' option: @@ -35,8 +34,7 @@ tiers: the OpenStack deployment. https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84 run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)' option: @@ -51,5 +49,4 @@ tiers: This test case runs the full suite of scenarios of the OpenStack Rally suite using several threads and iterations. run: - module: 'functest.opnfv_tests.openstack.rally.rally' - class: 'RallyFull' + name: rally_full diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml index 138451174..74c420bc7 100644 --- a/docker/features/testcases.yaml +++ b/docker/features/testcases.yaml @@ -18,8 +18,7 @@ tiers: - INSTALLER_TYPE: '(apex)|(fuel)|(daisy)' - DEPLOY_SCENARIO: '^((?!fdio|nofeature).)*$' run: - module: 'xtesting.core.feature' - class: 'BashFeature' + name: bashfeature args: cmd: 'doctor-test' @@ -33,8 +32,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'bgpvpn' run: - module: 'sdnvpn.test.functest.run_sdnvpn_tests' - class: 'SdnvpnFunctest' + name: bgpvpn - case_name: functest-odl-sfc @@ -47,8 +45,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'odl.*sfc' run: - module: 'sfc.tests.functest.run_sfc_tests' - class: 'SfcFunctest' + name: functest-odl-sfc - case_name: barometercollectd @@ -62,8 +59,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'bar' run: - module: 'baro_tests.barometer' - class: 'BarometerCollectd' + name: barometercollectd - case_name: fds @@ -77,8 +73,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'odl.*-fdio' run: - module: 'functest.opnfv_tests.sdn.odl.odl' - class: 'ODLTests' + name: odl args: suites: - /src/fds/testing/robot @@ -92,8 +87,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'vgpu' run: - module: 'functest.opnfv_tests.openstack.vgpu.vgpu' - class: 'vGPU' + name: vgpu - case_name: stor4nfv_os @@ -106,5 +100,4 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'stor4nfv' run: - module: 'stor4nfv_tests.stor4nfv_os' - class: 'OsStor4nfvTest' + name: stor4nfv_os diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index 84135678b..cdb13e53b 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -17,9 +17,7 @@ tiers: Keystone, Glance, Neutron and Nova and may perform some simple queries. run: - module: - 'functest.opnfv_tests.openstack.api.connection_check' - class: 'ConnectionCheck' + name: connection_check - case_name: tenantnetwork1 @@ -31,8 +29,7 @@ tiers: required by advanced testcases (subnet, network and router). run: - module: 'functest.core.tenantnetwork' - class: 'TenantNetwork1' + name: tenantnetwork1 - case_name: tenantnetwork2 @@ -44,8 +41,7 @@ tiers: all tenant network ressources required by a testcase (subnet, network and router). run: - module: 'functest.core.tenantnetwork' - class: 'TenantNetwork2' + name: tenantnetwork2 - case_name: vmready1 @@ -57,8 +53,7 @@ tiers: resources and prepares a future VM attached to that network. run: - module: 'functest.core.singlevm' - class: 'VmReady1' + name: vmready1 - case_name: vmready2 @@ -70,8 +65,7 @@ tiers: all tenant network ressources, flavors, images, etc. required by advanced testcases. run: - module: 'functest.core.singlevm' - class: 'VmReady2' + name: vmready2 - case_name: singlevm1 @@ -83,8 +77,7 @@ tiers: resources and completes it by booting a VM attached to that network. run: - module: 'functest.core.singlevm' - class: 'SingleVm1' + name: singlevm1 - case_name: singlevm2 @@ -96,8 +89,7 @@ tiers: all tenant network ressources and vms required by advanced testcases. run: - module: 'functest.core.singlevm' - class: 'SingleVm2' + name: singlevm2 - case_name: vping_ssh @@ -109,8 +101,7 @@ tiers: floating IPs over the public network. 2) Connectivity between 2 instances over a private network. run: - module: 'functest.opnfv_tests.openstack.vping.vping_ssh' - class: 'VPingSSH' + name: vping_ssh - case_name: vping_userdata @@ -121,9 +112,7 @@ tiers: This test case verifies: 1) Boot a VM with given userdata. 2) Connectivity between 2 instances over a private network. run: - module: - 'functest.opnfv_tests.openstack.vping.vping_userdata' - class: 'VPingUserdata' + name: vping_userdata - case_name: cinder_test @@ -136,8 +125,7 @@ tiers: from instance 1, attach it on instance 2 3) Read volume data run: - module: 'functest.opnfv_tests.openstack.cinder.cinder_test' - class: 'CinderCheck' + name: cinder_test - case_name: odl @@ -151,8 +139,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'odl' run: - module: 'functest.opnfv_tests.sdn.odl.odl' - class: 'ODLTests' + name: odl args: suites: - /src/odl_test/csit/suites/integration/basic @@ -170,8 +157,7 @@ tiers: snaps.use_keystone is True, functest must have access to the cloud's private network. run: - module: 'functest.opnfv_tests.openstack.snaps.api_check' - class: 'ApiCheck' + name: api_check - case_name: snaps_health_check @@ -184,5 +170,4 @@ tiers: and Cirros VM instance and observes the console output to validate the single port obtains the correct IP address. run: - module: 'functest.opnfv_tests.openstack.snaps.health_check' - class: 'HealthCheck' + name: snaps_health_check diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 7c22e838c..2897e1045 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -18,8 +18,7 @@ tiers: the OpenStack deplopyment. https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L114 run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '(?=.*\[.*\bsmoke\b.*\])(^tempest\.api)' option: @@ -36,8 +35,7 @@ tiers: Tempest automatically and depends on the parameters of the OpenStack deployment. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '^neutron_tempest_plugin\.api' option: @@ -52,8 +50,7 @@ tiers: This test case runs a sub group of tests of the OpenStack Rally suite in smoke mode. run: - module: 'functest.opnfv_tests.openstack.rally.rally' - class: 'RallySanity' + name: rally_sanity - case_name: refstack_defcore @@ -64,9 +61,7 @@ tiers: This test case runs a sub group of tests of the OpenStack Defcore testcases. run: - module: - 'functest.opnfv_tests.openstack.refstack.refstack' - class: 'Refstack' + name: refstack_defcore args: option: - '--concurrency=4' @@ -79,8 +74,7 @@ tiers: description: >- Test suite from Patrole project. run: - module: 'functest.opnfv_tests.openstack.patrole.patrole' - class: 'Patrole' + name: patrole args: role: 'admin' includes: @@ -101,9 +95,7 @@ tiers: dependencies: - POD_ARCH: '^(?!aarch64$)' run: - module: - 'functest.opnfv_tests.openstack.vmtp.vmtp' - class: 'Vmtp' + name: vmtp - case_name: shaker @@ -116,9 +108,7 @@ tiers: is able to deploy OpenStack instances and networks in different topologies. run: - module: - 'functest.opnfv_tests.openstack.shaker.shaker' - class: 'Shaker' + name: shaker - case_name: snaps_smoke @@ -134,8 +124,7 @@ tiers: snaps.use_keystone is True, functest must have access to the cloud's private network. run: - module: 'functest.opnfv_tests.openstack.snaps.smoke' - class: 'SnapsSmoke' + name: snaps_smoke - case_name: neutron_trunk @@ -148,8 +137,7 @@ tiers: generated by Tempest having as input the relevant testcase list file. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: 'neutron_tempest_plugin.(api|scenario).test_trunk' neutron_extensions: @@ -166,8 +154,7 @@ tiers: suite. The list of test cases is generated by Tempest having as input the relevant regex. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '^networking_bgpvpn_tempest\.' neutron_extensions: @@ -185,8 +172,7 @@ tiers: suite. The list of test cases is generated by Tempest having as input the relevant regex. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: '^(?:networking_sfc\.tests\.tempest_plugin.tests.api).*$' @@ -204,8 +190,7 @@ tiers: It leverages on the tempest plugin containing tests used to verify the functionality of a barbican installation. run: - module: 'functest.opnfv_tests.openstack.tempest.tempest' - class: 'TempestCommon' + name: tempest_common args: mode: 'barbican_tempest_plugin.tests.(api|scenario).(?!test_image_signing)' diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index 1f0817708..04d4000b9 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -16,8 +16,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: - module: 'functest.core.cloudify' - class: 'Cloudify' + name: cloudify - case_name: cloudify_ims project_name: functest @@ -30,8 +29,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: - module: 'functest.opnfv_tests.vnf.ims.cloudify_ims' - class: 'CloudifyIms' + name: cloudify_ims - case_name: heat_ims @@ -45,8 +43,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: - module: 'functest.opnfv_tests.vnf.ims.heat_ims' - class: 'HeatIms' + name: heat_ims - case_name: vyos_vrouter @@ -58,8 +55,7 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: - module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter' - class: 'CloudifyVrouter' + name: vyos_vrouter - case_name: juju_epc @@ -72,5 +68,4 @@ tiers: dependencies: - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha' run: - module: 'functest.opnfv_tests.vnf.epc.juju_epc' - class: 'JujuEpc' + name: juju_epc -- cgit 1.2.3-korg