36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From b1e94d1aa04f51b2d15711c8e7ab37198b173065 Mon Sep 17 00:00:00 2001
|
|
From: Gris Ge <fge@redhat.com>
|
|
Date: Tue, 1 Jun 2021 16:33:15 +0800
|
|
Subject: [PATCH] bond: Fix bond fail_over_mac=active
|
|
|
|
With bond interface in fail_over_mac=active and active-backup mode,
|
|
any future change via nmstate will fail as nmstate is validating
|
|
on current state instead of desire state for this bond mac restriction.
|
|
|
|
Fixed the code to only validate bond mac restriction on desired or
|
|
changed bond interface.
|
|
|
|
Integration test case include.
|
|
|
|
Signed-off-by: Gris Ge <fge@redhat.com>
|
|
---
|
|
libnmstate/ifaces/bond.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libnmstate/ifaces/bond.py b/libnmstate/ifaces/bond.py
|
|
index 138386e..01859b0 100644
|
|
--- a/libnmstate/ifaces/bond.py
|
|
+++ b/libnmstate/ifaces/bond.py
|
|
@@ -88,7 +88,7 @@ class BondIface(BaseIface):
|
|
|
|
def pre_edit_validation_and_cleanup(self):
|
|
super().pre_edit_validation_and_cleanup()
|
|
- if self.is_up:
|
|
+ if self.is_up and (self.is_desired or self.is_changed):
|
|
self._discard_bond_option_when_mode_change()
|
|
self._validate_bond_mode()
|
|
self._fix_mac_restriced_mode()
|
|
--
|
|
2.31.1
|
|
|