Merge "Removing a router twice from the same agent shouldn't cause an error"

diff --cc neutron/db/l3_agentschedulers_db.py
Simple merge

diff --cc neutron/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/tests/unit/ml2/test_ml2_plugin.py
index 1d46c172b63f9c9ef8d46d2aa69b77684a6934d3,5dec58e49d6002d2305639a923c22c607be06476..22f76e4bc04a98d538b40ffee5a5636ca1d2eebf
--- 1/neutron/tests/unit/ml2/test_ml2_plugin.py
--- 2/neutron/tests/unit/ml2/test_ml2_plugin.py
+++ b/neutron/tests/unit/ml2/test_ml2_plugin.py
@@@ -505,13 -320,11 +504,10 @@@ class TestMl2DvrPortsV2(TestMl2PortsV2)
              mock.patch.object(manager.NeutronManager,
                                'get_service_plugins',
                                return_value=self.service_plugins),
 -            self.port(do_delete=False,
 -                      device_owner='compute:None'),
 +            self.port(device_owner='compute:None'),
              mock.patch.object(self.l3plugin, 'dvr_deletens_if_no_port',
                                return_value=[ns_to_delete]),
-             mock.patch.object(self.l3plugin, 'remove_router_from_l3_agent',
-                 side_effect=l3agentscheduler.RouterNotHostedByL3Agent(
-                             router_id=ns_to_delete['router_id'],
-                             agent_id=ns_to_delete['agent_id']))
+             mock.patch.object(self.l3plugin, 'remove_router_from_l3_agent')
          ) as (get_service_plugin, port, dvr_delns_ifno_port,
                remove_router_from_l3_agent):
  

diff --cc neutron/tests/unit/test_l3_schedulers.py
Simple merge