openstack/rally
Code Issues Proposed changes

Merge "Use _create_network in _create_network_structure"

Browse Source
This commit is contained in:
Jenkins 2017-02-03 21:48:30 +00:00 committed by Gerrit Code Review
commit d85b6d6851
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/plugins/openstack/scenarios/neutron/utils.py
View File

@ -348,7 +348,7 @@ class NeutronScenario(scenario.OpenStackScenario):
:param router_create_args: dict, POST /v2.0/routers request options :param router_create_args: dict, POST /v2.0/routers request options
:returns: tuple of (network, subnets, routers) :returns: tuple of (network, subnets, routers)
""" """
network = self._get_or_create_network(network_create_args) network = self._create_network(network_create_args or {})
subnets = self._create_subnets(network, subnet_create_args, subnets = self._create_subnets(network, subnet_create_args,
subnet_cidr_start, subnet_cidr_start,
subnets_per_network) subnets_per_network)

6
tests/unit/plugins/openstack/scenarios/neutron/test_utils.py
View File

@ -533,7 +533,7 @@ class NeutronScenarioTestCase(test.ScenarioTestCase):
routers.append(mock.MagicMock()) routers.append(mock.MagicMock())
router_create_calls.append(mock.call(router_create_args)) router_create_calls.append(mock.call(router_create_args))
self.scenario._get_or_create_network = mock.Mock(return_value=network) self.scenario._create_network = mock.Mock(return_value=network)
self.scenario._create_subnets = mock.Mock(return_value=subnets) self.scenario._create_subnets = mock.Mock(return_value=subnets)
self.scenario._create_router = mock.Mock(side_effect=routers) self.scenario._create_router = mock.Mock(side_effect=routers)
self.scenario._add_interface_router = mock.Mock() self.scenario._add_interface_router = mock.Mock()
@ -544,8 +544,8 @@ class NeutronScenarioTestCase(test.ScenarioTestCase):
subnets_per_network, subnets_per_network,
router_create_args) router_create_args)
self.assertEqual(actual, (network, subnets, routers)) self.assertEqual(actual, (network, subnets, routers))
self.scenario._get_or_create_network.assert_called_once_with( self.scenario._create_network.assert_called_once_with(
network_create_args) network_create_args or {})
self.scenario._create_subnets.assert_called_once_with( self.scenario._create_subnets.assert_called_once_with(
network, network,
subnet_create_args, subnet_create_args,