vyos.config.configdict: T4592: T4629: only print interface name, not interface dict on error

(cherry picked from commit 475fbb785dca76868715827833dc44115635c4a6)

2 files changed, 9 insertions, 8 deletions

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 466433c37..53bd1a13e 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -322,8 +322,8 @@ def is_source_interface(conf, interface, intftype=None):
     for it in intftype:
         base = ['interfaces', it]
         for intf in conf.list_nodes(base):
-            lower_intf = base + [intf, 'source-interface']
-            if conf.exists(lower_intf) and interface in conf.return_values(lower_intf):
+            src_intf = base + [intf, 'source-interface']
+            if conf.exists(src_intf) and interface in conf.return_values(src_intf):
                 ret_val = intf
                 break
 
diff --git a/python/vyos/configverify.py b/python/vyos/configverify.py
index 356246053..d4b532d22 100644
--- a/python/vyos/configverify.py
+++ b/python/vyos/configverify.py
@@ -237,15 +237,16 @@ def verify_source_interface(config):
         raise ConfigError('Specified source-interface {source_interface} does '
                           'not exist'.format(**config))
 
+    src_ifname = config['source_interface']
     if 'source_interface_is_bridge_member' in config:
-        raise ConfigError('Invalid source-interface {source_interface}. Interface '
-                          'is already a member of bridge '
-                          '{source_interface_is_bridge_member}'.format(**config))
+        bridge_name = next(iter(config['source_interface_is_bridge_member']))
+        raise ConfigError(f'Invalid source-interface "{src_ifname}". Interface '
+                          f'is already a member of bridge "{bridge_name}"!')
 
     if 'source_interface_is_bond_member' in config:
-        raise ConfigError('Invalid source-interface {source_interface}. Interface '
-                          'is already a member of bond '
-                          '{source_interface_is_bond_member}'.format(**config))
+        bond_name = next(iter(config['source_interface_is_bond_member']))
+        raise ConfigError(f'Invalid source-interface "{src_ifname}". Interface '
+                          f'is already a member of bond "{bond_name}"!')
 
 def verify_dhcpv6(config):
     """