openstack/rally-openstack
Code Issues Proposed changes

Merge "Use public_network_id when creating router"

Browse Source
This commit is contained in:
Zuul 2020-02-24 23:41:39 +00:00 committed by Gerrit Code Review
commit 845325d0a7
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rally_openstack/verification/tempest/context.py
View File

@ -280,9 +280,22 @@ class TempestContext(context.VerifierContext):
def _create_network_resources(self):
neutron_wrapper = network.NeutronWrapper(self.clients, self)
tenant_id = self.clients.keystone.auth_ref.project_id
router_create_args = {}
public_net = None
if self.conf.has_section("network"):
public_net = self.conf.get("network", "public_network_id")
if public_net:
ext_gw_mode_enabled = neutron_wrapper.ext_gw_mode_enabled
external_gateway_info = {
"network_id": public_net
}
if ext_gw_mode_enabled:
external_gateway_info["enable_snat"] = True
router_create_args["external_gateway_info"] = external_gateway_info
LOG.debug("Creating network resources: network, subnet, router.")
net = neutron_wrapper.create_network(
tenant_id, subnets_num=1, add_router=True,
router_create_args=router_create_args,
network_create_args={"shared": True})
LOG.debug("Network resources have been successfully created!")
self._created_networks.append(net)

26
tests/unit/verification/tempest/test_context.py
View File

@ -270,6 +270,32 @@ class TempestContextTestCase(test.TestCase):
self.assertEqual("subid1",
self.context._created_networks[0]["subnets"][0])
@mock.patch("rally_openstack.wrappers.network.NeutronWrapper.ext_gw_mode_enabled", # noqa E501
new_callable=mock.PropertyMock, return_value=True)
def test__create_network_resources_public_network_override(self, mock_ext_gw_mode_enabled): # noqa E501
client = self.context.clients.neutron()
conf = self.context.conf
conf.add_section("network")
conf.set("network", "public_network_id", "my-uuid")
fake_network = {
"id": "nid1",
"name": "network",
"status": "status"}
client.create_network.side_effect = [{"network": fake_network}]
client.create_router.side_effect = [{"router": {"id": "rid1"}}]
client.create_subnet.side_effect = [{"subnet": {"id": "subid1"}}]
client.list_networks.return_value = {"networks": []}
self.context._create_network_resources()
_name, pos, _kwargs = client.create_router.mock_calls[0]
router = pos[0]["router"]
external_gateway_info = router["external_gateway_info"]
self.assertEqual('my-uuid', external_gateway_info["network_id"])
self.assertEqual(True, external_gateway_info["enable_snat"])
def test__cleanup_tempest_roles(self):
self.context._created_roles = [fakes.FakeRole(), fakes.FakeRole()]