Merge "If router is HA, get current_cidrs from keepalived object"

diff --cc neutron/agent/l3/agent.py
index c73481e52d6a5b00b4fbc223fecfea0ff51769ca,8f3604340948611f2051d28c24aaa8ff8c60de69..847ab32ad1e00d89a06e37f04e0c7fc31b133565
--- 1/neutron/agent/l3/agent.py
--- 2/neutron/agent/l3/agent.py
+++ b/neutron/agent/l3/agent.py
@@@ -725,10 -690,9 +731,10 @@@ class L3NATAgent(firewall_l3_agent.FWaa
  
          device = ip_lib.IPDevice(interface_name, self.root_helper,
                                   namespace=ri.ns_name)
-         existing_cidrs = set([addr['cidr'] for addr in device.addr.list()])
+         existing_cidrs = self._get_router_cidrs(ri, device)
          new_cidrs = set()
  
 +        floating_ips = self.get_floating_ips(ri)
          # Loop once to ensure that floating ips are configured.
          for fip in floating_ips:
              fip_ip = fip['floating_ip_address']

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

diff --cc neutron/agent/linux/keepalived.py
Simple merge

diff --cc neutron/tests/unit/agent/linux/test_keepalived.py
Simple merge

diff --cc neutron/tests/unit/test_l3_agent.py
Simple merge