#include "ofpbuf.h"
#include "packets.h"
#include "poll-loop.h"
+#include "shash.h"
#include "timer.h"
#include "timeval.h"
#include "unixctl.h"
static struct slave *slave_lookup(const struct lacp *, const void *slave);
static bool info_tx_equal(struct lacp_info *, struct lacp_info *);
-static void lacp_unixctl_show(struct unixctl_conn *, const char *args,
- void *aux);
+static unixctl_cb_func lacp_unixctl_show;
/* Populates 'pdu' with a LACP PDU comprised of 'actor' and 'partner'. */
static void
void
lacp_init(void)
{
- unixctl_command_register("lacp/show", lacp_unixctl_show, NULL);
+ unixctl_command_register("lacp/show", "[port]", 0, 1,
+ lacp_unixctl_show, NULL);
}
/* Creates a LACP object. */
void
lacp_configure(struct lacp *lacp, const struct lacp_settings *s)
{
+ assert(!eth_addr_is_zero(s->id));
+
if (!lacp->name || strcmp(s->name, lacp->name)) {
free(lacp->name);
lacp->name = xstrdup(s->name);
lacp->active = s->active;
lacp->lacp_time = s->lacp_time;
- lacp->custom_time = MAX(TIME_UPDATE_INTERVAL, s->custom_time);
+ lacp->custom_time = (s->lacp_time == LACP_TIME_CUSTOM
+ ? MAX(TIME_UPDATE_INTERVAL, s->custom_time)
+ : 0);
}
/* Returns true if 'lacp' is configured in active mode, false if 'lacp' is
}
}
-/* Returns true if 'lacp' has successfully negotiated with its partner. False
- * if 'lacp' is NULL. */
-bool
-lacp_negotiated(const struct lacp *lacp)
+/* Returns the lacp_status of the given 'lacp' object (which may be NULL). */
+enum lacp_status
+lacp_status(const struct lacp *lacp)
{
- return lacp ? lacp->negotiated : false;
+ if (!lacp) {
+ return LACP_DISABLED;
+ } else if (lacp->negotiated) {
+ return LACP_NEGOTIATED;
+ } else {
+ return LACP_CONFIGURED;
+ }
}
/* Registers 'slave_' as subordinate to 'lacp'. This should be called at least
struct slave *slave = slave_lookup(lacp, slave_);
/* The slave may be enabled if it's attached to an aggregator and its
- * partner is synchronized. The only exception is defaulted slaves.
- * They are not required to have synchronized partners because they
- * have no partners at all. They will only be attached if negotiations
- * failed on all slaves in the bond. */
- return slave->attached && (slave->partner.state & LACP_STATE_SYNC
- || slave->status == LACP_DEFAULTED);
+ * partner is synchronized.*/
+ return slave->attached && (slave->partner.state & LACP_STATE_SYNC);
} else {
return true;
}
HMAP_FOR_EACH (slave, node, &lacp->slaves) {
struct lacp_info pri;
- slave->attached = true;
+ slave->attached = false;
/* XXX: In the future allow users to configure the expected system ID.
* For now just special case loopback. */
if (eth_addr_equals(slave->partner.sys_id, slave->lacp->sys_id)) {
VLOG_WARN_RL(&rl, "slave %s: Loopback detected. Slave is "
"connected to its own bond", slave->name);
- slave->attached = false;
continue;
}
continue;
}
+ slave->attached = true;
slave_get_priority(slave, &pri);
if (!lead || memcmp(&pri, &lead_pri, sizeof pri) < 0) {
if (lead) {
HMAP_FOR_EACH (slave, node, &lacp->slaves) {
- if (slave->status == LACP_DEFAULTED
- || lead->partner.key != slave->partner.key
+ if (lead->partner.key != slave->partner.key
|| !eth_addr_equals(lead->partner.sys_id,
slave->partner.sys_id)) {
slave->attached = false;
ds_put_lacp_state(struct ds *ds, uint8_t state)
{
if (state & LACP_STATE_ACT) {
- ds_put_cstr(ds, "activity ");
+ ds_put_cstr(ds, " activity");
}
if (state & LACP_STATE_TIME) {
- ds_put_cstr(ds, "timeout ");
+ ds_put_cstr(ds, " timeout");
}
if (state & LACP_STATE_AGG) {
- ds_put_cstr(ds, "aggregation ");
+ ds_put_cstr(ds, " aggregation");
}
if (state & LACP_STATE_SYNC) {
- ds_put_cstr(ds, "synchronized ");
+ ds_put_cstr(ds, " synchronized");
}
if (state & LACP_STATE_COL) {
- ds_put_cstr(ds, "collecting ");
+ ds_put_cstr(ds, " collecting");
}
if (state & LACP_STATE_DIST) {
- ds_put_cstr(ds, "distributing ");
+ ds_put_cstr(ds, " distributing");
}
if (state & LACP_STATE_DEF) {
- ds_put_cstr(ds, "defaulted ");
+ ds_put_cstr(ds, " defaulted");
}
if (state & LACP_STATE_EXP) {
- ds_put_cstr(ds, "expired ");
+ ds_put_cstr(ds, " expired");
}
}
static void
-lacp_unixctl_show(struct unixctl_conn *conn,
- const char *args, void *aux OVS_UNUSED)
+lacp_print_details(struct ds *ds, struct lacp *lacp)
{
- struct ds ds = DS_EMPTY_INITIALIZER;
- struct lacp *lacp;
- struct slave *slave;
+ struct shash slave_shash = SHASH_INITIALIZER(&slave_shash);
+ const struct shash_node **sorted_slaves = NULL;
- lacp = lacp_find(args);
- if (!lacp) {
- unixctl_command_reply(conn, 501, "no such lacp object");
- return;
- }
-
- ds_put_format(&ds, "lacp: %s\n", lacp->name);
+ struct slave *slave;
+ int i;
- ds_put_format(&ds, "\tstatus: %s", lacp->active ? "active" : "passive");
+ ds_put_format(ds, "---- %s ----\n", lacp->name);
+ ds_put_format(ds, "\tstatus: %s", lacp->active ? "active" : "passive");
if (lacp->heartbeat) {
- ds_put_cstr(&ds, " heartbeat");
+ ds_put_cstr(ds, " heartbeat");
}
if (lacp->negotiated) {
- ds_put_cstr(&ds, " negotiated");
+ ds_put_cstr(ds, " negotiated");
}
- ds_put_cstr(&ds, "\n");
+ ds_put_cstr(ds, "\n");
- ds_put_format(&ds, "\tsys_id: " ETH_ADDR_FMT "\n", ETH_ADDR_ARGS(lacp->sys_id));
- ds_put_format(&ds, "\tsys_priority: %u\n", lacp->sys_priority);
- ds_put_cstr(&ds, "\taggregation key: ");
+ ds_put_format(ds, "\tsys_id: " ETH_ADDR_FMT "\n", ETH_ADDR_ARGS(lacp->sys_id));
+ ds_put_format(ds, "\tsys_priority: %u\n", lacp->sys_priority);
+ ds_put_cstr(ds, "\taggregation key: ");
if (lacp->key_slave) {
- ds_put_format(&ds, "%u", lacp->key_slave->port_id);
+ ds_put_format(ds, "%u", lacp->key_slave->port_id);
} else {
- ds_put_cstr(&ds, "none");
+ ds_put_cstr(ds, "none");
}
- ds_put_cstr(&ds, "\n");
+ ds_put_cstr(ds, "\n");
- ds_put_cstr(&ds, "\tlacp_time: ");
+ ds_put_cstr(ds, "\tlacp_time: ");
switch (lacp->lacp_time) {
case LACP_TIME_FAST:
- ds_put_cstr(&ds, "fast\n");
+ ds_put_cstr(ds, "fast\n");
break;
case LACP_TIME_SLOW:
- ds_put_cstr(&ds, "slow\n");
+ ds_put_cstr(ds, "slow\n");
break;
case LACP_TIME_CUSTOM:
- ds_put_format(&ds, "custom (%lld)\n", lacp->custom_time);
+ ds_put_format(ds, "custom (%lld)\n", lacp->custom_time);
break;
default:
- ds_put_cstr(&ds, "unknown\n");
+ ds_put_cstr(ds, "unknown\n");
}
HMAP_FOR_EACH (slave, node, &lacp->slaves) {
+ shash_add(&slave_shash, slave->name, slave);
+ }
+ sorted_slaves = shash_sort(&slave_shash);
+
+ for (i = 0; i < shash_count(&slave_shash); i++) {
char *status;
struct lacp_info actor;
+ slave = sorted_slaves[i]->data;
slave_get_actor(slave, &actor);
switch (slave->status) {
case LACP_CURRENT:
NOT_REACHED();
}
- ds_put_format(&ds, "\nslave: %s: %s %s\n", slave->name, status,
+ ds_put_format(ds, "\nslave: %s: %s %s\n", slave->name, status,
slave->attached ? "attached" : "detached");
- ds_put_format(&ds, "\tport_id: %u\n", slave->port_id);
- ds_put_format(&ds, "\tport_priority: %u\n", slave->port_priority);
+ ds_put_format(ds, "\tport_id: %u\n", slave->port_id);
+ ds_put_format(ds, "\tport_priority: %u\n", slave->port_priority);
- ds_put_format(&ds, "\n\tactor sys_id: " ETH_ADDR_FMT "\n",
+ ds_put_format(ds, "\n\tactor sys_id: " ETH_ADDR_FMT "\n",
ETH_ADDR_ARGS(actor.sys_id));
- ds_put_format(&ds, "\tactor sys_priority: %u\n",
+ ds_put_format(ds, "\tactor sys_priority: %u\n",
ntohs(actor.sys_priority));
- ds_put_format(&ds, "\tactor port_id: %u\n",
+ ds_put_format(ds, "\tactor port_id: %u\n",
ntohs(actor.port_id));
- ds_put_format(&ds, "\tactor port_priority: %u\n",
+ ds_put_format(ds, "\tactor port_priority: %u\n",
ntohs(actor.port_priority));
- ds_put_format(&ds, "\tactor key: %u\n",
+ ds_put_format(ds, "\tactor key: %u\n",
ntohs(actor.key));
- ds_put_cstr(&ds, "\tactor state: ");
- ds_put_lacp_state(&ds, actor.state);
- ds_put_cstr(&ds, "\n\n");
+ ds_put_cstr(ds, "\tactor state:");
+ ds_put_lacp_state(ds, actor.state);
+ ds_put_cstr(ds, "\n\n");
- ds_put_format(&ds, "\tpartner sys_id: " ETH_ADDR_FMT "\n",
+ ds_put_format(ds, "\tpartner sys_id: " ETH_ADDR_FMT "\n",
ETH_ADDR_ARGS(slave->partner.sys_id));
- ds_put_format(&ds, "\tpartner sys_priority: %u\n",
+ ds_put_format(ds, "\tpartner sys_priority: %u\n",
ntohs(slave->partner.sys_priority));
- ds_put_format(&ds, "\tpartner port_id: %u\n",
+ ds_put_format(ds, "\tpartner port_id: %u\n",
ntohs(slave->partner.port_id));
- ds_put_format(&ds, "\tpartner port_priority: %u\n",
+ ds_put_format(ds, "\tpartner port_priority: %u\n",
ntohs(slave->partner.port_priority));
- ds_put_format(&ds, "\tpartner key: %u\n",
+ ds_put_format(ds, "\tpartner key: %u\n",
ntohs(slave->partner.key));
- ds_put_cstr(&ds, "\tpartner state: ");
- ds_put_lacp_state(&ds, slave->partner.state);
- ds_put_cstr(&ds, "\n");
+ ds_put_cstr(ds, "\tpartner state:");
+ ds_put_lacp_state(ds, slave->partner.state);
+ ds_put_cstr(ds, "\n");
+ }
+
+ shash_destroy(&slave_shash);
+ free(sorted_slaves);
+}
+
+static void
+lacp_unixctl_show(struct unixctl_conn *conn, int argc, const char *argv[],
+ void *aux OVS_UNUSED)
+{
+ struct ds ds = DS_EMPTY_INITIALIZER;
+ struct lacp *lacp;
+
+ if (argc > 1) {
+ lacp = lacp_find(argv[1]);
+ if (!lacp) {
+ unixctl_command_reply_error(conn, "no such lacp object");
+ return;
+ }
+ lacp_print_details(&ds, lacp);
+ } else {
+ LIST_FOR_EACH (lacp, node, &all_lacps) {
+ lacp_print_details(&ds, lacp);
+ }
}
- unixctl_command_reply(conn, 200, ds_cstr(&ds));
+ unixctl_command_reply(conn, ds_cstr(&ds));
ds_destroy(&ds);
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff