X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fvnf%2Ftestcases.yaml;h=7d5548b38e622ad61c078c43e8baf73d39e31e67;hb=9df8ee861d2161a105598474092e5e83da88a354;hp=0a0282df16e2de62e511c8816326b6ee001c695d;hpb=025520c093bbda8749cd3db5e993bb61c214bbfa;p=functest.git

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 0a0282df1..7d5548b38 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -3,83 +3,59 @@ 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.
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    This test case deploys the Cloudify orchestrator.
                 run:
-                    module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
-                    class: 'CloudifyIms'
-
+                    name: cloudify
             -
-                case_name: vyos_vrouter
+                case_name: cloudify_ims
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    This test case is vRouter testing.
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    This test case deploys an OpenSource vIMS solution from
+                    Clearwater using the Cloudify orchestrator. It also runs
+                    some signaling traffic.
                 run:
-                    module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
-                    class: 'CloudifyVrouter'
+                    name: cloudify_ims
 
             -
-                case_name: orchestra_openims
-                project_name: orchestra
-                enabled: false
+                case_name: heat_ims
+                project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    OpenIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: 'daisy'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    This test case deploys an OpenSource vIMS solution from
+                    Clearwater using the OpenStack Heat orchestrator.
+                    It also runs some signaling traffic.
                 run:
-                    module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
-                    class: 'OpenImsVnf'
+                    name: heat_ims
 
             -
-                case_name: orchestra_clearwaterims
-                project_name: orchestra
-                enable: false
+                case_name: vyos_vrouter
+                project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
-                    ClearwaterIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: 'daisy'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    This test case is vRouter testing.
                 run:
-                    module:
-                        'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
-                    class: 'ClearwaterImsVnf'
+                    name: vyos_vrouter
 
             -
                 case_name: juju_epc
-                enabled: true
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
                 run:
-                    module: 'functest.opnfv_tests.vnf.epc.juju_epc'
-                    class: 'JujuEpc'
+                    name: juju_epc