Merge "Refactor process_router method in L3 agent"

diff --cc neutron/agent/l3/agent.py
index cbf52e83e9bbda78e82707a4774d1100139e462d,bdd23759d6044a050b37cf74d579e5f93101e411..98a5455c91ef54537121dfa8bc25bb6a4d9ddfd0
--- 1/neutron/agent/l3/agent.py
--- 2/neutron/agent/l3/agent.py
+++ b/neutron/agent/l3/agent.py
@@@ -662,11 -657,9 +657,9 @@@ class L3NATAgent(firewall_l3_agent.FWaa
                                 namespace=ri.ns_name,
                                 prefix=EXTERNAL_DEV_PREFIX)
  
-         # Process static routes for router
-         self.routes_updated(ri)
          # Process SNAT rules for external gateway
          if (not ri.router['distributed'] or
 -            ex_gw_port and ri.router['gw_port_host'] == self.host):
 +            ex_gw_port and self.get_gw_port_host(ri.router) == self.host):
              ri.perform_snat_action(self._handle_router_snat_rules,
                                     interface_name)