Disable falsy Patrole subtests
[functest.git] / functest / ci / testcases.yaml
index 4b73a84..d000af6 100644 (file)
@@ -17,9 +17,7 @@ tiers:
                     Keystone, Glance, Neutron and Nova and may perform some
                     simple queries.
                 run:
                     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
 
             -
                 case_name: tenantnetwork1
@@ -31,8 +29,7 @@ tiers:
                     required by advanced testcases (subnet, network and
                     router).
                 run:
                     required by advanced testcases (subnet, network and
                     router).
                 run:
-                    module: 'functest.core.tenantnetwork'
-                    class: 'TenantNetwork1'
+                    name: tenantnetwork1
 
             -
                 case_name: tenantnetwork2
 
             -
                 case_name: tenantnetwork2
@@ -44,8 +41,7 @@ tiers:
                     all tenant network ressources required by a testcase
                     (subnet, network and router).
                 run:
                     all tenant network ressources required by a testcase
                     (subnet, network and router).
                 run:
-                    module: 'functest.core.tenantnetwork'
-                    class: 'TenantNetwork2'
+                    name: tenantnetwork2
 
             -
                 case_name: vmready1
 
             -
                 case_name: vmready1
@@ -57,8 +53,7 @@ tiers:
                     resources and prepares a future VM attached to that
                     network.
                 run:
                     resources and prepares a future VM attached to that
                     network.
                 run:
-                    module: 'functest.core.singlevm'
-                    class: 'VmReady1'
+                    name: vmready1
 
             -
                 case_name: vmready2
 
             -
                 case_name: vmready2
@@ -70,8 +65,7 @@ tiers:
                     all tenant network ressources, flavors, images, etc.
                     required by advanced testcases.
                 run:
                     all tenant network ressources, flavors, images, etc.
                     required by advanced testcases.
                 run:
-                    module: 'functest.core.singlevm'
-                    class: 'VmReady2'
+                    name: vmready2
 
             -
                 case_name: singlevm1
 
             -
                 case_name: singlevm1
@@ -83,8 +77,7 @@ tiers:
                     resources and completes it by booting a VM attached to that
                     network.
                 run:
                     resources and completes it by booting a VM attached to that
                     network.
                 run:
-                    module: 'functest.core.singlevm'
-                    class: 'SingleVm1'
+                    name: singlevm1
 
             -
                 case_name: singlevm2
 
             -
                 case_name: singlevm2
@@ -96,8 +89,7 @@ tiers:
                     all tenant network ressources and vms required by advanced
                     testcases.
                 run:
                     all tenant network ressources and vms required by advanced
                     testcases.
                 run:
-                    module: 'functest.core.singlevm'
-                    class: 'SingleVm2'
+                    name: singlevm2
 
             -
                 case_name: vping_ssh
 
             -
                 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:
                     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
 
             -
                 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:
                     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
 
             -
                 case_name: cinder_test
@@ -136,8 +125,7 @@ tiers:
                     from instance 1, attach it on instance 2 3) Read volume
                     data
                 run:
                     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
 
             -
                 case_name: odl
@@ -151,48 +139,12 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'odl'
                 run:
                 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
                             - /src/odl_test/csit/suites/openstack/neutron
 
                     args:
                         suites:
                             - /src/odl_test/csit/suites/integration/basic
                             - /src/odl_test/csit/suites/openstack/neutron
 
-            -
-                case_name: api_check
-                project_name: functest
-                criteria: 100
-                blocking: true
-                description: >-
-                    This test case verifies the retrieval of OpenStack clients:
-                    Keystone, Glance, Neutron and Nova and may perform some
-                    simple queries. When the config value of
-                    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'
-
-            -
-                case_name: snaps_health_check
-                project_name: functest
-                criteria: 100
-                blocking: true
-                description: >-
-                    This test case creates executes the SimpleHealthCheck
-                    Python test class which creates an, image, flavor, network,
-                    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: smoke
-        order: 1
-        description: >-
-            Set of basic Functional tests to validate the OPNFV scenarios.
-        testcases:
             -
                 case_name: tempest_smoke
                 project_name: functest
             -
                 case_name: tempest_smoke
                 project_name: functest
@@ -205,13 +157,18 @@ tiers:
                     the OpenStack deplopyment.
                     https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L114
                 run:
                     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:
                             - '--concurrency=4'
 
                     args:
                         mode: '(?=.*\[.*\bsmoke\b.*\])(^tempest\.api)'
                         option:
                             - '--concurrency=4'
 
+    -
+        name: smoke
+        order: 1
+        description: >-
+            Set of basic Functional tests to validate the OPNFV scenarios.
+        testcases:
             -
                 case_name: neutron-tempest-plugin-api
                 project_name: functest
             -
                 case_name: neutron-tempest-plugin-api
                 project_name: functest
@@ -223,8 +180,7 @@ tiers:
                     Tempest automatically and depends on the parameters of
                     the OpenStack deployment.
                 run:
                     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:
                     args:
                         mode: '^neutron_tempest_plugin\.api'
                         option:
@@ -239,90 +195,82 @@ tiers:
                     This test case runs a sub group of tests of the OpenStack
                     Rally suite in smoke mode.
                 run:
                     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
+                    args:
+                        optional:
+                            - 'gnocchi'
 
             -
                 case_name: refstack_defcore
                 project_name: functest
                 criteria: 100
                 blocking: false
 
             -
                 case_name: refstack_defcore
                 project_name: functest
                 criteria: 100
                 blocking: false
+                deny_skipping: true
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Defcore testcases.
                 run:
                 description: >-
                     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'
 
             -
                     args:
                         option:
                             - '--concurrency=4'
 
             -
-                case_name: patrole
+                case_name: tempest_full
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    Test suite from Patrole project.
+                    The list of test cases is generated by
+                    Tempest automatically and depends on the parameters of
+                    the OpenStack deployment.
+                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L83
                 run:
                 run:
-                    module: 'functest.opnfv_tests.openstack.patrole.patrole'
-                    class: 'Patrole'
+                    name: tempest_common
                     args:
                     args:
-                        role: 'admin'
-                        includes:
-                            - 'image'
-                            - 'network'
-                        excludes:
-                            - 'test_networks_multiprovider_rbac'
-
-            -
-                case_name: vmtp
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    VMTP is a small python application that will automatically
-                    perform ping connectivity, round trip time measurement
-                    (latency) and TCP/UDP throughput
-                dependencies:
-                    - POD_ARCH: '^(?!aarch64$)'
-                run:
-                    module:
-                        'functest.opnfv_tests.openstack.vmtp.vmtp'
-                    class: 'Vmtp'
+                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.api)'
+                        option:
+                            - '--concurrency=4'
 
             -
 
             -
-                case_name: shaker
+                case_name: tempest_scenario
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    Shaker wraps around popular system network testing tools
-                    like iperf, iperf3 and netperf (with help of flent). Shaker
-                    is able to deploy OpenStack instances and networks in
-                    different topologies.
+                    The list of test cases is generated by
+                    Tempest automatically and depends on the parameters of
+                    the OpenStack deployment.
+                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84
                 run:
                 run:
-                    module:
-                        'functest.opnfv_tests.openstack.shaker.shaker'
-                    class: 'Shaker'
+                    name: tempest_common
+                    args:
+                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)'
+                        option:
+                            - '--concurrency=1'
 
             -
 
             -
-                case_name: snaps_smoke
+                case_name: patrole
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    This test case contains tests that setup and destroy
-                    environments with VMs with and without Floating IPs
-                    with a newly created user and project. Set the config
-                    value snaps.use_floating_ips (True|False) to toggle
-                    this functionality. When the config value of
-                    snaps.use_keystone is True, functest must have access to
-                    the cloud's private network.
+                    Test suite from Patrole project.
                 run:
                 run:
-                    module: 'functest.opnfv_tests.openstack.snaps.smoke'
-                    class: 'SnapsSmoke'
+                    name: patrole
+                    args:
+                        role: 'admin'
+                        includes:
+                            - 'image'
+                            - 'network'
+                        excludes:
+                            - 'network.test_flavors_rbac'
+                            - 'network.test_network_ip_availability_rbac'
+                            - 'test_networks_multiprovider_rbac'
+                            - 'test_auto_allocated_topology_rbac'
+                            - 'test_create_network_provider_segmentation_id'
+                            - 'test_update_network_provider_physical_network'
+                            - 'test_update_network_provider_segmentation_id'
 
             -
                 case_name: neutron_trunk
 
             -
                 case_name: neutron_trunk
