From 299a244b6bd15f8451e7d7b06a2cdfe65f5ce282 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Fri, 19 Nov 2010 16:23:27 -0800 Subject: [PATCH] vswitchd: Remove trailing whitespace Removed trailing whitespace from files in the vswitchd directory. --- vswitchd/ovs-brcompatd.8.in | 10 +++++----- vswitchd/ovs-vswitchd.8.in | 4 ++-- vswitchd/vswitch.ovsschema | 8 ++++---- vswitchd/vswitch.xml | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/vswitchd/ovs-brcompatd.8.in b/vswitchd/ovs-brcompatd.8.in index 33cee241..0cce84d7 100644 --- a/vswitchd/ovs-brcompatd.8.in +++ b/vswitchd/ovs-brcompatd.8.in @@ -9,10 +9,10 @@ ovs\-brcompatd \- Bridge compatibility front-end for ovs\-vswitchd [\fIoptions\fR] \fIdatabase\fR . .SH DESCRIPTION -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. +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. .PP The mandatory \fIdatabase\fR argument specifies the \fBovsdb\-server\fR from which \fBovs\-vswitchd\fR's configuration is @@ -43,7 +43,7 @@ both of these streams separately. \fB\-\-prune\-timeout=\fIsecs\fR . Sets the maximum time between pruning port entries to \fIsecs\fR seconds. -Pruning ports is the process of removing port entries from \fIdatabase\fR +Pruning ports is the process of removing port entries from \fIdatabase\fR that no longer exist. If \fIsecs\fR is zero, then entries are never pruned. The default prune timeout is 5 seconds. . diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in index e59893ff..b5c74473 100644 --- a/vswitchd/ovs-vswitchd.8.in +++ b/vswitchd/ovs-vswitchd.8.in @@ -18,7 +18,7 @@ ovs\-vswitchd \- Open vSwitch daemon \fIdatabase\fR . .SH DESCRIPTION -A daemon that manages and controls any number of Open vSwitch switches +A daemon that manages and controls any number of Open vSwitch switches on the local machine. .PP The mandatory \fIdatabase\fR argument normally takes the form @@ -37,7 +37,7 @@ configuration to match. Upon receipt of a SIGHUP signal, \fBovs\-vswitchd\fR reopens its log file, if one was specified on the command line. .PP -\fBovs\-vswitchd\fR switches may be configured with any of the following +\fBovs\-vswitchd\fR switches may be configured with any of the following features: . .IP \(bu diff --git a/vswitchd/vswitch.ovsschema b/vswitchd/vswitch.ovsschema index 05a2e05c..db8f6eba 100644 --- a/vswitchd/vswitch.ovsschema +++ b/vswitchd/vswitch.ovsschema @@ -77,7 +77,7 @@ "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}}, "flood_vlans": { "type": {"key": {"type": "integer", - "minInteger": 0, + "minInteger": 0, "maxInteger": 4095}, "min": 0, "max": 4096}}}}, "Port": { @@ -161,7 +161,7 @@ "refTable": "Queue"}, "min": 0, "max": "unlimited"}}, "other_config": { - "type": {"key": "string", "value": "string", + "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}}, "external_ids": { "type": {"key": "string", "value": "string", @@ -169,7 +169,7 @@ "Queue": { "columns": { "other_config": { - "type": {"key": "string", "value": "string", + "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}}, "external_ids": { "type": {"key": "string", "value": "string", @@ -279,7 +279,7 @@ "minInteger": 100}, "min": 0, "max": 1}}, "controller_burst_limit": { - "type": {"key": {"type": "integer", + "type": {"key": {"type": "integer", "minInteger": 25}, "min": 0, "max": 1}}, "external_ids": { diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 7cfba180..dd6fce7c 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -314,7 +314,7 @@

If this value is unset, the default is implementation-specific.

-

When more than one controller is configured, +

When more than one controller is configured, is considered only when none of the configured controllers can be contacted.

@@ -343,7 +343,7 @@ defined key-value pairs are:
bridge-id
-
A unique identifier of the bridge. On Citrix XenServer this +
A unique identifier of the bridge. On Citrix XenServer this will commonly be the same as xs-network-uuids.
xs-network-uuids
Semicolon-delimited set of universally unique identifier(s) for @@ -362,7 +362,7 @@ digits to set the OpenFlow datapath ID to a specific value. May not be all-zero.
disable-in-band
-
If set to true, disable in-band control on +
If set to true, disable in-band control on the bridge regardless of controller and manager settings.
hwaddr
An Ethernet address in the form @@ -492,7 +492,7 @@ Quality of Service configuration for this port. - + The MAC address to use for this port for the purpose of choosing the bridge's MAC address. This column does not necessarily reflect the @@ -615,7 +615,7 @@ the same except one has an optional identifier and the other does not, the more specific one is matched first. in_key is considered more specific than local_ip if a port - defines one and another port defines the other. The following + defines one and another port defines the other. The following options may be specified in the column:
remote_ip
@@ -908,7 +908,7 @@ For Citrix XenServer, this is the value of the MAC field in the VIF record for this interface.
iface-id
-
A system-unique identifier for the interface. On XenServer, +
A system-unique identifier for the interface. On XenServer, this will commonly be the same as xs-vif-uuid.

@@ -947,7 +947,7 @@ set.

ipsec_psk
Required key for GRE-over-IPsec interfaces. Specifies a - pre-shared key for authentication that must be identical on + pre-shared key for authentication that must be identical on both sides of the tunnel. Additionally, the ipsec_local_ip key must also be set.
@@ -1237,7 +1237,7 @@

Open vSwitch supports two kinds of OpenFlow controllers:

- +
Primary controllers
@@ -1593,7 +1593,7 @@ that describes how Open vSwitch contacts this OVSDB client over the network:

- +
in-band
-- 2.30.2