[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvswitch-discuss
Subject:    [ovs-discuss] [NIC-19 0/8] Make "brctl show" output match Citrix QA expectation
From:       blp () nicira ! com (Ben Pfaff)
Date:       2009-07-30 22:27:41
Message-ID: 1248992869-27179-1-git-send-email-blp () nicira ! com
[Download RAW message or body]

When there is a bridge that contains a bond and a number of VLANs,
currently the output of "brctl show" reflects the ovs-vswitchd.conf
topology:

bridge name	bridge id		STP enabled	interfaces
xapi1		0000.001d0964382a	no		xapi5
							xapi4
							xapi3
							xapi2
							eth1
							eth0
xenbr0		0000.de6c6fba2195	no		
xenbr1		0000.fe004a456140	no		
xenbr2		0000.001b210fdf18	no		eth2
xenbr3		0000.001b210fdf19	no		eth3
xenbr4		0000.001b210fdf1c	no		eth4
xenbr5		0000.001b210fdf1d	no		eth5

However, this is quite different from what "brctl show" would report
with the standard Linux bridging module, which is more like this:

bridge name	bridge id		STP enabled	interfaces
xapi1		0000.001d0964382a	no		bond0
xapi2		0000.001d0964382a	no		bond0.<VLAN1>
xapi3		0000.001d0964382a	no		bond0.<VLAN2>
xapi4		0000.001d0964382a	no		bond0.<VLAN3>
xapi5		0000.001d0964382a	no		bond0.<VLAN4>
xenbr0		0000.de6c6fba2195	no		
xenbr1		0000.fe004a456140	no		
xenbr2		0000.001b210fdf18	no		eth2
xenbr3		0000.001b210fdf19	no		eth3
xenbr4		0000.001b210fdf1c	no		eth4
xenbr5		0000.001b210fdf1d	no		eth5

This set of commits makes the brcompatd output more like the latter.

This has only been lightly tested, and not on a XenServer box.  It is
necessary to test it on XenServer before pushing it.

Ben Pfaff (8):
  datapath: Unexport is_dp_dev(), since it is only used in
    openvswitch_mod.
  svec: New convenience macro SVEC_FOR_EACH.
  brcompatd: Make parse_command() parse commands without dp arguments.
  brcompatd: Break send_reply() up into more functions for flexibility.
  brcompatd: Fix handle_fdb_query_cmd() return value on error.
  brcompatd: Factor code out of handle_fdb_query_cmd().
  brcompat: Move BRCTL_GET_BRIDGES, BRCTL_GET_PORT_LIST into userspace.
  vswitchd: Support creating fake bond device interfaces.

 datapath/brcompat.c                                |   98 +++----
 datapath/dp_dev.c                                  |    1 -
 include/openvswitch/brcompat-netlink.h             |    7 +-
 lib/svec.h                                         |    9 +
 vswitchd/bridge.c                                  |   27 ++-
 vswitchd/ovs-brcompatd.c                           |  275 ++++++++++++++++----
 .../opt_xensource_libexec_interface-reconfigure    |    1 +
 7 files changed, 303 insertions(+), 115 deletions(-)



[prev in list] [next in list] [prev in thread] [next in thread]