From: Aaron Rosen Date: Wed, 6 Mar 2013 23:02:12 +0000 (-0800) Subject: isolated network metadata does not work with nvp plugin X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0285379aece40e6650480cffc8a757f21a5aa52d;p=openstack-build%2Fneutron-build.git isolated network metadata does not work with nvp plugin This patch removes the not self.conf.enable_metadata_network check before adding METADATA_DEFAULT_IP to ip_cidrs. This result of this is that the dhcp agent interface will have 169.254.169.254/16 on it even if the network is enable_metadata_network=True which doesn't matter and happens anyway if one sets enable_meta_network=False. This change only effects the nvp plugin as this is the only one that uses the enable_metadata_network flag. Change-Id: Ifb3b28daed9e3bfc61bb0d8a48c40d027d0e2a51 --- diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py index f19156a6e..cea7896f0 100644 --- a/quantum/agent/dhcp_agent.py +++ b/quantum/agent/dhcp_agent.py @@ -522,8 +522,7 @@ class DeviceManager(object): ip_cidrs.append(ip_cidr) if (self.conf.enable_isolated_metadata and - self.conf.use_namespaces and - not self.conf.enable_metadata_network): + self.conf.use_namespaces): ip_cidrs.append(METADATA_DEFAULT_IP) self.driver.init_l3(interface_name, ip_cidrs, diff --git a/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py index fdfde7327..721e1319b 100644 --- a/quantum/tests/unit/test_dhcp_agent.py +++ b/quantum/tests/unit/test_dhcp_agent.py @@ -852,7 +852,6 @@ class TestDeviceManager(base.BaseTestCase): super(TestDeviceManager, self).tearDown() def _test_setup_helper(self, device_exists, reuse_existing=False, - metadata_access_network=False, net=None, port=None): net = net or fake_network port = port or fake_port1 @@ -871,10 +870,7 @@ class TestDeviceManager(base.BaseTestCase): namespace = dhcp_agent.NS_PREFIX + net.id - if metadata_access_network: - expected_ips = ['169.254.169.254/30'] - else: - expected_ips = ['172.9.9.9/24', '169.254.169.254/16'] + expected_ips = ['172.9.9.9/24', '169.254.169.254/16'] expected = [mock.call.init_l3('tap12345678-12', expected_ips, namespace=namespace)] @@ -886,10 +882,6 @@ class TestDeviceManager(base.BaseTestCase): 'tap12345678-12', 'aa:bb:cc:dd:ee:ff', 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) def test_setup(self): @@ -902,11 +894,6 @@ class TestDeviceManager(base.BaseTestCase): def test_setup_device_exists_reuse(self): 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): fake_network = FakeModel('12345678-1234-5678-1234567890ab', tenant_id='aaaaaaaa-aaaa-aaaa-aaaaaaaaaaaa')