From 33e01d3a2b539f0ffd6fd02d019fda6a26bfcb0c Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 20 Apr 2010 10:48:15 -0700 Subject: [PATCH] ovs-openflowd: Prefer --fail=standalone|secure over --fail=open|closed. The "standalone" and "secure" terminology is less confusing. This retains support for "open" and "closed" but does not document it. --- utilities/ovs-openflowd.8.in | 11 ++++++----- utilities/ovs-openflowd.c | 8 +++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/utilities/ovs-openflowd.8.in b/utilities/ovs-openflowd.8.in index 7a78bf29..e50a4a7a 100644 --- a/utilities/ovs-openflowd.8.in +++ b/utilities/ovs-openflowd.8.in @@ -243,23 +243,24 @@ Ethernet address of the datapath's local port (which is typically randomly generated) in the lower 48 bits and zeros in the upper 16. . .TP -\fB--fail=\fR[\fBopen\fR|\fBclosed\fR] +\fB--fail=\fR[\fBstandalone\fR|\fBsecure\fR] The controller is, ordinarily, responsible for setting up all flows on the OpenFlow switch. Thus, if the connection to the controller fails, no new network connections can be set up. If the connection to the controller stays down long enough, no packets can pass through the switch at all. .IP -If this option is set to \fBopen\fR (the default), \fBovs\-openflowd\fR will +If this option is set to \fBstandalone\fR (the default), +\fBovs\-openflowd\fR will take over responsibility for setting up flows in the local datapath when no message has been received from the controller for three times the inactivity probe interval (see below), or 45 seconds by default. In this ``fail open'' mode, \fBovs\-openflowd\fR causes the datapath to act like an ordinary MAC-learning switch. \fBovs\-openflowd\fR will continue to retry connection to the controller in the background and, when the -connection succeeds, it discontinues its fail-open behavior. +connection succeeds, it discontinues its standalone switching behavior. .IP -If this option is set to \fBclosed\fR, then \fBovs\-openflowd\fR will not +If this option is set to \fBsecure\fR, then \fBovs\-openflowd\fR will not set up flows on its own when the controller connection fails. . .TP @@ -301,7 +302,7 @@ more information about in-band control). .RE . .IP -As a result, when both \fB--fail=closed\fR and \fB--out-of-band\fR are +As a result, when both \fB--fail=secure\fR and \fB--out-of-band\fR are specified, this option has no effect. . .TP diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 1460423d..e84a3999 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -336,12 +336,14 @@ parse_options(int argc, char *argv[], struct ofsettings *s) break; case OPT_FAIL_MODE: - if (!strcmp(optarg, "open")) { + if (!strcmp(optarg, "open") || !strcmp(optarg, "standalone")) { controller_opts.fail = OFPROTO_FAIL_STANDALONE; - } else if (!strcmp(optarg, "closed")) { + } else if (!strcmp(optarg, "closed") + || !strcmp(optarg, "secure")) { controller_opts.fail = OFPROTO_FAIL_SECURE; } else { - ovs_fatal(0, "--fail argument must be \"open\" or \"closed\""); + ovs_fatal(0, "--fail argument must be \"standalone\" " + "or \"secure\""); } break; -- 2.30.2