Fix DVR functional tests resources leak

Change-Id: I882bd9127a61de7e016abfca53d22b01cbf57835
Closes-Bug: #1446288

diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py
index 73d2a23c29848816f350ff671def3eb2fec93b46..514c2ff1bb953e7ac1a86af1da4a85a9e822efa9 100755 (executable)
--- a/neutron/tests/functional/agent/test_l3_agent.py
+++ b/neutron/tests/functional/agent/test_l3_agent.py
@@ -133,11 +133,7 @@ class L3AgentTestFramework(base.BaseLinuxTestCase):
                                                      v6_ext_gw_with_sub))
 
     def manage_router(self, agent, router):
-        self.addCleanup(self._delete_router, agent, router['id'])
-        ri = self._create_router(agent, router)
-        return ri
-
-    def _create_router(self, agent, router):
+        self.addCleanup(agent._safe_router_removed, router['id'])
         agent._process_added_router(router)
         return agent.router_info[router['id']]
 
@@ -666,7 +662,7 @@ class L3AgentTestCase(L3AgentTestFramework):
         self._add_fip(router1, '192.168.111.12')
         restarted_agent = neutron_l3_agent.L3NATAgentWithStateReport(
             self.agent.host, self.agent.conf)
-        self._create_router(restarted_agent, router1.router)
+        self.manage_router(restarted_agent, router1.router)
         utils.wait_until_true(lambda: self.floating_ips_configured(router1))
         self.assertIn(
             router1._get_primary_vip(),
@@ -1143,13 +1139,13 @@ class TestDvrRouter(L3AgentTestFramework):
     def test_dvr_router_rem_fips_on_restarted_agent(self):
         self.agent.conf.agent_mode = 'dvr_snat'
         router_info = self.generate_dvr_router_info()
-        router1 = self._create_router(self.agent, router_info)
+        router1 = self.manage_router(self.agent, router_info)
         self._add_fip(router1, '192.168.111.12', self.agent.conf.host)
         fip_ns = router1.fip_ns.get_name()
         restarted_agent = neutron_l3_agent.L3NATAgentWithStateReport(
             self.agent.host, self.agent.conf)
         router1.router[l3_constants.FLOATINGIP_KEY] = []
-        self._create_router(restarted_agent, router1.router)
+        self.manage_router(restarted_agent, router1.router)
         self._assert_dvr_snat_gateway(router1)
         self.assertFalse(self._namespace_exists(fip_ns))
 
@@ -1167,7 +1163,7 @@ class TestDvrRouter(L3AgentTestFramework):
             'device_owner': 'compute:None'
         }
         self.agent.plugin_rpc.get_ports_by_subnet.return_value = [port_data]
-        router1 = self._create_router(self.agent, router_info)
+        router1 = self.manage_router(self.agent, router_info)
         internal_device = router1.get_internal_device_name(
             router_info['_interfaces'][0]['id'])
         neighbors = ip_lib.IPDevice(internal_device, router1.ns_name).neigh