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

diff --git a/neutron/agent/l3/dvr_router.py b/neutron/agent/l3/dvr_router.py
index 7bf913f02e2c6d6099d1576c8d07e807b306aeef..d7fbbead7d9f8c708d5288048cfb2f1f340e0c9f 100644 (file)
--- 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 5786006e84f034ab3ea85d3ebf570a4e1c87ecc1..1d0a86311e369d1d8d24efe5abbb3b2af7b9f032 100755 (executable)
--- 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):