Merge "Use router state in get_ha_device_name and ha_network_added"

diff --cc neutron/tests/functional/agent/test_l3_agent.py
index 0d0f6f7cfd95530c685993c8d3f6fab3cc432a88,518d1b866b1b184db8fad12364a96b5dbd49ca8e..735f33d32fd2c031a5a91262f3ff43918b780b45
--- 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
@@@ -151,13 -151,9 +151,13 @@@ class L3AgentTestFramework(base.BaseOVS
              name_getter(expected_device['id']), expected_device['ip_cidr'],
              expected_device['mac_address'], namespace)
  
 +    def get_device_mtu(self, target_device, name_getter, namespace):
 +        device = ip_lib.IPDevice(name_getter(target_device), namespace)
 +        return device.link.mtu
 +
      def get_expected_keepalive_configuration(self, router):
          router_id = router.router_id
-         ha_device_name = router.get_ha_device_name(router.ha_port['id'])
+         ha_device_name = router.get_ha_device_name()
          ha_device_cidr = router.ha_port['ip_cidr']
          external_port = router.get_ex_gw_port()
          ex_port_ipv6 = ip_lib.get_ipv6_lladdr(external_port['mac_address'])