summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--python/vyos/validate.py6
-rwxr-xr-xsrc/completion/list_interfaces.py14
-rwxr-xr-xsrc/conf_mode/interface-bridge.py7
3 files changed, 18 insertions, 9 deletions
diff --git a/python/vyos/validate.py b/python/vyos/validate.py
index 97a401423..258f7f76a 100644
--- a/python/vyos/validate.py
+++ b/python/vyos/validate.py
@@ -16,6 +16,12 @@
import netifaces
import ipaddress
+def is_ip(addr):
+ """
+ Check addr if it is an IPv4 or IPv6 address
+ """
+ return is_ipv4(addr) or is_ipv6(addr)
+
def is_ipv4(addr):
"""
Check addr if it is an IPv4 address/network. Returns True/False
diff --git a/src/completion/list_interfaces.py b/src/completion/list_interfaces.py
index 66432af19..5e444ef78 100755
--- a/src/completion/list_interfaces.py
+++ b/src/completion/list_interfaces.py
@@ -2,15 +2,14 @@
import sys
import argparse
-
import vyos.interfaces
-
parser = argparse.ArgumentParser()
group = parser.add_mutually_exclusive_group()
group.add_argument("-t", "--type", type=str, help="List interfaces of specific type")
group.add_argument("-b", "--broadcast", action="store_true", help="List all broadcast interfaces")
group.add_argument("-br", "--bridgeable", action="store_true", help="List all bridgeable interfaces")
+group.add_argument("-bo", "--bondable", action="store_true", help="List all bondable interfaces")
args = parser.parse_args()
@@ -21,11 +20,13 @@ if 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")
interfaces = eth + bridge + bond
+
elif args.bridgeable:
eth = vyos.interfaces.list_interfaces_of_type("ethernet")
bond = vyos.interfaces.list_interfaces_of_type("bonding")
@@ -34,6 +35,15 @@ elif args.bridgeable:
vxlan = vyos.interfaces.list_interfaces_of_type("vxlan")
wireless = vyos.interfaces.list_interfaces_of_type("wireless")
interfaces = eth + bond + l2tpv3 + openvpn + vxlan + wireless
+
+elif args.bondable:
+ eth = vyos.interfaces.list_interfaces_of_type("ethernet")
+ # we need to filter out VLAN interfaces identified by a dot (.) in their name
+ for intf in eth:
+ if '.' in intf:
+ eth.remove(intf)
+ interfaces = eth
+
else:
interfaces = vyos.interfaces.list_interfaces()
diff --git a/src/conf_mode/interface-bridge.py b/src/conf_mode/interface-bridge.py
index 85ea68e26..c1527e4a7 100755
--- a/src/conf_mode/interface-bridge.py
+++ b/src/conf_mode/interface-bridge.py
@@ -45,13 +45,6 @@ default_config_data = {
'stp': 0
}
-def freeze(d):
- if isinstance(d, dict):
- return frozenset((key, freeze(value)) for key, value in d.items())
- elif isinstance(d, list):
- return tuple(freeze(value) for value in d)
- return d
-
def diff(first, second):
second = set(second)
return [item for item in first if item not in second]