@@ -335,8 +283,7 @@ tiers:
                     generated by Tempest having as input the relevant
                     testcase list file.
                 run:
                     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:
                     args:
                         mode: 'neutron_tempest_plugin.(api|scenario).test_trunk'
                         neutron_extensions:
@@ -353,10 +300,9 @@ tiers:
                     suite. The list of test cases is generated by Tempest
                     having as input the relevant regex.
                 run:
                     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:
                     args:
-                        mode: '^networking_bgpvpn_tempest\.'
+                        mode: '^networking_bgpvpn_tempest.tests.api\.'
                         neutron_extensions:
                             - bgpvpn
                         option:
                         neutron_extensions:
                             - bgpvpn
                         option:
@@ -372,8 +318,7 @@ tiers:
                     suite. The list of test cases is generated by Tempest
                     having as input the relevant regex.
                 run:
                     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).*$'
                     args:
                         mode:
                             '^(?:networking_sfc\.tests\.tempest_plugin.tests.api).*$'
@@ -391,17 +336,78 @@ tiers:
                     It leverages on the tempest plugin containing tests used to
                     verify the functionality of a barbican installation.
                 run:
                     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: barbican
                     args:
                         mode:
                     args:
                         mode:
-                            'barbican_tempest_plugin.tests.(api|scenario).(?!test_image_signing)'
+                            '^barbican_tempest_plugin.((?!test_signed_image_upload_boot_failure).)*$'
                         services:
                             - barbican
 
     -
                         services:
                             - barbican
 
     -
-        name: features
+        name: benchmarking
         order: 2
         order: 2
+        description: >-
+            Run several OpenStack performance tools
+            https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
+        testcases:
+            -
+                case_name: rally_full
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs the full suite of scenarios of the
+                    OpenStack Rally suite using several threads and iterations.
+                run:
+                    name: rally_full
+                    args:
+                        optional:
+                            - 'gnocchi'
+
+            -
+                case_name: rally_jobs
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs a group of Rally jobs used in
+                    OpenStack gating
+                run:
+                    name: rally_jobs
+                    args:
+                        optional:
+                            - 'gnocchi'
+
+            -
+                case_name: vmtp
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    VMTP is a small python application that will automatically
+                    perform ping connectivity, round trip time measurement
+                    (latency) and TCP/UDP throughput
+                dependencies:
+                    - POD_ARCH: '^(?!aarch64$)'
+                run:
+                    name: vmtp
+
+            -
+                case_name: shaker
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Shaker wraps around popular system network testing tools
+                    like iperf, iperf3 and netperf (with help of flent). Shaker
+                    is able to deploy OpenStack instances and networks in
+                    different topologies.
+                run:
+                    name: shaker
+
+    -
+        name: features
+        order: 3
         description: >-
             Test suites from feature projects
             integrated in functest
         description: >-
             Test suites from feature projects
             integrated in functest
@@ -409,6 +415,7 @@ tiers:
             -
                 case_name: doctor-notification
                 project_name: doctor
             -
                 case_name: doctor-notification
                 project_name: doctor
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
                 criteria: 100
                 blocking: false
                 description: >-
@@ -417,24 +424,10 @@ tiers:
                     - INSTALLER_TYPE: '(apex)|(fuel)|(daisy)'
                     - DEPLOY_SCENARIO: '^((?!fdio|nofeature).)*$'
                 run:
                     - INSTALLER_TYPE: '(apex)|(fuel)|(daisy)'
                     - DEPLOY_SCENARIO: '^((?!fdio|nofeature).)*$'
                 run:
-                    module: 'xtesting.core.feature'
-                    class: 'BashFeature'
+                    name: bashfeature
                     args:
                         cmd: 'doctor-test'
 
                     args:
                         cmd: 'doctor-test'
 
-            -
-                case_name: bgpvpn
-                project_name: sdnvpn
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test suite from SDNVPN project.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'bgpvpn'
-                run:
-                    module: 'sdnvpn.test.functest.run_sdnvpn_tests'
-                    class: 'SdnvpnFunctest'
-
             -
                 case_name: functest-odl-sfc
                 project_name: sfc
             -
                 case_name: functest-odl-sfc
                 project_name: sfc
@@ -446,12 +439,12 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'odl.*sfc'
                 run:
                 dependencies:
                     - DEPLOY_SCENARIO: 'odl.*sfc'
                 run:
