ovs-test is barely used nowadays. Standard tools like iperf are preferred for performance testing. Remove the utility, its man page, and all build system and packaging references.
Suggested-by: Ilya Maximets <[email protected]> Signed-off-by: Timothy Redaelli <[email protected]> --- Documentation/automake.mk | 1 - Documentation/conf.py | 2 - Documentation/ref/index.rst | 5 - Documentation/ref/ovs-test.8.rst | 163 -------------------------- Documentation/ref/ovs-vlan-test.8.rst | 9 +- NEWS | 2 + debian/openvswitch-test.install | 2 - rhel/openvswitch-fedora.spec.in | 2 - rhel/openvswitch.spec.in | 2 - utilities/.gitignore | 2 - utilities/automake.mk | 3 - utilities/ovs-test.in | 141 ---------------------- 12 files changed, 3 insertions(+), 331 deletions(-) delete mode 100644 Documentation/ref/ovs-test.8.rst delete mode 100644 utilities/ovs-test.in diff --git a/Documentation/automake.mk b/Documentation/automake.mk index f5ae85d3a..8cc5058cb 100644 --- a/Documentation/automake.mk +++ b/Documentation/automake.mk @@ -166,7 +166,6 @@ RST_MANPAGES = \ ovs-pki.8.rst \ ovs-tcpdump.8.rst \ ovs-tcpundump.1.rst \ - ovs-test.8.rst \ ovs-vlan-test.8.rst \ ovsdb-server.7.rst \ ovsdb.5.rst \ diff --git a/Documentation/conf.py b/Documentation/conf.py index 9c10e554f..dc62c3fd4 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -140,8 +140,6 @@ _man_pages = [ u'Dump traffic from an Open vSwitch port using tcpdump'), ('ovs-tcpundump.1', u'convert "tcpdump -xx" output to hex strings'), - ('ovs-test.8', - u'Check Linux drivers for performance, vlan and L3 tunneling problems'), ('ovs-vlan-test.8', u'Check Linux drivers for problems with vlan traffic'), ('ovsdb-server.7', diff --git a/Documentation/ref/index.rst b/Documentation/ref/index.rst index 8ef0d8e73..9d931018a 100644 --- a/Documentation/ref/index.rst +++ b/Documentation/ref/index.rst @@ -47,7 +47,6 @@ time: ovs-sim.1 ovs-tcpdump.8 ovs-tcpundump.1 - ovs-test.8 ovs-vlan-test.8 ovsdb-server.7 ovsdb.5 @@ -93,10 +92,6 @@ The remainder are still in roff format can be found below: - `(pdf) <http://www.openvswitch.org/support/dist-docs/ovs-pcap.1.pdf>`__ - `(html) <http://www.openvswitch.org/support/dist-docs/ovs-pcap.1.html>`__ - `(plain text) <http://www.openvswitch.org/support/dist-docs/ovs-pcap.1.txt>`__ - * - ovs-test(8) - - `(pdf) <http://www.openvswitch.org/support/dist-docs/ovs-test.8.pdf>`__ - - `(html) <http://www.openvswitch.org/support/dist-docs/ovs-test.8.html>`__ - - `(plain text) <http://www.openvswitch.org/support/dist-docs/ovs-test.8.txt>`__ * - ovs-testcontroller(8) - `(pdf) <http://www.openvswitch.org/support/dist-docs/ovs-testcontroller.8.pdf>`__ - `(html) <http://www.openvswitch.org/support/dist-docs/ovs-testcontroller.8.html>`__ diff --git a/Documentation/ref/ovs-test.8.rst b/Documentation/ref/ovs-test.8.rst deleted file mode 100644 index f902d9c3b..000000000 --- a/Documentation/ref/ovs-test.8.rst +++ /dev/null @@ -1,163 +0,0 @@ -======== -ovs-test -======== - -Synopsis -======== - -**ovs-test** -s *port* - -**ovs-test** -c *server1* *server2* [**-b** *targetbandwidth*] [**-i** *testinterval*] [**-d**] - [**-l** *vlantag*] [**-t** *tunnelmodes*] - -Description -=========== - -The :program:`ovs-test` program may be used to check for problems sending -802.1Q or GRE traffic that Open vSwitch may uncover. These problems, for -example, can occur when Open vSwitch is used to send 802.1Q traffic through -physical interfaces running certain drivers of certain Linux kernel versions. -To run a test, configure IP addresses on `server1` and `server2` for interfaces -you intended to test. These interfaces could also be already configured OVS -bridges that have a physical interface attached to them. Then, on one of the -nodes, run :program:`ovs-test` in server mode and on the other node run it in -client mode. The client will connect to :program:`ovs-test` server and schedule -tests between both of them. The :program:`ovs-test` client will perform UDP and -TCP tests. - -UDP tests can report packet loss and achieved bandwidth for various datagram -sizes. By default target bandwidth for UDP tests is 1Mbit/s. - -TCP tests report only achieved bandwidth, because kernel TCP stack takes care -of flow control and packet loss. TCP tests are essential to detect potential -TSO related issues. - -To determine whether Open vSwitch is encountering any problems, the user must -compare packet loss and achieved bandwidth in a setup where traffic is being -directly sent and in one where it is not. If in the 802.1Q or L3 tunneled tests -both :program:`ovs-test` processes are unable to communicate or the achieved -bandwidth is much lower compared to direct setup, then, most likely, Open -vSwitch has encountered a pre-existing kernel or driver bug. - -Some examples of the types of problems that may be encountered are: - -- When NICs use VLAN stripping on receive they must pass a pointer to a - `vlan_group` when reporting the stripped tag to the networking core. If no - `vlan_group` is in use then some drivers just drop the extracted tag. - Drivers are supposed to only enable stripping if a `vlan_group` is registered - but not all of them do that. - -- On receive, some drivers handle priority tagged packets specially and don't - pass the tag onto the network stack at all, so Open vSwitch never has a - chance to see it. - -- Some drivers size their receive buffers based on whether a `vlan_group` is - enabled, meaning that a maximum size packet with a VLAN tag will not fit if - no `vlan_group` is configured. - -- On transmit, some drivers expect that VLAN acceleration will be used if it is - available, which can only be done if a `vlan_group` is configured. In these - cases, the driver may fail to parse the packet and correctly setup checksum - offloading or TSO. - -Client Mode - An :program:`ovs-test` client will connect to two :program:`ovs-test` servers - and will ask them to exchange test traffic. It is also possible to spawn an - :program:`ovs-test` server automatically from the client. - -Server Mode - To conduct tests, two :program:`ovs-test` servers must be running on two - different hosts where the client can connect. The actual test traffic is - exchanged only between both :program:`ovs-test` servers. It is recommended - that both servers have their IP addresses in the same subnet, otherwise one - would have to make sure that routing is set up correctly. - -Options -======= - -.. program:: ovs-test - -.. option:: -s <port>, --server <port> - - Run in server mode and wait for the client to establish XML RPC Control - Connection on this TCP port. It is recommended to have `ethtool(8)` - installed on the server so that it could retrieve information about the NIC - driver. - -.. option:: -c <server1> <server2>, --client <server1> <server2> - - Run in client mode and schedule tests between `server1` and `server2`, - where each server must be given in the following format:: - - OuterIP[:OuterPort],InnerIP[/Mask][:InnerPort]. - - The `OuterIP` must be already assigned to the physical interface which is - going to be tested. This is the IP address where client will try to - establish XML RPC connection. If `OuterIP` is 127.0.0.1 then client will - automatically spawn a local instance of :program:`ovs-test` server. - OuterPort is TCP port where server is listening for incoming XML/RPC - control connections to schedule tests (by default it is 15531). The - :program:`ovs-test` will automatically assign `InnerIP[/Mask]` to the - interfaces that will be created on the fly for testing purposes. It is - important that `InnerIP[/Mask]` does not interfere with already existing IP - addresses on both :program:`ovs-test` servers and client. InnerPort is port - which will be used by server to listen for test traffic that will be - encapsulated (by default it is 15532). - -.. option:: -b <targetbandwidth>, --bandwidth <targetbandwidth> - - Target bandwidth for UDP tests. The targetbandwidth must be given in bits - per second. It is possible to use postfix `M` or `K` to alter the target - bandwidth magnitude. - -.. option:: -i <testinterval>, --interval <testinterval> - - How long each test should run. By default 5 seconds. - -.. option:: -h, --help - - Prints a brief help message to the console. - -.. option:: -V, --version - - Prints version information to the console. - -The following test modes are supported by :program:`ovs-test`. It is possible -to combine multiple of them in a single :program:`ovs-test` invocation. - -.. option:: -d, --direct - - Perform direct tests between both OuterIP addresses. These tests could be - used as a reference to compare 802.1Q or L3 tunneling test results. - -.. option:: -l <vlantag>, --vlan-tag <vlantag> - - Perform 802.1Q tests between both servers. These tests will create a - temporary OVS bridge, if necessary, and attach a VLAN tagged port to - it for testing purposes. - -.. option:: -t <tunnelmodes>, --tunnel-modes <tunnelmodes> - - Perform L3 tunneling tests. The given argument is a comma sepaâ? rated - string that specifies all the L3 tunnel modes that should be tested (e.g. - gre). The L3 tunnels are terminated on interface that has the OuterIP - address assigned. - -Examples -======== - -On host 1.2.3.4 start :program:`ovs-test` in server mode:: - - ovs-test -s 15531 - -On host 1.2.3.5 start :program:`ovs-test` in client mode and do direct, VLAN -and GRE tests between both nodes:: - - ovs-test -c 127.0.0.1,1.1.1.1/30 1.2.3.4,1.1.1.2/30 -d -l 123 -t - gre - -See Also -======== - -`ovs-vswitchd(8)`, `ovs-ofctl(8)`, `ovs-vsctl(8)`, :program:`ovs-vlan-test`, -`ethtool(8)`, `uname(1)` diff --git a/Documentation/ref/ovs-vlan-test.8.rst b/Documentation/ref/ovs-vlan-test.8.rst index d4fbabbdf..bd945c016 100644 --- a/Documentation/ref/ovs-vlan-test.8.rst +++ b/Documentation/ref/ovs-vlan-test.8.rst @@ -10,12 +10,6 @@ Synopsis Description =========== -The :program:`ovs-vlan-test` utility has some limitations, for example, it does -not use TCP in its tests. Also it does not take into account MTU to detect -potential edge cases. To overcome those limitations a new tool was developed - -:program:`ovs-test`. :program:`ovs-test` is currently supported only on Debian -so, if possible, try to use that on instead of :program:`ovs-vlan-test`. - The :program:`ovs-vlan-test` program may be used to check for problems sending 802.1Q traffic which may occur when running Open vSwitch. These problems can occur when Open vSwitch is used to send 802.1Q traffic through physical @@ -109,5 +103,4 @@ Run an :program:`ovs-vlan-test` client with a control server located at See Also ======== -`ovs-vswitchd(8)`, `ovs-ofctl(8)`, `ovs-vsctl(8)`, :program:`ovs-test`, -`ethtool(8)`, `uname(1)` +`ovs-vswitchd(8)`, `ovs-ofctl(8)`, `ovs-vsctl(8)`, `ethtool(8)`, `uname(1)` diff --git a/NEWS b/NEWS index 6c89aeca5..a8810c08a 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ Post-v3.7.0 -------------------- - Removed ovs-l3ping utility. Standard tools like iperf are preferred for performance testing. + - Removed ovs-test utility. Standard tools like iperf are + preferred for performance testing. - Userspace datapath: * ARP/ND lookups for native tunnel are now rate limited. The holdout timer can be configured with 'tnl/neigh/retrans_time'. diff --git a/debian/openvswitch-test.install b/debian/openvswitch-test.install index adde61b45..12b0d284a 100644 --- a/debian/openvswitch-test.install +++ b/debian/openvswitch-test.install @@ -1,4 +1,2 @@ -usr/bin/ovs-test -usr/share/man/man8/ovs-test.8 usr/share/openvswitch/python/ovstest usr/lib/python3/dist-packages/ usr/share/openvswitch/scripts/usdt/* diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 7d2b8394f..359a6dd29 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -418,13 +418,11 @@ fi %{python3_sitelib}/ovs %files test -%{_bindir}/ovs-test %{_bindir}/ovs-vlan-test %{_bindir}/ovs-pcap %{_bindir}/ovs-tcpdump %{_bindir}/ovs-tcpundump %{_datadir}/openvswitch/scripts/usdt/* -%{_mandir}/man8/ovs-test.8* %{_mandir}/man8/ovs-vlan-test.8* %{_mandir}/man1/ovs-pcap.1* %{_mandir}/man8/ovs-tcpdump.8* diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index ac234bd21..f119b7ae4 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -97,8 +97,6 @@ install -p -m 644 -D selinux/openvswitch-custom.pp \ rm \ $RPM_BUILD_ROOT/usr/bin/ovs-testcontroller \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-testcontroller.8 \ - $RPM_BUILD_ROOT/usr/bin/ovs-test \ - $RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 (cd "$RPM_BUILD_ROOT" && rm -rf usr/%{_lib}/*.la) (cd "$RPM_BUILD_ROOT" && rm -rf usr/include) diff --git a/utilities/.gitignore b/utilities/.gitignore index 8d7cbb1b0..3f140a744 100644 --- a/utilities/.gitignore +++ b/utilities/.gitignore @@ -22,8 +22,6 @@ /ovs-pki /ovs-pki-cgi /ovs-pki.8 -/ovs-test -/ovs-test.8 /ovs-tcpdump /ovs-tcpdump.8 /ovs-tcpundump diff --git a/utilities/automake.mk b/utilities/automake.mk index 560cfd12d..e83c283b8 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -10,7 +10,6 @@ bin_SCRIPTS += utilities/ovs-docker \ utilities/ovs-tcpdump \ utilities/ovs-tcpundump \ utilities/ovs-dpctl-top \ - utilities/ovs-test \ utilities/ovs-vlan-test scripts_SCRIPTS += \ utilities/ovs-check-dead-ifs \ @@ -58,7 +57,6 @@ EXTRA_DIST += \ utilities/ovs-save \ utilities/ovs-tcpdump.in \ utilities/ovs-tcpundump.in \ - utilities/ovs-test.in \ utilities/ovs-vlan-test.in \ utilities/ovs-vsctl-bashcomp.bash \ utilities/checkpatch.py \ @@ -103,7 +101,6 @@ CLEANFILES += \ utilities/ovs-sim \ utilities/ovs-tcpdump \ utilities/ovs-tcpundump \ - utilities/ovs-test \ utilities/ovs-vlan-test \ utilities/ovs-vsctl.8 diff --git a/utilities/ovs-test.in b/utilities/ovs-test.in deleted file mode 100644 index eb712ffe8..000000000 --- a/utilities/ovs-test.in +++ /dev/null @@ -1,141 +0,0 @@ -#! @PYTHON3@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -""" -ovs test utility that allows to do tests between remote hosts -""" - -import fcntl -import math -import os -import select -import signal -import socket -import subprocess -import sys -import time -import xmlrpclib - -import argparse -import twisted - -import ovstest.args as args -import ovstest.rpcserver as rpcserver -import ovstest.tests as tests -import ovstest.util as util - -DEFAULT_TEST_BRIDGE = "ovstestbr0" -DEFAULT_TEST_PORT = "ovstestport0" -DEFAULT_TEST_TUN = "ovstestport1" - - -def collect_information(node): - """Print information about hosts that will do testing""" - print "Node %s:%u " % (node[0], node[1]) - server = util.rpc_client(node[0], node[1]) - interface_name = server.get_interface(node[0]) - phys_iface = None - uname = server.uname() - mtu = 1500 - - if not interface_name: - print ("Could not find interface that has %s IP address." - "Make sure that you specified correct Outer IP." % (node[0])) - else: - if server.is_ovs_bridge(interface_name): - phys_iface = server.get_iface_from_bridge(interface_name) - else: - phys_iface = interface_name - - if phys_iface: - driver = server.get_driver(phys_iface) - mtu = server.get_interface_mtu(phys_iface) - - print "Will be using %s (%s) with MTU %u" % (phys_iface, node[0], - mtu) - if not driver: - print "Unable to get driver information from ethtool." - else: - print "On this host %s has %s." % (phys_iface, driver) - - if not uname: - print "Unable to retrieve kernel information. Is this Linux?" - else: - print "Running kernel %s." % uname - print "\n" - - return mtu - - -if __name__ == '__main__': - local_server = None - try: - ovs_args = args.ovs_initialize_args() - - if ovs_args.port is not None: # Start in pure server mode - rpcserver.start_rpc_server(ovs_args.port) - - elif ovs_args.servers is not None: # Run in client mode - node1 = ovs_args.servers[0] - node2 = ovs_args.servers[1] - - # Verify whether client will need to spawn a local instance of - # ovs-test server by looking at the first OuterIP. if it is a - # 127.0.0.1 then spawn local ovs-test server. - if node1[0] == "127.0.0.1": - local_server = util.start_local_server(node1[1]) - # We must determine the IP address that local ovs-test server - # will use: - me = util.rpc_client(node1[0], node1[1]) - my_ip = me.get_my_address_from(node2[0], node2[1]) - node1 = (my_ip, node1[1], node1[2], node1[3]) - - mtu_node2 = collect_information(node2) - mtu_node1 = collect_information(node1) - - bandwidth = ovs_args.targetBandwidth - interval = ovs_args.testInterval - ps = util.get_datagram_sizes(mtu_node1, mtu_node2) - - direct = ovs_args.direct - vlan_tag = ovs_args.vlanTag - tunnel_modes = ovs_args.tunnelModes - - if direct is not None: - print "Performing direct tests" - tests.do_direct_tests(node2, node1, bandwidth, interval, ps) - - if vlan_tag is not None: - print "Performing VLAN tests" - tests.do_vlan_tests(node2, node1, bandwidth, interval, ps, - vlan_tag) - - for tmode in tunnel_modes: - print "Performing", tmode, "tests" - tests.do_l3_tests(node2, node1, bandwidth, interval, ps, - tmode) - - except KeyboardInterrupt: - pass - except xmlrpclib.Fault: - print "Couldn't establish XMLRPC control channel" - except socket.error: - print "Couldn't establish XMLRPC control channel" - except xmlrpclib.ProtocolError: - print "XMLRPC control channel was abruptly terminated" - except twisted.internet.error.CannotListenError: - print "Couldn't start XMLRPC server on port %u" % ovs_args.port - finally: - if local_server is not None: - local_server.terminate() -- 2.54.0
_______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
