Remove auto deletion of routers in unit tests

Remove the automatic deletion behavior of the router
context manager in the L3 unit tests. Any tests that
depend on the router being deleted should do so
explicitly.

It additionally removes the logic from the test_l3_plugin
unit tests that was just related to tearing down enough
stuff to allow the context managers to exit. It was code
that distracted from what the tests were actaully verifying.

All of the context managers for port, network, and subnet
do not auto delete by default and that will be extended to
the L3 constructs as well. The patch that did this for
ports/subnets/networks is here:
https://review.openstack.org/#/c/102465/

Change-Id: Iec97198f18e9fc390ff0747b795f7f309c8f3990

diff --git a/neutron/tests/unit/openvswitch/test_agent_scheduler.py b/neutron/tests/unit/openvswitch/test_agent_scheduler.py
index feeb8a436d3ef202bd3fe7973e5e709b1a6f6f8d..727fbbff1d19b61cb7c12d8691aa0afc10a6cd03 100644 (file)
--- a/neutron/tests/unit/openvswitch/test_agent_scheduler.py
+++ b/neutron/tests/unit/openvswitch/test_agent_scheduler.py
@@ -816,6 +816,8 @@ class OvsAgentSchedulerTestCase(OvsAgentSchedulerTestCaseBase):
         with self.router() as router:
             l3_rpc_cb = l3_rpc.L3RpcCallback()
             self._register_agent_states()
+        self._delete('routers', router['router']['id'])
+
         # deleted router
         ret_a = l3_rpc_cb.sync_routers(self.adminContext, host=L3_HOSTA,
                                        router_ids=[router['router']['id']])

diff --git a/neutron/tests/unit/test_l3_plugin.py b/neutron/tests/unit/test_l3_plugin.py
index d4a835cf9d5da46095562322a219b3da9a276a10..6844eb74132ef3e7d4a7b3331defd7d862af2922 100644 (file)
--- a/neutron/tests/unit/test_l3_plugin.py
+++ b/neutron/tests/unit/test_l3_plugin.py
@@ -408,14 +408,11 @@ class L3NatTestCaseMixin(object):
     def router(self, name='router1', admin_state_up=True,
                fmt=None, tenant_id=_uuid(),
                external_gateway_info=None, set_context=False,
-               no_delete=False,
                **kwargs):
         router = self._make_router(fmt or self.fmt, tenant_id, name,
                                    admin_state_up, external_gateway_info,
                                    set_context, **kwargs)
         yield router
