The name makes more sense, especially with the addition of a userspace
system testsuite. No functional change in this commit.
Signed-off-by: Daniele Di Proietto <diproiet...@vmware.com>
---
tests/.gitignore | 2 +-
tests/automake.mk | 24 ++++-----
tests/kmod-macros.at | 35 --------------
tests/kmod-testsuite.at | 23 ---------
tests/system-common-macros.at | 53 ++++++++++++++++++++
tests/system-kmod-macros.at | 35 ++++++++++++++
tests/system-kmod-testsuite.at | 23 +++++++++
tests/system-traffic.at | 107 +++++++++++++++++++++++++++++++++++++++++
tests/traffic-common-macros.at | 53 --------------------
tests/traffic.at | 107 -----------------------------------------
10 files changed, 231 insertions(+), 231 deletions(-)
delete mode 100644 tests/kmod-macros.at
delete mode 100644 tests/kmod-testsuite.at
create mode 100644 tests/system-common-macros.at
create mode 100644 tests/system-kmod-macros.at
create mode 100644 tests/system-kmod-testsuite.at
create mode 100644 tests/system-traffic.at
delete mode 100644 tests/traffic-common-macros.at
delete mode 100644 tests/traffic.at
diff --git a/tests/.gitignore b/tests/.gitignore
index 9d0be33..98a42f9 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -6,11 +6,11 @@
/idltest.c
/idltest.h
/idltest.ovsidl
-/kmod-testsuite
/ovstest
/test-dpdkr
/ovs-pki.log
/pki/
+/system-kmod-testsuite
/test-aes128
/test-atomic
/test-bundle
diff --git a/tests/automake.mk b/tests/automake.mk
index 502bbd5..9e428ea 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -1,9 +1,9 @@
EXTRA_DIST += \
$(COMMON_MACROS_AT) \
$(TESTSUITE_AT) \
- $(KMOD_TESTSUITE_AT) \
+ $(SYSTEM_KMOD_TESTSUITE_AT) \
$(TESTSUITE) \
- $(KMOD_TESTSUITE) \
+ $(SYSTEM_KMOD_TESTSUITE) \
tests/atlocal.in \
$(srcdir)/package.m4 \
$(srcdir)/tests/testsuite \
@@ -85,15 +85,15 @@ TESTSUITE_AT = \
tests/auto-attach.at \
tests/ovn.at
-KMOD_TESTSUITE_AT = \
- tests/kmod-testsuite.at \
- tests/kmod-macros.at \
- tests/traffic-common-macros.at \
- tests/traffic.at
+SYSTEM_KMOD_TESTSUITE_AT = \
+ tests/system-common-macros.at \
+ tests/system-kmod-testsuite.at \
+ tests/system-kmod-macros.at \
+ tests/system-traffic.at
TESTSUITE = $(srcdir)/tests/testsuite
TESTSUITE_PATCH = $(srcdir)/tests/testsuite.patch
-KMOD_TESTSUITE = $(srcdir)/tests/kmod-testsuite
+SYSTEM_KMOD_TESTSUITE = $(srcdir)/tests/system-kmod-testsuite
DISTCLEANFILES += tests/atconfig tests/atlocal
AUTOTEST_PATH = utilities:vswitchd:ovsdb:vtep:tests:$(PTHREAD_WIN32_DIR_DLL)
@@ -190,11 +190,11 @@ check-ryu: all
EXTRA_DIST += tests/run-ryu
# Run kmod tests. Assume kernel modules has been installed or linked into the
kernel
-check-kernel: all tests/atconfig tests/atlocal $(KMOD_TESTSUITE)
- $(SHELL) '$(KMOD_TESTSUITE)' -C tests AUTOTEST_PATH='$(AUTOTEST_PATH)'
-d $(TESTSUITEFLAGS)
+check-kernel: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE)
+ $(SHELL) '$(SYSTEM_KMOD_TESTSUITE)' -C tests
AUTOTEST_PATH='$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
# Testing the out of tree Kernel module
-check-kmod: all tests/atconfig tests/atlocal $(KMOD_TESTSUITE)
+check-kmod: all tests/atconfig tests/atlocal $(SYSTEM_KMOD_TESTSUITE)
$(MAKE) modules_install
modprobe -r openvswitch
$(MAKE) check-kernel
@@ -215,7 +215,7 @@ $(TESTSUITE): package.m4 $(TESTSUITE_AT) $(COMMON_MACROS_AT)
$(AM_V_at)mv $@.tmp $@
endif
-$(KMOD_TESTSUITE): package.m4 $(KMOD_TESTSUITE_AT) $(COMMON_MACROS_AT)
+$(SYSTEM_KMOD_TESTSUITE): package.m4 $(SYSTEM_KMOD_TESTSUITE_AT)
$(COMMON_MACROS_AT)
$(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
$(AM_V_at)mv $@.tmp $@
diff --git a/tests/kmod-macros.at b/tests/kmod-macros.at
deleted file mode 100644
index c74d348..0000000
--- a/tests/kmod-macros.at
+++ /dev/null
@@ -1,35 +0,0 @@
-# OVS_KMOD_VSWITCHD_START([vsctl-args], [vsctl-output], [=override])
-#
-# Creates a database and starts ovsdb-server, starts ovs-vswitchd
-# connected to that database, calls ovs-vsctl to create a bridge named
-# br0 with predictable settings, passing 'vsctl-args' as additional
-# commands to ovs-vsctl. If 'vsctl-args' causes ovs-vsctl to provide
-# output (e.g. because it includes "create" commands) then 'vsctl-output'
-# specifies the expected output after filtering through uuidfilt.pl.
-#
-m4_define([OVS_KMOD_VSWITCHD_START],
- [ AT_CHECK([modprobe openvswitch])
- ON_EXIT([modprobe -r openvswitch])
- _OVS_VSWITCHD_START([])
- dnl Add bridges, ports, etc.
- AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0
protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]]
fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])],
[0], [$2])
-])
-#
-#
-# OVS_KMOD_VSWITCHD_STOP([WHITELIST], [extra_cmds])
-#
-# Gracefully stops ovs-vswitchd and ovsdb-server, checking their log files
-# for messages with severity WARN or higher and signaling an error if any
-# is present. The optional WHITELIST may contain shell-quoted "sed"
-# commands to delete any warnings that are actually expected, e.g.:
-#
-# OVS_KMOD_VSWITCHD_STOP(["/expected error/d"])
-#
-# 'extra_cmds' are shell commands to be executed afte OVS_VSWITCHD_STOP() is
-# invoked. They can be used to perform additional cleanups such as name space
-# removal.
-m4_define([OVS_KMOD_VSWITCHD_STOP],
- [AT_CHECK([ovs-vsctl del-br br0])
- OVS_VSWITCHD_STOP([$1])
- AT_CHECK([:; $2])
- ])
diff --git a/tests/kmod-testsuite.at b/tests/kmod-testsuite.at
deleted file mode 100644
index dd3018f..0000000
--- a/tests/kmod-testsuite.at
+++ /dev/null
@@ -1,23 +0,0 @@
-AT_INIT
-
-AT_COPYRIGHT([Copyright (c) 2015 Nicira, Inc.
-
-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.])
-
-m4_include([tests/ovs-macros.at])
-m4_include([tests/ovsdb-macros.at])
-m4_include([tests/ofproto-macros.at])
-m4_include([tests/kmod-macros.at])
-m4_include([tests/traffic-common-macros.at])
-
-m4_include([tests/traffic.at])
diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
new file mode 100644
index 0000000..bd622d2
--- /dev/null
+++ b/tests/system-common-macros.at
@@ -0,0 +1,53 @@
+# DEL_NAMESPACES(ns [, ns ... ])
+#
+# Delete namespaces from the running OS
+m4_define([DEL_NAMESPACES],
+ [m4_foreach([ns], [$@],
+ [ip netns del ns
+])
+ ]
+)
+#
+# ADD_NAMESPACES(ns [, ns ... ])
+#
+# Add new namespaces, if ns exists, the old one
+# will be remove before new ones are installed.
+m4_define([ADD_NAMESPACES],
+ [m4_foreach([ns], [$@],
+ [DEL_NAMESPACES(ns)
+ AT_CHECK([ip netns add ns])
+ ON_EXIT(DEL_NAMESPACES(ns))
+ ])
+ ]
+)
+
+# ADD_VETH([port], [namespace], [ovs-br], [ip_addr])
+#
+# Add a pair of veth ports. 'port' will be added to name space 'namespace',
+# and "ovs-'port'" will be added to ovs bridge 'ovs-br'.
+#
+# The 'port' in 'namespace' will be brought up with static IP address
+# with 'ip_addr' in CIDR notation.
+#
+# The existing 'port' or 'ovs-port' will be removed before new ones are added.
+#
+m4_define([ADD_VETH],
+ [ AT_CHECK([ip link add $1 type veth peer name ovs-$1])
+ AT_CHECK([ip link set $1 netns $2])
+ AT_CHECK([ovs-vsctl add-port $3 ovs-$1])
+ AT_CHECK([ip link set dev ovs-$1 up])
+ AT_CHECK([ip netns exec $2 ip addr add $4 dev $1])
+ AT_CHECK([ip netns exec $2 ip link set dev $1 up])
+ ]
+)
+
+# ADD_VLAN([port], [namespace], [vlan-id], [ip-addr])
+#
+# Add a VLAN device named 'port' within 'namespace'. It will be configured
+# with the ID 'vlan-id' and the address 'ip-addr'.
+m4_define([ADD_VLAN],
+ [ AT_CHECK([ip netns exec $2 ip link add link $1 name $1.$3 type vlan id
$3])
+ AT_CHECK([ip netns exec $2 ip link set dev $1.$3 up])
+ AT_CHECK([ip netns exec $2 ip addr add dev $1.$3 $4])
+ ]
+)
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at
new file mode 100644
index 0000000..c74d348
--- /dev/null
+++ b/tests/system-kmod-macros.at
@@ -0,0 +1,35 @@
+# OVS_KMOD_VSWITCHD_START([vsctl-args], [vsctl-output], [=override])
+#
+# Creates a database and starts ovsdb-server, starts ovs-vswitchd
+# connected to that database, calls ovs-vsctl to create a bridge named
+# br0 with predictable settings, passing 'vsctl-args' as additional
+# commands to ovs-vsctl. If 'vsctl-args' causes ovs-vsctl to provide
+# output (e.g. because it includes "create" commands) then 'vsctl-output'
+# specifies the expected output after filtering through uuidfilt.pl.
+#
+m4_define([OVS_KMOD_VSWITCHD_START],
+ [ AT_CHECK([modprobe openvswitch])
+ ON_EXIT([modprobe -r openvswitch])
+ _OVS_VSWITCHD_START([])
+ dnl Add bridges, ports, etc.
+ AT_CHECK([ovs-vsctl -- add-br br0 -- set bridge br0
protocols=[[OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15]]
fail-mode=secure -- $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])],
[0], [$2])
+])
+#
+#
+# OVS_KMOD_VSWITCHD_STOP([WHITELIST], [extra_cmds])
+#
+# Gracefully stops ovs-vswitchd and ovsdb-server, checking their log files
+# for messages with severity WARN or higher and signaling an error if any
+# is present. The optional WHITELIST may contain shell-quoted "sed"
+# commands to delete any warnings that are actually expected, e.g.:
+#
+# OVS_KMOD_VSWITCHD_STOP(["/expected error/d"])
+#
+# 'extra_cmds' are shell commands to be executed afte OVS_VSWITCHD_STOP() is
+# invoked. They can be used to perform additional cleanups such as name space
+# removal.
+m4_define([OVS_KMOD_VSWITCHD_STOP],
+ [AT_CHECK([ovs-vsctl del-br br0])
+ OVS_VSWITCHD_STOP([$1])
+ AT_CHECK([:; $2])
+ ])
diff --git a/tests/system-kmod-testsuite.at b/tests/system-kmod-testsuite.at
new file mode 100644
index 0000000..eebb5b0
--- /dev/null
+++ b/tests/system-kmod-testsuite.at
@@ -0,0 +1,23 @@
+AT_INIT
+
+AT_COPYRIGHT([Copyright (c) 2015 Nicira, Inc.
+
+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.])
+
+m4_include([tests/ovs-macros.at])
+m4_include([tests/ovsdb-macros.at])
+m4_include([tests/ofproto-macros.at])
+m4_include([tests/system-common-macros.at])
+m4_include([tests/system-kmod-macros.at])
+
+m4_include([tests/system-traffic.at])
diff --git a/tests/system-traffic.at b/tests/system-traffic.at
new file mode 100644
index 0000000..9df8b62
--- /dev/null
+++ b/tests/system-traffic.at
@@ -0,0 +1,107 @@
+AT_BANNER([kmod-sanity])
+
+AT_SETUP([kmod - ping between two ports])
+OVS_KMOD_VSWITCHD_START(
+ [set-fail-mode br0 standalone -- ])
+
+ADD_NAMESPACES(at_ns0, at_ns1)
+
+ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
+ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
+
+AT_CAPTURE_FILE([ping.output])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping -q -c 3 -i 0.3 -w 2 10.1.1.2 >
ping.output"])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping -s 1600 -q -c 3 -i 0.3 -w 2
10.1.1.2 >> ping.output"])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping -s 3200 -q -c 3 -i 0.3 -w 2
10.1.1.2 >> ping.output"])
+
+AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time 0ms/'],
[0], [dnl
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+])
+
+OVS_KMOD_VSWITCHD_STOP
+AT_CLEANUP
+
+AT_SETUP([kmod - ping between two ports on vlan])
+OVS_KMOD_VSWITCHD_START(
+ [set-fail-mode br0 standalone -- ])
+
+ADD_NAMESPACES(at_ns0, at_ns1)
+
+ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
+ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
+
+ADD_VLAN(p0, at_ns0, 100, "10.2.2.1/24")
+ADD_VLAN(p1, at_ns1, 100, "10.2.2.2/24")
+
+AT_CAPTURE_FILE([ping.output])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping -q -c 3 -i 0.3 -w 2 10.2.2.2 >
ping.output"])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping -s 1600 -q -c 3 -i 0.3 -w 2
10.2.2.2 >> ping.output"])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping -s 3200 -q -c 3 -i 0.3 -w 2
10.2.2.2 >> ping.output"])
+
+AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time 0ms/'],
[0], [dnl
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+])
+
+OVS_KMOD_VSWITCHD_STOP
+AT_CLEANUP
+
+AT_SETUP([kmod - ping6 between two ports])
+OVS_KMOD_VSWITCHD_START(
+ [set-fail-mode br0 standalone -- ])
+
+ADD_NAMESPACES(at_ns0, at_ns1)
+
+ADD_VETH(p0, at_ns0, br0, "fc00::1/96")
+ADD_VETH(p1, at_ns1, br0, "fc00::2/96")
+
+dnl Without this sleep, we get occasional failures due to the following error:
+dnl "connect: Cannot assign requested address"
+sleep 2;
+
+AT_CAPTURE_FILE([ping.output])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -q -c 3 -i 0.3 -w 2 fc00::2 >
ping.output"])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -s 1600 -q -c 3 -i 0.3 -w 2
fc00::2 >> ping.output"])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -s 3200 -q -c 3 -i 0.3 -w 2
fc00::2 >> ping.output"])
+
+AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time 0ms/'],
[0], [dnl
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+])
+
+OVS_KMOD_VSWITCHD_STOP
+AT_CLEANUP
+
+AT_SETUP([kmod - ping6 between two ports on vlan])
+OVS_KMOD_VSWITCHD_START(
+ [set-fail-mode br0 standalone -- ])
+
+ADD_NAMESPACES(at_ns0, at_ns1)
+
+ADD_VETH(p0, at_ns0, br0, "fc00::1/96")
+ADD_VETH(p1, at_ns1, br0, "fc00::2/96")
+
+ADD_VLAN(p0, at_ns0, 100, "fc00:1::1/96")
+ADD_VLAN(p1, at_ns1, 100, "fc00:1::2/96")
+
+dnl Without this sleep, we get occasional failures due to the following error:
+dnl "connect: Cannot assign requested address"
+sleep 2;
+
+AT_CAPTURE_FILE([ping.output])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -q -c 3 -i 0.3 -w 2 fc00:1::2 >
ping.output"])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -s 1600 -q -c 3 -i 0.3 -w 2
fc00:1::2 >> ping.output"])
+AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -s 3200 -q -c 3 -i 0.3 -w 2
fc00:1::2 >> ping.output"])
+
+AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time 0ms/'],
[0], [dnl
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+3 packets transmitted, 3 received, 0% packet loss, time 0ms
+])
+
+OVS_KMOD_VSWITCHD_STOP
+AT_CLEANUP
diff --git a/tests/traffic-common-macros.at b/tests/traffic-common-macros.at
deleted file mode 100644
index bd622d2..0000000
--- a/tests/traffic-common-macros.at
+++ /dev/null
@@ -1,53 +0,0 @@
-# DEL_NAMESPACES(ns [, ns ... ])
-#
-# Delete namespaces from the running OS
-m4_define([DEL_NAMESPACES],
- [m4_foreach([ns], [$@],
- [ip netns del ns
-])
- ]
-)
-#
-# ADD_NAMESPACES(ns [, ns ... ])
-#
-# Add new namespaces, if ns exists, the old one
-# will be remove before new ones are installed.
-m4_define([ADD_NAMESPACES],
- [m4_foreach([ns], [$@],
- [DEL_NAMESPACES(ns)
- AT_CHECK([ip netns add ns])
- ON_EXIT(DEL_NAMESPACES(ns))
- ])
- ]
-)
-
-# ADD_VETH([port], [namespace], [ovs-br], [ip_addr])
-#
-# Add a pair of veth ports. 'port' will be added to name space 'namespace',
-# and "ovs-'port'" will be added to ovs bridge 'ovs-br'.
-#
-# The 'port' in 'namespace' will be brought up with static IP address
-# with 'ip_addr' in CIDR notation.
-#
-# The existing 'port' or 'ovs-port' will be removed before new ones are added.
-#
-m4_define([ADD_VETH],
- [ AT_CHECK([ip link add $1 type veth peer name ovs-$1])
- AT_CHECK([ip link set $1 netns $2])
- AT_CHECK([ovs-vsctl add-port $3 ovs-$1])
- AT_CHECK([ip link set dev ovs-$1 up])
- AT_CHECK([ip netns exec $2 ip addr add $4 dev $1])
- AT_CHECK([ip netns exec $2 ip link set dev $1 up])
- ]
-)
-
-# ADD_VLAN([port], [namespace], [vlan-id], [ip-addr])
-#
-# Add a VLAN device named 'port' within 'namespace'. It will be configured
-# with the ID 'vlan-id' and the address 'ip-addr'.
-m4_define([ADD_VLAN],
- [ AT_CHECK([ip netns exec $2 ip link add link $1 name $1.$3 type vlan id
$3])
- AT_CHECK([ip netns exec $2 ip link set dev $1.$3 up])
- AT_CHECK([ip netns exec $2 ip addr add dev $1.$3 $4])
- ]
-)
diff --git a/tests/traffic.at b/tests/traffic.at
deleted file mode 100644
index 9df8b62..0000000
--- a/tests/traffic.at
+++ /dev/null
@@ -1,107 +0,0 @@
-AT_BANNER([kmod-sanity])
-
-AT_SETUP([kmod - ping between two ports])
-OVS_KMOD_VSWITCHD_START(
- [set-fail-mode br0 standalone -- ])
-
-ADD_NAMESPACES(at_ns0, at_ns1)
-
-ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
-ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
-
-AT_CAPTURE_FILE([ping.output])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping -q -c 3 -i 0.3 -w 2 10.1.1.2 >
ping.output"])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping -s 1600 -q -c 3 -i 0.3 -w 2
10.1.1.2 >> ping.output"])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping -s 3200 -q -c 3 -i 0.3 -w 2
10.1.1.2 >> ping.output"])
-
-AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time 0ms/'],
[0], [dnl
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-])
-
-OVS_KMOD_VSWITCHD_STOP
-AT_CLEANUP
-
-AT_SETUP([kmod - ping between two ports on vlan])
-OVS_KMOD_VSWITCHD_START(
- [set-fail-mode br0 standalone -- ])
-
-ADD_NAMESPACES(at_ns0, at_ns1)
-
-ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24")
-ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24")
-
-ADD_VLAN(p0, at_ns0, 100, "10.2.2.1/24")
-ADD_VLAN(p1, at_ns1, 100, "10.2.2.2/24")
-
-AT_CAPTURE_FILE([ping.output])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping -q -c 3 -i 0.3 -w 2 10.2.2.2 >
ping.output"])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping -s 1600 -q -c 3 -i 0.3 -w 2
10.2.2.2 >> ping.output"])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping -s 3200 -q -c 3 -i 0.3 -w 2
10.2.2.2 >> ping.output"])
-
-AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time 0ms/'],
[0], [dnl
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-])
-
-OVS_KMOD_VSWITCHD_STOP
-AT_CLEANUP
-
-AT_SETUP([kmod - ping6 between two ports])
-OVS_KMOD_VSWITCHD_START(
- [set-fail-mode br0 standalone -- ])
-
-ADD_NAMESPACES(at_ns0, at_ns1)
-
-ADD_VETH(p0, at_ns0, br0, "fc00::1/96")
-ADD_VETH(p1, at_ns1, br0, "fc00::2/96")
-
-dnl Without this sleep, we get occasional failures due to the following error:
-dnl "connect: Cannot assign requested address"
-sleep 2;
-
-AT_CAPTURE_FILE([ping.output])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -q -c 3 -i 0.3 -w 2 fc00::2 >
ping.output"])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -s 1600 -q -c 3 -i 0.3 -w 2
fc00::2 >> ping.output"])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -s 3200 -q -c 3 -i 0.3 -w 2
fc00::2 >> ping.output"])
-
-AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time 0ms/'],
[0], [dnl
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-])
-
-OVS_KMOD_VSWITCHD_STOP
-AT_CLEANUP
-
-AT_SETUP([kmod - ping6 between two ports on vlan])
-OVS_KMOD_VSWITCHD_START(
- [set-fail-mode br0 standalone -- ])
-
-ADD_NAMESPACES(at_ns0, at_ns1)
-
-ADD_VETH(p0, at_ns0, br0, "fc00::1/96")
-ADD_VETH(p1, at_ns1, br0, "fc00::2/96")
-
-ADD_VLAN(p0, at_ns0, 100, "fc00:1::1/96")
-ADD_VLAN(p1, at_ns1, 100, "fc00:1::2/96")
-
-dnl Without this sleep, we get occasional failures due to the following error:
-dnl "connect: Cannot assign requested address"
-sleep 2;
-
-AT_CAPTURE_FILE([ping.output])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -q -c 3 -i 0.3 -w 2 fc00:1::2 >
ping.output"])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -s 1600 -q -c 3 -i 0.3 -w 2
fc00:1::2 >> ping.output"])
-AT_CHECK([ip netns exec at_ns0 bash -c "ping6 -s 3200 -q -c 3 -i 0.3 -w 2
fc00:1::2 >> ping.output"])
-
-AT_CHECK([cat ping.output | grep "transmitted" | sed 's/time.*ms$/time 0ms/'],
[0], [dnl
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-3 packets transmitted, 3 received, 0% packet loss, time 0ms
-])
-
-OVS_KMOD_VSWITCHD_STOP
-AT_CLEANUP
--
2.1.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
