Disable Vmtp if POD_ARCH = aarch64

[functest.git] / functest / ci / testcases.yaml

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 7b866e7..32fbacd 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -3,7 +3,6 @@ tiers:
     -
         name: healthcheck
         order: 0
     -
         name: healthcheck
         order: 0

-        ci_loop: '(merge)|(verify)|(daily)|(weekly)'

         description: >-
             First tier to be executed to verify the basic
             operations in the VIM.
         description: >-
             First tier to be executed to verify the basic
             operations in the VIM.


@@ -16,59 +15,90 @@ tiers:
                 description: >-
                     This test case verifies the retrieval of OpenStack clients:
                     Keystone, Glance, Neutron and Nova and may perform some
                 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.
-                dependencies:
-                    installer: '^((?!netvirt).)*$'
-                    scenario: ''
+                    simple queries.

                 run:
                     module:
                 run:
                     module:

-                        'functest.opnfv_tests.openstack.snaps.connection_check'
+                        'functest.opnfv_tests.openstack.api.connection_check'

                     class: 'ConnectionCheck'
 
             -
                     class: 'ConnectionCheck'
 
             -

-                case_name: api_check
+                case_name: tenantnetwork1

                 project_name: functest
                 criteria: 100
                 blocking: true
                 description: >-
                 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.
-                dependencies:
-                    installer: '^((?!netvirt).)*$'
-                    scenario: '^((?!lxd).)*$'
+                    It creates and configures all tenant network ressources
+                    required by advanced testcases (subnet, network and
+                    router).

                 run:
                 run:

-                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
-                    class: 'ApiCheck'
+                    module: 'functest.core.tenantnetwork'
+                    class: 'TenantNetwork1'

 
             -
 
             -

-                case_name: snaps_health_check
+                case_name: tenantnetwork2

                 project_name: functest
                 criteria: 100
                 blocking: true
                 description: >-
                 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.
-                dependencies:
-                    installer: ''
-                    scenario: '^((?!lxd).)*$'
+                    It creates new user/project before creating and configuring
+                    all tenant network ressources required by a testcase
+                    (subnet, network and router).

                 run:
                 run:

-                    module: 'functest.opnfv_tests.openstack.snaps.health_check'
-                    class: 'HealthCheck'
+                    module: 'functest.core.tenantnetwork'
+                    class: 'TenantNetwork2'
+
+            -
+                case_name: vmready1
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    It inherits from TenantNetwork1 which creates all network
+                    resources and prepares a future VM attached to that
+                    network.
+                run:
+                    module: 'functest.core.singlevm'
+                    class: 'VmReady1'
+
+            -
+                case_name: vmready2
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    It creates new user/project before creating and configuring
+                    all tenant network ressources, flavors, images, etc.
+                    required by advanced testcases.
+                run:
+                    module: 'functest.core.singlevm'
+                    class: 'VmReady2'
+
+            -
+                case_name: singlevm1
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    It inherits from TenantNetwork1 which creates all network
+                    resources and completes it by booting a VM attached to that
+                    network.
+                run:
+                    module: 'functest.core.singlevm'
+                    class: 'SingleVm1'
+
+            -
+                case_name: singlevm2
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    It creates new user/project before creating and configuring
+                    all tenant network ressources and vms required by advanced
+                    testcases.
+                run:
+                    module: 'functest.core.singlevm'
+                    class: 'SingleVm2'

 
 

-    -
-        name: smoke
-        order: 1
-        ci_loop: '(daily)|(weekly)'
-        description: >-
-            Set of basic Functional tests to validate the OPNFV scenarios.
-        testcases:

             -
                 case_name: vping_ssh
                 project_name: functest
             -
                 case_name: vping_ssh
                 project_name: functest


@@ -78,9 +108,6 @@ tiers:
                     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).)*$'

                 run:
                     module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
                     class: 'VPingSSH'
                 run:
                     module: 'functest.opnfv_tests.openstack.vping.vping_ssh'
                     class: 'VPingSSH'


@@ -93,16 +120,85 @@ tiers:
                 description: >-
                     This test case verifies:  1) Boot a VM with given userdata.
                     2) Connectivity between 2 instances over a private network.
                 description: >-
                     This test case verifies:  1) Boot a VM with given userdata.
                     2) Connectivity between 2 instances over a private network.

-                dependencies:
-                    installer: ''
-                    scenario: '^((?!lxd).)*$'

                 run:
                     module:
                         'functest.opnfv_tests.openstack.vping.vping_userdata'
                     class: 'VPingUserdata'
 
             -
                 run:
                     module:
                         'functest.opnfv_tests.openstack.vping.vping_userdata'
                     class: 'VPingUserdata'
 
             -

