ovs-vsctl: additional commands for querying VLAN fake bridges.

Our test automation needs to be able to validate that a VLAN bridge and
for this I needed two new operations in ovs-vsctl:
      * The ability to query the VLAN tag for a bridge.
      * The ability to query the 'parent' of a bridge. The parent is the
        non-VLAN/untagged bridge with the same physical devices and
        could be a bond.

So given xenbr0 (containing eth0) + xapi2 (VLAN 42 on eth0) and xapi1
(containing bond0 == eth2+eth3) + xapi3 (VLAN 23 on the bonded
interface):

[root@warlock ~]# ovs-vsctl br-to-vlan xapi2
42
[root@warlock ~]# ovs-vsctl br-to-vlan xapi3
23
[root@warlock ~]# ovs-vsctl br-to-parent xapi2
xenbr0
[root@warlock ~]# ovs-vsctl br-to-parent xapi3
xapi1

diff --git a/utilities/ovs-vsctl.in b/utilities/ovs-vsctl.in
index ce3f8d3c5b9890aa0495f3cb6752682dc9e53631..438b978b89e9a6195be16145782ba84afa6e2f44 100755 (executable)
--- a/utilities/ovs-vsctl.in
+++ b/utilities/ovs-vsctl.in
@@ -277,7 +277,9 @@ Bridge commands:
   del-br BRIDGE               delete BRIDGE and all of its ports
   list-br                     print the names of all the bridges
   br-exists BRIDGE            test whether BRIDGE exists
-
+  br-to-vlan BRIDGE           print the VLAN which BRIDGE is on
+  br-to-parent BRIDGE         print the parent of BRIDGE
+  
 Port commands:
   list-ports BRIDGE           print the names of all the ports on BRIDGE
   add-port BRIDGE PORT        add network device PORT to BRIDGE
@@ -427,6 +429,16 @@ def cmd_iface_to_br(iface):
             return
     raise Error("no interface named %s" % iface)
 
+def cmd_br_to_vlan(bridge):
+    cfg = cfg_read(VSWITCHD_CONF)
+    parent, vlan = find_bridge(cfg, bridge)
+    print vlan
+
+def cmd_br_to_parent(bridge):
+    cfg = cfg_read(VSWITCHD_CONF)
+    parent, vlan = find_bridge(cfg, bridge)
+    print parent
+    
 def main():
     # Parse command line.
     try:
@@ -475,6 +487,8 @@ def main():
                 'add-bond': (cmd_add_bond, lambda n: n >= 4),
                 'del-port': (cmd_del_port, 2),
                 'port-to-br': (cmd_port_to_br, 1),
+                'br-to-vlan': (cmd_br_to_vlan, 1),
+                'br-to-parent': (cmd_br_to_parent, 1),
                 'list-ifaces': (cmd_list_ifaces, 1),
                 'iface-to-br': (cmd_iface_to_br, 1)}
     command = args[0]