From 905fe01e1d9bf0930e0dd113f825777786daaa57 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 10 Jul 2022 22:44:03 +0200
Subject: vyos.configdict(): T4228: is_member() must use the "real" hardware
 interface

When is_member() is inspecting the bridge/Bond member interfaces it must work
with the real interface (e.g. eth1) under the "ethernet" node and not work on
the "member interface eth1" CLI tree, that makes no sense at all.

(cherry picked from commit 3915791216998a18bf6831450df68ee199e2e4f8)
---
 python/vyos/configdict.py           | 14 +++++++-------
 src/conf_mode/interfaces-bonding.py | 12 +++++++-----
 src/conf_mode/interfaces-bridge.py  |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index be10cbdfc..cc50c5167 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -203,11 +203,12 @@ def is_member(conf, interface, intftype=None):
     intftype is optional, if not passed it will search all known types
     (currently bridge and bonding)
 
-    Returns:
-    None -> Interface is not a member
-    interface name -> Interface is a member of this interface
-    False -> interface type cannot have members
+    Returns: dict
+    empty -> Interface is not a member
+    key -> Interface is a member of this interface
     """
+    from vyos.ifconfig import Section
+
     ret_val = {}
     intftypes = ['bonding', 'bridge']
 
@@ -227,9 +228,8 @@ def is_member(conf, interface, intftype=None):
         for intf in conf.list_nodes(base):
             member = base + [intf, 'member', 'interface', interface]
             if conf.exists(member):
-                tmp = conf.get_config_dict(member, key_mangling=('-', '_'),
-                                           get_first_key=True, no_tag_node_value_mangle=True)
-                ret_val.update({intf : tmp})
+                if conf.exists(['interfaces', Section.section(interface), interface]):
+                    ret_val.update({intf : {}})
 
     old_level = conf.set_level(old_level)
     return ret_val
diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index d5be21949..55ffb184d 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -108,20 +108,22 @@ def get_config(config=None):
         for interface, interface_config in bond['member']['interface'].items():
             # Check if member interface is already member of another bridge
             tmp = is_member(conf, interface, 'bridge')
-            if tmp: interface_config.update({'is_bridge_member' : tmp})
+            if tmp: bond['member']['interface'][interface].update({'is_bridge_member' : tmp})
 
             # Check if member interface is already member of a bond
             tmp = is_member(conf, interface, 'bonding')
-            if tmp and bond['ifname'] not in tmp:
-                interface_config.update({'is_bond_member' : tmp})
+            for tmp in is_member(conf, interface, 'bonding'):
+                if bond['ifname'] == tmp:
+                    continue
+                bond['member']['interface'][interface].update({'is_bond_member' : tmp})
 
             # Check if member interface is used as source-interface on another interface
             tmp = is_source_interface(conf, interface)
-            if tmp: interface_config.update({'is_source_interface' : tmp})
+            if tmp: bond['member']['interface'][interface].update({'is_source_interface' : tmp})
 
             # bond members must not have an assigned address
             tmp = has_address_configured(conf, interface)
-            if tmp: interface_config.update({'has_address' : ''})
+            if tmp: bond['member']['interface'][interface].update({'has_address' : {}})
 
     return bond
 
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index f4dba9d4a..a0cfca0af 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -132,7 +132,7 @@ def verify(bridge):
 
             if 'enable_vlan' in bridge:
                 if 'has_vlan' in interface_config:
-                    raise ConfigError(error_msg + 'it has an VLAN subinterface assigned!')
+                    raise ConfigError(error_msg + 'it has VLAN subinterface(s) assigned!')
 
                 if 'wlan' in interface:
                     raise ConfigError(error_msg + 'VLAN aware cannot be set!')
-- 
cgit v1.2.3