From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 26 Nov 2020 16:57:23 +0000 (+0100)
Subject: Skip dataplane benchmarkign if no tenant resources
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2e997aea70abd4565e2991ce1de0f3c264c17a07;p=functest.git

Skip dataplane benchmarkign if no tenant resources

It asks for routers for instance.

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

diff --git a/docker/benchmarking-cntt/testcases.yaml b/docker/benchmarking-cntt/testcases.yaml
index f96fbee07..9c382c7d4 100644
--- a/docker/benchmarking-cntt/testcases.yaml
+++ b/docker/benchmarking-cntt/testcases.yaml
@@ -51,7 +51,7 @@ tiers:
                     perform ping connectivity, round trip time measurement
                     (latency) and TCP/UDP throughput
                 dependencies:
-                    - POD_ARCH: '^(?!aarch64$)'
+                    - NO_TENANT_NETWORK: '^(?![tT]rue$)'
                 run:
                     name: vmtp
 
@@ -66,6 +66,6 @@ tiers:
                     is able to deploy OpenStack instances and networks in
                     different topologies.
                 dependencies:
-                    - POD_ARCH: '^(?!aarch64$)'
+                    - NO_TENANT_NETWORK: '^(?![tT]rue$)'
                 run:
                     name: shaker
diff --git a/docker/benchmarking/testcases.yaml b/docker/benchmarking/testcases.yaml
index efc3f3d13..0a4368603 100644
--- a/docker/benchmarking/testcases.yaml
+++ b/docker/benchmarking/testcases.yaml
@@ -44,7 +44,7 @@ tiers:
                     perform ping connectivity, round trip time measurement
                     (latency) and TCP/UDP throughput
                 dependencies:
-                    - POD_ARCH: '^(?!aarch64$)'
+                    - NO_TENANT_NETWORK: '^(?![tT]rue$)'
                 run:
                     name: vmtp
 
@@ -59,6 +59,6 @@ tiers:
                     is able to deploy OpenStack instances and networks in
                     different topologies.
                 dependencies:
-                    - POD_ARCH: '^(?!aarch64$)'
+                    - NO_TENANT_NETWORK: '^(?![tT]rue$)'
                 run:
                     name: shaker
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index cb9bbade9..f65b2b018 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -721,7 +721,7 @@ tiers:
                     perform ping connectivity, round trip time measurement
                     (latency) and TCP/UDP throughput
                 dependencies:
-                    - POD_ARCH: '^(?!aarch64$)'
+                    - NO_TENANT_NETWORK: '^(?![tT]rue$)'
                 run:
                     name: vmtp
 
@@ -736,7 +736,7 @@ tiers:
                     is able to deploy OpenStack instances and networks in
                     different topologies.
                 dependencies:
-                    - POD_ARCH: '^(?!aarch64$)'
+                    - NO_TENANT_NETWORK: '^(?![tT]rue$)'
                 run:
                     name: shaker