diff options
| author | Jernej Jakob <jernej.jakob@gmail.com> | 2020-05-03 13:46:47 +0200 |
|---|---|---|
| committer | Jernej Jakob <jernej.jakob@gmail.com> | 2020-05-04 20:58:06 +0200 |
| commit | 900e75e387939a1d1d4d5b0b79809b8bb2305b91 (patch) | |
| tree | 6575a6da1691f712e88bf6c49bca6b0569a7f672 /python/vyos/configdict.py | |
| parent | c1ad2a6461fc2e767d69567be9647150c3310569 (diff) | |
| download | vyos-1x-900e75e387939a1d1d4d5b0b79809b8bb2305b91.tar.gz vyos-1x-900e75e387939a1d1d4d5b0b79809b8bb2305b91.zip | |
validate: T2241: rewrite is_bridge_member to generic is_member
- rewrite the function to support both bridge and bonding interface types,
if the type is passed it searches only that type, otherwise it searches
both
- move is_member check out of the deleted condition
- move is_member check to intf_from_dict for interfaces that use it
Diffstat (limited to 'python/vyos/configdict.py')
| -rw-r--r-- | python/vyos/configdict.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index cd3364c94..ab72aac6c 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -23,6 +23,7 @@ from copy import deepcopy from vyos import ConfigError from vyos.ifconfig import Interface +from vyos.validate import is_member from vyos.util import ifname_from_config @@ -268,6 +269,8 @@ def intf_to_dict(conf, default): # Media Access Control (MAC) address if conf.exists('mac'): intf['mac'] = conf.return_value('mac') + # check if interface is member of a bridge + intf['is_bridge_member'] = is_member(conf, intf['intf'], 'bridge') # IPv6 Duplicate Address Detection (DAD) tries if conf.exists('ipv6 dup-addr-detect-transmits'): |