From 6dac1d6a4b882e51102caeacd9ed8d960c22c84d Mon Sep 17 00:00:00 2001 From: Gal Sagie Date: Wed, 29 Apr 2015 07:49:16 +0300 Subject: [PATCH] Rename delete_gateway method name Fix last comments from bug #1435012 Some comments were left out and the patch is already merged. This patch address these comments. Rename method and remove an unneeded comment Change-Id: Ie087edf1fee7136eddf75ce01d4b640211445bfa --- neutron/agent/l3/dvr_router.py | 11 +++++------ neutron/tests/functional/agent/test_l3_agent.py | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/neutron/agent/l3/dvr_router.py b/neutron/agent/l3/dvr_router.py index 7bf913f02..d7fbbead7 100644 --- a/neutron/agent/l3/dvr_router.py +++ b/neutron/agent/l3/dvr_router.py @@ -247,13 +247,12 @@ class DvrRouter(router.RouterInfo): snat_idx = net.value return snat_idx - def _snat_delete_device_gateway(self, ns_ip_device, gw_ip_addr, - snat_idx): + def _delete_gateway_device_if_exists(self, ns_ip_device, gw_ip_addr, + snat_idx): try: ns_ip_device.route.delete_gateway(gw_ip_addr, table=snat_idx) except exceptions.DeviceNotFoundError: - # Suppress device not exist exception pass def _snat_redirect_modify(self, gateway, sn_port, sn_int, is_add): @@ -281,9 +280,9 @@ class DvrRouter(router.RouterInfo): ['sysctl', '-w', 'net.ipv4.conf.%s.send_redirects=0' % sn_int]) else: - self._snat_delete_device_gateway(ns_ipd, - gw_ip_addr, - snat_idx) + self._delete_gateway_device_if_exists(ns_ipd, + gw_ip_addr, + snat_idx) ns_ipr.rule.delete(sn_port_cidr, snat_idx, snat_idx) break diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py index 5786006e8..1d0a86311 100755 --- a/neutron/tests/functional/agent/test_l3_agent.py +++ b/neutron/tests/functional/agent/test_l3_agent.py @@ -1120,7 +1120,7 @@ class TestDvrRouter(L3AgentTestFramework): namespace=namespace) # Assert that no exception is thrown for this case - self.assertIsNone(router._snat_delete_device_gateway( + self.assertIsNone(router._delete_gateway_device_if_exists( device, "192.168.0.1", 0)) def _assert_snat_namespace_does_not_exist(self, router): -- 2.45.2