From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 9 Dec 2020 17:54:17 +0000 (+0100)
Subject: Remove all network data in Rally full tasks
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F71711%2F1;p=functest.git

Remove all network data in Rally full tasks

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

diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
index fec3a5639..187f2cfd2 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
@@ -39,9 +39,6 @@
           - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
         quotas:
           {{ unlimited_neutron() }}
           {{ unlimited_nova() }}
@@ -59,9 +56,6 @@
           - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
         quotas:
           {{ unlimited_neutron() }}
           {{ unlimited_nova() }}
@@ -80,9 +74,6 @@
           - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
         quotas:
           {{ unlimited_neutron() }}
           {{ unlimited_nova() }}
@@ -104,9 +95,6 @@
           - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
         quotas:
           {{ unlimited_neutron() }}
           {{ unlimited_nova() }}
@@ -124,9 +112,6 @@
           - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
         quotas:
           {{ unlimited_neutron() }}
           {{ unlimited_nova() }}
@@ -256,9 +241,6 @@
               - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
         quotas:
           {{ unlimited_neutron() }}
           {{ unlimited_nova(keypairs=true) }}
@@ -277,9 +259,6 @@
           - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
         quotas:
           {{ unlimited_volumes() }}
           {{ unlimited_neutron() }}
@@ -301,9 +280,6 @@
           - net-id: {{ netid }}
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          networks_per_tenant: 1
-          start_cidr: "100.1.0.0/25"
         quotas:
           {{ unlimited_neutron() }}
           {{ unlimited_nova() }}