Merge "Distributed router can not add routes"

neutron/agent/l3/dvr_edge_router.py

@@ -176,3 +176,8 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter):
 
             self._add_snat_rules(ex_gw_port, self.snat_iptables_manager,
                                  interface_name)
+
+    def update_routing_table(self, operation, route, namespace=None):
+        ns_name = dvr_snat_ns.SnatNamespace.get_snat_ns_name(self.router['id'])
+        super(DvrEdgeRouter, self).update_routing_table(operation, route,
+                                                        namespace=ns_name)

neutron/agent/l3/router_info.py

@@ -109,12 +109,17 @@ class RouterInfo(object):
     def get_external_device_interface_name(self, ex_gw_port):
         return self.get_external_device_name(ex_gw_port['id'])
 
-    def _update_routing_table(self, operation, route):
+    def _update_routing_table(self, operation, route, namespace):
         cmd = ['ip', 'route', operation, 'to', route['destination'],
                'via', route['nexthop']]
-        ip_wrapper = ip_lib.IPWrapper(namespace=self.ns_name)
+        ip_wrapper = ip_lib.IPWrapper(namespace=namespace)
         ip_wrapper.netns.execute(cmd, check_exit_code=False)
 
+    def update_routing_table(self, operation, route, namespace=None):
+        if namespace is None:
+            namespace = self.ns_name
+        self._update_routing_table(operation, route, namespace)
+
     def routes_updated(self):
         new_routes = self.router['routes']
 
@@ -128,10 +133,10 @@ class RouterInfo(object):
                 if route['destination'] == del_route['destination']:
                     removes.remove(del_route)
             #replace success even if there is no existing route
-            self._update_routing_table('replace', route)
+            self.update_routing_table('replace', route)
         for route in removes:
             LOG.debug("Removed route entry is '%s'", route)
-            self._update_routing_table('delete', route)
+            self.update_routing_table('delete', route)
         self.routes = new_routes
 
     def get_ex_gw_port(self):

neutron/tests/unit/agent/l3/test_agent.py

@@ -1077,6 +1077,28 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
                                        router)
         self.assertEqual(self.send_adv_notif.call_count, 1)
 
+    def test_update_routing_table(self):
+        # Just verify the correct namespace was used in the call
+        router = l3_test_common.prepare_router_data()
+        uuid = router['id']
+        netns = 'snat-' + uuid
+        fake_route1 = {'destination': '135.207.0.0/16',
+                       'nexthop': '1.2.3.4'}
+
+        agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
+        ri = dvr_router.DvrEdgeRouter(
+            agent,
+            HOSTNAME,
+            uuid,
+            router,
+            **self.ri_kwargs)
+        ri._update_routing_table = mock.Mock()
+
+        ri.update_routing_table('replace', fake_route1)
+        ri._update_routing_table.assert_called_once_with('replace',
+                                                         fake_route1,
+                                                         netns)
+
     def test_process_router_interface_added(self):
         agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
         router = l3_test_common.prepare_router_data()

neutron/tests/unit/agent/l3/test_router_info.py

@@ -52,26 +52,41 @@ class TestRouterInfo(base.BaseTestCase):
         fake_route2 = {'destination': '135.207.111.111/32',
                        'nexthop': '1.2.3.4'}
 
-        ri._update_routing_table('replace', fake_route1)
+        ri.update_routing_table('replace', fake_route1)
         expected = [['ip', 'route', 'replace', 'to', '135.207.0.0/16',
                      'via', '1.2.3.4']]
         self._check_agent_method_called(expected)
 
-        ri._update_routing_table('delete', fake_route1)
+        ri.update_routing_table('delete', fake_route1)
         expected = [['ip', 'route', 'delete', 'to', '135.207.0.0/16',
                      'via', '1.2.3.4']]
         self._check_agent_method_called(expected)
 
-        ri._update_routing_table('replace', fake_route2)
+        ri.update_routing_table('replace', fake_route2)
         expected = [['ip', 'route', 'replace', 'to', '135.207.111.111/32',
                      'via', '1.2.3.4']]
         self._check_agent_method_called(expected)
 
-        ri._update_routing_table('delete', fake_route2)
+        ri.update_routing_table('delete', fake_route2)
         expected = [['ip', 'route', 'delete', 'to', '135.207.111.111/32',
                      'via', '1.2.3.4']]
         self._check_agent_method_called(expected)
 
+    def test_update_routing_table(self):
+        # Just verify the correct namespace was used in the call
+        uuid = _uuid()
+        netns = 'qrouter-' + uuid
+        fake_route1 = {'destination': '135.207.0.0/16',
+                       'nexthop': '1.2.3.4'}
+
+        ri = router_info.RouterInfo(uuid, {'id': uuid}, **self.ri_kwargs)
+        ri._update_routing_table = mock.Mock()
+
+        ri.update_routing_table('replace', fake_route1)
+        ri._update_routing_table.assert_called_once_with('replace',
+                                                         fake_route1,
+                                                         netns)
+
     def test_routes_updated(self):
         ri = router_info.RouterInfo(_uuid(), {}, **self.ri_kwargs)
         ri.router = {}