-                case_name: tempest_smoke_serial
+                case_name: cinder_test
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    This test case verifies: 1) Attach volume and to 1
+                    instance; 2) Write data on volume 3) Detach volume
+                    from instance 1, attach it on instance 2 3) Read volume
+                    data
+                run:
+                    module: 'functest.opnfv_tests.openstack.cinder.cinder_test'
+                    class: 'CinderCheck'
+
+            -
+                case_name: odl
+                project_name: functest
+                criteria: 100
+                blocking: true
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller. It
+                    integrates some test suites from upstream using
+                    Robot as the test framework.
+                dependencies:
+                    - DEPLOY_SCENARIO: 'odl'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    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.
+                dependencies:
+                    - DEPLOY_SCENARIO: '^((?!lxd).)*$'
+                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.
+                dependencies:
+                    - DEPLOY_SCENARIO: '^((?!lxd).)*$'
+                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
                 criteria: 100
                 blocking: false
                 project_name: functest
                 criteria: 100
                 blocking: false


@@ -111,12 +207,32 @@ tiers:
                     Tempest suite. The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.
                     Tempest suite. The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.

-                dependencies:
-                    installer: '^((?!netvirt).)*$'
-                    scenario: ''
+                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L114
+                run:
+                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
+                    class: 'TempestCommon'
+                    args:
+                        mode: '(?=.*\[.*\bsmoke\b.*\])(^tempest\.api)'
+                        option:
+                            - '--concurrency=4'
+
+            -
+                case_name: neutron-tempest-plugin-api
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs the Tempest suite proposed by the
+                    Neutron project. The list of test cases is generated by
+                    Tempest automatically and depends on the parameters of
+                    the OpenStack deployment.

                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'

-                    class: 'TempestSmokeSerial'
+                    class: 'TempestCommon'
+                    args:
+                        mode: '^neutron_tempest_plugin\.api'
+                        option:
+                            - '--concurrency=4'

 
             -
                 case_name: rally_sanity
 
             -
                 case_name: rally_sanity


@@ -126,9 +242,6 @@ tiers:
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Rally suite in smoke mode.
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Rally suite in smoke mode.

-                dependencies:
-                    installer: ''
-                    scenario: ''

                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
                     class: 'RallySanity'
                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
                     class: 'RallySanity'


@@ -136,14 +249,12 @@ tiers:
             -
                 case_name: refstack_defcore
                 project_name: functest
             -
                 case_name: refstack_defcore
                 project_name: functest

+                enabled: false

                 criteria: 100
                 blocking: false
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Defcore testcases.
                 criteria: 100
                 blocking: false
                 description: >-
                     This test case runs a sub group of tests of the OpenStack
                     Defcore testcases.

-                dependencies:
-                    installer: ''
-                    scenario: ''

                 run:
                     module:
                         'functest.opnfv_tests.openstack.refstack.refstack'
                 run:
                     module:
                         'functest.opnfv_tests.openstack.refstack.refstack'


@@ -156,62 +267,47 @@ tiers:
                 blocking: false
                 description: >-
                     Test suite from Patrole project.
                 blocking: false
                 description: >-
                     Test suite from Patrole project.

-                dependencies:
-                    installer: ''
-                    scenario: ''

                 run:
                     module: 'functest.opnfv_tests.openstack.patrole.patrole'
                     class: 'Patrole'
                     args:
                         role: 'admin'
                 run:
                     module: 'functest.opnfv_tests.openstack.patrole.patrole'
                     class: 'Patrole'
                     args:
                         role: 'admin'

-                        services:
+                        includes:

                             - 'image'
                             - 'network'
                             - 'image'
                             - 'network'

-                            - 'volume'
-                        exclude:
+                        excludes:

                             - 'test_networks_multiprovider_rbac'
 
             -
                             - 'test_networks_multiprovider_rbac'
 
             -

-                case_name: odl
+                case_name: vmtp

                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-

-                    Test Suite for the OpenDaylight SDN Controller. It
-                    integrates some test suites from upstream using
-                    Robot as the test framework.
+                    VMTP is a small python application that will automatically
+                    perform ping connectivity, round trip time measurement
+                    (latency) and TCP/UDP throughput

                 dependencies:
                 dependencies:

-                    installer: ''
-                    scenario: 'odl'
+                    - POD_ARCH: '^(?!aarch64$)'

                 run:
                 run:

-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            - /src/odl_test/csit/suites/integration/basic
-                            - /src/odl_test/csit/suites/openstack/neutron
+                    module:
+                        'functest.opnfv_tests.openstack.vmtp.vmtp'
+                    class: 'Vmtp'

 
             -
 
             -

-                case_name: odl_netvirt
+                case_name: shaker

                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-

