Merge "Move gateway processing out of init_router_port"

diff --cc neutron/agent/l3/router_info.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_agent.py
index a40a29dcc93cf772781c79d14791e0c004e8ff2e,4b2f16dfcd92b11e7d686f530ebae9976cfef562..511ea944341554a548b3651c77816a6c35ad430e
--- 1/neutron/tests/unit/agent/l3/test_agent.py
--- 2/neutron/tests/unit/agent/l3/test_agent.py
+++ b/neutron/tests/unit/agent/l3/test_agent.py
@@@ -397,19 -395,14 +396,14 @@@ class TestBasicRouterOperations(BasicRo
              router[l3_constants.FLOATINGIP_KEY] = fake_fip['floatingips']
          ri.external_gateway_added(ex_gw_port, interface_name)
          if not router.get('distributed'):
 -            self.assertEqual(self.mock_driver.plug.call_count, 1)
 -            self.assertEqual(self.mock_driver.init_router_port.call_count, 1)
 +            self.assertEqual(1, self.mock_driver.plug.call_count)
 +            self.assertEqual(1, self.mock_driver.init_router_port.call_count)
              if no_subnet and not dual_stack:
 -                self.assertEqual(self.send_adv_notif.call_count, 0)
 +                self.assertEqual(0, self.send_adv_notif.call_count)
                  ip_cidrs = []
-                 gateway_ips = []
-                 if no_sub_gw:
-                     gateway_ips.append(no_sub_gw)
                  kwargs = {'preserve_ips': [],
-                           'gateway_ips': gateway_ips,
                            'namespace': 'qrouter-' + router['id'],
                            'extra_subnets': [],
-                           'enable_ra_on_gw': enable_ra_on_gw,
                            'clean_connections': True}
              else:
                  exp_arp_calls = [mock.call(ri.ns_name, interface_name,