Merge remote-tracking branch 'upstream/current' into current

2 files changed, 20 insertions, 3 deletions

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 58ecd3f17..ce6d58693 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -290,8 +290,12 @@ def get_interface_dict(config, base, ifname=''):
     config.set_level(base + [ifname])
     dict = config.get_config_dict([], key_mangling=('-', '_'), get_first_key=True)
 
-    # Check if interface has been removed
-    if dict == {}:
+    # Check if interface has been removed. We must use exists() as get_config_dict()
+    # will always return {} - even when an empty interface node like
+    # +macsec macsec1 {
+    # +}
+    # exists.
+    if not config.exists([]):
         dict.update({'deleted' : ''})
 
     # Add interface instance name into dictionary
@@ -356,6 +360,10 @@ def get_interface_dict(config, base, ifname=''):
         # XXX: T2665: blend in proper DHCPv6-PD default values
         dict['vif'][vif] = T2665_set_dhcpv6pd_defaults(dict['vif'][vif])
 
+        # Check if we are a member of a bridge device
+        bridge = is_member(config, f'{ifname}.{vif}', 'bridge')
+        if bridge: dict['vif'][vif].update({'is_bridge_member' : bridge})
+
     for vif_s, vif_s_config in dict.get('vif_s', {}).items():
         default_vif_s_values = defaults(base + ['vif-s'])
         # XXX: T2665: we only wan't the vif-s defaults - do not care about vif-c
@@ -371,6 +379,10 @@ def get_interface_dict(config, base, ifname=''):
         dict['vif_s'][vif_s] = T2665_set_dhcpv6pd_defaults(
             dict['vif_s'][vif_s])
 
+        # Check if we are a member of a bridge device
+        bridge = is_member(config, f'{ifname}.{vif_s}', 'bridge')
+        if bridge: dict['vif_s'][vif_s].update({'is_bridge_member' : bridge})
+
         for vif_c, vif_c_config in vif_s_config.get('vif_c', {}).items():
             default_vif_c_values = defaults(base + ['vif-s', 'vif-c'])
 
@@ -385,6 +397,11 @@ def get_interface_dict(config, base, ifname=''):
             dict['vif_s'][vif_s]['vif_c'][vif_c] = T2665_set_dhcpv6pd_defaults(
                 dict['vif_s'][vif_s]['vif_c'][vif_c])
 
+            # Check if we are a member of a bridge device
+            bridge = is_member(config, f'{ifname}.{vif_s}.{vif_c}', 'bridge')
+            if bridge: dict['vif_s'][vif_s]['vif_c'][vif_c].update(
+                {'is_bridge_member' : bridge})
+
     # Check vif, vif-s/vif-c VLAN interfaces for removal
     dict = get_removed_vlans(config, dict)
     return dict
diff --git a/python/vyos/xml/definition.py b/python/vyos/xml/definition.py
index a25fc50c5..7831af4d2 100644
--- a/python/vyos/xml/definition.py
+++ b/python/vyos/xml/definition.py
@@ -297,7 +297,7 @@ class XML(dict):
                 continue
             value = conf[k]
             if self.is_multi(fpath) and not isinstance(value, list):
-                value = [value]
+                value = value.split(' ')
             r[under] = value
         return r