-        if not no_delete:
-            self._delete('routers', router['router']['id'])
 
     def _set_net_external(self, net_id):
         self._update('networks', net_id,
@@ -492,12 +489,6 @@ class L3NatTestCaseMixin(object):
                     if floatingip:
                         self._delete('floatingips',
                                      floatingip['floatingip']['id'])
-                    self._router_interface_action(
-                        'remove', r['router']['id'],
-                        private_sub['subnet']['id'], None)
-                    self._remove_external_gateway_from_router(
-                        r['router']['id'],
-                        public_sub['subnet']['network_id'])
 
     @contextlib.contextmanager
     def floatingip_no_assoc_with_public_sub(
@@ -522,12 +513,6 @@ class L3NatTestCaseMixin(object):
             if floatingip:
                 self._delete('floatingips',
                              floatingip['floatingip']['id'])
-            self._router_interface_action('remove', r['router']['id'],
-                                          private_sub['subnet']['id'],
-                                          None)
-            self._remove_external_gateway_from_router(
-                r['router']['id'],
-                public_sub['subnet']['network_id'])
 
     @contextlib.contextmanager
     def floatingip_no_assoc(self, private_sub, fmt=None, set_context=False):
@@ -627,7 +612,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
             self.assertEqual(
                 s['subnet']['network_id'],
                 router['router']['external_gateway_info']['network_id'])
-            self._delete('routers', router['router']['id'])
 
     def test_router_create_with_gwinfo_ext_ip(self):
         with self.subnet() as s:
@@ -641,7 +625,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                 external_gateway_info=ext_info
             )
             router = self.deserialize(self.fmt, res)
-            self._delete('routers', router['router']['id'])
             self.assertEqual(
                 [{'ip_address': '10.0.0.99', 'subnet_id': s['subnet']['id']}],
                 router['router']['external_gateway_info'][
@@ -669,7 +652,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                     ext_ips = router['router']['external_gateway_info'][
                         'external_fixed_ips']
 
-                    self._delete('routers', router['router']['id'])
                     self.assertEqual(
                         [{'subnet_id': s['subnet']['id'],
                           'ip_address': mock.ANY}], ext_ips)
@@ -984,7 +966,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                  ipv6_ra_mode=uc['ra_mode'],
                                  ipv6_address_mode=uc['address_mode']) as s:
                     self._test_router_add_interface_subnet(r, s, uc['msg'])
-                self._delete('subnets', s['subnet']['id'])
 
     def test_router_add_iface_ipv6_ext_ra_subnet_returns_400(self):
         """Test router-interface-add for in-valid ipv6 subnets.
@@ -1016,7 +997,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                                   None,
                                                   expected_code=exp_code,
                                                   msg=uc['msg'])
-                self._delete('subnets', s['subnet']['id'])
 
     def test_router_add_interface_ipv6_subnet_without_gateway_ip(self):
         with self.router() as r:
@@ -1058,11 +1038,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                                       s['subnet']['id'],
                                                       None,
                                                       err_code)
-                        tdict.return_value = admin_context
-                        body = self._router_interface_action('remove',
-                                                             r['router']['id'],
-                                                             s['subnet']['id'],
-                                                             None)
 
     def test_router_add_interface_subnet_with_port_from_other_tenant(self):
         tenant_id = _uuid()
@@ -1087,17 +1062,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                         None,
                         tenant_id=tenant_id)
                     self.assertIn('port_id', body)
-                    self._router_interface_action(
-                        'remove',
-                        r['router']['id'],
-                        s1['subnet']['id'],
-                        None,
-                        tenant_id=tenant_id)
-                    body = self._router_interface_action(
-                        'remove',
-                        r['router']['id'],
-                        s2['subnet']['id'],
-                        None)
 
     def test_router_add_interface_port(self):
         with self.router() as r:
@@ -1113,12 +1077,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                 body = self._show('ports', p['port']['id'])
                 self.assertEqual(body['port']['device_id'], r['router']['id'])
 
-                # clean-up
-                self._router_interface_action('remove',
-                                              r['router']['id'],
-                                              None,
-                                              p['port']['id'])
-
     def test_router_add_interface_empty_port_and_subnet_ids(self):
         with self.router() as r:
             self._router_interface_action('add', r['router']['id'],
@@ -1155,12 +1113,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                                   p['port']['id'],
                                                   err_code)
 
-                    tdict.return_value = admin_context
-                    self._router_interface_action('remove',
-                                                  r['router']['id'],
-                                                  None,
-                                                  p['port']['id'])
-
     def test_router_add_interface_dup_subnet1_returns_400(self):
         with self.router() as r:
             with self.subnet() as s:
@@ -1174,10 +1126,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                               None,
                                               expected_code=exc.
                                               HTTPBadRequest.code)
-                self._router_interface_action('remove',
-                                              r['router']['id'],
-                                              s['subnet']['id'],
-                                              None)
 
     def test_router_add_interface_dup_subnet2_returns_400(self):
         with self.router() as r:
@@ -1194,11 +1142,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                                       p2['port']['id'],
                                                       expected_code=exc.
                                                       HTTPBadRequest.code)
-                        # clean-up
-                        self._router_interface_action('remove',
-                                                      r['router']['id'],
-                                                      None,
-                                                      p1['port']['id'])
 
     def test_router_add_interface_overlapped_cidr_returns_400(self):
         with self.router() as r:
@@ -1220,11 +1163,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                 try_overlapped_cidr('10.0.1.0/24')
                 # another subnet with overlapped cidr including s1
                 try_overlapped_cidr('10.0.0.0/16')
-                # clean-up
-                self._router_interface_action('remove',
-                                              r['router']['id'],
-                                              s1['subnet']['id'],
-                                              None)
 
     def test_router_add_interface_no_data_returns_400(self):
         with self.router() as r:
@@ -1258,10 +1196,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                     r['router']['id'],
                     s['subnet']['network_id'],
                     expected_code=exc.HTTPBadRequest.code)
-                self._router_interface_action('remove',
-                                              r['router']['id'],
-                                              s['subnet']['id'],
-                                              None)
 
     def test_router_add_gateway_dup_subnet2_returns_400(self):
         with self.router() as r:
@@ -1276,11 +1210,8 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                               None,
                                               expected_code=exc.
                                               HTTPBadRequest.code)
-                self._remove_external_gateway_from_router(
-                    r['router']['id'],
-                    s['subnet']['network_id'])
 
-    def test_router_add_gateway(self):
+    def test_router_add_and_remove_gateway(self):
         with self.router() as r:
             with self.subnet() as s:
                 self._set_net_external(s['subnet']['network_id'])
@@ -1297,7 +1228,7 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                 gw_info = body['router']['external_gateway_info']
                 self.assertIsNone(gw_info)
 
-    def test_router_add_gateway_tenant_ctx(self):
+    def test_router_add_and_remove_gateway_tenant_ctx(self):
         with self.router(tenant_id='noadmin',
                          set_context=True) as r:
             with self.subnet() as s:
@@ -1352,7 +1283,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                         self._update('ports', port['port']['id'], data,
                                      neutron_context=neutron_context,
                                      expected_code=exc.HTTPConflict.code)
-                        self._delete('ports', port['port']['id'])
 
     def test_update_port_device_id_to_different_tenants_router(self):
         with self.router() as admin_router:
@@ -1370,9 +1300,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                         self._update('ports', port['port_id'], data,
                                      neutron_context=neutron_context,
                                      expected_code=exc.HTTPConflict.code)
-                        self._router_interface_action(
-                            'remove', tenant_router['router']['id'],
-                            s['subnet']['id'], None, tenant_id='tenant_a')
 
     def test_router_add_gateway_invalid_network_returns_400(self):
         with self.router() as r:
@@ -1422,12 +1349,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                 self._delete('routers', r['router']['id'],
                              expected_code=exc.HTTPConflict.code)
 
-                # remove interface so test can exit without errors
-                self._router_interface_action('remove',
-                                              r['router']['id'],
-                                              s['subnet']['id'],
-                                              None)
-
     def test_router_remove_interface_callback_failure_returns_409(self):
         with contextlib.nested(
             self.router(),
@@ -1452,12 +1373,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                     s['subnet']['id'],
                     None,
                     exc.HTTPConflict.code)
-                # remove properly to clean-up
-                self._router_interface_action(
-                    'remove',
-                    r['router']['id'],
-                    s['subnet']['id'],
-                    None)
 
     def test_router_clear_gateway_callback_failure_returns_409(self):
         with contextlib.nested(
@@ -1492,11 +1407,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                                   s['subnet']['id'],
                                                   p['port']['id'],
                                                   exc.HTTPBadRequest.code)
-                    #remove properly to clean-up
-                    self._router_interface_action('remove',
-                                                  r['router']['id'],
-                                                  None,
-                                                  p['port']['id'])
 
     def test_router_remove_interface_nothing_returns_400(self):
         with self.router() as r:
@@ -1559,13 +1469,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                                   None,
                                                   p2['port']['id'],
                                                   exc.HTTPNotFound.code)
-                    # remove correct interface to cleanup
-                    self._router_interface_action('remove',
-                                                  r['router']['id'],
-                                                  None,
-                                                  p['port']['id'])
-                    # remove extra port created
-                    self._delete('ports', p2['port']['id'])
 
     def test_router_delete(self):
         with self.router() as router:
@@ -1584,11 +1487,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                                           None)
             self._delete('routers', router['router']['id'],
                          exc.HTTPConflict.code)
-            self._router_interface_action('remove',
-                                          router['router']['id'],
-                                          subnet['subnet']['id'],
-                                          None)
-            self._delete('routers', router['router']['id'])
 
     def test_router_delete_with_floatingip_existed_returns_409(self):
         with self.port() as p:
@@ -1608,15 +1506,8 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                     self.fmt, public_sub['subnet']['network_id'],
                     port_id=p['port']['id'])
                 self.assertEqual(res.status_int, exc.HTTPCreated.code)
-                floatingip = self.deserialize(self.fmt, res)
                 self._delete('routers', r['router']['id'],
                              expected_code=exc.HTTPConflict.code)
-                # Cleanup
-                self._delete('floatingips', floatingip['floatingip']['id'])
-                self._router_interface_action('remove', r['router']['id'],
-                                              private_sub['subnet']['id'],
-                                              None)
-                self._delete('routers', r['router']['id'])
 
     def test_router_show(self):
         name = 'router1'
@@ -1640,9 +1531,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                 self._update('networks', s1['subnet']['network_id'],
                              {'network': {external_net.EXTERNAL: False}},
                              expected_code=exc.HTTPConflict.code)
-                self._remove_external_gateway_from_router(
-                    r['router']['id'],
-                    s1['subnet']['network_id'])
 
     def test_network_update_external(self):
         with self.router() as r:
@@ -1655,9 +1543,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                         s1['subnet']['network_id'])
                     self._update('networks', testnet['network']['id'],
                                  {'network': {external_net.EXTERNAL: False}})
-                    self._remove_external_gateway_from_router(
-                        r['router']['id'],
-                        s1['subnet']['network_id'])
 
     def test_floatingip_crd_ops(self):
         with self.floatingip_with_assoc() as fip:
@@ -1696,13 +1581,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                         if (p['device_owner'] ==
                             l3_constants.DEVICE_OWNER_FLOATINGIP):
                             self.fail('garbage port is not deleted')
-                    self._remove_external_gateway_from_router(
-                        r['router']['id'],
-                        public_sub['subnet']['network_id'])
-                    self._router_interface_action('remove',
-                                                  r['router']['id'],
-                                                  private_sub['subnet']['id'],
-                                                  None)
 
     def test_floatingip_with_assoc_fails(self):
         self._test_floatingip_with_assoc_fails(
@@ -1800,18 +1678,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                     body = self._show('ports', p['port']['id'],
                                       expected_code=exc.HTTPNotFound.code)
 
-                    for fip in [fip1, fip2]:
-                        self._delete('floatingips',
-                                     fip['floatingip']['id'])
-
-                    self._router_interface_action(
-                        'remove', r['router']['id'],
-                        private_sub['subnet']['id'], None)
-
-                self._remove_external_gateway_from_router(
-                    r['router']['id'],
-                    public_sub['subnet']['network_id'])
-
     def test_floatingip_update_different_fixed_ip_same_port(self):
         with self.subnet() as s:
             ip_range = list(netaddr.IPNetwork(s['subnet']['cidr']))
@@ -1959,12 +1825,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                         port_id=p['port']['id'])
                     self.assertEqual(res.status_int,
                                      exc.HTTPBadRequest.code)
-                    self._router_interface_action('remove',
-                                                  r['router']['id'],
-                                                  private_sub
-                                                  ['subnet']['id'],
-                                                  None)
-                    self._delete('routers', r['router']['id'])
 
     def test_floatingip_with_invalid_create_port(self):
         self._test_floatingip_with_invalid_create_port(
@@ -2008,11 +1868,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
                         public_network['network']['id'],
                         port_id=private_port['port']['id'])
                     self.assertEqual(res.status_int, exc.HTTPBadRequest.code)
-                    # cleanup
-                    self._router_interface_action('remove',
-                                                  r['router']['id'],
-                                                  private_sub['subnet']['id'],
-                                                  None)
 
     def test_create_floatingip_invalid_floating_network_id_returns_400(self):
         # API-level test - no need to create all objects for l3 plugin
@@ -2046,13 +1901,8 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
             fp1 = self._make_floatingip(self.fmt, network_id1)
             fp2 = self._make_floatingip(self.fmt, network_id2)
             fp3 = self._make_floatingip(self.fmt, network_id3)
-            try:
-                self._test_list_with_sort('floatingip', (fp3, fp2, fp1),
-                                          [('floating_ip_address', 'desc')])
-            finally:
-                self._delete('floatingips', fp1['floatingip']['id'])
-                self._delete('floatingips', fp2['floatingip']['id'])
-                self._delete('floatingips', fp3['floatingip']['id'])
+            self._test_list_with_sort('floatingip', (fp3, fp2, fp1),
+                                      [('floating_ip_address', 'desc')])
 
     def test_floatingip_list_with_port_id(self):
         with self.floatingip_with_assoc() as fip:
@@ -2077,14 +1927,9 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
             fp1 = self._make_floatingip(self.fmt, network_id1)
             fp2 = self._make_floatingip(self.fmt, network_id2)
             fp3 = self._make_floatingip(self.fmt, network_id3)
-            try:
-                self._test_list_with_pagination(
-                    'floatingip', (fp1, fp2, fp3),
-                    ('floating_ip_address', 'asc'), 2, 2)
-            finally:
-                self._delete('floatingips', fp1['floatingip']['id'])
-                self._delete('floatingips', fp2['floatingip']['id'])
-                self._delete('floatingips', fp3['floatingip']['id'])
+            self._test_list_with_pagination(
+                'floatingip', (fp1, fp2, fp3),
+                ('floating_ip_address', 'asc'), 2, 2)
 
     def test_floatingip_list_with_pagination_reverse(self):
         with contextlib.nested(self.subnet(cidr="10.0.0.0/24"),
@@ -2100,14 +1945,9 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
             fp1 = self._make_floatingip(self.fmt, network_id1)
             fp2 = self._make_floatingip(self.fmt, network_id2)
             fp3 = self._make_floatingip(self.fmt, network_id3)
-            try:
-                self._test_list_with_pagination_reverse(
-                    'floatingip', (fp1, fp2, fp3),
-                    ('floating_ip_address', 'asc'), 2, 2)
-            finally:
-                self._delete('floatingips', fp1['floatingip']['id'])
-                self._delete('floatingips', fp2['floatingip']['id'])
-                self._delete('floatingips', fp3['floatingip']['id'])
+            self._test_list_with_pagination_reverse(
+                'floatingip', (fp1, fp2, fp3),
+                ('floating_ip_address', 'asc'), 2, 2)
 
     def test_floatingip_multi_external_one_internal(self):
         with contextlib.nested(self.subnet(cidr="10.0.0.0/24"),
@@ -2189,11 +2029,6 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
         # subnet cannot be deleted as it's attached to a router
         self._delete('subnets', s['subnet']['id'],
                      expected_code=exc.HTTPConflict.code)
-        # remove interface so test can exit without errors
-        self._router_interface_action('remove',
-                                      r['router']['id'],
-                                      s['subnet']['id'],
-                                      None)
 
     def _ipv6_subnet(self, mode):
         return self.subnet(cidr='fd00::1/64', gateway_ip='fd00::1',
@@ -2229,11 +2064,8 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
             self._set_net_external(network_id)
             fp = self._make_floatingip(self.fmt, network_id,
                                        floating_ip='10.0.0.10')
-            try:
-                self.assertEqual(fp['floatingip']['floating_ip_address'],
-                                 '10.0.0.10')
-            finally:
-                self._delete('floatingips', fp['floatingip']['id'])
+            self.assertEqual(fp['floatingip']['floating_ip_address'],
+                             '10.0.0.10')
 
     def test_create_floatingip_with_specific_ip_out_of_allocation(self):
         with self.subnet(cidr='10.0.0.0/24',
@@ -2244,11 +2076,8 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
             self._set_net_external(network_id)
             fp = self._make_floatingip(self.fmt, network_id,
                                        floating_ip='10.0.0.30')
-            try:
-                self.assertEqual(fp['floatingip']['floating_ip_address'],
-                                 '10.0.0.30')
-            finally:
-                self._delete('floatingips', fp['floatingip']['id'])
+            self.assertEqual(fp['floatingip']['floating_ip_address'],
+                             '10.0.0.30')
 
     def test_create_floatingip_with_specific_ip_non_admin(self):
         ctx = context.Context('user_id', 'tenant_id')
@@ -2275,15 +2104,12 @@ class L3NatTestCaseBase(L3NatTestCaseMixin):
         with self.subnet(cidr='10.0.0.0/24') as s:
             network_id = s['subnet']['network_id']
             self._set_net_external(network_id)
-            fp1 = self._make_floatingip(self.fmt, network_id,
-                                        floating_ip='10.0.0.10')
+            self._make_floatingip(self.fmt, network_id,
+                                  floating_ip='10.0.0.10')
 
-            try:
-                self._make_floatingip(self.fmt, network_id,
-                                      floating_ip='10.0.0.10',
-                                      http_status=exc.HTTPConflict.code)
-            finally:
-                self._delete('floatingips', fp1['floatingip']['id'])
+            self._make_floatingip(self.fmt, network_id,
+                                  floating_ip='10.0.0.10',
+                                  http_status=exc.HTTPConflict.code)
 
 
 class L3AgentDbTestCaseBase(L3NatTestCaseMixin):
@@ -2308,11 +2134,6 @@ class L3AgentDbTestCaseBase(L3NatTestCaseMixin):
                 subnet_id = subnets[0]['id']
                 wanted_subnetid = p['port']['fixed_ips'][0]['subnet_id']
                 self.assertEqual(wanted_subnetid, subnet_id)
-                # clean-up
-                self._router_interface_action('remove',
-                                              r['router']['id'],
-                                              None,
-                                              p['port']['id'])
 
     def test_l3_agent_routers_query_ignore_interfaces_with_moreThanOneIp(self):
         with self.router() as r:
@@ -2334,11 +2155,6 @@ class L3AgentDbTestCaseBase(L3NatTestCaseMixin):
                     self.assertEqual(1, len(routers))
                     interfaces = routers[0].get(l3_constants.INTERFACE_KEY, [])
                     self.assertEqual(1, len(interfaces))
-                    # clean-up
-                    self._router_interface_action('remove',
-                                                  r['router']['id'],
-                                                  None,
-                                                  p['port']['id'])
 
     def test_l3_agent_routers_query_gateway(self):
         with self.router() as r:
@@ -2420,9 +2236,8 @@ class L3AgentDbTestCaseBase(L3NatTestCaseMixin):
     def _test_floatingips_op_agent(self, notifyApi):
         with self.floatingip_with_assoc():
             pass
-        # add gateway, add interface, associate, deletion of floatingip,
-        # delete gateway, delete interface
-        self.assertEqual(6, notifyApi.routers_updated.call_count)
+        # add gateway, add interface, associate, deletion of floatingip
+        self.assertEqual(4, notifyApi.routers_updated.call_count)
 
     def test_floatingips_op_agent(self):
         self._test_notify_op_agent(self._test_floatingips_op_agent)
@@ -2520,10 +2335,6 @@ class L3NatDBIntAgentSchedulingTestCase(L3BaseForIntTests,
                 s2['subnet']['network_id'])
             self._assert_router_on_agent(r['router']['id'], 'host2')
 
-            self._remove_external_gateway_from_router(
-                r['router']['id'],
-                s2['subnet']['network_id'])
-
     def test_update_gateway_agent_exists_supporting_multiple_network(self):
         with contextlib.nested(self.router(),
                                self.subnet(),
@@ -2551,10 +2362,6 @@ class L3NatDBIntAgentSchedulingTestCase(L3BaseForIntTests,
                 s2['subnet']['network_id'])
             self._assert_router_on_agent(r['router']['id'], 'host2')
 
-            self._remove_external_gateway_from_router(
-                r['router']['id'],
-                s2['subnet']['network_id'])
-
     def test_router_update_gateway_no_eligible_l3_agent(self):
         with self.router() as r:
             with self.subnet() as s1: