Bugfix: heat conext of test case yamls jinja2 bypass sriov type

the "if provider" condition bypass when provider = "sriov",
related to https://gerrit.opnfv.org/gerrit/#/c/32789/

  networks:
    test:
      cidr: '10.0.1.0/24'
      {% if provider == "vlan" %}
      provider: {{provider}}
      physical_network: {{physical_network}}
        {% if segmentation_id %}
      segmentation_id: {{segmentation_id}}
        {% endif %}
      {% endif %}

JIRA: YARDSTICK-1242

Change-Id: I6a611e839654f401648d9bd6188589816f7b4946
Signed-off-by: rexlee8776 <limingjiang@huawei.com>

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml
index 4faa0bc..8bfe446 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml
@@ -62,7 +62,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
index 7f8c229..596db25 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml
@@ -59,7 +59,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
index 101c421..756c14d 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
@@ -60,7 +60,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
index fe244e8..cf12436 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml
@@ -64,7 +64,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml
index 22e5760..c905302 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml
@@ -78,13 +78,10 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}
       segmentation_id: {{segmentation_id}}
         {% endif %}
       {% endif %}
-    #test-sriov:
-      #cidr: '10.0.1.0/24'
-      #provider: "sriov"

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml
index 3c5f72d..cefa505 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml
@@ -64,7 +64,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
index cf97068..e84e113 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
@@ -49,7 +49,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
index ee36c6c..9980022 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml
@@ -61,7 +61,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
index b8b208f..a1058bc 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
@@ -50,7 +50,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml
index bd0fe36..78c9e85 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml
@@ -43,7 +43,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc023.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc023.yaml
index 7136a9e..c2c176b 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc023.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc023.yaml
@@ -181,7 +181,7 @@ contexts:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml
index 3622b40..a6cf6a2 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml
@@ -95,7 +95,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml
index 59fb95d..2250ae5 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml
@@ -95,7 +95,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc069.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc069.yaml
index 2a40823..3bfaff9 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc069.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc069.yaml
@@ -49,7 +49,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc070.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc070.yaml
index 7ea10d8..8cbd247 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc070.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc070.yaml
@@ -97,7 +97,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc071.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc071.yaml
index b6a944b..c1ce2c5 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc071.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc071.yaml
@@ -95,7 +95,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc072.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc072.yaml
index 09930d4..d237fa9 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc072.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc072.yaml
@@ -97,7 +97,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc076.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc076.yaml
index 8c0edac..c5e799c 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc076.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc076.yaml
@@ -58,7 +58,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc079.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc079.yaml
index 9c15acc..04a9225 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc079.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc079.yaml
@@ -45,7 +45,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc082.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc082.yaml
index 4b67f0f..85b6c91 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc082.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc082.yaml
@@ -55,7 +55,7 @@ context:
   networks:
     test:
       cidr: "10.0.1.0/24"
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc083.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc083.yaml
index 6315fdc..158f064 100755 (executable)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc083.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc083.yaml
@@ -81,7 +81,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc084.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc084.yaml
index 472aabe..9df1657 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc084.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc084.yaml
@@ -58,7 +58,7 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      {% if provider == "vlan" %}
+      {% if provider == "vlan" or provider == "sriov" %}
       provider: {{provider}}
       physical_network: {{physical_network}}
         {% if segmentation_id %}