From bbea850ea5f8ff0402cd276ab63963ece7e0c763 Mon Sep 17 00:00:00 2001
From: Thomas Mangin <thomas.mangin@exa.net.uk>
Date: Tue, 24 Mar 2020 18:36:46 +0000
Subject: ifconfig: T2057: remove need for interface-types.json
---
python/vyos/ifconfig/interface.py | 2 --
python/vyos/interfaces.py | 36 +-----------------------------------
2 files changed, 1 insertion(+), 37 deletions(-)
(limited to 'python')
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 1759e3545..f2b43fd35 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -20,8 +20,6 @@ import glob
import time
from copy import deepcopy
-import vyos.interfaces
-
from vyos.validate import * # should not * include
from vyos.config import Config # not used anymore
from vyos import ConfigError
diff --git a/python/vyos/interfaces.py b/python/vyos/interfaces.py
index 37c093aca..4697c0acc 100644
--- a/python/vyos/interfaces.py
+++ b/python/vyos/interfaces.py
@@ -16,44 +16,10 @@
import re
import json
+from vyos.ifconfig import Interface
import subprocess
import netifaces
-intf_type_data_file = '/usr/share/vyos/interface-types.json'
-
-def list_interfaces():
- interfaces = netifaces.interfaces()
-
- # Remove "fake" interfaces associated with drivers
- for i in ["dummy0", "ip6tnl0", "tunl0", "ip_vti0", "ip6_vti0"]:
- try:
- interfaces.remove(i)
- except ValueError:
- pass
-
- return interfaces
-
-def list_interfaces_of_type(typ):
- with open(intf_type_data_file, 'r') as f:
- types_data = json.load(f)
-
- all_intfs = list_interfaces()
- if not (typ in types_data.keys()):
- raise ValueError("Unknown interface type: {0}".format(typ))
- else:
- r = re.compile('^{0}\d+'.format(types_data[typ]))
- return list(filter(lambda i: re.match(r, i), all_intfs))
-
-def get_type_of_interface(intf):
- with open(intf_type_data_file, 'r') as f:
- types_data = json.load(f)
-
- for key,val in types_data.items():
- r = re.compile('^{0}\d+'.format(val))
- if re.match(r, intf):
- return key
-
- raise ValueError("No type found for interface name: {0}".format(intf))
def wireguard_dump():
"""Dump wireguard data in a python friendly way."""
--
cgit v1.2.3