-                    Test Suite for the OpenDaylight SDN Controller when
-                    the NetVirt features are installed. It integrates
-                    some test suites from upstream using Robot as the
-                    test framework.
-                dependencies:
-                    installer: 'apex'
-                    scenario: 'os-odl_l3-nofeature'
+                    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:
                 run:

-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            - /src/odl_test/csit/suites/integration/basic
-                            - /src/odl_test/csit/suites/openstack/neutron
-                            - /src/odl_test/csit/suites/openstack/connectivity
+                    module:
+                        'functest.opnfv_tests.openstack.shaker.shaker'
+                    class: 'Shaker'

 
             -
                 case_name: snaps_smoke
 
             -
                 case_name: snaps_smoke


@@ -226,10 +322,8 @@ tiers:
                     this functionality. When the config value of
                     snaps.use_keystone is True, functest must have access to
                     the cloud's private network.
                     this functionality. When the config value of
                     snaps.use_keystone is True, functest must have access to
                     the cloud's private network.

-

                 dependencies:
                 dependencies:

-                    installer: '^((?!netvirt).)*$'
-                    scenario: '^((?!lxd).)*$'
+                    - DEPLOY_SCENARIO: '^((?!lxd).)*$'

                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.smoke'
                     class: 'SnapsSmoke'
                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.smoke'
                     class: 'SnapsSmoke'


@@ -244,17 +338,74 @@ tiers:
                     OpenStack Tempest suite. The list of test cases is
                     generated by Tempest having as input the relevant
                     testcase list file.
                     OpenStack Tempest suite. The list of test cases is
                     generated by Tempest having as input the relevant
                     testcase list file.

-                dependencies:
-                    installer: '(fuel)|(apex)|(compass)'
-                    scenario: ''

                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'

-                    class: 'TempestNeutronTrunk'
+                    class: 'TempestCommon'
+                    args:
+                        mode: 'neutron_tempest_plugin.(api|scenario).test_trunk'
+                        neutron_extensions:
+                            - trunk
+                            - trunk-details
+
+            -
+                case_name: networking-bgpvpn
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs OpenStack networking-bgpvpn Tempest
+                    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'
+                    args:
+                        mode: '^networking_bgpvpn_tempest\.'
+                        neutron_extensions:
+                            - bgpvpn
+                        option:
+                            - '--concurrency=4'
+
+            -
+                case_name: networking-sfc
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs OpenStack networking-sfc Tempest
+                    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'
+                    args:
+                        mode:
+                            '^(?:networking_sfc\.tests\.tempest_plugin.tests.api).*$'
+                        neutron_extensions:
+                            - sfc
+                        option:
+                            - '--concurrency=0'
+
+            -
+                case_name: barbican
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    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'
+                    args:
+                        mode:
+                            'barbican_tempest_plugin.tests.(api|scenario).(?!test_image_signing)'
+                        services:
+                            - barbican

 
     -
         name: features
         order: 2
 
     -
         name: features
         order: 2

-        ci_loop: '(daily)|(weekly)'

         description: >-
             Test suites from feature projects
             integrated in functest
         description: >-
             Test suites from feature projects
             integrated in functest


@@ -267,8 +418,8 @@ tiers:
                 description: >-
                     Test suite from Doctor project.
                 dependencies:
                 description: >-
                     Test suite from Doctor project.
                 dependencies:

-                    installer: 'apex'
-                    scenario: '^((?!fdio|nofeature).)*$'
+                    - INSTALLER_TYPE: '(apex)|(fuel)|(daisy)'
+                    - DEPLOY_SCENARIO: '^((?!fdio|nofeature).)*$'

                 run:
                     module: 'xtesting.core.feature'
                     class: 'BashFeature'
                 run:
                     module: 'xtesting.core.feature'
                     class: 'BashFeature'


@@ -283,8 +434,7 @@ tiers:
                 description: >-
                     Test suite from SDNVPN project.
                 dependencies:
                 description: >-
                     Test suite from SDNVPN project.
                 dependencies:

-                    installer: '(fuel)|(apex)|(netvirt)'
-                    scenario: 'bgpvpn'
+                    - DEPLOY_SCENARIO: 'bgpvpn'

                 run:
                     module: 'sdnvpn.test.functest.run_sdnvpn_tests'
                     class: 'SdnvpnFunctest'
                 run:
                     module: 'sdnvpn.test.functest.run_sdnvpn_tests'
                     class: 'SdnvpnFunctest'


@@ -298,8 +448,7 @@ tiers:
                     Test suite for odl-sfc to test two chains with one SF and
                     one chain with two SFs
                 dependencies:
                     Test suite for odl-sfc to test two chains with one SF and
                     one chain with two SFs
                 dependencies:

