From b41523289ca416c25e8e8da80e24d9c97423ddc2 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 5 Dec 2016 08:46:25 -0500 Subject: [PATCH] rally/subnet-router-create: Fix multiple networks. This code had two cases, one for when there was only 1 network and another case for when more than 1 network was used. Simplify the code so that only one code path is needed. This also fixes an off-by-one error in the multiple networks code. It was actually only doing N-1 networks instead of N, which could explain why an alternate code path was added for a single network, as this code would not have done anything when num_networks == 1. Tweak some spacing in passing to be pep8 compliant. Change-Id: I27cac72f1e20774e8f097fe5e24b20fa6b76970e Signed-off-by: Russell Bryant --- .../subnet-router-create/subnet-router-create.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/rally/rally-plugins/subnet-router-create/subnet-router-create.py b/rally/rally-plugins/subnet-router-create/subnet-router-create.py index 4e727155e..176a2f66c 100644 --- a/rally/rally-plugins/subnet-router-create/subnet-router-create.py +++ b/rally/rally-plugins/subnet-router-create/subnet-router-create.py @@ -22,20 +22,14 @@ class BrowbeatPlugin(neutron_utils.NeutronScenario, flavor={"type": "nova_flavor"}) @validation.required_openstack(users=True) @scenario.configure(context={"cleanup": ["neutron"]}) - def create_router_and_net(self,num_networks=1,network_create_args=None, - subnet_create_args=None,**kwargs): + def create_router_and_net(self, num_networks=1, network_create_args=None, + subnet_create_args=None, **kwargs): router = self._create_router({}) subnets = [] - if num_networks == 1 : + for net in range(num_networks): network = self._create_network(network_create_args or {}) subnet = self._create_subnet(network, subnet_create_args or {}) subnets.append(subnet) self._add_interface_router(subnet['subnet'],router['router']) - else : - for net in range(1,num_networks): - network = self._create_network(network_create_args or {}) - subnet = self._create_subnet(network, subnet_create_args or {}) - subnets.append(subnet) - self._add_interface_router(subnet['subnet'],router['router']) for subnet in subnets : self._remove_interface_router(subnet['subnet'],router['router'])