openstack
/
neutron
Code Issues Proposed changes

Merge "Update code to properly use dict returned from get_gateway."

This commit is contained in:
Jenkins 2013-06-29 16:18:35 +00:00 committed by Gerrit Code Review
parent 4c9ea16ba1 21fd100a98
commit cac82c4ba6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/agent/dhcp_agent.py
View File

@ -547,6 +547,8 @@ class DeviceManager(object):
"""
device = self._get_device(network)
gateway = device.route.get_gateway()
if gateway:
gateway = gateway['gateway']
for subnet in network.subnets:
skip_subnet = (

8
quantum/tests/unit/test_dhcp_agent.py
View File

@ -1228,7 +1228,7 @@ class TestDeviceManager(base.BaseTestCase):
def test_set_default_route_no_subnet_delete_gateway(self):
device = mock.Mock()
device.route.get_gateway.return_value = '192.168.0.1'
device.route.get_gateway.return_value = dict(gateway='192.168.0.1')
# Try a namespace but no subnet where a gateway needs to be deleted.
dh = self._get_device_manager_with_mock_device(cfg.CONF, device)
@ -1242,7 +1242,7 @@ class TestDeviceManager(base.BaseTestCase):
def test_set_default_route_no_gateway(self):
device = mock.Mock()
device.route.get_gateway.return_value = '192.168.0.1'
device.route.get_gateway.return_value = dict(gateway='192.168.0.1')
# Try a subnet with no gateway
dh = self._get_device_manager_with_mock_device(cfg.CONF, device)
@ -1256,7 +1256,7 @@ class TestDeviceManager(base.BaseTestCase):
def test_set_default_route_do_nothing(self):
device = mock.Mock()
device.route.get_gateway.return_value = '192.168.0.1'
device.route.get_gateway.return_value = dict(gateway='192.168.0.1')
# Try a subnet where the gateway doesn't change. Should do nothing.
dh = self._get_device_manager_with_mock_device(cfg.CONF, device)
@ -1270,7 +1270,7 @@ class TestDeviceManager(base.BaseTestCase):
def test_set_default_route_change_gateway(self):
device = mock.Mock()
device.route.get_gateway.return_value = '192.168.0.2'
device.route.get_gateway.return_value = dict(gateway='192.168.0.2')
# Try a subnet with a gateway this is different than the current.
dh = self._get_device_manager_with_mock_device(cfg.CONF, device)