Merge "In SX mark floating IPs as deprecated in dual-stack"

This commit is contained in:
Zuul 2024-04-19 17:12:20 +00:00 committed by Gerrit Code Review
commit e47cc2a10e
1 changed files with 7 additions and 14 deletions

View File

@ -1717,20 +1717,13 @@ def generate_unassigned_pxeboot_intf_config(context, config, db_api,
def get_address_config(context, iface, addresses): def get_address_config(context, iface, addresses):
ifname = get_interface_os_ifname(context, iface) ifname = get_interface_os_ifname(context, iface)
if constants.DUAL_STACK_COMPATIBILITY_MODE: address_list = []
address = addresses[0] for address in addresses:
return { address_list.append(str(address.address) + '/' + str(address.prefix))
'ifname': ifname, return {
'address': str(address.address) + '/' + str(address.prefix) 'ifname': ifname,
} 'addresses': address_list,
else: }
address_list = []
for address in addresses:
address_list.append(str(address.address) + '/' + str(address.prefix))
return {
'ifname': ifname,
'addresses': address_list,
}
def generate_address_configs(context, config): def generate_address_configs(context, config):