-                    installer: ''
-                    scenario: 'odl.*sfc'
+                    - DEPLOY_SCENARIO: 'odl.*sfc'

                 run:
                     module: 'sfc.tests.functest.run_sfc_tests'
                     class: 'SfcFunctest'
                 run:
                     module: 'sfc.tests.functest.run_sfc_tests'
                     class: 'SfcFunctest'


@@ -314,8 +463,7 @@ tiers:
                     the proper configuration and basic functionality of all the
                     collectd plugins as described in the Project Release Plan
                 dependencies:
                     the proper configuration and basic functionality of all the
                     collectd plugins as described in the Project Release Plan
                 dependencies:

-                    installer: '(apex)|(compass)'
-                    scenario: 'bar'
+                    - DEPLOY_SCENARIO: 'bar'

                 run:
                     module: 'baro_tests.barometer'
                     class: 'BarometerCollectd'
                 run:
                     module: 'baro_tests.barometer'
                     class: 'BarometerCollectd'


@@ -330,8 +478,7 @@ tiers:
                     features are installed. It integrates some test suites from
                     upstream using Robot as the test framework.
                 dependencies:
                     features are installed. It integrates some test suites from
                     upstream using Robot as the test framework.
                 dependencies:

-                    installer: 'apex'
-                    scenario: 'odl.*-fdio'
+                    - DEPLOY_SCENARIO: 'odl.*-fdio'

                 run:
                     module: 'functest.opnfv_tests.sdn.odl.odl'
                     class: 'ODLTests'
                 run:
                     module: 'functest.opnfv_tests.sdn.odl.odl'
                     class: 'ODLTests'


@@ -342,25 +489,44 @@ tiers:
     -
         name: components
         order: 3
     -
         name: components
         order: 3

-        ci_loop: 'weekly'

         description: >-
             Extensive testing of OpenStack API.
         testcases:
             -
         description: >-
             Extensive testing of OpenStack API.
         testcases:
             -

-                case_name: tempest_full_parallel
+                case_name: tempest_full

                 project_name: functest
                 project_name: functest

-                criteria: 80
+                criteria: 100

                 blocking: false
                 description: >-
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
                 blocking: false
                 description: >-
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of

-                    the OpenStack deplopyment.
-                dependencies:
-                    installer: '^((?!netvirt).)*$'
-                    scenario: ''
+                    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'
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'

-                    class: 'TempestFullParallel'
+                    class: 'TempestCommon'
+                    args:
+                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)'
+                        option:
+                            - '--concurrency=1'

 
             -
                 case_name: rally_full
 
             -
                 case_name: rally_full


@@ -370,9 +536,6 @@ tiers:
                 description: >-
                     This test case runs the full suite of scenarios of the
                     OpenStack Rally suite using several threads and iterations.
                 description: >-
                     This test case runs the full suite of scenarios of the
                     OpenStack Rally suite using several threads and iterations.

-                dependencies:
-                    installer: '^((?!netvirt).)*$'
-                    scenario: ''

                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
                     class: 'RallyFull'
                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
                     class: 'RallyFull'


@@ -380,26 +543,51 @@ tiers:
     -
         name: vnf
         order: 4
     -
         name: vnf
         order: 4

-        ci_loop: '(daily)|(weekly)'

         description: >-
             Collection of VNF test cases.
         testcases:
         description: >-
             Collection of VNF test cases.
         testcases:

+            -
+                case_name: cloudify
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case deploys the Cloudify orchestrator.
+                dependencies:
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
+                run:
+                    module: 'functest.core.cloudify'
+                    class: 'Cloudify'

             -
                 case_name: cloudify_ims
                 project_name: functest
             -
                 case_name: cloudify_ims
                 project_name: functest

-                criteria: 80
+                criteria: 100

                 blocking: false
                 description: >-
                     This test case deploys an OpenSource vIMS solution from
                     Clearwater using the Cloudify orchestrator. It also runs
                     some signaling traffic.
                 dependencies:
                 blocking: false
                 description: >-
                     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'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'

                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
 
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
 

+            -
+                case_name: heat_ims
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    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:
+                    module: 'functest.opnfv_tests.vnf.ims.heat_ims'
+                    class: 'HeatIms'
+

             -
                 case_name: vyos_vrouter
                 project_name: functest
             -
                 case_name: vyos_vrouter
                 project_name: functest


@@ -408,8 +596,7 @@ tiers:
                 description: >-
                     This test case is vRouter testing.
                 dependencies:
                 description: >-
                     This test case is vRouter testing.
                 dependencies:

-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'

                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'


@@ -423,8 +610,7 @@ tiers:
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
                 dependencies:
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
                 dependencies:

-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'

                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'
                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'