Merge pull request #265 from thomas-mangin/2057-dhcp-vlan

ifconfig: T2057: break down DHCP, add register, STP and VLAN as adapters

2 files changed, 21 insertions, 16 deletions

diff --git a/src/completion/list_interfaces.py b/src/completion/list_interfaces.py
index 8cd59917d..77de4e327 100755
--- a/src/completion/list_interfaces.py
+++ b/src/completion/list_interfaces.py
@@ -3,6 +3,7 @@
 import sys
 import argparse
 import vyos.interfaces
+from vyos.ifconfig import Interface
 
 parser = argparse.ArgumentParser()
 group = parser.add_mutually_exclusive_group()
@@ -13,35 +14,39 @@ group.add_argument("-bo", "--bondable", action="store_true", help="List all bond
 
 args = parser.parse_args()
 
+# XXX: Need to be rewritten using the data in the class definition
+# XXX: It can be done once vti and input are moved into vyos
+# XXX: We store for each class what type they are (broadcast, bridgeabe, ...)
+
 if args.type:
     try:
-        interfaces = vyos.interfaces.list_interfaces_of_type(args.type)
+        interfaces = Interface.listing(args.type)
 
     except ValueError as e:
         print(e, file=sys.stderr)
         print("")
 
 elif args.broadcast:
-    eth = vyos.interfaces.list_interfaces_of_type("ethernet")
-    bridge = vyos.interfaces.list_interfaces_of_type("bridge")
-    bond = vyos.interfaces.list_interfaces_of_type("bonding")
+    eth = Interface.listing("ethernet")
+    bridge = Interface.listing("bridge")
+    bond = Interface.listing("bonding")
     interfaces = eth + bridge + bond
 
 elif args.bridgeable:
-    eth = vyos.interfaces.list_interfaces_of_type("ethernet")
-    bond = vyos.interfaces.list_interfaces_of_type("bonding")
-    l2tpv3 = vyos.interfaces.list_interfaces_of_type("l2tpv3")
-    openvpn = vyos.interfaces.list_interfaces_of_type("openvpn")
-    wireless = vyos.interfaces.list_interfaces_of_type("wireless")
-    tunnel = vyos.interfaces.list_interfaces_of_type("tunnel")
-    vxlan = vyos.interfaces.list_interfaces_of_type("vxlan")
-    geneve  = vyos.interfaces.list_interfaces_of_type("geneve")
+    eth = Interface.listing("ethernet")
+    bond = Interface.listing("bonding")
+    l2tpv3 = Interface.listing("l2tpv3")
+    openvpn = Interface.listing("openvpn")
+    wireless = Interface.listing("wireless")
+    tunnel = Interface.listing("tunnel")
+    vxlan = Interface.listing("vxlan")
+    geneve = Interface.listing("geneve")
 
     interfaces = eth + bond + l2tpv3 + openvpn + vxlan + tunnel + wireless + geneve
 
 elif args.bondable:
     interfaces = []
-    eth = vyos.interfaces.list_interfaces_of_type("ethernet")
+    eth = Interface.listing("ethernet")
 
     # we need to filter out VLAN interfaces identified by a dot (.) in their name
     for intf in eth:
@@ -49,6 +54,6 @@ elif args.bondable:
             interfaces.append(intf)
 
 else:
-    interfaces = vyos.interfaces.list_interfaces()
+    interfaces = Interface.listing()
 
 print(" ".join(interfaces))
diff --git a/src/completion/list_openvpn_clients.py b/src/completion/list_openvpn_clients.py
index 828ce6b5e..17b0c7008 100755
--- a/src/completion/list_openvpn_clients.py
+++ b/src/completion/list_openvpn_clients.py
@@ -18,7 +18,7 @@ import os
 import sys
 import argparse
 
-from vyos.interfaces import list_interfaces_of_type
+from vyos.ifconfig import Interface
 
 def get_client_from_interface(interface):
     clients = []
@@ -50,7 +50,7 @@ if __name__ == "__main__":
     if args.interface:
         clients = get_client_from_interface(args.interface)
     elif args.all:
-        for interface in list_interfaces_of_type("openvpn"):
+        for interface in Interface.listing("openvpn"):
             clients += get_client_from_interface(interface)
 
     print(" ".join(clients))