ndb.objects.interface: strict check on rename

Control `alt_ifname_list` after rename. Ignore the old interface name in `alt_ifname_list`. Bug-Url: #1178
svinota · Feb 21, 2024 · 99678bb · 99678bb
1 parent fc899cb
commit 99678bb
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/pyroute2/ndb/objects/interface.py b/pyroute2/ndb/objects/interface.py
@@ -979,7 +979,7 @@ def make_req(self, prime):
         return req
 
     @check_auth('obj:modify')
-    def apply_altnames(self, alt_ifname_setup):
+    def apply_altnames(self, alt_ifname_setup, old_ifname=None):
         alt_ifname_remove = set(self['alt_ifname_list']) - alt_ifname_setup
         alt_ifname_add = alt_ifname_setup - set(self['alt_ifname_list'])
         for ifname in alt_ifname_remove:
@@ -992,10 +992,9 @@ def apply_altnames(self, alt_ifname_setup):
             )
         self.load_from_system()
         self.load_sql(set_state=False)
-        if (
-            'ifname' not in self.changed
-            and set(self['alt_ifname_list']) != alt_ifname_setup
-        ):
+        if old_ifname is not None and old_ifname in self['alt_ifname_list']:
+            alt_ifname_setup.add(old_ifname)
+        if set(self['alt_ifname_list']) != alt_ifname_setup:
             raise Exception('could not setup alt ifnames')
 
     @check_auth('obj:modify')
@@ -1007,6 +1006,7 @@ def apply(self, rollback=False, req_filter=None, mode='apply'):
         setns = self.state.get() == 'setns'
         remove = self.state.get() == 'remove'
         alt_ifname_setup = set(self['alt_ifname_list'])
+        old_ifname = self['ifname'] if 'ifname' in self.changed else None
         if 'alt_ifname_list' in self.changed:
             self.changed.remove('alt_ifname_list')
         try:
@@ -1018,7 +1018,7 @@ def apply(self, rollback=False, req_filter=None, mode='apply'):
                 if spec:
                     self.state.set('system')
             if not remove:
-                self.apply_altnames(alt_ifname_setup)
+                self.apply_altnames(alt_ifname_setup, old_ifname)
 
         except NetlinkError as e:
             if (