diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-05-08 18:37:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-08 18:37:06 +0200 |
commit | 088cfcfde4168054035904f00dd9b1d43e1c3477 (patch) | |
tree | 2b8b110f90544eb7efe305fe5b62d8ec2a9cb9dd | |
parent | 991ff167d53ab173495f75b33b877a94c3edd24f (diff) | |
parent | d546e8d730f83d0a7a97027b4b2b05e25ac19b8c (diff) | |
download | vyos-1x-088cfcfde4168054035904f00dd9b1d43e1c3477.tar.gz vyos-1x-088cfcfde4168054035904f00dd9b1d43e1c3477.zip |
Merge pull request #402 from jjakob/fix-syntax-T2435
T2435: fix syntax errors
-rw-r--r-- | python/vyos/ifconfig_vlan.py | 2 | ||||
-rwxr-xr-x | src/conf_mode/interfaces-pseudo-ethernet.py | 4 | ||||
-rwxr-xr-x | src/conf_mode/interfaces-vxlan.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/python/vyos/ifconfig_vlan.py b/python/vyos/ifconfig_vlan.py index 09fb8c802..bb93121e7 100644 --- a/python/vyos/ifconfig_vlan.py +++ b/python/vyos/ifconfig_vlan.py @@ -185,7 +185,7 @@ def verify_vlan_config(config): if vif_id == vif_s_id: raise ConfigError(( f'Cannot use identical ID on vif "{vif["intf"]}" ' - f'and vif-s "{vif_s}"')) + f'and vif-s "{vif_s["intf"]}"')) # DHCPv6 parameters-only and temporary address are mutually exclusive if vif_s['dhcpv6_prm_only'] and vif_s['dhcpv6_temporary']: diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py index 4063b85b0..ec2f1146e 100755 --- a/src/conf_mode/interfaces-pseudo-ethernet.py +++ b/src/conf_mode/interfaces-pseudo-ethernet.py @@ -122,7 +122,7 @@ def verify(peth): if not peth['source_interface'] in interfaces(): raise ConfigError(( - f'Pseudo-ethernet "{peth["intf"]}" link device does not exist') + f'Pseudo-ethernet "{peth["intf"]}" link device does not exist')) if ( peth['is_bridge_member'] and ( peth['address'] @@ -254,7 +254,7 @@ def apply(peth): p.add_to_bridge(peth['is_bridge_member']) # apply all vlans to interface - apply_all_vlans(b, bond) + apply_all_vlans(p, peth) return None diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py index fabfaa9df..91682a540 100755 --- a/src/conf_mode/interfaces-vxlan.py +++ b/src/conf_mode/interfaces-vxlan.py @@ -167,7 +167,7 @@ def verify(vxlan): if vxlan['is_bridge_member']: raise ConfigError(( f'Cannot delete interface "{vxlan["intf"]}" as it is a ' - f'member of bridge "{vxlan["is_bridge_member"]}"!') + f'member of bridge "{vxlan["is_bridge_member"]}"!')) return None |