T7016: Simplify logic for force deleting dynamic IPv4 address from in…

…terface
vyos · Jan 6, 2025 · 68afb84 · 68afb84
1 parent f9f4137
commit 68afb84
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
@@ -1,4 +1,4 @@
-# Copyright 2019-2024 VyOS maintainers and contributors <[email protected]>
+# Copyright 2019-2025 VyOS maintainers and contributors <[email protected]>
 #
 # 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 @@ def set_dhcp(self, enable):
             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]: