]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Remove un-used keys in keepalived tests
authorsridhargaddam <sridhar.gaddam@enovance.com>
Wed, 15 Apr 2015 15:07:45 +0000 (15:07 +0000)
committerGal Sagie <gal.sagie@huawei.com>
Sat, 2 May 2015 12:16:21 +0000 (15:16 +0300)
Change-Id: Ie1069f5ee6c7c28da67260656c4a0753b930624a

neutron/tests/functional/agent/test_l3_agent.py

index 127dfcc17f693de41c77b2e237446bf08a91ead3..7b39722e9144136d0e6bfbf593cf39b259ae1953 100644 (file)
@@ -178,9 +178,7 @@ class L3AgentTestFramework(base.BaseSudoTestCase):
         return device.link.mtu
 
     def get_expected_keepalive_configuration(self, router):
-        router_id = router.router_id
         ha_device_name = router.get_ha_device_name()
-        ha_device_cidr = self._port_first_ip_cidr(router.ha_port)
         external_port = router.get_ex_gw_port()
         ex_port_ipv6 = ip_lib.get_ipv6_lladdr(external_port['mac_address'])
         external_device_name = router.get_external_device_name(
@@ -220,9 +218,7 @@ class L3AgentTestFramework(base.BaseSudoTestCase):
         8.8.8.0/24 via 19.4.4.4
     }
 }""" % {
-            'router_id': router_id,
             'ha_device_name': ha_device_name,
-            'ha_device_cidr': ha_device_cidr,
             'external_device_name': external_device_name,
             'external_device_cidr': external_device_cidr,
             'internal_device_name': internal_device_name,