From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 13 Feb 2018 10:39:44 +0000 (+0100)
Subject: Test vnf in all os-nosdn-nofeature scenarios
X-Git-Tag: opnfv-6.0.0~154^2~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2fbff506d2bece39db007af98c7c5292329b7f31;p=functest.git

Test vnf in all os-nosdn-nofeature scenarios

It allows setting os-nosdn-nofeature-noha as default value if
DEPLOY_SCENARIO is unset.

As orchestra* testcases are already disabled, it's useless to ask a
specific installer. All vnf testcases should work vs any installer.

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

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 636bf9d19..e95f64b3f 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -18,7 +18,7 @@ tiers:
                     some signaling traffic.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
@@ -32,7 +32,7 @@ tiers:
                     This test case is vRouter testing.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
@@ -46,8 +46,8 @@ tiers:
                 description: >-
                     OpenIMS VNF deployment with Open Baton (Orchestra)
                 dependencies:
-                    installer: 'daisy'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    installer: ''
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
                     class: 'OpenImsVnf'
@@ -61,8 +61,8 @@ tiers:
                 description: >-
                     ClearwaterIMS VNF deployment with Open Baton (Orchestra)
                 dependencies:
-                    installer: 'daisy'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    installer: ''
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module:
                         'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
@@ -78,7 +78,7 @@ tiers:
                     executor.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index b3c66bc45..eaf62adc1 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -359,7 +359,7 @@ tiers:
                     some signaling traffic.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
@@ -373,7 +373,7 @@ tiers:
                     This test case is vRouter testing.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
@@ -387,8 +387,8 @@ tiers:
                 description: >-
                     OpenIMS VNF deployment with Open Baton (Orchestra)
                 dependencies:
-                    installer: 'daisy'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    installer: ''
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
                     class: 'OpenImsVnf'
@@ -402,8 +402,8 @@ tiers:
                 description: >-
                     ClearwaterIMS VNF deployment with Open Baton (Orchestra)
                 dependencies:
-                    installer: 'daisy'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    installer: ''
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module:
                         'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
@@ -419,7 +419,7 @@ tiers:
                     executor.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'