-                    module: 'sfc.tests.functest.run_sfc_tests'
-                    class: 'SfcFunctest'
+                    name: functest-odl-sfc
 
             -
                 case_name: barometercollectd
                 project_name: barometer
 
             -
                 case_name: barometercollectd
                 project_name: barometer
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
                 criteria: 100
                 blocking: false
                 description: >-
@@ -461,26 +454,8 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'bar'
                 run:
                 dependencies:
                     - DEPLOY_SCENARIO: 'bar'
                 run:
-                    module: 'baro_tests.barometer'
-                    class: 'BarometerCollectd'
+                    name: barometercollectd
 
 
-            -
-                case_name: fds
-                project_name: fastdatastacks
-                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.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'odl.*-fdio'
-                run:
-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            - /src/fds/testing/robot
             -
                 case_name: vgpu
                 project_name: functest
             -
                 case_name: vgpu
                 project_name: functest
@@ -491,12 +466,12 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'vgpu'
                 run:
                 dependencies:
                     - DEPLOY_SCENARIO: 'vgpu'
                 run:
-                    module: 'functest.opnfv_tests.openstack.vgpu.vgpu'
-                    class: 'vGPU'
+                    name: vgpu
 
             -
                 case_name: stor4nfv_os
                 project_name: stor4nfv
 
             -
                 case_name: stor4nfv_os
                 project_name: stor4nfv
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
                 criteria: 100
                 blocking: false
                 description: >-
@@ -505,62 +480,7 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'stor4nfv'
                 run:
                 dependencies:
                     - DEPLOY_SCENARIO: 'stor4nfv'
                 run:
-                    module: 'stor4nfv_tests.stor4nfv_os'
-                    class: 'OsStor4nfvTest'
-
-    -
-        name: components
-        order: 3
-        description: >-
-            Extensive testing of OpenStack API.
-        testcases:
-            -
-                case_name: tempest_full
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The list of test cases is generated by
-                    Tempest automatically and depends on the parameters of
-                    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'
-                    args:
-                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.api)'
-                        option:
-                            - '--concurrency=4'
-
-            -
-                case_name: tempest_scenario
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The list of test cases is generated by
-                    Tempest automatically and depends on the parameters of
-                    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'
-                    args:
-                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)'
-                        option:
-                            - '--concurrency=1'
-
-            -
-                case_name: rally_full
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    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: stor4nfv_os
 
     -
         name: vnf
 
     -
         name: vnf
@@ -575,11 +495,8 @@ tiers:
                 blocking: false
                 description: >-
                     This test case deploys the Cloudify orchestrator.
                 blocking: false
                 description: >-
                     This test case deploys the Cloudify orchestrator.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                 run:
-                    module: 'functest.core.cloudify'
-                    class: 'Cloudify'
+                    name: cloudify
             -
                 case_name: cloudify_ims
                 project_name: functest
             -
                 case_name: cloudify_ims
                 project_name: functest
@@ -592,8 +509,7 @@ tiers:
                 dependencies:
                     - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                 dependencies:
                     - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
-                    module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
-                    class: 'CloudifyIms'
+                    name: cloudify_ims
 
             -
                 case_name: heat_ims
 
             -
                 case_name: heat_ims
@@ -604,11 +520,8 @@ tiers:
                     This test case deploys an OpenSource vIMS solution from
                     Clearwater using the OpenStack Heat orchestrator.
                     It also runs some signaling traffic.
                     This test case deploys an OpenSource vIMS solution from
                     Clearwater using the OpenStack Heat orchestrator.
                     It also runs some signaling traffic.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                 run:
-                    module: 'functest.opnfv_tests.vnf.ims.heat_ims'
-                    class: 'HeatIms'
+                    name: heat_ims
 
             -
                 case_name: vyos_vrouter
 
             -
                 case_name: vyos_vrouter
@@ -617,11 +530,8 @@ tiers:
                 blocking: false
                 description: >-
                     This test case is vRouter testing.
                 blocking: false
                 description: >-
                     This test case is vRouter testing.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                 run:
-                    module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
-                    class: 'CloudifyVrouter'
+                    name: vyos_vrouter
 
             -
                 case_name: juju_epc
 
             -
                 case_name: juju_epc
@@ -631,8 +541,5 @@ tiers:
                 description: >-
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
                 description: >-
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
-                dependencies:
-                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
                 run:
-                    module: 'functest.opnfv_tests.vnf.epc.juju_epc'
-                    class: 'JujuEpc'
+                    name: juju_epc