Update Xtesting to 0.60

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 <cedric.ollivier@orange.com>

9 files changed, 110 insertions, 172 deletions

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
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 4b73a8418..23f0620ec 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/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,8 +170,7 @@ 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
 
     -
         name: smoke
@@ -205,8 +190,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:
@@ -223,8 +207,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:
@@ -239,8 +222,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
@@ -251,9 +233,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'
@@ -266,8 +246,7 @@ tiers:
                 description: >-
                     Test suite from Patrole project.
                 run:
-                    module: 'functest.opnfv_tests.openstack.patrole.patrole'
-                    class: 'Patrole'
+                    name: patrole
                     args:
                         role: 'admin'
                         includes:
@@ -288,9 +267,7 @@ tiers:
                 dependencies:
                     - POD_ARCH: '^(?!aarch64$)'
                 run:
-                    module:
-                        'functest.opnfv_tests.openstack.vmtp.vmtp'
-                    class: 'Vmtp'
+                    name: vmtp
 
             -
                 case_name: shaker
@@ -303,9 +280,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
@@ -321,8 +296,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
@@ -335,8 +309,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:
@@ -353,8 +326,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:
@@ -372,8 +344,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).*$'
@@ -391,8 +362,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)'
@@ -417,8 +387,7 @@ tiers:
                     - INSTALLER_TYPE: '(apex)|(fuel)|(daisy)'
                     - DEPLOY_SCENARIO: '^((?!fdio|nofeature).)*$'
                 run:
-                    module: 'xtesting.core.feature'
-                    class: 'BashFeature'
+                    name: bashfeature
                     args:
                         cmd: 'doctor-test'
 
@@ -432,8 +401,7 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'bgpvpn'
                 run:
-                    module: 'sdnvpn.test.functest.run_sdnvpn_tests'
-                    class: 'SdnvpnFunctest'
+                    name: bgpvpn
 
             -
                 case_name: functest-odl-sfc
@@ -446,8 +414,7 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'odl.*sfc'
                 run:
-                    module: 'sfc.tests.functest.run_sfc_tests'
-                    class: 'SfcFunctest'
+                    name: functest-odl-sfc
 
             -
                 case_name: barometercollectd
@@ -461,8 +428,7 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'bar'
                 run:
-                    module: 'baro_tests.barometer'
-                    class: 'BarometerCollectd'
+                    name: barometercollectd
 
             -
                 case_name: fds
@@ -476,8 +442,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
@@ -491,8 +456,7 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'vgpu'
                 run:
-                    module: 'functest.opnfv_tests.openstack.vgpu.vgpu'
-                    class: 'vGPU'
+                    name: vgpu
 
             -
                 case_name: stor4nfv_os
@@ -505,8 +469,7 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'stor4nfv'
                 run:
-                    module: 'stor4nfv_tests.stor4nfv_os'
-                    class: 'OsStor4nfvTest'
+                    name: stor4nfv_os
 
     -
         name: components
@@ -525,8 +488,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:
@@ -543,8 +505,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:
@@ -559,8 +520,7 @@ 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
 
     -
         name: vnf
@@ -578,8 +538,7 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
-                    module: 'functest.core.cloudify'
-                    class: 'Cloudify'
+                    name: cloudify
             -
                 case_name: cloudify_ims
                 project_name: functest
@@ -592,8 +551,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
@@ -607,8 +565,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
@@ -620,8 +577,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
@@ -634,5 +590,4 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
-                    module: 'functest.opnfv_tests.vnf.epc.juju_epc'
-                    class: 'JujuEpc'
+                    name: juju_epc
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index f65170453..1b2e10b07 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -253,7 +253,7 @@ class ODLMainTesting(ODLTesting):
                 mock.patch.object(self.test, 'parse_results'), \
                 mock.patch.object(self.test, 'generate_report',
                                   return_value=1):
-            self._test_run_suites(testcase.TestCase.EX_RUN_ERROR, *args)
+            self._test_run_suites(testcase.TestCase.EX_OK, *args)
 
     @mock.patch('os.makedirs')
     @mock.patch('robot.run')
diff --git a/setup.cfg b/setup.cfg
index 17451a5b3..0f3a63594 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,6 +13,34 @@ scripts =
 console_scripts =
     functest_odl = functest.opnfv_tests.sdn.odl.odl:main
     check_deployment = functest.ci.check_deployment:main
+xtesting.testcase =
+    connection_check = functest.opnfv_tests.openstack.api.connection_check:ConnectionCheck
+    tenantnetwork1 = functest.core.tenantnetwork:TenantNetwork1
+    tenantnetwork2 = functest.core.tenantnetwork:TenantNetwork2
+    vmready1 = functest.core.singlevm:VmReady1
+    vmready2 = functest.core.singlevm:VmReady2
+    singlevm1 = functest.core.singlevm:SingleVm1
+    singlevm2 = functest.core.singlevm:SingleVm2
+    vping_ssh = functest.opnfv_tests.openstack.vping.vping_ssh:VPingSSH
+    vping_userdata = functest.opnfv_tests.openstack.vping.vping_userdata:VPingUserdata
+    cinder_test = functest.opnfv_tests.openstack.cinder.cinder_test:CinderCheck
+    odl = functest.opnfv_tests.sdn.odl.odl:ODLTests
+    api_check = functest.opnfv_tests.openstack.snaps.api_check:ApiCheck
+    snaps_health_check = functest.opnfv_tests.openstack.snaps.health_check:HealthCheck
+    tempest_common = functest.opnfv_tests.openstack.tempest.tempest:TempestCommon
+    rally_sanity = functest.opnfv_tests.openstack.rally.rally:RallySanity
+    refstack_defcore = functest.opnfv_tests.openstack.refstack.refstack:Refstack
+    patrole = functest.opnfv_tests.openstack.patrole.patrole:Patrole
+    vmtp = functest.opnfv_tests.openstack.vmtp.vmtp:Vmtp
+    shaker = functest.opnfv_tests.openstack.shaker.shaker:Shaker
+    snaps_smoke = functest.opnfv_tests.openstack.snaps.smoke:SnapsSmoke
+    vgpu = functest.opnfv_tests.openstack.vgpu.vgpu:vGPU
+    rally_full = functest.opnfv_tests.openstack.rally.rally:RallyFull
+    cloudify = functest.core.cloudify:Cloudify
+    cloudify_ims = functest.opnfv_tests.vnf.ims.cloudify_ims:CloudifyIms
+    heat_ims = functest.opnfv_tests.vnf.ims.heat_ims:HeatIms
+    vyos_vrouter = functest.opnfv_tests.vnf.router.cloudify_vrouter:CloudifyVrouter
+    juju_epc = functest.opnfv_tests.vnf.epc.juju_epc:JujuEpc
 
 [build_sphinx]
 all_files = 1
diff --git a/upper-constraints.txt b/upper-constraints.txt
index 2ffb034e7..8ac4fd069 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -16,6 +16,6 @@ robotframework-httplibrary===0.4.2
 robotframework-requests===0.4.7
 robotframework-sshlibrary===2.1.3;python_version=='2.7'
 ansible===2.3.2.0
-xtesting===0.58.0
+xtesting===0.60.0
 networking-bgpvpn===8.0.0
 networking-sfc===6.0.0