From: Jenkins Date: Fri, 27 Mar 2015 21:29:47 +0000 (+0000) Subject: Merge "Use router state in get_ha_device_name and ha_network_added" X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=801f78cce2a8169f1cb51bf09a039ec5d620e0d5;p=openstack-build%2Fneutron-build.git Merge "Use router state in get_ha_device_name and ha_network_added" --- 801f78cce2a8169f1cb51bf09a039ec5d620e0d5 diff --cc neutron/tests/functional/agent/test_l3_agent.py index 0d0f6f7cf,518d1b866..735f33d32 --- a/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'])