From 560c8903bd770300714e4efb109d7da1c4e3f46f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 21 May 2009 12:40:05 -0700 Subject: [PATCH] Rename vswitchd to ovs-vswitchd, for consistency. --- INSTALL | 2 +- README | 6 +- datapath/brcompat.c | 3 +- debian/openvswitch-switchui.copyright | 19 +++--- include/openflow/openflow-mgmt.h | 4 +- include/openvswitch/brcompat-netlink.h | 2 +- secchan/ofproto.c | 2 +- secchan/ofproto.h | 2 +- secchan/secchan.8.in | 2 +- utilities/ovs-appctl.8.in | 4 +- utilities/ovs-cfg-mod.8.in | 24 +++---- utilities/ovs-dpctl.8.in | 10 +-- utilities/ovs-ofctl.8.in | 4 +- vswitchd/.gitignore | 6 +- vswitchd/automake.mk | 27 ++++---- vswitchd/bridge.c | 2 +- vswitchd/mgmt.c | 2 +- vswitchd/ovs-brcompatd.8.in | 14 ++-- vswitchd/ovs-brcompatd.c | 25 ++++---- vswitchd/{vswitchd.8.in => ovs-vswitchd.8.in} | 36 +++++------ vswitchd/{vswitchd.c => ovs-vswitchd.c} | 4 +- ...itchd.conf.5.in => ovs-vswitchd.conf.5.in} | 64 +++++++++---------- vswitchd/{vswitchd.h => ovs-vswitchd.h} | 2 +- vswitchd/port.c | 2 +- vswitchd/proc-net-compat.c | 2 +- xenserver/README | 6 +- xenserver/etc_init.d_vswitch | 30 ++++----- xenserver/etc_init.d_vswitch-xapi-update | 6 +- xenserver/etc_logrotate.d_vswitch | 2 +- xenserver/etc_profile.d_vswitch.sh | 4 +- xenserver/etc_sysconfig_vswitch.example | 18 +++--- .../etc_xapi.d_plugins_vswitch-cfg-update | 6 +- xenserver/etc_xensource_scripts_vif | 4 +- ...pt_xensource_libexec_interface-reconfigure | 8 +-- ...xsconsole_plugins-base_XSFeatureVSwitch.py | 8 +-- xenserver/vswitch-xen.spec | 16 ++--- 36 files changed, 192 insertions(+), 186 deletions(-) rename vswitchd/{vswitchd.8.in => ovs-vswitchd.8.in} (64%) rename vswitchd/{vswitchd.c => ovs-vswitchd.c} (98%) rename vswitchd/{vswitchd.conf.5.in => ovs-vswitchd.conf.5.in} (92%) rename vswitchd/{vswitchd.h => ovs-vswitchd.h} (98%) diff --git a/INSTALL b/INSTALL index 68efbdb0..994e8d32 100644 --- a/INSTALL +++ b/INSTALL @@ -146,7 +146,7 @@ distribution in the ordinary way using "configure" and "make". The following main binaries will be built: - - Virtual switch daemon: vswitchd/vswitchd + - Virtual switch daemon: vswitchd/ovs-vswitchd - Bridge compatibility daemon: vswitchd/ovs-brcompatd diff --git a/README b/README index bb33e54e..8991e4c8 100644 --- a/README +++ b/README @@ -26,7 +26,7 @@ The most important components of this distribution are: - A Linux kernel module for flow-based switching, in the datapath directory. - - vswitchd, a daemon that implements the virtual switch. + - ovs-vswitchd, a daemon that implements the virtual switch. - ovs-dpctl, a tool for configuring the kernel module and controlling OpenFlow switches. @@ -34,8 +34,8 @@ The most important components of this distribution are: This distribution includes some additional software as well: - secchan, a program that implements a simple OpenFlow switch - (without the special features provided by vswitchd) using - the same kernel module as vswitchd. + (without the special features provided by ovs-vswitchd) using + the same kernel module as ovs-vswitchd. - ovs-controller, a simple OpenFlow switch diff --git a/datapath/brcompat.c b/datapath/brcompat.c index 4cbce781..36b72c06 100644 --- a/datapath/brcompat.c +++ b/datapath/brcompat.c @@ -19,7 +19,8 @@ static struct genl_family brc_genl_family; static struct genl_multicast_group brc_mc_group; -/* Time to wait for vswitchd to respond to a datapath action, in jiffies. */ +/* Time to wait for ovs-vswitchd to respond to a datapath action, in + * jiffies. */ #define BRC_TIMEOUT (HZ * 5) /* Mutex to serialize ovs-brcompatd callbacks. (Some callbacks naturally hold diff --git a/debian/openvswitch-switchui.copyright b/debian/openvswitch-switchui.copyright index 326fc496..ab7cac59 100644 --- a/debian/openvswitch-switchui.copyright +++ b/debian/openvswitch-switchui.copyright @@ -21,12 +21,13 @@ License: You should have received a copy of the GNU General Public License along with this program. If not, see . - In addition, as a special exception, Nicira Networks gives permission - to link the code of its release of vswitchd with the OpenSSL project's - "OpenSSL" library (or with modified versions of it that use the same - license as the "OpenSSL" library), and distribute the linked - executables. You must obey the GNU General Public License in all - respects for all of the code used other than "OpenSSL". If you modify - this file, you may extend this exception to your version of the file, - but you are not obligated to do so. If you do not wish to do so, - delete this exception statement from your version. + In addition, as a special exception, Nicira Networks gives + permission to link the code of its release of ovs-vswitchd with + the OpenSSL project's "OpenSSL" library (or with modified versions + of it that use the same license as the "OpenSSL" library), and + distribute the linked executables. You must obey the GNU General + Public License in all respects for all of the code used other than + "OpenSSL". If you modify this file, you may extend this exception + to your version of the file, but you are not obligated to do so. + If you do not wish to do so, delete this exception statement from + your version. diff --git a/include/openflow/openflow-mgmt.h b/include/openflow/openflow-mgmt.h index 830ee5ac..caf7dcf1 100644 --- a/include/openflow/openflow-mgmt.h +++ b/include/openflow/openflow-mgmt.h @@ -74,7 +74,7 @@ OFP_ASSERT(sizeof(struct ofmp_tlv_end) == 4); /* Bitmask of capability description styles. */ enum ofmp_capability_format { - OFMPCAF_SIMPLE = 0 << 0, /* "vswitchd.conf" style. */ + OFMPCAF_SIMPLE = 0 << 0, /* "ovs-vswitchd.conf" style. */ }; /* Body of capbility request. @@ -134,7 +134,7 @@ OFP_ASSERT(sizeof(struct ofmp_resources_update) == 20); /* Bitmask of capability description styles. */ enum ofmp_config_format { - OFMPCOF_SIMPLE = 0 << 0, /* "vswitchd.conf" style. */ + OFMPCOF_SIMPLE = 0 << 0, /* "ovs-vswitchd.conf" style. */ }; #define CONFIG_COOKIE_LEN 20 diff --git a/include/openvswitch/brcompat-netlink.h b/include/openvswitch/brcompat-netlink.h index 457f865d..98ecdad4 100644 --- a/include/openvswitch/brcompat-netlink.h +++ b/include/openvswitch/brcompat-netlink.h @@ -61,7 +61,7 @@ enum brc_genl_command { */ BRC_GENL_C_DP_ADD, /* K: Datapath created. */ BRC_GENL_C_DP_DEL, /* K: Datapath destroyed. */ - BRC_GENL_C_DP_RESULT, /* U: Result of datapath command from vswitchd. */ + BRC_GENL_C_DP_RESULT, /* U: Return code from ovs-brcompatd. */ BRC_GENL_C_PORT_ADD, /* K: Port added to datapath. */ BRC_GENL_C_PORT_DEL, /* K: Port removed from datapath. */ BRC_GENL_C_QUERY_MC, /* U: Get multicast group for brcompat. */ diff --git a/secchan/ofproto.c b/secchan/ofproto.c index 350f22e9..534d001f 100644 --- a/secchan/ofproto.c +++ b/secchan/ofproto.c @@ -238,7 +238,7 @@ struct ofproto { struct pvconn **snoops; size_t n_snoops; - /* Hooks for vswitchd. */ + /* Hooks for ovs-vswitchd. */ const struct ofhooks *ofhooks; void *aux; diff --git a/secchan/ofproto.h b/secchan/ofproto.h index 83c66a7b..df90d0b9 100644 --- a/secchan/ofproto.h +++ b/secchan/ofproto.h @@ -109,7 +109,7 @@ void ofproto_delete_flow(struct ofproto *, const flow_t *, uint32_t wildcards, unsigned int priority); void ofproto_flush_flows(struct ofproto *); -/* Hooks for vswitchd. */ +/* Hooks for ovs-vswitchd. */ struct ofhooks { void (*port_changed_cb)(enum ofp_port_reason, const struct ofp_phy_port *, void *aux); diff --git a/secchan/secchan.8.in b/secchan/secchan.8.in index d3889dac..b40842a9 100644 --- a/secchan/secchan.8.in +++ b/secchan/secchan.8.in @@ -460,4 +460,4 @@ require the controller to send the CA certificate, but .BR ovs\-dpctl (8), .BR ovs\-ofctl (8), .BR ovs\-pki (8), -.BR vswitchd.conf (5) +.BR ovs\-vswitchd.conf (5) diff --git a/utilities/ovs-appctl.8.in b/utilities/ovs-appctl.8.in index 1e516215..9bf97fd2 100644 --- a/utilities/ovs-appctl.8.in +++ b/utilities/ovs-appctl.8.in @@ -27,7 +27,7 @@ The available \fIaction\fR options are: .SH DESCRIPTION The \fBovs\-appctl\fR program connects to one or more running -Open vSwitch daemons (such as \fBvswitchd\fR(8)), as specified by the +Open vSwitch daemons (such as \fBovs\-vswitchd\fR(8)), as specified by the user, and sends them commands to query or modify their behavior. Its primary purpose is currently to adjust daemons' logging levels. @@ -42,7 +42,7 @@ begin with \fB/\fR, it is treated as relative to \fB@RUNDIR@\fR. Each Open vSwitch daemon by default creates a socket named \fB@RUNDIR@/\fIprogram\fB.\fIpid\fB.ctl\fR, where \fIprogram\fR is -the program's name (such as \fBvswitchd\fR) and \fIpid\fR is the +the program's name (such as \fBovs\-vswitchd\fR) and \fIpid\fR is the daemon's PID. .PP diff --git a/utilities/ovs-cfg-mod.8.in b/utilities/ovs-cfg-mod.8.in index ebe2c143..0d1e4746 100644 --- a/utilities/ovs-cfg-mod.8.in +++ b/utilities/ovs-cfg-mod.8.in @@ -2,17 +2,17 @@ .ds PN ovs-cfg-mod . .SH NAME -ovs-cfg-mod \- Safely manage a vswitchd.conf-style configuration file +ovs-cfg-mod \- Safely manage a ovs\-vswitchd.conf-style configuration file . .SH SYNOPSIS .B ovs-cfg-mod --config-file=\fIfile\fR [ \fIaction\fR ][ \fIaction\fR \fI...\fR ] . .SH DESCRIPTION -A program for managing a \fBvswitchd.conf\fR(5)-style configuration file. -\fBovs-cfg-mod\fR uses the same locking mechanisms as \fBvswitchd\fR and its -related utilities. This allows it to be run safely on "live" -configurations. +A program for managing a \fovs\-vswitchd.conf\fR(5)-style configuration +file. \fBovs-cfg-mod\fR uses the same locking mechanisms as +\fBovs\-vswitchd\fR and its related utilities. This allows it to be +run safely on "live" configurations. The \fB--config-file\fR argument must be the first argument provided: .TP @@ -26,11 +26,11 @@ actions follows. These are executed in the order provided and under a single lock instance, so they appear atomic to external viewers of \fIfile\fR. -As discussed in \fBvswitchd.conf\fR(5), each line in the configuration -file consists of a key-value pair. Actions generally take either a -\fIkey\fR or \fIentry\fR argument. A \fIkey\fR is a dot-separated -description of a configuration option. A \fIentry\fR is a key-value -pair, separated by the '=' sign. +As discussed in \fBovs\-vswitchd.conf\fR(5), each line in the +configuration file consists of a key-value pair. Actions generally +take either a \fIkey\fR or \fIentry\fR argument. A \fIkey\fR is a +dot-separated description of a configuration option. A \fIentry\fR is +a key-value pair, separated by the '=' sign. The following actions are supported: @@ -81,5 +81,5 @@ instances after the first log only the changes since the previous instance. . .SH "SEE ALSO" -.BR vswitchd (8), -.BR vswitchd.conf (5) +.BR ovs\-vswitchd (8), +.BR ovs\-vswitchd.conf (5) diff --git a/utilities/ovs-dpctl.8.in b/utilities/ovs-dpctl.8.in index 8f1f6079..652ebb13 100644 --- a/utilities/ovs-dpctl.8.in +++ b/utilities/ovs-dpctl.8.in @@ -22,9 +22,9 @@ given network device, use the \fBadd\-if\fR command to explicitly add that network device to the datapath. Do not use \fBovs\-dpctl\fR commands to modify datapaths if -\fBvswitchd\fR(8) is in use. Instead, modify the \fBvswitchd\fR -configuration file and send \fBSIGHUP\fR to the \fBvswitchd\fR -process. +\fBovs\-vswitchd\fR(8) is in use. Instead, modify the +\fBovs\-vswitchd\fR configuration file and send \fBSIGHUP\fR to the +\fBovs\-vswitchd\fR process. .PP Most \fBovs\-dpctl\fR commands that work with datapaths take an argument @@ -161,6 +161,6 @@ Deletes the datapath. .SH "SEE ALSO" -.BR vswitchd (8), .BR secchan (8), -.BR ovs\-appctl (8) +.BR ovs\-appctl (8), +.BR ovs\-vswitchd (8) diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index 8dc50a37..3a9c305f 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -484,6 +484,6 @@ Prints the flow entries in the switch. .SH "SEE ALSO" -.BR vswitchd (8), .BR ovs\-appctl (8), -.BR ovs\-controller (8) +.BR ovs\-controller (8), +.BR ovs\-vswitchd (8) diff --git a/vswitchd/.gitignore b/vswitchd/.gitignore index 27233bcc..01d57ae7 100644 --- a/vswitchd/.gitignore +++ b/vswitchd/.gitignore @@ -2,6 +2,6 @@ /Makefile.in /ovs-brcompatd /ovs-brcompatd.8 -/vswitchd -/vswitchd.8 -/vswitchd.conf.5 +/ovs-vswitchd +/ovs-vswitchd.8 +/ovs-vswitchd.conf.5 diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk index 71516b4a..6883731e 100644 --- a/vswitchd/automake.mk +++ b/vswitchd/automake.mk @@ -1,12 +1,14 @@ -sbin_PROGRAMS += vswitchd/vswitchd vswitchd/ovs-brcompatd -man_MANS += vswitchd/vswitchd.conf.5 \ - vswitchd/vswitchd.8 \ +sbin_PROGRAMS += vswitchd/ovs-vswitchd vswitchd/ovs-brcompatd +man_MANS += \ + vswitchd/ovs-vswitchd.conf.5 \ + vswitchd/ovs-vswitchd.8 \ + vswitchd/ovs-brcompatd.8 +DISTCLEANFILES += \ + vswitchd/ovs-vswitchd.conf.5 \ + vswitchd/ovs-vswitchd.8 \ vswitchd/ovs-brcompatd.8 -DISTCLEANFILES += vswitchd/vswitchd.conf.5 \ - vswitchd/vswitchd.8 \ - vswitchd/ovs-brcompatd.8 -vswitchd_vswitchd_SOURCES = \ +vswitchd_ovs_vswitchd_SOURCES = \ vswitchd/bridge.c \ vswitchd/bridge.h \ vswitchd/mgmt.c \ @@ -15,11 +17,11 @@ vswitchd_vswitchd_SOURCES = \ vswitchd/port.h \ vswitchd/proc-net-compat.c \ vswitchd/proc-net-compat.h \ - vswitchd/vswitchd.c \ - vswitchd/vswitchd.h \ + vswitchd/ovs-vswitchd.c \ + vswitchd/ovs-vswitchd.h \ vswitchd/xenserver.c \ vswitchd/xenserver.h -vswitchd_vswitchd_LDADD = \ +vswitchd_ovs_vswitchd_LDADD = \ secchan/libsecchan.a \ lib/libopenvswitch.a \ $(FAULT_LIBS) \ @@ -32,6 +34,7 @@ vswitchd_ovs_brcompatd_LDADD = \ lib/libopenvswitch.a \ $(FAULT_LIBS) -EXTRA_DIST += vswitchd/vswitchd.conf.5.in \ - vswitchd/vswitchd.8.in \ +EXTRA_DIST += \ + vswitchd/ovs-vswitchd.conf.5.in \ + vswitchd/ovs-vswitchd.8.in \ vswitchd/ovs-brcompatd.8.in diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 3d7c9173..736e014d 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -243,7 +243,7 @@ static struct ofhooks bridge_ofhooks; /* Public functions. */ -/* xxx Temporary to get around "." delimiter vswitchd.conf problem in +/* xxx Temporary to get around "." delimiter ovs-vswitchd.conf problem in * xxx port.c. */ void bridge_get_ifaces(struct svec *svec) diff --git a/vswitchd/mgmt.c b/vswitchd/mgmt.c index 5ffccb70..c6dd38d0 100644 --- a/vswitchd/mgmt.c +++ b/vswitchd/mgmt.c @@ -41,12 +41,12 @@ #include "openflow/openflow.h" #include "openflow/openflow-mgmt.h" #include "ofpbuf.h" +#include "ovs-vswitchd.h" #include "packets.h" #include "rconn.h" #include "svec.h" #include "vconn.h" #include "vconn-ssl.h" -#include "vswitchd.h" #include "xtoxll.h" #define THIS_MODULE VLM_mgmt diff --git a/vswitchd/ovs-brcompatd.8.in b/vswitchd/ovs-brcompatd.8.in index 15c30518..ebd67028 100644 --- a/vswitchd/ovs-brcompatd.8.in +++ b/vswitchd/ovs-brcompatd.8.in @@ -2,22 +2,22 @@ .ds PN ovs\-brcompatd . .SH NAME -ovs\-brcompatd \- Bridge compatibility front-end for vswitchd +ovs\-brcompatd \- Bridge compatibility front-end for ovs\-vswitchd . .SH SYNOPSIS .B ovs\-brcompatd [\fIoptions\fR] \fIconfig\fR . .SH DESCRIPTION -A daemon that provides a legacy bridge front-end for \fBvswitchd\fR. It +A daemon that provides a legacy bridge front-end for \fBovs\-vswitchd\fR. It does this by listening for bridge ioctl commands (e.g., those generated by the \fBbrctl\fR program) to add or remove datapaths and the interfaces that attach to them. It modifies \fIconfig\fR and forces -\fBvswitchd\fR to reload its configuration file. +\fBovs\-vswitchd\fR to reload its configuration file. .PP .SH OPTIONS .IP "\fB--reload-command=\fIcommand\fR" -Sets the command that \fBovs\-brcompatd\fR runs to force \fBvswitchd\fR to +Sets the command that \fBovs\-brcompatd\fR runs to force \fBovs\-vswitchd\fR to reload its configuration file to \fIcommand\fR. The command is run in a subshell, so it may contain arbitrary shell metacharacters, etc. The \fB--help\fR option displays the default reload command. @@ -43,7 +43,7 @@ Sets the maximum time to wait for \fIconfig\fR to become unlocked to \fBovs\-brcompatd\fR requires the \fBbrcompat_mod.ko\fR kernel module to be loaded. .SH "SEE ALSO" -.BR ovs-appctl (8), -.BR vswitchd (8), -.BR vswitchd.conf (5), +.BR ovs\-appctl (8), +.BR ovs\-vswitchd (8), +.BR ovs\-vswitchd.conf (5), \fBINSTALL\fR in the Open vSwitch distribution. diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index fbd063d8..5531aa44 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -81,10 +81,11 @@ static int lock_timeout = 500; * no longer exist. If set to zero, ports are never pruned. */ static int prune_timeout = 5000; -/* Config file shared with vswitchd (usually vswitchd.conf). */ +/* Config file shared with ovs-vswitchd (usually ovs-vswitchd.conf). */ static char *config_file; -/* Command to run (via system()) to reload the vswitchd configuration file. */ +/* Command to run (via system()) to reload the ovs-vswitchd configuration + * file. */ static char *reload_command; /* Netlink socket to listen for interface changes. */ @@ -243,9 +244,9 @@ prune_ports(void) enum netdev_flags flags; /* The local port and internal ports are created and destroyed by - * vswitchd itself, so don't bother checking for them at all. In - * practice, they might not exist if vswitchd hasn't finished - * reloading since the configuration file was updated. */ + * ovs-vswitchd itself, so don't bother checking for them at all. + * In practice, they might not exist if ovs-vswitchd hasn't + * finished reloading since the configuration file was updated. */ if (!strcmp(iface_name, br_name) || cfg_get_bool(0, "iface.%s.internal", iface_name)) { continue; @@ -285,8 +286,8 @@ prune_ports(void) * false otherwise. * * XXX it is possible that this doesn't entirely accomplish what we want in - * context, since vswitchd.conf may cause vswitchd to create or destroy network - * devices based on iface.*.internal settings. + * context, since ovs-vswitchd.conf may cause vswitchd to create or destroy + * network devices based on iface.*.internal settings. * * XXX may want to move this to lib/netdev. */ static bool @@ -676,8 +677,8 @@ parse_options(int argc, char *argv[]) char *short_options = long_options_to_short_options(long_options); int error; - reload_command = xasprintf("%s/ovs-appctl " - "-t %s/vswitchd.`cat %s/vswitchd.pid`.ctl " + reload_command = xasprintf("%s/ovs-appctl -t " + "%s/ovs-vswitchd.`cat %s/ovs-vswitchd.pid`.ctl " "-e vswitchd/reload 2>&1 " "| /usr/bin/logger -t brcompatd-reload", ovs_bindir, ovs_rundir, ovs_rundir); @@ -742,12 +743,12 @@ parse_options(int argc, char *argv[]) static void usage(void) { - printf("%s: bridge compatibility front-end for vswitchd\n" + printf("%s: bridge compatibility front-end for ovs-vswitchd\n" "usage: %s [OPTIONS] CONFIG\n" - "CONFIG is the configuration file used by vswitchd.\n", + "CONFIG is the configuration file used by ovs-vswitchd.\n", program_name, program_name); printf("\nConfiguration options:\n" - " --reload-command=COMMAND command to run to reload vswitchd\n" + " --reload-command=COMMAND shell command to reload ovs-vswitchd\n" " --prune-timeout=SECS wait at most SECS before pruning ports\n" " --lock-timeout=MSECS wait at most MSECS for CONFIG to unlock\n" ); diff --git a/vswitchd/vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in similarity index 64% rename from vswitchd/vswitchd.8.in rename to vswitchd/ovs-vswitchd.8.in index 7b799911..28e55ba3 100644 --- a/vswitchd/vswitchd.8.in +++ b/vswitchd/ovs-vswitchd.8.in @@ -1,11 +1,11 @@ -.TH vswitchd 8 "March 2009" "Open vSwitch" "Open vSwitch Manual" -.ds PN vswitchd +.TH ovs\-vswitchd 8 "March 2009" "Open vSwitch" "OpenVSwitch Manual" +.ds PN ovs\-vswitchd . .SH NAME -vswitchd \- virtual switch daemon +ovs\-vswitchd \- virtual switch daemon . .SH SYNOPSIS -.B vswitchd +.B ovs\-vswitchd \fIconfig\fR . .SH DESCRIPTION @@ -13,16 +13,16 @@ A daemon that manages and controls any number of virtual switches on the local machine. .PP The mandatory \fIconfig\fR argument specifies a configuration file. -For a description of \fBvswitchd\fR configuration syntax, see -\fBvswitchd.conf\fR(5). +For a description of \fBovs\-vswitchd\fR configuration syntax, see +\fBovs\-vswitchd.conf\fR(5). .PP -At startup or upon receipt of a \fBSIGHUP\fR signal, \fBvswitchd\fR +At startup or upon receipt of a \fBSIGHUP\fR signal, \fBovs\-vswitchd\fR reads the configuration file. It sets up Open vSwitch datapaths and then operates switching across each bridge described in its configuration files. If a logfile was specified on the command line it will also be opened or reopened. .PP -\fBvswitchd\fR virtual switches may be configured with any of the +\fBovs\-vswitchd\fR virtual switches may be configured with any of the following features: . .IP \(bu @@ -45,24 +45,24 @@ NetFlow v5 flow logging. Connectivity to an external OpenFlow controller, such as NOX. . .PP -Only a single instance of \fBvswitchd\fR is intended to run at a time. -A single \fBvswitchd\fR can manage any number of virtual switches, up +Only a single instance of \fBovs\-vswitchd\fR is intended to run at a time. +A single \fBovs\-vswitchd\fR can manage any number of virtual switches, up to the maximum number of supported Open vSwitch datapaths. .PP -\fBvswitchd\fR does all the necessary management of Open vSwitch datapaths +\fBovs\-vswitchd\fR does all the necessary management of OpenVSwitch datapaths itself. Thus, external tools, such \fBovs\-dpctl\fR(8), are not needed for -managing datapaths in conjunction with \fBvswitchd\fR, and their use -to modify datapaths when \fBvswitchd\fR is running can interfere with +managing datapaths in conjunction with \fBovs\-vswitchd\fR, and their use +to modify datapaths when \fBovs\-vswitchd\fR is running can interfere with its operation. (\fBovs\-dpctl\fR may still be useful for diagnostics.) .PP -An Open vSwitch datapath kernel module must be loaded for \fBvswitchd\fR +An Open vSwitch datapath kernel module must be loaded for \fBovs\-vswitchd\fR to be useful. Please refer to the \fBINSTALL\fR file included in the Open vSwitch distribution for instructions on how to build and load the Open vSwitch kernel module. .PP .SH OPTIONS .IP "\fB--fake-proc-net\fR" -Causes \fBvswitchd\fR to simulate some files in \fB/proc/net/vlan\fR +Causes \fBovs\-vswitchd\fR to simulate some files in \fB/proc/net/vlan\fR and \fB/proc/net/bonding\fR that some legacy software expects to exist. This option should only be used if such legacy software is actually in use. It requires the \fBbrcompat_mod.ko\fR kernel module @@ -81,7 +81,7 @@ future, this restriction may be lifted. Only Linux 2.6.\fIx\fR is currently supported. . .SH "SEE ALSO" -.BR ovs-appctl (8), -.BR vswitchd.conf (5), -.BR brcompatd (8), +.BR ovs\-appctl (8), +.BR ovs\-vswitchd.conf (5), +.BR ovs\-brcompatd (8), \fBINSTALL\fR in the Open vSwitch distribution. diff --git a/vswitchd/vswitchd.c b/vswitchd/ovs-vswitchd.c similarity index 98% rename from vswitchd/vswitchd.c rename to vswitchd/ovs-vswitchd.c index 907e488c..00550b5a 100644 --- a/vswitchd/vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -42,6 +42,7 @@ #include "fault.h" #include "leak-checker.h" #include "mgmt.h" +#include "ovs-vswitchd.h" #include "poll-loop.h" #include "port.h" #include "proc-net-compat.h" @@ -53,7 +54,6 @@ #include "util.h" #include "vconn-ssl.h" #include "vconn.h" -#include "vswitchd.h" #include "vlog.h" #define THIS_MODULE VLM_vswitchd @@ -241,7 +241,7 @@ usage(void) { printf("%s: virtual switch daemon\n" "usage: %s [OPTIONS] CONFIG\n" - "CONFIG is a configuration file in vswitchd.conf(5) format.\n", + "CONFIG is a configuration file in ovs-vswitchd.conf(5) format.\n", program_name, program_name); daemon_usage(); vlog_usage(); diff --git a/vswitchd/vswitchd.conf.5.in b/vswitchd/ovs-vswitchd.conf.5.in similarity index 92% rename from vswitchd/vswitchd.conf.5.in rename to vswitchd/ovs-vswitchd.conf.5.in index 5f1171c1..b632312b 100644 --- a/vswitchd/vswitchd.conf.5.in +++ b/vswitchd/ovs-vswitchd.conf.5.in @@ -16,14 +16,14 @@ . RE . PP .. -.TH vswitchd.conf 5 "April 2009" "Open vSwitch" "Open vSwitch Manual" +.TH ovs\-vswitchd.conf 5 "April 2009" "Open vSwitch" "OpenVSwitch Manual" . .SH NAME -vswitchd.conf \- configuration file for \fBvswitchd\fR +ovs\-vswitchd.conf \- configuration file for \fBovs\-vswitchd\fR . .SH DESCRIPTION This manual page describes the syntax for the configuration file used -by \fBvswitchd\fR(8), the virtual switch daemon. +by \fBovs\-vswitchd\fR(8), the virtual switch daemon. .PP The configuration file is based on key-value pairs, which are given one per line in the form \fIkey\fB=\fIvalue\fR. Each \fIkey\fR @@ -46,7 +46,7 @@ elements and strip comments and blank lines. .PP The following subsections describe how key-value pairs are used to -configure \fBvswitchd\fR. +configure \fBovs\-vswitchd\fR. .SS "Bridge Configuration" A bridge (switch) with a given \fIname\fR is configured by specifying the names of its network devices as values for key @@ -61,7 +61,7 @@ virtual switch. An internal port may configured with an IP address, etc. using the usual system tools (e.g. \fBifconfig\fR, \fBip\fR). To designate network device \fInetdev\fR as an internal port, add \fBiface.\fInetdev\fB.internal=true\fR to the configuration file. -\fBvswitchd\fR will honor this configuration setting by automatically +\fBovs\-vswitchd\fR will honor this configuration setting by automatically creating the named internal port. .PP A bridge with a given \fIname\fR always has an internal port with the @@ -148,7 +148,7 @@ Bonding allows multiple ``slave'' network devices to be treated as if they were a single virtual ``bonded'' network device. It is useful for load balancing and fail-over. .PP -\fBvswitchd\fR supports ``source load balancing'' (SLB) bonding, which +\fBovs\-vswitchd\fR supports ``source load balancing'' (SLB) bonding, which assigns flows to slaves based on source MAC address, with periodic rebalancing as traffic patterns change. This form of bonding does not require 802.3ad or other special support from the upstream switch to @@ -185,7 +185,7 @@ bonding.bond0.slave=eth1 .fi .RE .SS "Port Mirroring (SPAN and RSPAN)" -\fBvswitchd\fR may be configured to send selected frames to special +\fBovs\-vswitchd\fR may be configured to send selected frames to special ``mirrored'' ports, in addition to their normal destinations. Mirroring traffic may also be referred to as SPAN or RSPAN, depending on the mechanism used for delivery. @@ -252,7 +252,7 @@ any existing tag; when it is sent out an implicit VLAN port, the frame will not be tagged. This type of mirroring may be referred to as RSPAN. .ST "Example" -The following \fBvswitchd\fR configuration copies all frames received +The following \fBovs\-vswitchd\fR configuration copies all frames received on \fBeth1\fR or \fBeth2\fR to \fBeth3\fR. .PP .RS @@ -336,7 +336,7 @@ netflow.mybr.host=nflow.example.com:9995 .fi .RE .SS "Remote Management" -A \fBvswitchd\fR instance may be remotely managed by a controller that +A \fBovs\-vswitchd\fR instance may be remotely managed by a controller that supports the OpenFlow Management Protocol, such as NOX. This functionality is enabled by setting the key \fBmgmt.controller\fR to one of the following values: @@ -358,19 +358,19 @@ default maximum backoff is 15 seconds, and the minimum value is 1 second. An inactivity probe may be configured with the \fBmgmt.inactivity-probe\fR -key. If \fBvswitchd\fR does not communicate with the controller for the +key. If \fBovs\-vswitchd\fR does not communicate with the controller for the specified number of seconds, it will send a probe. If a response is not -received for an additional amount of that time, \fBvswitchd\fR assumes +received for an additional amount of that time, \fBovs\-vswitchd\fR assumes the connection has been broken and attempts to reconnect. The default is 15 seconds, and the minimum value is 5 seconds. A management id may be specified with the \fBmgmt.id\fR key. It takes an id in the form of exactly 12 hexadecimal digits. If one is not -specified, a random id is generated each time \fBvswitchd\fR is started. +specified, a random id is generated each time \fBovs\-vswitchd\fR is started. .fi .RE .SS "OpenFlow Controller Connectivity" -\fBvswitchd\fR can perform all configured bridging and switching +\fBovs\-vswitchd\fR can perform all configured bridging and switching locally, or it can be configured to connect a given bridge to an external OpenFlow controller, such as NOX. Its behavior depends on the \fBbridge.\fIname\fB.controller\fR setting: @@ -411,12 +411,12 @@ The regular expression is implicitly anchored at the beginning of the controller location string, as if it begins with \fB^\fR. .TP \fBbridge.\fIname\fB.controller.update-resolv.conf=\fBtrue\fR|\fBfalse\fR -By default, or if this is set to \fBtrue\fR, \fBvswitchd\fR overwrites +By default, or if this is set to \fBtrue\fR, \fBovs\-vswitchd\fR overwrites the system's \fB/etc/resolv.conf\fR with domain information and DNS servers obtained via DHCP. If this setting is \fBfalse\fR, -\fBvswitchd\fR will not modify \fB/etc/resolv.conf\fR. +\fBovs\-vswitchd\fR will not modify \fB/etc/resolv.conf\fR. .IP -\fBvswitchd\fR will only modify \fBresolv.conf\fR if the DHCP response +\fBovs\-vswitchd\fR will only modify \fBresolv.conf\fR if the DHCP response that it receives specifies one or more DNS servers. .RE . @@ -446,9 +446,9 @@ When an external controller is configured, but controller discovery is not in use, the following additional settings are honored: .TP \fBbridge.\fIname\fB.controller.in-band=\fBtrue\fR|\fBfalse\fR -By default, or if this is set to \fBtrue\fR, \fBvswitchd\fR connects +By default, or if this is set to \fBtrue\fR, \fBovs\-vswitchd\fR connects to the controller in-band. If this is set to \fBfalse\fR, -\fBvswitchd\fR connects to the controller out-of-band. Refer to +\fBovs\-vswitchd\fR connects to the controller out-of-band. Refer to \fBsecchan\fR(8) for a description of in-band and out-of-band control. .IP "\fBbridge.\fIname\fB.controller.ip=\fIip\fR" If specified, the IP address to configure on the bridge's local port. @@ -485,17 +485,17 @@ the connection to the controller stays down long enough, no packets can pass through the switch at all. .IP The first of these that is set takes effect. -If the value is \fBstandalone\fR, \fBvswitchd\fR will take over +If the value is \fBstandalone\fR, \fBovs\-vswitchd\fR will take over responsibility for setting up flows when no message has been received from the controller for three times the inactivity probe interval (see above). In this mode, -\fBvswitchd\fR causes the datapath to act like an ordinary -MAC-learning switch. \fBvswitchd\fR will continue to retry connecting +\fBovs\-vswitchd\fR causes the datapath to act like an ordinary +MAC-learning switch. \fBovs\-vswitchd\fR will continue to retry connecting to the controller in the background and, when the connection succeeds, it discontinues its standalone behavior. .IP If this option is set to \fBsecure\fR, or if neither of these settings -is set, \fBvswitchd\fR will not set up flows on its own when the +is set, \fBovs\-vswitchd\fR will not set up flows on its own when the controller connection fails. .IP "\fBbridge.\fIname\fB.controller.max-backoff=\fIsecs\fR" Sets the maximum time between attempts to connect to the controller to @@ -533,7 +533,7 @@ These settings configure the commands that remote OpenFlow connections are allowed to invoke using (e.g.) \fBovs\-ofctl execute\fR. To be permitted, a command name must be whitelisted and must not be blacklisted. When the whitelist and blacklist permit a command name, -\fBvswitchd\fR looks for a program with the same name as the command +\fBovs\-vswitchd\fR looks for a program with the same name as the command in the commands directory (see below). Other directories are not searched. .IP "\fBbridge.\fIname\fB.controller.commands.acl=\fIglob\fR" @@ -553,7 +553,7 @@ Sets the directory searched for remote command execution to \fIdirectory\fR. The default directory is \fB@pkgdatadir@/commands\fR. .SS "SSL Configuration" -When \fBvswitchd\fR is configured to connect over SSL for management or +When \fBovs\-vswitchd\fR is configured to connect over SSL for management or for controller connectivity, the following settings are required: .TP \fBssl.private-key=\fIprivkey.pem\fR @@ -570,15 +570,15 @@ switch. Specifies a PEM file containing the CA certificate used to verify that the virtual switch is connected to a trustworthy controller. .PP -These files are read only once, at \fBvswitchd\fR startup time. If -their contents change, \fBvswitchd\fR must be killed and restarted. +These files are read only once, at \fBovs\-vswitchd\fR startup time. If +their contents change, \fBovs\-vswitchd\fR must be killed and restarted. .PP These SSL settings apply to all SSL connections made by the virtual switch. .ST "CA Certificate Bootstrap" Ordinarily, all of the files named in the SSL configuration must exist -when \fBvswitchd\fR starts. However, if \fBssl.bootstrap-ca-cert\fR -is set to \fBtrue\fR, then \fBvswitchd\fR will attempt to obtain the +when \fBovs\-vswitchd\fR starts. However, if \fBssl.bootstrap-ca-cert\fR +is set to \fBtrue\fR, then \fBovs\-vswitchd\fR will attempt to obtain the CA certificate from the controller on its first SSL connection and save it to the named PEM file. If it is successful, it will immediately drop the connection and reconnect, and from then on all @@ -603,7 +603,7 @@ unix:@RUNDIR@/\fIname\fB.mgmt\fR to display the flows currently set up in bridge \fIname\fR. .PP If \fBbridge.\fIname\fB.openflow.listeners\fR is set to one or more -values, \fBvswitchd\fR instead listens on the specified connection +values, \fBovs\-vswitchd\fR instead listens on the specified connection methods. Acceptable connection methods include: .RS .IP "\fBpunix:\fIfile\fR" @@ -629,7 +629,7 @@ controller, or vice versa, on the primary OpenFlow controller connection. .PP If \fBbridge.\fIname\fB.openflow.snoops\fR is set to one or more -values, \fBvswitchd\fR instead listens on the specified connection +values, \fBovs\-vswitchd\fR instead listens on the specified connection methods. The acceptable connection methods are the same as for OpenFlow management connections (see above). .PP @@ -637,6 +637,6 @@ To entirely disable controller connection snooping, set \fBbridge.\fIname\fB.openflow.snoops\fR to the single value \fBnone\fR. .SH "SEE ALSO" -.BR vswitchd (8), .BR ovs\-brcompatd (8), -.BR ovs\-cfg\-mod (8). +.BR ovs\-cfg\-mod (8), +.BR ovs\-vswitchd (8) diff --git a/vswitchd/vswitchd.h b/vswitchd/ovs-vswitchd.h similarity index 98% rename from vswitchd/vswitchd.h rename to vswitchd/ovs-vswitchd.h index a9617afb..77c1f5d0 100644 --- a/vswitchd/vswitchd.h +++ b/vswitchd/ovs-vswitchd.h @@ -29,4 +29,4 @@ void reconfigure(void); -#endif /* vswitchd.h */ +#endif /* ovs-vswitchd.h */ diff --git a/vswitchd/port.c b/vswitchd/port.c index f3d05140..069d71bb 100644 --- a/vswitchd/port.c +++ b/vswitchd/port.c @@ -30,9 +30,9 @@ #include "bridge.h" #include "cfg.h" #include "netdev.h" +#include "ovs-vswitchd.h" #include "port.h" #include "svec.h" -#include "vswitchd.h" #define THIS_MODULE VLM_port #include "vlog.h" diff --git a/vswitchd/proc-net-compat.c b/vswitchd/proc-net-compat.c index cd4324a7..848fbd70 100644 --- a/vswitchd/proc-net-compat.c +++ b/vswitchd/proc-net-compat.c @@ -144,7 +144,7 @@ proc_net_compat_update_bond(const char *name, const struct compat_bond *bond) ds_init(&ds); ds_put_format( &ds, - "Ethernet Channel Bonding Driver: vswitchd " + "Ethernet Channel Bonding Driver: ovs-vswitchd " VERSION BUILDNR" ("__DATE__" "__TIME__")\n" "Bonding Mode: source load balancing\n" "Primary Slave: None\n" diff --git a/xenserver/README b/xenserver/README index be853ac0..7cd04ab6 100644 --- a/xenserver/README +++ b/xenserver/README @@ -22,8 +22,8 @@ files are: etc_logrotate.d_vswitch - Ensures that /var/log/vswitchd.log is rotated periodically and - that vswitch reopens its log file at that point. + Ensures that /var/log/ovs-vswitchd.log is rotated periodically + and that ovs-vswitchd reopens its log file at that point. etc_profile.d_vswitch.sh @@ -37,7 +37,7 @@ files are: etc_xapi.d_plugins_vswitch-cfg-update xapi plugin script to update the cache of configuration items - in the vswitchd configuration file that are managed in the + in the ovs-vswitchd configuration file that are managed in the xapi database when integrated with Citrix management tools. etc_xensource_scripts_vif diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch index 61b41526..5c05df7b 100755 --- a/xenserver/etc_init.d_vswitch +++ b/xenserver/etc_init.d_vswitch @@ -31,11 +31,11 @@ ENABLE_FAKE_PROC_NET="${ENABLE_FAKE_PROC_NET:-y}" FORCE_COREFILES="${FORCE_COREFILES:-n}" COREFILE_PATTERN="${COREFILE_PATTERN:-/var/log/%e-%t}" -# Config variables specific to vswitchd -VSWITCHD_CONF="${VSWITCHD_CONF:-/etc/vswitchd.conf}" -VSWITCHD_PIDFILE="${VSWITCHD_PIDFILE:-/var/run/vswitchd.pid}" +# Config variables specific to ovs-vswitchd +VSWITCHD_CONF="${VSWITCHD_CONF:-/etc/ovs-vswitchd.conf}" +VSWITCHD_PIDFILE="${VSWITCHD_PIDFILE:-/var/run/ovs-vswitchd.pid}" VSWITCHD_PRIORITY="${VSWITCHD_PRIORITY:--5}" -VSWITCHD_LOGFILE="${VSWITCHD_LOGFILE:-/var/log/vswitchd.log}" +VSWITCHD_LOGFILE="${VSWITCHD_LOGFILE:-/var/log/ovs-vswitchd.log}" VSWITCHD_FILE_LOGLEVEL="${VSWITCHD_FILE_LOGLEVEL:-}" VSWITCHD_SYSLOG_LOGLEVEL="${VSWITCHD_SYSLOG_LOGLEVEL:-WARN}" VSWITCHD_MEMLEAK_LOGFILE="${VSWITCHD_MEMLEAK_LOGFILE:-}" @@ -47,7 +47,7 @@ VSWITCHD_VALGRIND_OPT="${VSWITCHD_VALGRIND_OPT:-}" # Config variables specific to ovs-brcompatd BRCOMPATD_PIDFILE="${BRCOMPATD_PIDFILE:-/var/run/ovs-brcompatd.pid}" BRCOMPATD_PRIORITY="${BRCOMPATD_PRIORITY:--5}" -BRCOMPATD_LOGFILE="${BRCOMPATD_LOGFILE:-/var/log/brcompatd.log}" +BRCOMPATD_LOGFILE="${BRCOMPATD_LOGFILE:-/var/log/ovs-brcompatd.log}" BRCOMPATD_FILE_LOGLEVEL="${BRCOMPATD_FILE_LOGLEVEL:-}" BRCOMPATD_SYSLOG_LOGLEVEL="${BRCOMPATD_SYSLOG_LOGLEVEL:-WARN}" BRCOMPATD_MEMLEAK_LOGFILE="${BRCOMPATD_MEMLEAK_LOGFILE:-}" @@ -60,7 +60,7 @@ BRCOMPATD_VALGRIND_OPT="${BRCOMPATD_VALGRIND_OPT:-}" # Full paths to executables & modules -vswitchd="$VSWITCH_BASE/sbin/vswitchd" +vswitchd="$VSWITCH_BASE/sbin/ovs-vswitchd" brcompatd="$VSWITCH_BASE/sbin/ovs-brcompatd" dpctl="$VSWITCH_BASE/bin/ovs-dpctl" appctl="$VSWITCH_BASE/bin/ovs-appctl" @@ -166,7 +166,7 @@ function remove_modules { function reload_vswitchd { if [ -f "$VSWITCHD_PIDFILE" ]; then "$appctl" \ - --target=vswitchd.$(cat "$VSWITCHD_PIDFILE").ctl \ + --target=ovs-vswitchd.$(cat "$VSWITCHD_PIDFILE").ctl \ --execute=vswitchd/reload fi } @@ -206,10 +206,10 @@ function start_vswitchd { fi if [ "$daemonize" != "y" ]; then # Start in background and force a "success" message - action "Starting vswitchd ($strace_opt$valgrind_opt)" true + action "Starting ovs-vswitchd ($strace_opt$valgrind_opt)" true (nice -n "$VSWITCHD_PRIORITY" $strace_opt $valgrind_opt "$vswitchd" -P"$VSWITCHD_PIDFILE" -D $fake_proc_net_opt -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt "$VSWITCHD_CONF") & else - action "Starting vswitchd" nice -n "$VSWITCHD_PRIORITY" "$vswitchd" -P"$VSWITCHD_PIDFILE" -D $fake_proc_net_opt -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt "$VSWITCHD_CONF" + action "Starting ovs-vswitchd" nice -n "$VSWITCHD_PRIORITY" "$vswitchd" -P"$VSWITCHD_PIDFILE" -D $fake_proc_net_opt -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt "$VSWITCHD_CONF" fi } @@ -242,7 +242,7 @@ function start_brcompatd { valgrind_opt="valgrind --log-file=$BRCOMPATD_VALGRIND_LOG $BRCOMPATD_VALGRIND_OPT" daemonize="n" fi - reload_cmd='/root/vswitch/bin/ovs-appctl -t /var/run/vswitchd.`cat /var/run/vswitchd.pid`.ctl -e vswitchd/reload 2>&1 | /usr/bin/logger -t brcompatd-reload' + reload_cmd='/root/vswitch/bin/ovs-appctl -t /var/run/ovs-vswitchd.`cat /var/run/ovs-vswitchd.pid`.ctl -e vswitchd/reload 2>&1 | /usr/bin/logger -t brcompatd-reload' if [ "$daemonize" != "y" ]; then # Start in background and force a "success" message action "Starting ovs-brcompatd ($strace_opt$valgrind_opt)" true @@ -255,7 +255,7 @@ function start_brcompatd { function stop_vswitchd { if [ -f "$VSWITCHD_PIDFILE" ]; then local pid=$(cat "$VSWITCHD_PIDFILE") - action "Killing vswitchd ($pid)" kill -TERM $pid + action "Killing ovs-vswitchd ($pid)" kill -TERM $pid rm -f "$VSWITCHD_PIDFILE" fi } @@ -295,7 +295,7 @@ function start { insert_modules_if_required start_vswitchd start_brcompatd - reload_vswitchd # ensures vswitchd has fully read config file. + reload_vswitchd # ensures ovs-vswitchd has fully read config file. #allow_xen_mgmt_traffic # Seems to work okay without... } @@ -361,11 +361,11 @@ case "$1" in restart_unload ;; status) - status -p vswitchd.pid vswitchd - status -p brcompatd.pid ovs-brcompatd + status -p ovs-vswitchd.pid ovs-vswitchd + status -p ovs-brcompatd.pid ovs-brcompatd ;; version) - "$VSWITCH_BASE"/sbin/vswitchd -V + "$VSWITCH_BASE"/sbin/ovs-vswitchd -V "$VSWITCH_BASE"/sbin/ovs-brcompatd -V ;; help) diff --git a/xenserver/etc_init.d_vswitch-xapi-update b/xenserver/etc_init.d_vswitch-xapi-update index 25003d38..d1be0b3a 100755 --- a/xenserver/etc_init.d_vswitch-xapi-update +++ b/xenserver/etc_init.d_vswitch-xapi-update @@ -24,10 +24,10 @@ test -e /etc/sysconfig/vswitch && . /etc/sysconfig/vswitch VSWITCH_BASE="${VSWITCH_BASE:-/root/vswitch}" -VSWITCHD_CONF="${VSWITCHD_CONF:-/etc/vswitchd.conf}" -VSWITCHD_PIDFILE="${VSWITCHD_PIDFILE:-/var/run/vswitchd.pid}" +VSWITCHD_CONF="${VSWITCHD_CONF:-/etc/ovs-vswitchd.conf}" +VSWITCHD_PIDFILE="${VSWITCHD_PIDFILE:-/var/run/ovs-vswitchd.pid}" VSWITCHD_PRIORITY="${VSWITCHD_PRIORITY:--5}" -VSWITCHD_LOGFILE="${VSWITCHD_LOGFILE:-/var/log/vswitchd.log}" +VSWITCHD_LOGFILE="${VSWITCHD_LOGFILE:-/var/log/ovs-vswitchd.log}" VSWITCHD_FILE_LOGLEVEL="${VSWITCHD_FILE_LOGLEVEL:-}" VSWITCHD_SYSLOG_LOGLEVEL="${VSWITCHD_SYSLOG_LOGLEVEL:-WARN}" VSWITCHD_MEMLEAK_LOGFILE="${VSWITCHD_MEMLEAK_LOGFILE:-}" diff --git a/xenserver/etc_logrotate.d_vswitch b/xenserver/etc_logrotate.d_vswitch index 13586ce1..dae235bd 100644 --- a/xenserver/etc_logrotate.d_vswitch +++ b/xenserver/etc_logrotate.d_vswitch @@ -5,7 +5,7 @@ # notice and this notice are preserved. This file is offered as-is, # without warranty of any kind. -/var/log/vswitchd.log { +/var/log/ovs-vswitchd.log { sharedscripts postrotate # Send sighup to vswitch which will cause it to reopen its log files. diff --git a/xenserver/etc_profile.d_vswitch.sh b/xenserver/etc_profile.d_vswitch.sh index 631a384f..90927547 100644 --- a/xenserver/etc_profile.d_vswitch.sh +++ b/xenserver/etc_profile.d_vswitch.sh @@ -13,7 +13,7 @@ export MANPATH alias vswitch='service vswitch' function watchconf { - watch cat /etc/vswitchd.conf + watch cat /etc/ovs-vswitchd.conf } function watchdp { @@ -50,7 +50,7 @@ function monitorlogs { done grep="$grep'" fi - cmd="tail -F /var/log/messages /var/log/vswitchd.log /var/log/xensource.log $grep | tee /var/log/monitorlogs.out" + cmd="tail -F /var/log/messages /var/log/ovs-vswitchd.log /var/log/xensource.log $grep | tee /var/log/monitorlogs.out" printf "cmd: $cmd\n" eval "$cmd" } diff --git a/xenserver/etc_sysconfig_vswitch.example b/xenserver/etc_sysconfig_vswitch.example index 8de056eb..cd13b591 100644 --- a/xenserver/etc_sysconfig_vswitch.example +++ b/xenserver/etc_sysconfig_vswitch.example @@ -16,7 +16,7 @@ # ENABLE_FAKE_PROC_NET: If 'y' then emulate linux bonding and vlan # files in /proc as if the bonding and vlan demultiplexing done in -# vswitchd were being implemented using existing Linux mechanisms. +# ovs-vswitchd were being implemented using existing Linux mechanisms. # This is useful in some cases when replacing existing solutions. # ENABLE_FAKE_PROC_NET=y @@ -28,19 +28,19 @@ # See the manpage for "core". # COREFILE_PATTERN="/var/log/%e-%t" -# VSWITCHD_CONF: File in which vswitchd stores its configuration. -# VSWITCHD_CONF=/etc/vswitchd.conf +# VSWITCHD_CONF: File in which ovs-vswitchd stores its configuration. +# VSWITCHD_CONF=/etc/ovs-vswitchd.conf # VSWITCHD_PIDFILE: File in which to store the pid of the running -# vswitchd. -# VSWITCHD_PIDFILE=/var/run/vswitchd.pid +# ovs-vswitchd. +# VSWITCHD_PIDFILE=/var/run/ovs-vswitchd.pid -# VSWITCHD_PRIORITY: "nice" priority at which to run vswitchd and related +# VSWITCHD_PRIORITY: "nice" priority at which to run ovs-vswitchd and related # processes. # VSWITCHD_PRIORITY=-5 # VSWITCHD_LOGFILE: File to send the FILE_LOGLEVEL log messages to. -# VSWITCHD_LOGFILE=/var/log/vswitchd.log +# VSWITCHD_LOGFILE=/var/log/ovs-vswitchd.log # VSWITCHD_FILE_LOGLEVEL: Log level at which to log into the # VSWITCHD_LOG file. If this is null or not set the logfile will @@ -54,13 +54,13 @@ # VSWITCHD_SYSLOG_LOGLEVEL="WARN" # BRCOMPATD_PIDFILE: File in which to store the pid of the running -# ovs-brcompatd (the Linux bridge compatibility daemon for vswitchd). +# ovs-brcompatd (the Linux bridge compatibility daemon for ovs-vswitchd). # If this is the empty string, ovs-brcompatd will not be started and # the brcompat_mod kernel module will not be inserted. Note that # the default is to use brcompat! # BRCOMPATD_PIDFILE=/var/run/ovs-brcompatd.pid -# BRCOMPATD_PRIORITY: "nice" priority at which to run vswitchd and related +# BRCOMPATD_PRIORITY: "nice" priority at which to run ovs-vswitchd and related # processes. # BRCOMPATD_PRIORITY=-5 diff --git a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update b/xenserver/etc_xapi.d_plugins_vswitch-cfg-update index 783e4143..b21cf46d 100755 --- a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_vswitch-cfg-update @@ -1,7 +1,7 @@ #!/usr/bin/env python # # xapi plugin script to update the cache of configuration items in the -# vswitchd configuration file that are managed in the xapi database +# ovs-vswitchd configuration file that are managed in the xapi database # when integrated with Citrix management tools. # Copyright (C) 2009 Nicira Networks, Inc. @@ -31,7 +31,7 @@ import XenAPI import subprocess cfg_mod="/root/vswitch/bin/ovs-cfg-mod" -vswitchd_cfg_filename="/etc/vswitchd.conf" +vswitchd_cfg_filename="/etc/ovs-vswitchd.conf" def update(session, args): pools = session.xenapi.pool.get_all() @@ -88,7 +88,7 @@ def setControllerCfg(controller): "--del-match", "ssl.certificate=*", "-a", "mgmt.controller=ssl:" + controller, "-a", "ssl.bootstrap-ca-cert=true", - "-a", "ssl.ca-cert=/etc/vswitchd.cacert", + "-a", "ssl.ca-cert=/etc/ovs-vswitchd.cacert", "-a", "ssl.private-key=/etc/xensource/xapi-ssl.pem", "-a", "ssl.certificate=/etc/xensource/xapi-ssl.pem"]) diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif index 01039a34..5195c0df 100755 --- a/xenserver/etc_xensource_scripts_vif +++ b/xenserver/etc_xensource_scripts_vif @@ -86,7 +86,7 @@ add_to_bridge() ${IP} link set "${vif}" address "${address}" || logger -t scripts-vif "Failed to ip link set ${vif} address ${address}" ${IP} addr flush "${vif}" || logger -t scripts-vif "Failed to ip addr flush ${vif}" - $cfg_mod -F /etc/vswitchd.conf \ + $cfg_mod -F /etc/ovs-vswitchd.conf \ --del-match="bridge.*.port=$vif" \ --del-match="vlan.$vif.[!0-9]*" \ --add="bridge.$bridge.port=$vif" \ @@ -121,7 +121,7 @@ remove) xenstore-rm "${HOTPLUG}/hotplug" vif=vif${DOMID}.${DEVID} logger -t scripts-vif "${vif} has been removed" - $cfg_mod -vANY:console:emer -F /etc/vswitchd.conf \ + $cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \ --del-match="bridge.*.port=${vif}" \ --del-match="vlan.${vif}.[!0-9]*" -c ;; diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure index d29d1cf6..54f26748 100755 --- a/xenserver/opt_xensource_libexec_interface-reconfigure +++ b/xenserver/opt_xensource_libexec_interface-reconfigure @@ -45,7 +45,7 @@ # XXX: Sometimes this leaves "orphaned" datapaths, e.g. a datapath whose # only port is the local port. Should delete those. -# XXX: This can leave crud in vswitchd.conf in this scenario: +# XXX: This can leave crud in ovs-vswitchd.conf in this scenario: # - Create bond in XenCenter. # - Create VLAN on bond in XenCenter. # - Attempt to delete bond in XenCenter (this will fail because there @@ -54,7 +54,7 @@ # - Delete VLAN in XenCenter. # - Delete bond in XenCenter. # At this point there will still be some configuration data for the bond -# or the VLAN in vswitchd.conf. +# or the VLAN in ovs-vswitchd.conf. import XenAPI import os, sys, getopt, time, signal @@ -722,7 +722,7 @@ def configure_netdev(pif): def modify_config(commands): run_command(['/root/vswitch/bin/ovs-cfg-mod', '-vANY:console:emer', - '-F', '/etc/vswitchd.conf'] + '-F', '/etc/ovs-vswitchd.conf'] + commands + ['-c']) run_command(['/sbin/service', 'vswitch', 'reload']) @@ -812,7 +812,7 @@ def action_up(pif): # implicitly being asked to take them down.) del_ports = add_ports + physdevs + get_bond_masters_of_pif(pif) - # Now modify the vswitchd config file. + # Now modify the ovs-vswitchd config file. argv = [] for port in set(del_ports): argv += interface_deconfigure_commands(port) diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py index 78a6654e..8f4be313 100644 --- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py +++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py @@ -15,7 +15,7 @@ import os import subprocess cfg_mod="/root/vswitch/bin/ovs-cfg-mod" -vswitchd_cfg_filename="/etc/vswitchd.conf" +vswitchd_cfg_filename="/etc/ovs-vswitchd.conf" if __name__ == "__main__": raise Exception("This script is a plugin for xsconsole and cannot run independently") @@ -99,7 +99,7 @@ class VSwitchControllerDialogue(Dialogue): lambda: self.deleteController()), ChoiceDef(Lang("Resync server controller config"), lambda: self.syncController()), -# ChoiceDef(Lang("Restart vswitchd"), +# ChoiceDef(Lang("Restart ovs-vswitchd"), # lambda: self.restartService("vswitch")), # ChoiceDef(Lang("Restart ovs-brcompatd"), # lambda: self.restartService("vswitch-brcompatd")) @@ -265,8 +265,8 @@ class XSFeatureVSwitch: inPane.AddStatusField(Lang("Controller (in-use)", 20), controller) inPane.NewLine() - inPane.AddStatusField(Lang("vswitchd status", 20), - VSwitchService.Inst("vswitch", "vswitchd").status()) + inPane.AddStatusField(Lang("ovs-vswitchd status", 20), + VSwitchService.Inst("vswitch", "ovs-vswitchd").status()) inPane.AddStatusField(Lang("ovs-brcompatd status", 20), VSwitchService.Inst("vswitch", "ovs-brcompatd").status()) diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec index 01e84b4a..57797bf8 100644 --- a/xenserver/vswitch-xen.spec +++ b/xenserver/vswitch-xen.spec @@ -121,8 +121,8 @@ source /etc/xensource-inventory xe host-param-set \ "other-config:vSwitchVersion=%{version}" uuid="$INSTALLATION_UUID" -# Ensure vswitchd.conf exists -touch /etc/vswitchd.conf +# Ensure ovs-vswitchd.conf exists +touch /etc/ovs-vswitchd.conf # Replace original XenServer files mkdir -p %{_prefix}/xs-original \ @@ -213,10 +213,10 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade || printf "Could not remove vSwitch install directory.\n" # Remove all configuration and log files - rm -f /etc/vswitchd.conf + rm -f /etc/ovs-vswitchd.conf rm -f /etc/sysconfig/vswitch rm -f /var/log/vswitch* - rm -f /etc/vswitchd.cacert + rm -f /etc/ovs-vswitchd.cacert if [ ! -f /etc/xensource-inventory ]; then printf "XenSource inventory not present in /etc/xensource-inventory\n" @@ -258,15 +258,15 @@ fi /root/vswitch/scripts/XSFeatureVSwitch.pyc /root/vswitch/scripts/XSFeatureVSwitch.pyo /root/vswitch/sbin/ovs-brcompatd -/root/vswitch/sbin/vswitchd +/root/vswitch/sbin/ovs-vswitchd /root/vswitch/bin/ovs-appctl /root/vswitch/bin/ovs-cfg-mod /root/vswitch/bin/ovs-dpctl /root/vswitch/bin/ovs-ofctl -/root/vswitch/share/man/man5/vswitchd.conf.5 -/root/vswitch/share/man/man8/ovs-brcompatd.8 +/root/vswitch/share/man/man5/ovs-vswitchd.conf.5 /root/vswitch/share/man/man8/ovs-appctl.8 +/root/vswitch/share/man/man8/ovs-brcompatd.8 /root/vswitch/share/man/man8/ovs-cfg-mod.8 /root/vswitch/share/man/man8/ovs-dpctl.8 /root/vswitch/share/man/man8/ovs-ofctl.8 -/root/vswitch/share/man/man8/vswitchd.8 +/root/vswitch/share/man/man8/ovs-vswitchd.8 -- 2.30.2