Merge "Fix VIP IPv6 subnet discovery order"

This commit is contained in:
Zuul 2019-08-08 11:44:54 +00:00 committed by Gerrit Code Review
commit 1b0e8b1529
1 changed files with 4 additions and 3 deletions

View File

@ -311,10 +311,10 @@ class LoadBalancerBaseTest(test.BaseTestCase):
name='ipv6-private-subnet')['subnets']
cls.lb_member_vip_ipv6_subnet_stateful = False
if (priv_ipv6_subnet[0]['ipv6_address_mode'] ==
'dhcpv6-stateful'):
cls.lb_member_vip_ipv6_subnet_stateful = True
if len(priv_ipv6_subnet) == 1:
if (priv_ipv6_subnet[0]['ipv6_address_mode'] ==
'dhcpv6-stateful'):
cls.lb_member_vip_ipv6_subnet_stateful = True
cls.lb_member_vip_ipv6_subnet = priv_ipv6_subnet[0]
cls.lb_member_vip_ipv6_net = {
'id': priv_ipv6_subnet[0]['network_id']}
@ -333,6 +333,7 @@ class LoadBalancerBaseTest(test.BaseTestCase):
cls._logging_delete_subnet,
cls.lb_mem_subnet_client.show_subnet,
cls.lb_member_vip_ipv6_subnet['id'])
LOG.info('lb_member_vip_ipv6_subnet: {}'.format(
cls.lb_member_vip_ipv6_subnet))