From ee65528d720964cf77bc9b28e6f8fb19b9783066 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 24 Jul 2020 21:06:02 +0200
Subject: ifconfig: T2653: move get_ethertype() from configdict to interface

... as it is only used inside the interface class.
---
 python/vyos/configdict.py         | 9 +--------
 python/vyos/ifconfig/interface.py | 8 +++++++-
 2 files changed, 8 insertions(+), 9 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
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 7e887db1b..5496499e5 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -31,7 +31,6 @@ from netifaces import AF_INET6
 
 from vyos import ConfigError
 from vyos.configdict import list_diff
-from vyos.configdict import get_ethertype
 from vyos.util import mac2eui64
 from vyos.validate import is_ipv4
 from vyos.validate import is_ipv6
@@ -49,6 +48,13 @@ from vyos.ifconfig.vrrp import VRRP
 from vyos.ifconfig.operational import Operational
 from vyos.ifconfig import Section
 
+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))
 
 class Interface(Control):
     # This is the class which will be used to create
-- 
cgit v1.2.3