X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fvnf%2Ftestcases.yaml;h=1f08177082794f9a6dcd1a781705710a78d9ffde;hb=026a9bfaa656d0e5ade327feda64f17796d6f209;hp=b2b6909b8b22a43980c27687924e931667db50e4;hpb=fa10ca0a16ab8d560b15814ce91e379e01b10030;p=functest.git

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index b2b6909b8..1f0817708 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -3,72 +3,66 @@ tiers:
     -
         name: vnf
         order: 4
-        ci_loop: '(daily)|(weekly)'
         description: >-
             Collection of VNF test cases.
         testcases:
             -
-                case_name: cloudify_ims
+                case_name: cloudify
                 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.
+                    This test case deploys the Cloudify orchestrator.
                 dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
-                    module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
-                    class: 'CloudifyIms'
-
+                    module: 'functest.core.cloudify'
+                    class: 'Cloudify'
             -
-                case_name: vyos_vrouter
+                case_name: cloudify_ims
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    This test case is vRouter testing.
+                    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.router.cloudify_vrouter'
-                    class: 'CloudifyVrouter'
+                    module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
+                    class: 'CloudifyIms'
 
             -
-                case_name: orchestra_openims
-                project_name: orchestra
+                case_name: heat_ims
+                project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    OpenIMS VNF deployment with Open Baton (Orchestra)
+                    This test case deploys an OpenSource vIMS solution from
+                    Clearwater using the OpenStack Heat orchestrator.
+                    It also runs some signaling traffic.
                 dependencies:
-                    installer: '^((?!compass|fuel).)*$'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
-                    module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
-                    class: 'OpenImsVnf'
+                    module: 'functest.opnfv_tests.vnf.ims.heat_ims'
+                    class: 'HeatIms'
 
             -
-                case_name: orchestra_clearwaterims
-                project_name: orchestra
+                case_name: vyos_vrouter
+                project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    ClearwaterIMS VNF deployment with Open Baton (Orchestra)
+                    This test case is vRouter testing.
                 dependencies:
-                    installer: '^((?!compass|fuel).)*$'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'
                 run:
-                    module:
-                        'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
-                    class: 'ClearwaterImsVnf'
+                    module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
+                    class: 'CloudifyVrouter'
 
             -
                 case_name: juju_epc
-                enabled: true
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -76,8 +70,7 @@ tiers:
                     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'