diff options
author | Ethan Jackson <ethan@nicira.com> | 2011-04-26 15:05:19 -0700 |
---|---|---|
committer | Ethan Jackson <ethan@nicira.com> | 2011-04-26 17:51:09 -0700 |
commit | da2f7b8ff5f41470cd1238376fbad5a4b75ad1a0 (patch) | |
tree | 54e79505837aeb9a701f23b547bf1098cdafbae9 /vswitchd | |
parent | d4f15cb982ff772110509c4292697bbe8a68d0f4 (diff) |
lacp: New other_config setting "lacp-force-aggregatable".
In some extremely advanced situations, one may want to force
non-bondable slaves to advertise themselves as bondable. This
patch adds that capability.
Also includes some minor code cleanup.
Diffstat (limited to 'vswitchd')
-rw-r--r-- | vswitchd/bridge.c | 4 | ||||
-rw-r--r-- | vswitchd/vswitch.xml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index dee19a9b..270ab800 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -3193,6 +3193,10 @@ port_reconfigure_lacp(struct port *port) "false"), "true"); + s.force_agg = !strcmp(get_port_other_config(port->cfg, + "lacp-force-aggregatable", + "false"), "true"); + lacp_time = get_port_other_config(port->cfg, "lacp-time", "slow"); custom_time = atoi(lacp_time); if (!strcmp(lacp_time, "fast")) { diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 0ec1fd3c..e7548355 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -683,6 +683,10 @@ require successful LACP negotiations to enable any slaves. Defaults to <code>false</code> which safely allows LACP to be used with switches that do not support the protocol.</dd> + <dt><code>lacp-force-aggregatable</code></dt> + <dd> When <code>true</code>, forces all slaves managed by this + <ref table="Port"/> to advertise themselves as aggregatable even if + they normally wouldn't. Defaults to <code>false</code>.</dd> </dl> </column> </group> |