From 3d262feb07e033174c0cbb9348221580e45b03f5 Mon Sep 17 00:00:00 2001 From: Carl Baldwin Date: Thu, 9 Jul 2015 21:14:39 +0000 Subject: [PATCH] Use _is_this_snat_host and remove _get_gw_port_host The _is_this_snat_host utility should be used consistently. After replacing a call to _get_gw_port_host with _is_this_snat_host, _get_gw_port_host is left as just a simple helper method for _is_this_snat_host. The indirection is excessive and so they are combined. Change-Id: I880c5fdc9db9ba1304dba74a6e12f3df604793e5 --- neutron/agent/l3/dvr_edge_router.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/neutron/agent/l3/dvr_edge_router.py b/neutron/agent/l3/dvr_edge_router.py index dd128dc88..8804be42f 100644 --- a/neutron/agent/l3/dvr_edge_router.py +++ b/neutron/agent/l3/dvr_edge_router.py @@ -146,14 +146,11 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter): return long_name[:self.driver.DEV_NAME_LEN] def _is_this_snat_host(self): - return self._get_gw_port_host() == self.host - - def _get_gw_port_host(self): host = self.router.get('gw_port_host') if not host: LOG.debug("gw_port_host missing from router: %s", self.router['id']) - return host + return host == self.host def _handle_router_snat_rules(self, ex_gw_port, interface_name, action): @@ -173,7 +170,7 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter): # NOTE DVR skips this step in a few cases... if not self.get_ex_gw_port(): return - if self._get_gw_port_host() != self.host: + if not self._is_this_snat_host(): return super(DvrEdgeRouter, self).perform_snat_action(snat_callback, *args) -- 2.45.2