|
 |
dad7e0 |
From 862e669fcfe02b49c0e24af210d6466197962b97 Mon Sep 17 00:00:00 2001
|
|
|
dad7e0 |
From: Gris Ge <fge@redhat.com>
|
|
|
dad7e0 |
Date: Mon, 3 Aug 2020 11:34:44 +0800
|
|
|
dad7e0 |
Subject: [PATCH] ovs: Fix bug when adding bond to existing bridge
|
|
|
dad7e0 |
|
|
|
dad7e0 |
When adding OVS bond/link aggregation interface to existing OVS bridge,
|
|
|
dad7e0 |
nmstate will fail with error:
|
|
|
dad7e0 |
|
|
|
dad7e0 |
> self._ifaces[slave_name].mark_as_changed()
|
|
|
dad7e0 |
E KeyError: 'bond1'
|
|
|
dad7e0 |
|
|
|
dad7e0 |
This is because ovs bond interface does not require a interface entry in
|
|
|
dad7e0 |
desire state.
|
|
|
dad7e0 |
|
|
|
dad7e0 |
Fixed by check before adding dict.
|
|
|
dad7e0 |
|
|
|
dad7e0 |
Integration test case added.
|
|
|
dad7e0 |
|
|
|
dad7e0 |
Signed-off-by: Gris Ge <fge@redhat.com>
|
|
|
dad7e0 |
---
|
|
|
dad7e0 |
libnmstate/ifaces/ifaces.py | 3 ++-
|
|
|
dad7e0 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
dad7e0 |
|
|
|
dad7e0 |
diff --git a/libnmstate/ifaces/ifaces.py b/libnmstate/ifaces/ifaces.py
|
|
|
dad7e0 |
index a400712..1c2ffd5 100644
|
|
|
dad7e0 |
--- a/libnmstate/ifaces/ifaces.py
|
|
|
dad7e0 |
+++ b/libnmstate/ifaces/ifaces.py
|
|
|
dad7e0 |
@@ -217,7 +217,8 @@ class Ifaces:
|
|
|
dad7e0 |
self._ifaces[iface_name].mark_as_changed()
|
|
|
dad7e0 |
if cur_iface:
|
|
|
dad7e0 |
for slave_name in iface.config_changed_slaves(cur_iface):
|
|
|
dad7e0 |
- self._ifaces[slave_name].mark_as_changed()
|
|
|
dad7e0 |
+ if slave_name in self._ifaces:
|
|
|
dad7e0 |
+ self._ifaces[slave_name].mark_as_changed()
|
|
|
dad7e0 |
|
|
|
dad7e0 |
def _match_child_iface_state_with_parent(self):
|
|
|
dad7e0 |
"""
|
|
|
dad7e0 |
--
|
|
|
dad7e0 |
2.28.0
|
|
|
dad7e0 |
|