From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 9 Oct 2015 11:53:40 +0000 (+0000)
Subject: Merge "Move gateway processing out of init_router_port"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=338f72df14dff3d20b353e912e2fc9bce9f7e736;p=openstack-build%2Fneutron-build.git

Merge "Move gateway processing out of init_router_port"
---

338f72df14dff3d20b353e912e2fc9bce9f7e736
diff --cc neutron/tests/unit/agent/l3/test_agent.py
index a40a29dcc,4b2f16dfc..511ea9443
--- a/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,