From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 9 Apr 2018 09:05:19 +0000 (+0200)
Subject: Run all VNFs vs SDN scenarios
X-Git-Tag: opnfv-6.0.0~37^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d78693808c999538124e578ef6894dd49dd26077;p=functest.git

Run all VNFs vs SDN scenarios

It allows a fair comparison between Neutron standalone and SDN
controllers. They should run successfully at least vs Daisy [1].

[1] https://build.opnfv.org/ci/view/functest/job/functest-daisy-baremetal-daily-master/lastSuccessfulBuild/

Change-Id: Iac34cd4d6eb070be0abe081fbc815e971675faef
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit abfdf1d28292198ef94059b5812a5987887404e0)
---

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index dbf470dd0..938f0b309 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-.*-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-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
@@ -47,7 +47,7 @@ tiers:
                     executor.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    scenario: 'os-.*-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 8676643da..13328c1a0 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -395,7 +395,7 @@ tiers:
                     some signaling traffic.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
@@ -409,7 +409,7 @@ tiers:
                     This test case is vRouter testing.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
@@ -424,7 +424,7 @@ tiers:
                     executor.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-.*ha'
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'