diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-07-25 00:39:14 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-07-25 17:30:12 +0200 |
| commit | e70a304e36fc6456e16fea81ace4a0a5fd8bd1df (patch) | |
| tree | 3959df9b7a5509b84ea92fd1fb577a8e0038d004 /src/conf_mode/interfaces-bonding.py | |
| parent | 72c0ac35b4acf049de29ce1ea67af28659793098 (diff) | |
| download | vyos-1x-e70a304e36fc6456e16fea81ace4a0a5fd8bd1df.tar.gz vyos-1x-e70a304e36fc6456e16fea81ace4a0a5fd8bd1df.zip | |
ifconfig: T2653: make ifname an optional argument to get_interface_dict()
Further reduce the boiler-plate code to determine interface tag node or not.
It can be passed into get_interface_dict() if explicitly required - else it
is taken from the environment.
Diffstat (limited to 'src/conf_mode/interfaces-bonding.py')
| -rwxr-xr-x | src/conf_mode/interfaces-bonding.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py index 8e87a0059..3b238f1ea 100755 --- a/src/conf_mode/interfaces-bonding.py +++ b/src/conf_mode/interfaces-bonding.py @@ -60,13 +60,7 @@ def get_config(): """ conf = Config() base = ['interfaces', 'bonding'] - - # determine tagNode instance - if 'VYOS_TAGNODE_VALUE' not in os.environ: - raise ConfigError('Interface (VYOS_TAGNODE_VALUE) not specified') - - ifname = os.environ['VYOS_TAGNODE_VALUE'] - bond = get_interface_dict(conf, base, ifname) + bond = get_interface_dict(conf, base) # To make our own life easier transfor the list of member interfaces # into a dictionary - we will use this to add additional information @@ -107,7 +101,7 @@ def get_config(): # Check if we are a member of a bond device tmp = is_member(conf, interface, 'bonding') - if tmp and tmp != ifname: + if tmp and tmp != bond['ifname']: interface_config.update({'is_bond_member' : tmp}) # bond members must not have an assigned address |