Complete the container opnfv-vnf

It adds the following testcases:
  - aaa
  - orchestra_openims
  - orchestra_clearwaterims

opera_vims is not yet integrated as it depends on Opera [1] and its
package must be fixed before being installed in Functest [2].

vyos_vrouter will be added when a package is available for installing
opnfv-functest-vrouter [3].

[1] https://wiki.opnfv.org/display/OPERA/Opera+Home
[2] https://git.opnfv.org/opera/tree/requirements.txt
[3] https://github.com/oolorg/opnfv-functest-vrouter

Change-Id: Iccd4626ec29c1e9eb1c2accc81fdf1a9ae1e613f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 170b0fd..1a42101 100644 (file)
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -20,3 +20,46 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
+
+            -
+                case_name: aaa
+                enabled: false
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    Simple VNF.
+                dependencies:
+                    installer: ''
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.vnf.aaa.aaa'
+                    class: 'AaaVnf'
+
+            -
+                case_name: orchestra_openims
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    OpenIMS VNF deployment with Open Baton (Orchestra)
+                dependencies:
+                    installer: ''
+                    scenario: 'os-nosdn-nofeature-ha'
+                run:
+                    module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
+                    class: 'OpenImsVnf'
+
+            -
+                case_name: orchestra_clearwaterims
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    ClearwaterIMS VNF deployment with Open Baton (Orchestra)
+                dependencies:
+                    installer: ''
+                    scenario: 'os-nosdn-nofeature-ha'
+                run:
+                    module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
+                    class: 'ClearwaterImsVnf'

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index ba15e53..06e01dd 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -486,7 +486,7 @@ tiers:
                 criteria: 100
                 blocking: false
                 description: >-
-                   Test suite from Parser project.
+                    Simple VNF.
                 dependencies:
                     installer: ''
                     scenario: ''