Update network context in selected rally tests

Network context not needed in following scenarios:

NeutronNetworks.create_and_delete_routers
NeutronNetworks.create_and_list_routers
NeutronNetworks.create_and_list_subnets
NeutronNetworks.create_and_update_routers
NeutronNetworks.create_and_update_subnets
NeutronNetworks.create_and_show_routers

Router not needed in network context in following scenarios:

NeutronNetworks.create_and_update_ports
NeutronNetworks.create_and_delete_ports
NeutronNetworks.create_and_delete_subnets
NeutronNetworks.create_and_list_ports
NeutronNetworks.create_and_show_ports
NeutronNetworks.create_and_show_subnets

This completes the patch skipping router creation [1].

[1] https://gerrit.opnfv.org/gerrit/#/c/67429/

Change-Id: I80ea145a21168fd984cc9ef88d50af227f0d6ed4
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
(cherry picked from commit b4b2e7f9a5a3cb3379b45ac4ddd0ef949974a698)

2 files changed, 12 insertions, 18 deletions

diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml
index 2951e953a..b8b1b9b6b 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-neutron.yaml
@@ -27,7 +27,8 @@
         ports_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
+        network:
+          router: {}
         quotas:
           neutron:
             network: -1
@@ -50,7 +51,6 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
         quotas:
           neutron:
             network: -1
@@ -74,7 +74,6 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
         quotas:
           neutron:
             network: -1
@@ -108,7 +107,8 @@
         ports_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
+        network:
+          router: {}
         quotas:
           neutron:
             network: -1
@@ -129,7 +129,6 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
         quotas:
           neutron:
             network: -1
@@ -151,7 +150,8 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
+        network:
+          router: {}
         quotas:
           neutron:
             network: -1
@@ -185,7 +185,8 @@
         ports_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
+        network:
+          router: {}
         quotas:
           neutron:
             network: -1
@@ -206,7 +207,6 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
         quotas:
           neutron:
             network: -1
@@ -227,7 +227,6 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
         quotas:
           neutron:
             network: -1
@@ -315,7 +314,8 @@
         ports_per_network: 2
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
+        network:
+          router: {}
         quotas:
           neutron:
             network: -1
@@ -332,7 +332,6 @@
         subnets_per_network: 2
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
         quotas:
           neutron:
             network: -1
@@ -350,7 +349,8 @@
         subnets_per_network: 2
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network: {}
+        network:
+          router: {}
         quotas:
           neutron:
             network: -1
diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml
index d045df367..3eb7652c0 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-neutron.yaml
@@ -43,8 +43,6 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          router: {}
         quotas:
           neutron:
             network: -1
@@ -123,8 +121,6 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          router: {}
         quotas:
           neutron:
             network: -1
@@ -145,8 +141,6 @@
         subnets_per_network: 1
       context:
         {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        network:
-          router: {}
         quotas:
           neutron:
             network: -1