x/vmware-nsx
Code Issues Proposed changes

Merge "isolated network metadata does not work with nvp plugin"

Browse Source
This commit is contained in:
Jenkins 2013-03-07 09:34:12 +00:00 committed by Gerrit Code Review
commit e059de1356
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quantum/agent/dhcp_agent.py
View File

@ -522,8 +522,7 @@ class DeviceManager(object):
ip_cidrs.append(ip_cidr) ip_cidrs.append(ip_cidr)
if (self.conf.enable_isolated_metadata and if (self.conf.enable_isolated_metadata and
self.conf.use_namespaces and self.conf.use_namespaces):
not self.conf.enable_metadata_network):
ip_cidrs.append(METADATA_DEFAULT_IP) ip_cidrs.append(METADATA_DEFAULT_IP)
self.driver.init_l3(interface_name, ip_cidrs, self.driver.init_l3(interface_name, ip_cidrs,

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

@ -852,7 +852,6 @@ class TestDeviceManager(base.BaseTestCase):
super(TestDeviceManager, self).tearDown() super(TestDeviceManager, self).tearDown()
def _test_setup_helper(self, device_exists, reuse_existing=False, def _test_setup_helper(self, device_exists, reuse_existing=False,
metadata_access_network=False,
net=None, port=None): net=None, port=None):
net = net or fake_network net = net or fake_network
port = port or fake_port1 port = port or fake_port1
@ -871,10 +870,7 @@ class TestDeviceManager(base.BaseTestCase):
namespace = dhcp_agent.NS_PREFIX + net.id namespace = dhcp_agent.NS_PREFIX + net.id
if metadata_access_network: expected_ips = ['172.9.9.9/24', '169.254.169.254/16']
expected_ips = ['169.254.169.254/30']
else:
expected_ips = ['172.9.9.9/24', '169.254.169.254/16']
expected = [mock.call.init_l3('tap12345678-12', expected = [mock.call.init_l3('tap12345678-12',
expected_ips, expected_ips,
namespace=namespace)] namespace=namespace)]
@ -886,10 +882,6 @@ class TestDeviceManager(base.BaseTestCase):
'tap12345678-12', 'tap12345678-12',
'aa:bb:cc:dd:ee:ff', 'aa:bb:cc:dd:ee:ff',
namespace=namespace)) namespace=namespace))
if metadata_access_network:
self.mock_iproute.assert_has_calls(
[mock.call.add_gateway('169.254.169.253')])
self.mock_driver.assert_has_calls(expected) self.mock_driver.assert_has_calls(expected)
def test_setup(self): def test_setup(self):
@ -902,11 +894,6 @@ class TestDeviceManager(base.BaseTestCase):
def test_setup_device_exists_reuse(self): def test_setup_device_exists_reuse(self):
self._test_setup_helper(True, True) self._test_setup_helper(True, True)
def test_setup_with_metadata_access_network(self):
cfg.CONF.set_override('enable_metadata_network', True)
self._test_setup_helper(False, metadata_access_network=True,
net=fake_meta_network, port=fake_meta_port)
def test_destroy(self): def test_destroy(self):
fake_network = FakeModel('12345678-1234-5678-1234567890ab', fake_network = FakeModel('12345678-1234-5678-1234567890ab',
tenant_id='aaaaaaaa-aaaa-aaaa-aaaaaaaaaaaa') tenant_id='aaaaaaaa-aaaa-aaaa-aaaaaaaaaaaa')