Merge "Move final remnants of router processing to router classes"

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

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

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

diff --cc neutron/tests/functional/agent/test_l3_agent.py
index 9671a17debd9aa1084c70f86288c43ea9db1a5be,07d435b0d6767c0fa002b617d1ac719152402c2a..3f990563bee6d94188b739403e08ff6a9173e2f3
--- 1/neutron/tests/functional/agent/test_l3_agent.py
--- 2/neutron/tests/functional/agent/test_l3_agent.py
+++ b/neutron/tests/functional/agent/test_l3_agent.py
@@@ -429,17 -418,10 +429,17 @@@ class L3AgentTestCase(L3AgentTestFramew
          existing_fip = '19.4.4.2'
          new_fip = '19.4.4.3'
          self._add_fip(router, new_fip)
 -        router.router['gw_port']['subnet']['gateway_ip'] = '19.4.4.5'
 -        router.router['gw_port']['fixed_ips'][0]['ip_address'] = '19.4.4.10'
 +        subnet_id = _uuid()
 +        fixed_ips = [{'ip_address': '19.4.4.10',
 +                      'prefixlen': 24,
 +                      'subnet_id': subnet_id}]
 +        subnets = [{'id': subnet_id,
 +                    'cidr': '19.4.4.0/24',
 +                    'gateway_ip': '19.4.4.5'}]
 +        router.router['gw_port']['subnets'] = subnets
 +        router.router['gw_port']['fixed_ips'] = fixed_ips
  
-         self.agent.process_router(router)
+         router.process(self.agent)
  
          # Get the updated configuration and assert that both FIPs are in,
          # and that the GW IP address was updated.

diff --cc neutron/tests/unit/test_l3_agent.py
index 6e233845ae015f195ef6ca3b4f8be258f07f545d,0c0c7bb21bd571624ec6fa2223ffb493754e6a0e..ae71eb3550b5f29f4234c0bf36a998a0cae7dc5f
--- 1/neutron/tests/unit/test_l3_agent.py
--- 2/neutron/tests/unit/test_l3_agent.py
+++ b/neutron/tests/unit/test_l3_agent.py
@@@ -1157,13 -1039,13 +1157,13 @@@ class TestBasicRouterOperations(BasicRo
          router_append_interface(router)
          # Reassign the router object to RouterInfo
          ri.router = router
-         agent.process_router(ri)
-         # send_arp is called both times process_router is called
+         ri.process(agent)
+         # send_arp is called both times process is called
          self.assertEqual(self.send_arp.call_count, 2)
  
 -    def test_process_ipv6_only_gw(self):
 +    def _test_process_ipv6_only_or_dual_stack_gw(self, dual_stack=False):
          agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
 -        router = prepare_router_data(ip_version=6)
 +        router = prepare_router_data(ip_version=6, dual_stack=dual_stack)
          # Get NAT rules without the gw_port
          gw_port = router['gw_port']
          router['gw_port'] = None