From ec5fde253274a9a771e5c6305e13cf6b67ede601 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Mon, 14 Jun 2021 12:40:58 +0200 Subject: [PATCH] addons: bridge: bridge-vlan-vni-map: add more details log error when finding duplicated vnis Signed-off-by: Julien Fortin --- ifupdown2/addons/bridge.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py index 130bce5..ef90a6d 100644 --- a/ifupdown2/addons/bridge.py +++ b/ifupdown2/addons/bridge.py @@ -2386,10 +2386,15 @@ class bridge(Bridge, moduleBase): for key, value in vlan_vni_dict.items(): rev.setdefault(value, set()).add(key) - duplicates = [key for key, values in rev.items() if len(values) > 1] + duplicates = [(key, values) for key, values in rev.items() if len(values) > 1] if duplicates: - self.log_error("duplicate vnis detected %s" % duplicates, ifaceobj) + err_msg = ["duplicate vnis detected - see details below"] + + for vni, vlans in duplicates: + err_msg.append("\tvni %s assigned to vlans: %s" % (vni, ", ".join(map(str, vlans)))) + + self.log_error("\n".join(err_msg), ifaceobj) return False return True