Added vlan and bridge management

README.md

@@ -49,6 +49,11 @@ Goal of this utility is to provide compatible CLI with [iproute2](http://www.pol
   * Set **Random MAC** address `ip link set en0 address random`
   * Set **Factory default MAC** address `ip link set en0 address factory`
   * Set MTU `ip link set dev en0 mtu 9000`
+  * Create VLAN inteface `ip link add link en0 name vlan111 type vlan id 111` (vlan interfaces must be named `vlan<n>`)
+  * Create a bridge interface `ip link add name bridge1 type bridge` (bridge interfaces must be named `bridge<n>`)
+  * Add an interface to a bridge `ip link set dev en2 master bridge1`
+  * Remove an interface from a bridge `ip link set dev en2 nomaster`
+  * Remove any virtual interface `ip link del vlan111`
 * Neighbour module (ARP/NDP)
   * Show all neighbours `ip neigh`
   * Show all IPv4 (ARP) neighbours `ip -4 neigh`
@@ -95,6 +100,7 @@ Goal of this utility is to provide compatible CLI with [iproute2](http://www.pol
 **v1.5.0**
 * Added `-json` option (Issue #49)
 * Added `bridge` command
+* Added vlan management
 * Internal reworking of `ip ... show` functions
 
 **v1.4.2**

src/bridge.py

@@ -105,7 +105,15 @@ def randomMAC():
 
 
 # Decode ifconfig output
-def parse_ifconfig(res):
+def parse_ifconfig():
+    status, res = subprocess.getstatusoutput(
+        IFCONFIG + " -v -a 2>/dev/null"
+    )
+    if status:  # unix status
+        if res != "":
+            perror(res)
+        return None
+
     links = []
     count = 1
 
@@ -224,28 +232,19 @@ def do_link(argv, json_print, pretty_json):
 
 
 def do_link_show(argv, json_print, pretty_json):
-    if len(argv) > 1:
-        if argv[0] != "dev":
-            return False
-        else:
-            argv.pop(0)
-    if len(argv) > 0:
-        dev = argv[0]
-    else:
-        dev = None
-
-    status, res = subprocess.getstatusoutput(
-        IFCONFIG + " -v -a 2>/dev/null"
-    )
-    if status:  # unix status
-        if res == "":
-            perror(param + " not found")
-        else:
-            perror(res)
+    links = parse_ifconfig()
+    if links is None:
         return False
 
+    dev = None
     bridges = []
-    links = parse_ifconfig(res)
+
+    if len(argv) > 0 and argv[0] == "dev":
+        argv.pop(0)
+    if len(argv) > 0:
+        dev = argv[0]
+        if [l for l in links if l["ifname"] == dev] == []:
+            perror("Cannot find device \"{}\"".format(dev))
 
     for master in [l for l in links if "bridge" in l]:
         for slave in master["bridge"].get("members",[]):