diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-07-24 21:06:02 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-07-25 17:30:12 +0200 |
| commit | ee65528d720964cf77bc9b28e6f8fb19b9783066 (patch) | |
| tree | 1487092398f29da9c8615c620020596dbb159dd1 /python/vyos/configdict.py | |
| parent | d81ce482836ab4adf4f71e2b3dc21477db49a9f0 (diff) | |
| download | vyos-1x-ee65528d720964cf77bc9b28e6f8fb19b9783066.tar.gz vyos-1x-ee65528d720964cf77bc9b28e6f8fb19b9783066.zip | |
ifconfig: T2653: move get_ethertype() from configdict to interface
... as it is only used inside the interface class.
Diffstat (limited to 'python/vyos/configdict.py')
| -rw-r--r-- | python/vyos/configdict.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index a1553ae61..d79365722 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -267,14 +267,6 @@ def get_interface_dict(config, base, ifname): return dict -def get_ethertype(ethertype_val): - if ethertype_val == '0x88A8': - return '802.1ad' - elif ethertype_val == '0x8100': - return '802.1q' - else: - raise ConfigError('invalid ethertype "{}"'.format(ethertype_val)) - dhcpv6_pd_default_data = { 'dhcpv6_prm_only': False, 'dhcpv6_temporary': False, @@ -636,6 +628,7 @@ def add_to_dict(conf, disabled, ifdict, section, key): def vlan_to_dict(conf, default=vlan_default): + from vyos.ifconfig.interface import get_ethertype vlan, disabled = intf_to_dict(conf, default) # if this is a not within vif-s node, we are done |