Add default route to dhcp agent netns.

Remove code block "if self.conf.enable_metadata_network:". No need to treat it
differently. Default route will be set as any other network.

Change-Id: I71eaaf46bbd01f577988211b650fdbe3972d1fa0
Fixes: bug #1196889

diff --git a/neutron/agent/dhcp_agent.py b/neutron/agent/dhcp_agent.py
index 38582e166acbc95e0de7bb50a54cd6f1e72d9564..95c1060c2852fd295417c20e3637c3b167a0193d 100644 (file)
--- a/neutron/agent/dhcp_agent.py
+++ b/neutron/agent/dhcp_agent.py
@@ -706,26 +706,14 @@ class DeviceManager(object):
                                      self.root_helper)
             device.route.pullup_route(interface_name)
 
-        if self.conf.enable_metadata_network:
-            meta_cidr = netaddr.IPNetwork(METADATA_DEFAULT_IP)
-            metadata_subnets = [s for s in network.subnets if
-                                netaddr.IPNetwork(s.cidr) in meta_cidr]
-            if metadata_subnets:
-                # Add a gateway so that packets can be routed back to VMs
-                device = ip_lib.IPDevice(interface_name,
-                                         self.root_helper,
-                                         namespace)
-                # Only 1 subnet on metadata access network
-                gateway_ip = metadata_subnets[0].gateway_ip
-                device.route.add_gateway(gateway_ip)
-        elif self.conf.use_namespaces:
+        if self.conf.use_namespaces:
             self._set_default_route(network)
 
         return interface_name
 
     def update(self, network):
         """Update device settings for the network's DHCP on this host."""
-        if self.conf.use_namespaces and not self.conf.enable_metadata_network:
+        if self.conf.use_namespaces:
             self._set_default_route(network)
 
     def destroy(self, network, device_name):

diff --git a/neutron/tests/unit/test_dhcp_agent.py b/neutron/tests/unit/test_dhcp_agent.py
index 0205bcfa0faac4fd381a5b335e3d9179e154dbaf..e2ae37d915d42d30949e5d7fb7ff59fdd16ea5fd 100644 (file)
--- a/neutron/tests/unit/test_dhcp_agent.py
+++ b/neutron/tests/unit/test_dhcp_agent.py
@@ -1099,6 +1099,9 @@ class TestDeviceManager(base.BaseTestCase):
         dh._set_default_route.assert_called_once_with(net)
 
     def test_setup(self):
+        cfg.CONF.set_override('enable_metadata_network', False)
+        self._test_setup_helper(False)
+        cfg.CONF.set_override('enable_metadata_network', True)
         self._test_setup_helper(False)
 
     def test_setup_device_exists(self):
@@ -1246,7 +1249,7 @@ class TestDeviceManager(base.BaseTestCase):
 
         dh.update(FakeV4Network())
 
-        self.assertFalse(dh._set_default_route.called)
+        self.assertTrue(dh._set_default_route.called)
 
         # For completeness
         cfg.CONF.set_override('use_namespaces', False)