openstack
/
neutron
Code Issues Proposed changes

Merge "Rename delete_gateway method name"

This commit is contained in:
Jenkins 2015-04-29 18:40:15 +00:00 committed by Gerrit Code Review
parent 84d2638579 6dac1d6a4b
commit eef3d42dfe
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/agent/l3/dvr_router.py
View File

@ -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

2
neutron/tests/functional/agent/test_l3_agent.py
View File

@ -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):