b41523289c
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 <rbryant@redhat.com>
36 lines
1.6 KiB
Python
36 lines
1.6 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
from rally.task import scenario
|
|
from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils
|
|
from rally.task import types
|
|
from rally.task import validation
|
|
|
|
class BrowbeatPlugin(neutron_utils.NeutronScenario,
|
|
scenario.Scenario):
|
|
|
|
@types.convert(image={"type": "glance_image"},
|
|
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):
|
|
router = self._create_router({})
|
|
subnets = []
|
|
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'])
|
|
for subnet in subnets :
|
|
self._remove_interface_router(subnet['subnet'],router['router'])
|