diff options
| author | Indrajit Raychaudhuri <irc@indrajit.com> | 2025-01-06 12:09:55 -0600 |
|---|---|---|
| committer | Indrajit Raychaudhuri <irc@indrajit.com> | 2025-01-06 12:11:31 -0600 |
| commit | 68afb84f43148604d0c0433994741db3fb7639c5 (patch) | |
| tree | 66230ef22221056377c080b95e88644a34b16593 | |
| parent | f9f4137d09564da90a18fec9c9d7ceb64cb6c736 (diff) | |
| download | vyos-1x-68afb84f43148604d0c0433994741db3fb7639c5.tar.gz vyos-1x-68afb84f43148604d0c0433994741db3fb7639c5.zip | |
T7016: Simplify logic for force deleting dynamic IPv4 address from interface
| -rw-r--r-- | python/vyos/ifconfig/interface.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py index de821ab60..a58ee0bbd 100644 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -1,4 +1,4 @@ -# Copyright 2019-2024 VyOS maintainers and contributors <maintainers@vyos.io> +# Copyright 2019-2025 VyOS maintainers and contributors <maintainers@vyos.io> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -1423,13 +1423,11 @@ class Interface(Control): tmp = get_interface_address(self.ifname) if tmp and 'addr_info' in tmp: for address_dict in tmp['addr_info']: - if address_dict['family'] == 'inet': - # Only remove dynamic assigned addresses - if 'dynamic' not in address_dict: - continue - address = address_dict['local'] - prefixlen = address_dict['prefixlen'] - self.del_addr(f'{address}/{prefixlen}') + # Only remove dynamic assigned addresses + if address_dict['family'] == 'inet' and 'dynamic' in address_dict: + address = address_dict['local'] + prefixlen = address_dict['prefixlen'] + self.del_addr(f'{address}/{prefixlen}') # cleanup old config files for file in [dhclient_config_file, systemd_override_file, dhclient_lease_file]: |