diff -Nru openvswitch-2.13.1/acinclude.m4 openvswitch-2.13.3/acinclude.m4
--- openvswitch-2.13.1/acinclude.m4	2020-08-04 21:41:31.911524451 +0000
+++ openvswitch-2.13.3/acinclude.m4	2021-02-10 20:04:59.478074628 +0000
@@ -431,6 +431,16 @@
     if test "$DPDK_AUTO_DISCOVER" = "false"; then
       OVS_LDFLAGS="$OVS_LDFLAGS -L$DPDK_LIB_DIR"
     fi
+    # Stripping out possible instruction set specific configuration that DPDK
+    # forces in pkg-config since this could override user-specified options.
+    # It's enough to have -mssse3 to build with DPDK headers.
+    DPDK_INCLUDE=$(echo "$DPDK_INCLUDE" | sed 's/-march=[[^ ]]*//g')
+    # Also stripping out '-mno-avx512f'.  Support for AVX512 will be disabled
+    # if OVS will detect that it's broken.  OVS could be built with a
+    # completely different toolchain that correctly supports AVX512, flags
+    # forced by DPDK only breaks our feature detection mechanism and leads to
+    # build failures: https://github.com/openvswitch/ovs-issues/issues/201
+    DPDK_INCLUDE=$(echo "$DPDK_INCLUDE" | sed 's/-mno-avx512f//g')
     OVS_CFLAGS="$OVS_CFLAGS $DPDK_INCLUDE"
     OVS_ENABLE_OPTION([-mssse3])
 
@@ -781,6 +791,10 @@
                   [prandom_u32[[\(]]],
                   [OVS_DEFINE([HAVE_PRANDOM_U32])])
   OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32_max])
+  OVS_GREP_IFELSE([$KSRC/include/linux/prandom.h],
+                  [prandom_u32[[\(]]],
+                  [OVS_DEFINE([HAVE_PRANDOM_U32])])
+  OVS_GREP_IFELSE([$KSRC/include/linux/prandom.h], [prandom_u32_max])
 
   OVS_GREP_IFELSE([$KSRC/include/net/rtnetlink.h], [get_link_net])
   OVS_GREP_IFELSE([$KSRC/include/net/rtnetlink.h], [name_assign_type])
@@ -934,8 +948,6 @@
 
   OVS_GREP_IFELSE([$KSRC/include/net/sock.h], [sk_no_check_tx])
   OVS_GREP_IFELSE([$KSRC/include/linux/udp.h], [no_check6_tx])
-  OVS_GREP_IFELSE([$KSRC/include/linux/utsrelease.h], [el6],
-                  [OVS_DEFINE([HAVE_RHEL6_PER_CPU])])
   OVS_FIND_PARAM_IFELSE([$KSRC/include/net/protocol.h],
                         [udp_add_offload], [net],
                         [OVS_DEFINE([HAVE_UDP_ADD_OFFLOAD_TAKES_NET])])
diff -Nru openvswitch-2.13.1/AUTHORS.rst openvswitch-2.13.3/AUTHORS.rst
--- openvswitch-2.13.1/AUTHORS.rst	2020-08-04 21:41:31.765524451 +0000
+++ openvswitch-2.13.3/AUTHORS.rst	2021-02-10 20:04:59.176074628 +0000
@@ -419,6 +419,7 @@
 ZhiPeng Lu                         luzhipeng@uniudc.com
 Zhou Yangchao                      1028519445@qq.com
 aginwala                           amginwal@gmail.com
+lzhecheng                          lzhecheng@vmware.com
 parameswaran krishnamurthy         parkrish@gmail.com
 solomon                            liwei.solomon@gmail.com
 wenxu                              wenxu@ucloud.cn
diff -Nru openvswitch-2.13.1/build-aux/dist-docs openvswitch-2.13.3/build-aux/dist-docs
--- openvswitch-2.13.1/build-aux/dist-docs	2020-08-04 21:40:41.356524451 +0000
+++ openvswitch-2.13.3/build-aux/dist-docs	2021-02-10 20:04:13.780074628 +0000
@@ -43,7 +43,7 @@
 mkdir $distdir
 
 # Install manpages.
-${MAKE-make} install-man mandir="$abs_distdir"/man
+${MAKE-make} install-man install-man-rst mandir="$abs_distdir"/man
 (cd $distdir && mv `find man -type f` . && rm -rf man)
 manpages=`cd $distdir && echo *`
 
diff -Nru openvswitch-2.13.1/.ci/linux-build.sh openvswitch-2.13.3/.ci/linux-build.sh
--- openvswitch-2.13.1/.ci/linux-build.sh	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch-2.13.3/.ci/linux-build.sh	2021-02-10 20:04:59.175074628 +0000
@@ -0,0 +1,244 @@
+#!/bin/bash
+
+set -o errexit
+set -x
+
+CFLAGS_FOR_OVS="-g -O2"
+SPARSE_FLAGS=""
+EXTRA_OPTS="--enable-Werror"
+TARGET="x86_64-native-linuxapp-gcc"
+
+function install_kernel()
+{
+    if [[ "$1" =~ ^5.* ]]; then
+        PREFIX="v5.x"
+    elif [[ "$1" =~ ^4.* ]]; then
+        PREFIX="v4.x"
+    elif [[ "$1" =~ ^3.* ]]; then
+        PREFIX="v3.x"
+    else
+        PREFIX="v2.6/longterm/v2.6.32"
+    fi
+
+    base_url="https://cdn.kernel.org/pub/linux/kernel/${PREFIX}"
+    # Download page with list of all available kernel versions.
+    wget ${base_url}/
+    # Uncompress in case server returned gzipped page.
+    (file index* | grep ASCII) || (mv index* index.new.gz && gunzip index*)
+    # Get version of the latest stable release.
+    hi_ver=$(echo ${1} | sed 's/\./\\\./')
+    lo_ver=$(cat ./index* | grep -P -o "${hi_ver}\.[0-9]+" | \
+             sed 's/.*\..*\.\(.*\)/\1/' | sort -h | tail -1)
+    version="${1}.${lo_ver}"
+
+    rm -rf index* linux-*
+
+    url="${base_url}/linux-${version}.tar.xz"
+    # Download kernel sources. Try direct link on CDN failure.
+    wget ${url} ||
+    (rm -f linux-${version}.tar.xz && wget ${url}) ||
+    (rm -f linux-${version}.tar.xz && wget ${url/cdn/www})
+
+    tar xvf linux-${version}.tar.xz > /dev/null
+    pushd linux-${version}
+    make allmodconfig
+
+    # Cannot use CONFIG_KCOV: -fsanitize-coverage=trace-pc is not supported by compiler
+    sed -i 's/CONFIG_KCOV=y/CONFIG_KCOV=n/' .config
+
+    # stack validation depends on tools/objtool, but objtool does not compile on travis.
+    # It is giving following error.
+    #  >>> GEN      arch/x86/insn/inat-tables.c
+    #  >>> Semantic error at 40: Unknown imm opnd: AL
+    # So for now disable stack-validation for the build.
+
+    sed -i 's/CONFIG_STACK_VALIDATION=y/CONFIG_STACK_VALIDATION=n/' .config
+    make oldconfig
+
+    # Older kernels do not include openvswitch
+    if [ -d "net/openvswitch" ]; then
+        make net/openvswitch/
+    else
+        make net/bridge/
+    fi
+
+    if [ "$AFXDP" ]; then
+        sudo make headers_install INSTALL_HDR_PATH=/usr
+        pushd tools/lib/bpf/
+        # Bulding with gcc because there are some issues in make files
+        # that breaks building libbpf with clang on Travis.
+        CC=gcc sudo make install
+        CC=gcc sudo make install_headers
+        sudo ldconfig
+        popd
+        # The Linux kernel defines __always_inline in stddef.h (283d7573), and
+        # sys/cdefs.h tries to re-define it.  Older libc-dev package in xenial
+        # doesn't have a fix for this issue.  Applying it manually.
+        sudo sed -i '/^# define __always_inline .*/i # undef __always_inline' \
+                    /usr/include/x86_64-linux-gnu/sys/cdefs.h || true
+        EXTRA_OPTS="${EXTRA_OPTS} --enable-afxdp"
+    else
+        EXTRA_OPTS="${EXTRA_OPTS} --with-linux=$(pwd)"
+        echo "Installed kernel source in $(pwd)"
+    fi
+    popd
+}
+
+function install_dpdk()
+{
+    local DPDK_VER=$1
+    local VERSION_FILE="dpdk-dir/travis-dpdk-cache-version"
+
+    if [ "${DPDK_VER##refs/*/}" != "${DPDK_VER}" ]; then
+        # Avoid using cache for git tree build.
+        rm -rf dpdk-dir
+
+        DPDK_GIT=${DPDK_GIT:-https://dpdk.org/git/dpdk}
+        git clone --single-branch $DPDK_GIT dpdk-dir -b "${DPDK_VER##refs/*/}"
+        pushd dpdk-dir
+        git log -1 --oneline
+    else
+        if [ -f "${VERSION_FILE}" ]; then
+            VER=$(cat ${VERSION_FILE})
+            if [ "${VER}" = "${DPDK_VER}" ]; then
+                EXTRA_OPTS="${EXTRA_OPTS} --with-dpdk=$(pwd)/dpdk-dir/build"
+                echo "Found cached DPDK ${VER} build in $(pwd)/dpdk-dir"
+                return
+            fi
+        fi
+        # No cache or version mismatch.
+        rm -rf dpdk-dir
+        wget https://fast.dpdk.org/rel/dpdk-$1.tar.xz
+        tar xvf dpdk-$1.tar.xz > /dev/null
+        DIR_NAME=$(tar -tf dpdk-$1.tar.xz | head -1 | cut -f1 -d"/")
+        mv ${DIR_NAME} dpdk-dir
+        pushd dpdk-dir
+    fi
+
+    make config CC=gcc T=$TARGET
+
+    if [ "$DPDK_SHARED" ]; then
+        sed -i '/CONFIG_RTE_BUILD_SHARED_LIB=n/s/=n/=y/' build/.config
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/$TARGET/lib
+    fi
+
+    # Disable building DPDK kernel modules. Not needed for OVS build or tests.
+    sed -i '/CONFIG_RTE_EAL_IGB_UIO=y/s/=y/=n/' build/.config
+    sed -i '/CONFIG_RTE_KNI_KMOD=y/s/=y/=n/' build/.config
+
+    # Enable pdump support in DPDK.
+    sed -i '/CONFIG_RTE_LIBRTE_PMD_PCAP=n/s/=n/=y/' build/.config
+    sed -i '/CONFIG_RTE_LIBRTE_PDUMP=n/s/=n/=y/' build/.config
+
+    # Switching to 'default' machine to make dpdk-dir cache usable on different
+    # CPUs.  We can't be sure that all CI machines are exactly same.
+    sed -i '/CONFIG_RTE_MACHINE="native"/s/="native"/="default"/' build/.config
+
+    make -j4 CC=gcc EXTRA_CFLAGS='-fPIC'
+    EXTRA_OPTS="$EXTRA_OPTS --with-dpdk=$(pwd)/build"
+    echo "Installed DPDK source in $(pwd)"
+    popd
+    echo "${DPDK_VER}" > ${VERSION_FILE}
+}
+
+function configure_ovs()
+{
+    ./boot.sh
+    ./configure CFLAGS="${CFLAGS_FOR_OVS}" $* || { cat config.log; exit 1; }
+}
+
+function build_ovs()
+{
+    local KERNEL=$1
+
+    configure_ovs $OPTS
+    make selinux-policy
+
+    # Only build datapath if we are testing kernel w/o running testsuite and
+    # AF_XDP support.
+    if [ "${KERNEL}" ] && ! [ "$AFXDP" ]; then
+        pushd datapath
+        make -j4
+        popd
+    else
+        make -j4 || { cat config.log; exit 1; }
+    fi
+}
+
+if [ "$DEB_PACKAGE" ]; then
+    mk-build-deps --install --root-cmd sudo --remove debian/control
+    dpkg-checkbuilddeps
+    DEB_BUILD_OPTIONS='parallel=4 nocheck' fakeroot debian/rules binary
+    # Not trying to install ipsec package as there are issues with system-wide
+    # installed python3-openvswitch package and the pyenv used by Travis.
+    packages=$(ls $(pwd)/../*.deb | grep -v ipsec)
+    sudo apt install ${packages}
+    exit 0
+fi
+
+if [ "$KERNEL" ]; then
+    install_kernel $KERNEL
+fi
+
+if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then
+    if [ -z "$DPDK_VER" ]; then
+        DPDK_VER="19.11.2"
+    fi
+    install_dpdk $DPDK_VER
+    # Enable pdump support in OVS.
+    EXTRA_OPTS="${EXTRA_OPTS} --enable-dpdk-pdump"
+    if [ "$CC" = "clang" ]; then
+        # Disregard cast alignment errors until DPDK is fixed
+        CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-cast-align"
+    fi
+fi
+
+if [ "$CC" = "clang" ]; then
+    CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-error=unused-command-line-argument"
+elif [ "$M32" ]; then
+    # Not using sparse for 32bit builds on 64bit machine.
+    # Adding m32 flag directly to CC to avoid any posiible issues with API/ABI
+    # difference on 'configure' and 'make' stages.
+    export CC="$CC -m32"
+else
+    OPTS="--enable-sparse"
+    if [ "$AFXDP" ]; then
+        # netdev-afxdp uses memset for 64M for umem initialization.
+        SPARSE_FLAGS="${SPARSE_FLAGS} -Wno-memcpy-max-count"
+    fi
+    CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} ${SPARSE_FLAGS}"
+fi
+
+save_OPTS="${OPTS} $*"
+OPTS="${EXTRA_OPTS} ${save_OPTS}"
+
+if [ "$TESTSUITE" ]; then
+    # 'distcheck' will reconfigure with required options.
+    # Now we only need to prepare the Makefile without sparse-wrapped CC.
+    configure_ovs
+
+    export DISTCHECK_CONFIGURE_FLAGS="$OPTS"
+    if ! make distcheck CFLAGS="${CFLAGS_FOR_OVS}" \
+         TESTSUITEFLAGS=-j4 RECHECK=yes; then
+        # testsuite.log is necessary for debugging.
+        cat */_build/sub/tests/testsuite.log
+        exit 1
+    fi
+else
+    if [ -z "${KERNEL_LIST}" ]; then build_ovs ${KERNEL};
+    else
+        save_EXTRA_OPTS="${EXTRA_OPTS}"
+        for KERNEL in ${KERNEL_LIST}; do
+            echo "=============================="
+            echo "Building with kernel ${KERNEL}"
+            echo "=============================="
+            EXTRA_OPTS="${save_EXTRA_OPTS}"
+            install_kernel ${KERNEL}
+            OPTS="${EXTRA_OPTS} ${save_OPTS}"
+            build_ovs ${KERNEL}
+            make distclean
+        done
+    fi
+fi
+
+exit 0
diff -Nru openvswitch-2.13.1/.ci/linux-prepare.sh openvswitch-2.13.3/.ci/linux-prepare.sh
--- openvswitch-2.13.1/.ci/linux-prepare.sh	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch-2.13.3/.ci/linux-prepare.sh	2021-02-10 20:04:59.175074628 +0000
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -ev
+
+if [ "$DEB_PACKAGE" ]; then
+    # We're not using sparse for debian packages, tests are skipped and
+    # all extra dependencies tracked by mk-build-deps.
+    exit 0
+fi
+
+# Build and install sparse.
+#
+# Explicitly disable sparse support for llvm because some travis
+# environments claim to have LLVM (llvm-config exists and works) but
+# linking against it fails.
+# Disabling sqlite support because sindex build fails and we don't
+# really need this utility being installed.
+git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git
+cd sparse
+make -j4 HAVE_LLVM= HAVE_SQLITE= install
+cd ..
+
+pip3 install --disable-pip-version-check --user flake8 hacking
+pip3 install --user --upgrade docutils
+
+if [ "$M32" ]; then
+    # Installing 32-bit libraries.
+    pkgs="gcc-multilib"
+    if [ -z "$GITHUB_WORKFLOW" ]; then
+        # 32-bit and 64-bit libunwind can not be installed at the same time.
+        # This will remove the 64-bit libunwind and install 32-bit version.
+        # GitHub Actions doesn't have 32-bit versions of these libs.
+        pkgs=$pkgs" libunwind-dev:i386 libunbound-dev:i386"
+    fi
+
+    sudo apt-get install -y $pkgs
+fi
+
+# IPv6 is supported by kernel but disabled in TravisCI images:
+#   https://github.com/travis-ci/travis-ci/issues/8891
+# Enable it to avoid skipping of IPv6 related tests.
+sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
diff -Nru openvswitch-2.13.1/.ci/osx-build.sh openvswitch-2.13.3/.ci/osx-build.sh
--- openvswitch-2.13.1/.ci/osx-build.sh	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch-2.13.3/.ci/osx-build.sh	2021-02-10 20:04:59.175074628 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -o errexit
+
+CFLAGS="-Werror $CFLAGS"
+EXTRA_OPTS=""
+
+function configure_ovs()
+{
+    ./boot.sh && ./configure $*
+}
+
+configure_ovs $EXTRA_OPTS $*
+
+if [ "$CC" = "clang" ]; then
+    set make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
+else
+    set make CFLAGS="$CFLAGS $BUILD_ENV"
+fi
+if ! "$@"; then
+    cat config.log
+    exit 1
+fi
+if [ "$TESTSUITE" ] && [ "$CC" != "clang" ]; then
+    if ! make distcheck RECHECK=yes; then
+        # testsuite.log is necessary for debugging.
+        cat */_build/sub/tests/testsuite.log
+        exit 1
+    fi
+fi
+
+exit 0
diff -Nru openvswitch-2.13.1/.ci/osx-prepare.sh openvswitch-2.13.3/.ci/osx-prepare.sh
--- openvswitch-2.13.1/.ci/osx-prepare.sh	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch-2.13.3/.ci/osx-prepare.sh	2021-02-10 20:04:59.175074628 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -ev
+pip3 install --user --upgrade docutils
diff -Nru openvswitch-2.13.1/.cirrus.yml openvswitch-2.13.3/.cirrus.yml
--- openvswitch-2.13.1/.cirrus.yml	2020-08-04 21:41:31.764524451 +0000
+++ openvswitch-2.13.3/.cirrus.yml	2021-02-10 20:04:59.175074628 +0000
@@ -2,8 +2,8 @@
 
   freebsd_instance:
     matrix:
-      image_family: freebsd-12-1-snap
-      image_family: freebsd-11-3-snap
+      image_family: freebsd-12-2-snap
+      image_family: freebsd-11-4-snap
     cpu: 4
     memory: 8G
 
diff -Nru openvswitch-2.13.1/config.h.in openvswitch-2.13.3/config.h.in
--- openvswitch-2.13.1/config.h.in	2020-08-04 21:41:40.344524451 +0000
+++ openvswitch-2.13.3/config.h.in	2021-02-10 20:05:07.780074628 +0000
@@ -47,6 +47,10 @@
 /* define if the compiler supports basic C++11 syntax */
 #undef HAVE_CXX11
 
+/* Define to 1 if you have the declaration of `malloc_trim', and to 0 if you
+   don't. */
+#undef HAVE_DECL_MALLOC_TRIM
+
 /* Define to 1 if you have the declaration of `RTE_EAL_NUMA_AWARE_HUGEPAGES',
    and to 0 if you don't. */
 #undef HAVE_DECL_RTE_EAL_NUMA_AWARE_HUGEPAGES
diff -Nru openvswitch-2.13.1/configure openvswitch-2.13.3/configure
--- openvswitch-2.13.1/configure	2020-08-04 21:41:39.686524451 +0000
+++ openvswitch-2.13.3/configure	2021-02-10 20:05:07.126074628 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for openvswitch 2.13.1.
+# Generated by GNU Autoconf 2.69 for openvswitch 2.13.3.
 #
 # Report bugs to <bugs@openvswitch.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='openvswitch'
 PACKAGE_TARNAME='openvswitch'
-PACKAGE_VERSION='2.13.1'
-PACKAGE_STRING='openvswitch 2.13.1'
+PACKAGE_VERSION='2.13.3'
+PACKAGE_STRING='openvswitch 2.13.3'
 PACKAGE_BUGREPORT='bugs@openvswitch.org'
 PACKAGE_URL=''
 
@@ -1464,7 +1464,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures openvswitch 2.13.1 to adapt to many kinds of systems.
+\`configure' configures openvswitch 2.13.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1534,7 +1534,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of openvswitch 2.13.1:";;
+     short | recursive ) echo "Configuration of openvswitch 2.13.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1688,7 +1688,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-openvswitch configure 2.13.1
+openvswitch configure 2.13.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2609,7 +2609,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by openvswitch $as_me 2.13.1, which was
+It was created by openvswitch $as_me 2.13.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3480,7 +3480,7 @@
 
 # Define the identity of the package.
  PACKAGE='openvswitch'
- VERSION='2.13.1'
+ VERSION='2.13.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18743,6 +18743,18 @@
 #define HAVE_DECL_SYS_SIGLIST $ac_have_decl
 _ACEOF
 
+ac_fn_c_check_decl "$LINENO" "malloc_trim" "ac_cv_have_decl_malloc_trim" "#include <malloc.h>
+"
+if test "x$ac_cv_have_decl_malloc_trim" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_MALLOC_TRIM $ac_have_decl
+_ACEOF
+
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "#include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = xyes; then :
@@ -25540,6 +25552,64 @@
   fi
 
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether prandom_u32[\(] matches in $KSRC/include/linux/prandom.h" >&5
+$as_echo_n "checking whether prandom_u32[\(] matches in $KSRC/include/linux/prandom.h... " >&6; }
+  if test -f $KSRC/include/linux/prandom.h; then
+    grep 'prandom_u32[\(]' $KSRC/include/linux/prandom.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_PRANDOM_U32 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether prandom_u32_max matches in $KSRC/include/linux/prandom.h" >&5
+$as_echo_n "checking whether prandom_u32_max matches in $KSRC/include/linux/prandom.h... " >&6; }
+  if test -f $KSRC/include/linux/prandom.h; then
+    grep 'prandom_u32_max' $KSRC/include/linux/prandom.h >/dev/null 2>&1
+    status=$?
+    case $status in
+      0)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+  echo '#define HAVE_PRANDOM_U32_MAX 1' >> datapath/linux/kcompat.h.new
+
+        ;;
+      1)
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+        ;;
+      *)
+        as_fn_error $? "grep exited with status $status" "$LINENO" 5
+        ;;
+    esac
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+
+  fi
+
+
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether get_link_net matches in $KSRC/include/net/rtnetlink.h" >&5
 $as_echo_n "checking whether get_link_net matches in $KSRC/include/net/rtnetlink.h... " >&6; }
@@ -28400,35 +28470,6 @@
   fi
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether el6 matches in $KSRC/include/linux/utsrelease.h" >&5
-$as_echo_n "checking whether el6 matches in $KSRC/include/linux/utsrelease.h... " >&6; }
-  if test -f $KSRC/include/linux/utsrelease.h; then
-    grep 'el6' $KSRC/include/linux/utsrelease.h >/dev/null 2>&1
-    status=$?
-    case $status in
-      0)
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-  echo '#define HAVE_RHEL6_PER_CPU 1' >> datapath/linux/kcompat.h.new
-
-        ;;
-      1)
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-        ;;
-      *)
-        as_fn_error $? "grep exited with status $status" "$LINENO" 5
-        ;;
-    esac
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
-$as_echo "file not found" >&6; }
-
-  fi
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether udp_add_offload has parameter net in $KSRC/include/net/protocol.h" >&5
 $as_echo_n "checking whether udp_add_offload has parameter net in $KSRC/include/net/protocol.h... " >&6; }
   if test -f $KSRC/include/net/protocol.h; then
@@ -31125,6 +31166,16 @@
     if test "$DPDK_AUTO_DISCOVER" = "false"; then
       OVS_LDFLAGS="$OVS_LDFLAGS -L$DPDK_LIB_DIR"
     fi
+    # Stripping out possible instruction set specific configuration that DPDK
+    # forces in pkg-config since this could override user-specified options.
+    # It's enough to have -mssse3 to build with DPDK headers.
+    DPDK_INCLUDE=$(echo "$DPDK_INCLUDE" | sed 's/-march=[^ ]*//g')
+    # Also stripping out '-mno-avx512f'.  Support for AVX512 will be disabled
+    # if OVS will detect that it's broken.  OVS could be built with a
+    # completely different toolchain that correctly supports AVX512, flags
+    # forced by DPDK only breaks our feature detection mechanism and leads to
+    # build failures: https://github.com/openvswitch/ovs-issues/issues/201
+    DPDK_INCLUDE=$(echo "$DPDK_INCLUDE" | sed 's/-mno-avx512f//g')
     OVS_CFLAGS="$OVS_CFLAGS $DPDK_INCLUDE"
 
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -mssse3" >&5
@@ -31927,7 +31978,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by openvswitch $as_me 2.13.1, which was
+This file was extended by openvswitch $as_me 2.13.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31993,7 +32044,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-openvswitch config.status 2.13.1
+openvswitch config.status 2.13.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru openvswitch-2.13.1/configure.ac openvswitch-2.13.3/configure.ac
--- openvswitch-2.13.1/configure.ac	2020-08-04 21:41:31.913524451 +0000
+++ openvswitch-2.13.3/configure.ac	2021-02-10 20:04:59.480074628 +0000
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.63)
-AC_INIT(openvswitch, 2.13.1, bugs@openvswitch.org)
+AC_INIT(openvswitch, 2.13.3, bugs@openvswitch.org)
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -100,6 +100,7 @@
 OVS_CHECK_STRTOK_R
 OVS_CHECK_LINUX_AF_XDP
 AC_CHECK_DECLS([sys_siglist], [], [], [[#include <signal.h>]])
+AC_CHECK_DECLS([malloc_trim], [], [], [[#include <malloc.h>]])
 AC_CHECK_MEMBERS([struct stat.st_mtim.tv_nsec, struct stat.st_mtimensec],
   [], [], [[#include <sys/stat.h>]])
 AC_CHECK_MEMBERS([struct ifreq.ifr_flagshigh], [], [], [[#include <net/if.h>]])
diff -Nru openvswitch-2.13.1/datapath/conntrack.c openvswitch-2.13.3/datapath/conntrack.c
--- openvswitch-2.13.1/datapath/conntrack.c	2020-08-04 21:41:31.916524451 +0000
+++ openvswitch-2.13.3/datapath/conntrack.c	2021-02-10 20:04:59.483074628 +0000
@@ -1972,7 +1972,8 @@
 		struct hlist_head *head = &info->limits[i];
 		struct ovs_ct_limit *ct_limit;
 
-		hlist_for_each_entry_rcu(ct_limit, head, hlist_node)
+		hlist_for_each_entry_rcu(ct_limit, head, hlist_node,
+					 lockdep_ovsl_is_held())
 			kfree_rcu(ct_limit, rcu);
 	}
 	kfree(ovs_net->ct_limit_info->limits);
diff -Nru openvswitch-2.13.1/datapath/datapath.c openvswitch-2.13.3/datapath/datapath.c
--- openvswitch-2.13.1/datapath/datapath.c	2020-08-04 21:41:31.917524451 +0000
+++ openvswitch-2.13.3/datapath/datapath.c	2021-02-10 20:04:59.484074628 +0000
@@ -2437,8 +2437,10 @@
 
 	ovs_netns_frags6_exit(dnet);
 	ovs_netns_frags_exit(dnet);
-	ovs_ct_exit(dnet);
 	ovs_lock();
+
+	ovs_ct_exit(dnet);
+
 	list_for_each_entry_safe(dp, dp_next, &ovs_net->dps, list_node)
 		__dp_destroy(dp);
 
diff -Nru openvswitch-2.13.1/datapath/linux/compat/include/linux/percpu.h openvswitch-2.13.3/datapath/linux/compat/include/linux/percpu.h
--- openvswitch-2.13.1/datapath/linux/compat/include/linux/percpu.h	2020-08-04 21:28:11.170524451 +0000
+++ openvswitch-2.13.3/datapath/linux/compat/include/linux/percpu.h	2021-02-10 20:00:27.197074628 +0000
@@ -7,12 +7,6 @@
 #define this_cpu_ptr(ptr) per_cpu_ptr(ptr, smp_processor_id())
 #endif
 
-#ifdef HAVE_RHEL6_PER_CPU
-#undef this_cpu_read
-#undef this_cpu_inc
-#undef this_cpu_dec
-#endif
-
 #if !defined this_cpu_read
 #define this_cpu_read(ptr) percpu_read(ptr)
 #endif
diff -Nru openvswitch-2.13.1/datapath/linux/compat/include/linux/rculist.h openvswitch-2.13.3/datapath/linux/compat/include/linux/rculist.h
--- openvswitch-2.13.1/datapath/linux/compat/include/linux/rculist.h	2020-08-04 19:11:45.540524451 +0000
+++ openvswitch-2.13.3/datapath/linux/compat/include/linux/rculist.h	2021-02-10 20:02:51.038074628 +0000
@@ -9,9 +9,28 @@
 #define hlist_pprev_rcu(node)   (*((struct hlist_node __rcu **)((node)->pprev)))
 #endif
 
+/*
+ * Check during list traversal that we are within an RCU reader
+ */
+
+#define check_arg_count_one(dummy)
+
+#ifdef CONFIG_PROVE_RCU_LIST
+#define __list_check_rcu(dummy, cond, extra...)				\
+	({								\
+	check_arg_count_one(extra);					\
+	RCU_LOCKDEP_WARN(!cond && !rcu_read_lock_any_held(),		\
+			 "RCU-list traversed in non-reader section!");	\
+	 })
+#else
+#define __list_check_rcu(dummy, cond, extra...)				\
+	({ check_arg_count_one(extra); })
+#endif
+
 #undef hlist_for_each_entry_rcu
-#define hlist_for_each_entry_rcu(pos, head, member)			\
-	for (pos = hlist_entry_safe (rcu_dereference_raw(hlist_first_rcu(head)),\
+#define hlist_for_each_entry_rcu(pos, head, member, cond...)		\
+	for (__list_check_rcu(dummy, ## cond, 0),			\
+	     pos = hlist_entry_safe(rcu_dereference_raw(hlist_first_rcu(head)),\
 			typeof(*(pos)), member);			\
 		pos;							\
 		pos = hlist_entry_safe(rcu_dereference_raw(hlist_next_rcu(\
diff -Nru openvswitch-2.13.1/datapath/linux/compat/include/linux/skbuff.h openvswitch-2.13.3/datapath/linux/compat/include/linux/skbuff.h
--- openvswitch-2.13.1/datapath/linux/compat/include/linux/skbuff.h	2020-08-04 21:41:31.919524451 +0000
+++ openvswitch-2.13.3/datapath/linux/compat/include/linux/skbuff.h	2021-02-10 20:04:59.486074628 +0000
@@ -278,7 +278,7 @@
 #ifdef HAVE_RXHASH
 	skb->rxhash = 0;
 #endif
-#if defined(HAVE_L4_RXHASH) && !defined(HAVE_RHEL_OVS_HOOK)
+#if defined(HAVE_L4_RXHASH)
 	skb->l4_rxhash = 0;
 #endif
 }
diff -Nru openvswitch-2.13.1/datapath/linux/compat/nf_conntrack_reasm.c openvswitch-2.13.3/datapath/linux/compat/nf_conntrack_reasm.c
--- openvswitch-2.13.1/datapath/linux/compat/nf_conntrack_reasm.c	2020-08-04 21:40:41.367524451 +0000
+++ openvswitch-2.13.3/datapath/linux/compat/nf_conntrack_reasm.c	2021-02-10 20:04:13.791074628 +0000
@@ -57,10 +57,13 @@
 #include <net/netns/generic.h>
 #include "datapath.h"
 
-#ifdef OVS_NF_DEFRAG6_BACKPORT
+#if defined(HAVE_INET_FRAGS_WITH_FRAGS_WORK) || !defined(HAVE_INET_FRAGS_RND)
 
 static const char nf_frags_cache_name[] = "ovs-frag6";
 
+#endif
+
+#ifdef OVS_NF_DEFRAG6_BACKPORT
 struct nf_ct_frag6_skb_cb
 {
 	struct inet6_skb_parm	h;
diff -Nru openvswitch-2.13.1/debian/changelog openvswitch-2.13.3/debian/changelog
--- openvswitch-2.13.1/debian/changelog	2021-01-28 19:46:04.000000000 +0000
+++ openvswitch-2.13.3/debian/changelog	2021-03-24 08:46:06.000000000 +0000
@@ -1,3 +1,37 @@
+openvswitch (2.13.3-0ubuntu0.20.10.1) groovy; urgency=medium
+
+  [ James Page ]
+  * New upstream point release (LP: #1920141, LP: #1907686):
+    - d/p/*: Refresh including drop of part of patch as equivalent
+      changes included in point release.
+    - Dropped security patches, included in release:
+      + CVE-2015-8011.patch
+      + CVE-2020-27827.patch
+      + CVE-2020-35498.patch
+  * Add BD on libdbus-1-dev to resolve linking issues for DPDK builds due
+    to changes in DPDK.
+  * d/control: Set minimum version of libdpdk-dev to avoid build
+    failures with 19.11.6-0ubuntu0.20.10.1.
+
+  [ Frode Nordahl ]
+  * Fix recording of FQDN/hostname on startup (LP: #1915829):
+    - d/p/ovs-dev-ovs-ctl-Allow-recording-hostname-separately.patch: Cherry
+      pick of committed upstream fix to support skip of hostname
+      configuration on ovs-vswitchd/ovsdb-server startup.
+    - d/openvswitch-switch.ovs-record-hostname.service: Record hostname in
+      Open vSwitch after network-online.target using new systemd unit.
+    - d/openvswitch-switch.ovs-vswitchd.service: Pass `--no-record-hostname`
+      option to `ovs-ctl` to delegate recording of hostname to the separate
+      service.
+    - d/openvswitch-switch.ovsdb-server.service: Pass `--no-record-hostname`
+      option to `ovs-ctl` to delegate recording of hostname to the separate
+      service.
+    - d/openvswitch-switch.service: Add `Also` reference to
+      ovs-record-hostname.service so that the service is enabled on install.
+    - d/rules: Add `ovs-record-hostname.service` to package build.
+
+ -- James Page <james.page@ubuntu.com>  Wed, 24 Mar 2021 08:46:06 +0000
+
 openvswitch (2.13.1-0ubuntu1.3) groovy-security; urgency=medium
 
   * SECURITY UPDATE: packet parsing vulnerability
diff -Nru openvswitch-2.13.1/debian/control openvswitch-2.13.3/debian/control
--- openvswitch-2.13.1/debian/control	2020-12-14 17:34:26.000000000 +0000
+++ openvswitch-2.13.3/debian/control	2021-03-24 08:46:06.000000000 +0000
@@ -14,7 +14,8 @@
  dh-python,
  graphviz,
  libcap-ng-dev,
- libdpdk-dev (>= 19.11) [amd64 i386 ppc64el arm64],
+ libdbus-1-dev [amd64 i386 ppc64el arm64],
+ libdpdk-dev (>= 19.11.7-0ubuntu0.20.10.1~) [amd64 i386 ppc64el arm64],
  libnuma-dev [amd64 i386 ppc64el arm64],
  libpcap-dev [amd64 i386 ppc64el arm64],
  libssl-dev,
diff -Nru openvswitch-2.13.1/debian/openvswitch-switch.ovsdb-server.service openvswitch-2.13.3/debian/openvswitch-switch.ovsdb-server.service
--- openvswitch-2.13.1/debian/openvswitch-switch.ovsdb-server.service	2020-12-14 17:34:26.000000000 +0000
+++ openvswitch-2.13.3/debian/openvswitch-switch.ovsdb-server.service	2021-03-18 09:18:13.000000000 +0000
@@ -12,9 +12,11 @@
 EnvironmentFile=-/etc/default/openvswitch-switch
 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
           --no-ovs-vswitchd --no-monitor --system-id=random \
+          --no-record-hostname \
           start $OVS_CTL_OPTS
 ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop
 ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \
-           --no-monitor restart $OVS_CTL_OPTS
+          --no-record-hostname \
+          --no-monitor restart $OVS_CTL_OPTS
 RuntimeDirectory=openvswitch
 RuntimeDirectoryMode=0755
diff -Nru openvswitch-2.13.1/debian/openvswitch-switch.ovs-record-hostname.service openvswitch-2.13.3/debian/openvswitch-switch.ovs-record-hostname.service
--- openvswitch-2.13.1/debian/openvswitch-switch.ovs-record-hostname.service	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch-2.13.3/debian/openvswitch-switch.ovs-record-hostname.service	2021-03-17 09:48:04.000000000 +0000
@@ -0,0 +1,18 @@
+[Unit]
+Description=Open vSwitch Record Hostname
+After=ovsdb-server.service ovs-vswitchd.service network-online.target
+Requires=ovsdb-server.service
+Requires=ovs-vswitchd.service
+Requires=network-online.target
+AssertPathIsReadWrite=/var/run/openvswitch/db.sock
+
+[Service]
+Type=oneshot
+ExecStart=/usr/share/openvswitch/scripts/ovs-ctl record-hostname-if-not-set
+ExecStop=/bin/true
+ExecReload=/usr/share/openvswitch/scripts/ovs-ctl record-hostname-if-not-set
+TimeoutSec=300
+RemainAfterExit=yes
+
+[Install]
+RequiredBy=openvswitch-switch.service
diff -Nru openvswitch-2.13.1/debian/openvswitch-switch.ovs-vswitchd.service openvswitch-2.13.3/debian/openvswitch-switch.ovs-vswitchd.service
--- openvswitch-2.13.1/debian/openvswitch-switch.ovs-vswitchd.service	2020-12-14 17:34:26.000000000 +0000
+++ openvswitch-2.13.3/debian/openvswitch-switch.ovs-vswitchd.service	2021-03-17 09:48:04.000000000 +0000
@@ -16,9 +16,11 @@
 EnvironmentFile=-/etc/default/openvswitch-switch
 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
           --no-ovsdb-server --no-monitor --system-id=random \
+          --no-record-hostname \
           start $OVS_CTL_OPTS
 ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop
 ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \
           --no-monitor --system-id=random \
+          --no-record-hostname \
           restart $OVS_CTL_OPTS
 TimeoutSec=300
diff -Nru openvswitch-2.13.1/debian/openvswitch-switch.service openvswitch-2.13.3/debian/openvswitch-switch.service
--- openvswitch-2.13.1/debian/openvswitch-switch.service	2020-12-14 17:34:26.000000000 +0000
+++ openvswitch-2.13.3/debian/openvswitch-switch.service	2021-03-17 09:48:04.000000000 +0000
@@ -15,3 +15,4 @@
 
 [Install]
 WantedBy=multi-user.target
+Also=ovs-record-hostname.service
diff -Nru openvswitch-2.13.1/debian/patches/CVE-2015-8011.patch openvswitch-2.13.3/debian/patches/CVE-2015-8011.patch
--- openvswitch-2.13.1/debian/patches/CVE-2015-8011.patch	2021-01-08 12:26:26.000000000 +0000
+++ openvswitch-2.13.3/debian/patches/CVE-2015-8011.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-From: Vincent Bernat <vincent at bernat.im>
-
-Upstream commit:
-	commit a8d8006c06d9ac16ebcf33295cbd625c0847ca9b
-	Author: Vincent Bernat <vincent at bernat.im>
-	Date: Sun, 4 Oct 2015 01:50:38 +0200
-
-	lldp: fix a buffer overflow when handling management address TLV
-
-	When a remote device was advertising a too large management address
-	while still respecting TLV boundaries, lldpd would crash due to a buffer
-	overflow. However, the buffer being a static one, this buffer overflow
-	is not exploitable if hardening was not disabled. This bug exists since
-	version 0.5.6.
-
-Co-authored-by: Fabrizio D'Angelo <fdangelo at redhat.com>
-Signed-off-by: Fabrizio D'Angelo <fdangelo at redhat.com>
-Acked-by: Aaron Conole <aconole at redhat.com>
----
- lib/lldp/lldp.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/lib/lldp/lldp.c
-+++ b/lib/lldp/lldp.c
-@@ -481,6 +481,11 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED
-         case LLDP_TLV_MGMT_ADDR:
-             CHECK_TLV_SIZE(1, "Management address");
-             addr_str_length = PEEK_UINT8;
-+            if (addr_str_length > sizeof(addr_str_buffer)) {
-+                VLOG_WARN("too large management address on %s",
-+                          hardware->h_ifname);
-+                goto malformed;
-+            }
-             CHECK_TLV_SIZE(1 + addr_str_length, "Management address");
-             PEEK_BYTES(addr_str_buffer, addr_str_length);
-             addr_length = addr_str_length - 1;
-@@ -505,7 +510,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED
-             break;
- 
-         case LLDP_TLV_ORG:
--            CHECK_TLV_SIZE(4, "Organisational");
-+            CHECK_TLV_SIZE(1 + (int)sizeof(orgid), "Organisational");
-             PEEK_BYTES(orgid, sizeof orgid);
-             tlv_subtype = PEEK_UINT8;
-             if (memcmp(dot1, orgid, sizeof orgid) == 0) {
diff -Nru openvswitch-2.13.1/debian/patches/CVE-2020-27827.patch openvswitch-2.13.3/debian/patches/CVE-2020-27827.patch
--- openvswitch-2.13.1/debian/patches/CVE-2020-27827.patch	2021-01-08 12:26:32.000000000 +0000
+++ openvswitch-2.13.3/debian/patches/CVE-2020-27827.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Reported-by: Jonas Rudloff <jonas.t.rudloff@gmail.com>
-Signed-off-by: Aaron Conole <aconole@redhat.com>
----
---- a/lib/lldp/lldp.c
-+++ b/lib/lldp/lldp.c
-@@ -464,10 +464,13 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED
-             b = xzalloc(tlv_size + 1);
-             PEEK_BYTES(b, tlv_size);
-             if (tlv_type == LLDP_TLV_PORT_DESCR) {
-+                free(port->p_descr);
-                 port->p_descr = b;
-             } else if (tlv_type == LLDP_TLV_SYSTEM_NAME) {
-+                free(chassis->c_name);
-                 chassis->c_name = b;
-             } else {
-+                free(chassis->c_descr);
-                 chassis->c_descr = b;
-             }
-             break;
diff -Nru openvswitch-2.13.1/debian/patches/CVE-2020-35498.patch openvswitch-2.13.3/debian/patches/CVE-2020-35498.patch
--- openvswitch-2.13.1/debian/patches/CVE-2020-35498.patch	2021-01-28 19:45:59.000000000 +0000
+++ openvswitch-2.13.3/debian/patches/CVE-2020-35498.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-From f9498a162855476f0c2548354f27d618dbb51666 Mon Sep 17 00:00:00 2001
-From: Flavio Leitner <fbl@sysclose.org>
-Date: Mon, 26 Oct 2020 16:03:19 -0300
-Subject: [PATCH v2 branch-2.13] flow: Support extra padding length.
-
-Although not required, padding can be optionally added until
-the packet length is MTU bytes. A packet with extra padding
-currently fails sanity checks.
-
-Fixes: fa8d9001a624 ("miniflow_extract: Properly handle small IP packets.")
-Reported-by: Joakim Hindersson <joakim.hindersson@elastx.se>
-Acked-by: Ilya Maximets <i.maximets@ovn.org>
-Signed-off-by: Flavio Leitner <fbl@sysclose.org>
----
- lib/conntrack.c     |  2 +-
- lib/dp-packet.h     | 10 +++++-----
- lib/flow.c          |  6 +++---
- tests/classifier.at | 36 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 45 insertions(+), 9 deletions(-)
-
-diff --git a/lib/conntrack.c b/lib/conntrack.c
-index 0cbc8f6d2..bb98395cd 100644
---- a/lib/conntrack.c
-+++ b/lib/conntrack.c
-@@ -813,7 +813,7 @@ static void
- reverse_nat_packet(struct dp_packet *pkt, const struct conn *conn)
- {
-     char *tail = dp_packet_tail(pkt);
--    uint8_t pad = dp_packet_l2_pad_size(pkt);
-+    uint16_t pad = dp_packet_l2_pad_size(pkt);
-     struct conn_key inner_key;
-     const char *inner_l4 = NULL;
-     uint16_t orig_l3_ofs = pkt->l3_ofs;
-diff --git a/lib/dp-packet.h b/lib/dp-packet.h
-index 9f8991faa..45655af46 100644
---- a/lib/dp-packet.h
-+++ b/lib/dp-packet.h
-@@ -81,7 +81,7 @@ struct dp_packet {
- 
-     /* All the following elements of this struct are copied in a single call
-      * of memcpy in dp_packet_clone_with_headroom. */
--    uint8_t l2_pad_size;           /* Detected l2 padding size.
-+    uint16_t l2_pad_size;          /* Detected l2 padding size.
-                                     * Padding is non-pullable. */
-     uint16_t l2_5_ofs;             /* MPLS label stack offset, or UINT16_MAX */
-     uint16_t l3_ofs;               /* Network-level header offset,
-@@ -118,8 +118,8 @@ void *dp_packet_resize_l2(struct dp_packet *, int increment);
- void *dp_packet_resize_l2_5(struct dp_packet *, int increment);
- static inline void *dp_packet_eth(const struct dp_packet *);
- static inline void dp_packet_reset_offsets(struct dp_packet *);
--static inline uint8_t dp_packet_l2_pad_size(const struct dp_packet *);
--static inline void dp_packet_set_l2_pad_size(struct dp_packet *, uint8_t);
-+static inline uint16_t dp_packet_l2_pad_size(const struct dp_packet *);
-+static inline void dp_packet_set_l2_pad_size(struct dp_packet *, uint16_t);
- static inline void *dp_packet_l2_5(const struct dp_packet *);
- static inline void dp_packet_set_l2_5(struct dp_packet *, void *);
- static inline void *dp_packet_l3(const struct dp_packet *);
-@@ -327,14 +327,14 @@ dp_packet_reset_offsets(struct dp_packet *b)
-     b->l4_ofs = UINT16_MAX;
- }
- 
--static inline uint8_t
-+static inline uint16_t
- dp_packet_l2_pad_size(const struct dp_packet *b)
- {
-     return b->l2_pad_size;
- }
- 
- static inline void
--dp_packet_set_l2_pad_size(struct dp_packet *b, uint8_t pad_size)
-+dp_packet_set_l2_pad_size(struct dp_packet *b, uint16_t pad_size)
- {
-     ovs_assert(pad_size <= dp_packet_size(b));
-     b->l2_pad_size = pad_size;
-diff --git a/lib/flow.c b/lib/flow.c
-index 45bb96b54..353d5cd3e 100644
---- a/lib/flow.c
-+++ b/lib/flow.c
-@@ -655,7 +655,7 @@ ipv4_sanity_check(const struct ip_header *nh, size_t size,
- 
-     tot_len = ntohs(nh->ip_tot_len);
-     if (OVS_UNLIKELY(tot_len > size || ip_len > tot_len ||
--                size - tot_len > UINT8_MAX)) {
-+                size - tot_len > UINT16_MAX)) {
-         return false;
-     }
- 
-@@ -693,8 +693,8 @@ ipv6_sanity_check(const struct ovs_16aligned_ip6_hdr *nh, size_t size)
-     if (OVS_UNLIKELY(plen + IPV6_HEADER_LEN > size)) {
-         return false;
-     }
--    /* Jumbo Payload option not supported yet. */
--    if (OVS_UNLIKELY(size - (plen + IPV6_HEADER_LEN) > UINT8_MAX)) {
-+
-+    if (OVS_UNLIKELY(size - (plen + IPV6_HEADER_LEN) > UINT16_MAX)) {
-         return false;
-     }
- 
-diff --git a/tests/classifier.at b/tests/classifier.at
-index 88818618b..cdcd72c15 100644
---- a/tests/classifier.at
-+++ b/tests/classifier.at
-@@ -304,3 +304,39 @@ ovs-ofctl: "conjunction" actions may be used along with "note" but not any other
- ])
- OVS_VSWITCHD_STOP
- AT_CLEANUP
-+
-+# Flow classifier a packet with excess of padding.
-+AT_SETUP([flow classifier - packet with extra padding])
-+OVS_VSWITCHD_START
-+add_of_ports br0 1 2
-+AT_DATA([flows.txt], [dnl
-+priority=5,ip,ip_dst=1.1.1.1,actions=1
-+priority=5,ip,ip_dst=1.1.1.2,actions=2
-+priority=0,actions=drop
-+])
-+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
-+packet=00020202020000010101010008004500001c00010000401176cc01010101010101020d6a00350008ee3a
-+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 $packet] , [0], [stdout])
-+AT_CHECK([tail -2 stdout], [0],
-+  [Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
-+Datapath actions: 2
-+])
-+# normal packet plus 255 bytes of padding (8bit padding).
-+# 255 * 2 = 510
-+padding=$(printf '%*s' 510 | tr ' ' '0')
-+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}] , [0], [stdout])
-+AT_CHECK([tail -2 stdout], [0],
-+  [Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
-+Datapath actions: 2
-+])
-+# normal packet plus padding up to 65535 bytes of length (16bit limit).
-+# 65535 - 43 = 65492
-+# 65492 * 2 = 130984
-+padding=$(printf '%*s' 130984 | tr ' ' '0')
-+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}], [0], [stdout])
-+AT_CHECK([tail -2 stdout], [0],
-+  [Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
-+Datapath actions: 2
-+])
-+OVS_VSWITCHD_STOP
-+AT_CLEANUP
--- 
-2.29.2
-
diff -Nru openvswitch-2.13.1/debian/patches/ovs-dev-ovs-ctl-Allow-recording-hostname-separately.patch openvswitch-2.13.3/debian/patches/ovs-dev-ovs-ctl-Allow-recording-hostname-separately.patch
--- openvswitch-2.13.1/debian/patches/ovs-dev-ovs-ctl-Allow-recording-hostname-separately.patch	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch-2.13.3/debian/patches/ovs-dev-ovs-ctl-Allow-recording-hostname-separately.patch	2021-03-18 09:18:13.000000000 +0000
@@ -0,0 +1,114 @@
+From 556e65e17991a5b165bc8697d2e4da266afada67 Mon Sep 17 00:00:00 2001
+From: Frode Nordahl <frode.nordahl@canonical.com>
+Date: Thu, 25 Feb 2021 16:28:16 +0100
+Subject: [PATCH] ovs-ctl: Allow recording hostname separately.
+
+ovs-ctl determines the system FQDN or hostname and records it in
+the `external-ids:hostname` field of the `Open-vSwitch` table on
+system startup if it is not already set.
+
+This value may be consumed by downstream software and having it
+unset or set to a incorrect value could lead to erratic behavior
+of a system.
+
+When a system is configured to use an Open vSwitch controlled
+datapath as its only network connection, the current ordering of
+events would always record a unreliable hostname.
+
+To tackle this problem this patch adds an optional argument that
+allows starting Open vSwitch without recording the hostname in
+the database as well as a new ctl command to record the hostname
+separately. This command can be called by the system startup
+scripts when the system is ready to collect and record this
+information.
+
+Reported-At: https://bugs.launchpad.net/bugs/1915829
+Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com>
+Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
+Origin: https://github.com/openvswitch/ovs/commit/556e65e17991a5b165bc8697d2e4da266afada67
+Applied-Upstream: https://github.com/openvswitch/ovs/commit/2ad201659cedbb1134a9d27af132e491173c7e40
+---
+ NEWS                 |  5 +++++
+ utilities/ovs-ctl.in | 41 +++++++++++++++++++++++++++--------------
+ 2 files changed, 32 insertions(+), 14 deletions(-)
+
+Index: openvswitch-2.13.1/utilities/ovs-ctl.in
+===================================================================
+--- openvswitch-2.13.1.orig/utilities/ovs-ctl.in
++++ openvswitch-2.13.1/utilities/ovs-ctl.in
+@@ -225,7 +225,9 @@ start_forwarding () {
+     if test X"$OVS_VSWITCHD" = Xyes; then
+         do_start_forwarding || return 1
+     fi
+-    set_hostname &
++    if test X"$RECORD_HOSTNAME" = Xyes; then
++        set_hostname &
++    fi
+     return 0
+ }
+ 
+@@ -312,6 +314,7 @@ set_defaults () {
+     SYSTEM_ID=
+ 
+     FULL_HOSTNAME=yes
++    RECORD_HOSTNAME=yes
+ 
+     DELETE_BRIDGES=no
+     DELETE_TRANSIENT_PORTS=no
+@@ -372,19 +375,24 @@ This program is intended to be invoked i
+ scripts.  System administrators should not normally invoke it directly.
+ 
+ Commands:
+-  start                   start Open vSwitch daemons
+-  stop                    stop Open vSwitch daemons
+-  restart                 stop and start Open vSwitch daemons
+-  status                  check whether Open vSwitch daemons are running
+-  version                 print versions of Open vSwitch daemons
+-  load-kmod               insert modules if not already present
+-  force-reload-kmod       save OVS network device state, stop OVS, unload kernel
+-                          module, reload kernel module, start OVS, restore state
+-  enable-protocol         enable protocol specified in options with iptables
+-  delete-transient-ports  delete transient (other_config:transient=true) ports
+-  start-ovs-ipsec         start Open vSwitch ipsec daemon
+-  stop-ovs-ipsec          stop Open vSwitch ipsec daemon
+-  help                    display this help message
++  start                       start Open vSwitch daemons
++  stop                        stop Open vSwitch daemons
++  restart                     stop and start Open vSwitch daemons
++  status                      check whether Open vSwitch daemons are running
++  version                     print versions of Open vSwitch daemons
++  load-kmod                   insert modules if not already present
++  force-reload-kmod           save OVS network device state, stop OVS, unload
++                              kernel module, reload kernel module, start OVS,
++                              restore state
++  enable-protocol             enable protocol specified in options with
++                              iptables
++  delete-transient-ports      delete transient (other_config:transient=true)
++                              ports
++  start-ovs-ipsec             start Open vSwitch ipsec daemon
++  stop-ovs-ipsec              stop Open vSwitch ipsec daemon
++  record-hostname-if-not-set  determine the system hostname and record it in
++                              the Open vSwitch database if not already set
++  help                        display this help message
+ 
+ One of the following options is required for "start", "restart" and "force-reload-kmod":
+   --system-id=UUID   set specific ID to uniquely identify this system
+@@ -405,6 +413,8 @@ Less important options for "start", "res
+   --ovsdb-server-priority=NICE   set ovsdb-server's niceness (default: $OVSDB_SERVER_PRIORITY)
+   --ovs-vswitchd-priority=NICE   set ovs-vswitchd's niceness (default: $OVS_VSWITCHD_PRIORITY)
+   --no-full-hostname             set short hostname instead of full hostname
++  --no-record-hostname           do not attempt to determine/record system
++                                 hostname as part of start command
+ 
+ Debugging options for "start", "restart" and "force-reload-kmod":
+   --ovsdb-server-wrapper=WRAPPER
+@@ -561,6 +571,9 @@ case $command in
+     stop-ovs-ipsec)
+         stop_ovs_ipsec
+         ;;
++    record-hostname-if-not-set)
++        set_hostname
++        ;;
+     help)
+         usage
+         ;;
diff -Nru openvswitch-2.13.1/debian/patches/py3-compat.patch openvswitch-2.13.3/debian/patches/py3-compat.patch
--- openvswitch-2.13.1/debian/patches/py3-compat.patch	2020-12-14 17:34:26.000000000 +0000
+++ openvswitch-2.13.3/debian/patches/py3-compat.patch	2021-03-16 16:55:51.000000000 +0000
@@ -126,93 +126,6 @@
  
  
  def ovs_vsctl_add_bridge(bridge):
---- a/utilities/bugtool/ovs-bugtool.in
-+++ b/utilities/bugtool/ovs-bugtool.in
-@@ -33,8 +33,6 @@
- # or func_output().
- #
- 
--import StringIO
--import commands
- import fcntl
- import getopt
- import hashlib
-@@ -48,10 +46,12 @@ import warnings
- import zipfile
- from select import select
- from signal import SIGTERM
--from subprocess import PIPE, Popen
-+from subprocess import PIPE, Popen, check_output
- 
- from xml.dom.minidom import getDOMImplementation, parse
- 
-+from six.moves import StringIO
-+
- warnings.filterwarnings(action="ignore", category=DeprecationWarning)
- 
- OS_RELEASE = platform.release()
-@@ -782,7 +782,7 @@ def dump_scsi_hosts(cap):
- 
- 
- def module_info(cap):
--    output = StringIO.StringIO()
-+    output = StringIO()
-     modules = open(PROC_MODULES, 'r')
-     procs = []
- 
-@@ -806,7 +806,7 @@ def multipathd_topology(cap):
- 
- 
- def dp_list():
--    output = StringIO.StringIO()
-+    output = StringIO()
-     procs = [ProcOutput([OVS_DPCTL, 'dump-dps'],
-              caps[CAP_NETWORK_STATUS][MAX_TIME], output)]
- 
-@@ -828,7 +828,7 @@ def collect_ovsdb():
-             if os.path.isfile(OPENVSWITCH_COMPACT_DB):
-                 os.unlink(OPENVSWITCH_COMPACT_DB)
- 
--            output = StringIO.StringIO()
-+            output = StringIO()
-             max_time = 5
-             procs = [ProcOutput(['ovsdb-tool', 'compact',
-                                 OPENVSWITCH_CONF_DB, OPENVSWITCH_COMPACT_DB],
-@@ -871,7 +871,7 @@ def fd_usage(cap):
- 
- 
- def dump_rdac_groups(cap):
--    output = StringIO.StringIO()
-+    output = StringIO()
-     procs = [ProcOutput([MPPUTIL, '-a'], caps[cap][MAX_TIME], output)]
- 
-     run_procs([procs])
-@@ -1095,7 +1095,7 @@ def make_inventory(inventory, subdir):
-     s.setAttribute('date', time.strftime('%c'))
-     s.setAttribute('hostname', platform.node())
-     s.setAttribute('uname', ' '.join(platform.uname()))
--    s.setAttribute('uptime', commands.getoutput(UPTIME))
-+    s.setAttribute('uptime', check_output([UPTIME]))
-     document.getElementsByTagName(INVENTORY_XML_ROOT)[0].appendChild(s)
- 
-     map(lambda k_v: inventory_entry(document, subdir, k_v[0], k_v[1]),
-@@ -1391,13 +1391,13 @@ def get_free_disk_space(path):
-     return s.f_frsize * s.f_bfree
- 
- 
--class StringIOmtime(StringIO.StringIO):
-+class StringIOmtime(StringIO):
-     def __init__(self, buf=''):
--        StringIO.StringIO.__init__(self, buf)
-+        StringIO.__init__(self, buf)
-         self.mtime = time.time()
- 
-     def write(self, s):
--        StringIO.StringIO.write(self, s)
-+        StringIO.write(self, s)
-         self.mtime = time.time()
- 
- 
 --- a/utilities/ovs-check-dead-ifs.in
 +++ b/utilities/ovs-check-dead-ifs.in
 @@ -1,5 +1,7 @@
@@ -252,7 +165,7 @@
  
      (field, stats, action) = (results[0], results[1:-1], results[-1])
  
-@@ -961,7 +963,7 @@ class FlowDB:
+@@ -963,7 +965,7 @@ class FlowDB:
          if not isinstance(line, str):
             line = str(line)
  
diff -Nru openvswitch-2.13.1/debian/patches/series openvswitch-2.13.3/debian/patches/series
--- openvswitch-2.13.1/debian/patches/series	2021-01-28 19:45:59.000000000 +0000
+++ openvswitch-2.13.3/debian/patches/series	2021-03-24 08:46:06.000000000 +0000
@@ -1,4 +1,2 @@
 py3-compat.patch
-CVE-2015-8011.patch
-CVE-2020-27827.patch
-CVE-2020-35498.patch
+ovs-dev-ovs-ctl-Allow-recording-hostname-separately.patch
diff -Nru openvswitch-2.13.1/debian/rules openvswitch-2.13.3/debian/rules
--- openvswitch-2.13.1/debian/rules	2020-12-14 17:34:26.000000000 +0000
+++ openvswitch-2.13.3/debian/rules	2021-03-24 08:46:06.000000000 +0000
@@ -107,9 +107,10 @@
 	dh_installinit --restart-after-upgrade
 	dh_installinit -popenvswitch-switch --name=ovsdb-server --no-start
 	dh_installinit -popenvswitch-switch --name=ovs-vswitchd --no-start
+	dh_installinit -popenvswitch-switch --name=ovs-record-hostname --no-start
 
 override_dh_systemd_start:
-	dh_systemd_start --restart-after-upgrade -Xovs-vswitchd.service -Xovsdb-server.service
+	dh_systemd_start --restart-after-upgrade -Xovs-vswitchd.service -Xovsdb-server.service -Xovs-record-hostname.service
 
 override_dh_strip:
 	dh_strip --dbg-package=openvswitch-dbg
diff -Nru openvswitch-2.13.1/Documentation/faq/releases.rst openvswitch-2.13.3/Documentation/faq/releases.rst
--- openvswitch-2.13.1/Documentation/faq/releases.rst	2020-08-04 21:41:31.766524451 +0000
+++ openvswitch-2.13.3/Documentation/faq/releases.rst	2021-02-10 20:04:59.176074628 +0000
@@ -67,9 +67,10 @@
     2.7.x        3.10 to 4.9
     2.8.x        3.10 to 4.12
     2.9.x        3.10 to 4.13
-    2.10.x       3.10 to 4.17
-    2.11.x       3.10 to 4.18
-    2.12.x       3.10 to 5.0
+    2.10.x       3.16 to 4.17
+    2.11.x       3.16 to 4.18
+    2.12.x       3.16 to 5.0
+    2.13.x       3.16 to 5.0
     ============ ==============
 
     Open vSwitch userspace should also work with the Linux kernel module built
@@ -78,6 +79,10 @@
     Open vSwitch userspace is not sensitive to the Linux kernel version.  It
     should build against almost any kernel, certainly against 2.6.32 and later.
 
+    Open vSwitch branches 2.10 through 2.13 will still compile against the
+    RHEL and CentOS 7 3.10 based kernels since they have diverged from the
+    Linux kernel.org 3.10 kernels.
+
 Q: Are all features available with all datapaths?
 
     A: Open vSwitch supports different datapaths on different platforms.  Each
diff -Nru openvswitch-2.13.1/Documentation/internals/contributing/submitting-patches.rst openvswitch-2.13.3/Documentation/internals/contributing/submitting-patches.rst
--- openvswitch-2.13.1/Documentation/internals/contributing/submitting-patches.rst	2020-08-04 21:38:24.739524451 +0000
+++ openvswitch-2.13.3/Documentation/internals/contributing/submitting-patches.rst	2021-02-10 20:03:31.966074628 +0000
@@ -68,11 +68,9 @@
   feature.  A bug fix patch should preferably add a test that would
   fail if the bug recurs.
 
-If you are using GitHub, then you may utilize the travis-ci.org CI build system
-by linking your GitHub repository to it. This will run some of the above tests
-automatically when you push changes to your repository.  See the "Continuous
-Integration with Travis-CI" in :doc:`/topics/testing` for details on how to set
-it up.
+If you are using GitHub, then you may utilize the GitHub Actions CI build
+system.  It will run some of the above tests automatically when you push
+changes to your repository.
 
 Email Subject
 -------------
diff -Nru openvswitch-2.13.1/Documentation/intro/install/dpdk.rst openvswitch-2.13.3/Documentation/intro/install/dpdk.rst
--- openvswitch-2.13.1/Documentation/intro/install/dpdk.rst	2020-08-04 21:41:31.900524451 +0000
+++ openvswitch-2.13.3/Documentation/intro/install/dpdk.rst	2021-02-10 20:04:59.467074628 +0000
@@ -687,6 +687,15 @@
   around is temporary and is expected to be removed once a method is provided
   by DPDK to query the upper bound MTU value for a given device.
 
+- Flow Control: When using i40e devices (Intel(R) 700 Series) it is recommended
+  to set Link State Change detection to interrupt mode. Otherwise it has been
+  observed that using the default polling mode, flow control changes may not be
+  applied, and flow control states will not be reflected correctly.
+  The issue is under investigation, this is a temporary work around.
+
+  For information about setting Link State Change detection, refer to
+  :ref:`lsc-detection`.
+
 Reporting Bugs
 --------------
 
diff -Nru openvswitch-2.13.1/Documentation/topics/dpdk/phy.rst openvswitch-2.13.3/Documentation/topics/dpdk/phy.rst
--- openvswitch-2.13.1/Documentation/topics/dpdk/phy.rst	2020-08-04 21:41:31.907524451 +0000
+++ openvswitch-2.13.3/Documentation/topics/dpdk/phy.rst	2021-02-10 20:04:59.474074628 +0000
@@ -385,6 +385,8 @@
 DPDK physical ports can be configured to use Jumbo Frames. For more
 information, refer to :doc:`jumbo-frames`.
 
+.. _lsc-detection:
+
 Link State Change (LSC) detection configuration
 -----------------------------------------------
 
diff -Nru openvswitch-2.13.1/Documentation/topics/testing.rst openvswitch-2.13.3/Documentation/topics/testing.rst
--- openvswitch-2.13.1/Documentation/topics/testing.rst	2020-08-04 21:41:31.908524451 +0000
+++ openvswitch-2.13.3/Documentation/topics/testing.rst	2021-02-10 20:04:59.475074628 +0000
@@ -405,45 +405,17 @@
 from ``clang-analyze`` will list the command (containing results directory)
 that you should invoke to view the results on a browser.
 
-Continuous Integration with Travis CI
--------------------------------------
+Continuous Integration with GitHub Actions
+------------------------------------------
 
-A .travis.yml file is provided to automatically build Open vSwitch with various
-build configurations and run the testsuite using Travis CI. Builds will be
-performed with gcc, sparse and clang with the -Werror compiler flag included,
-therefore the build will fail if a new warning has been introduced.
+A ``.github/workflows/*.yml`` files provided to automatically build
+Open vSwitch with various build configurations and run the testsuite using
+GitHub Actions. Builds will be performed with gcc, sparse and clang with the
+-Werror compiler flag included, therefore the build will fail if a new warning
+has been introduced.
 
 The CI build is triggered via git push (regardless of the specific branch) or
-pull request against any Open vSwitch GitHub repository that is linked to
-travis-ci.
-
-Instructions to setup travis-ci for your GitHub repository:
-
-1. Go to https://travis-ci.org/ and sign in using your GitHub ID.
-2. Go to the "Repositories" tab and enable the ovs repository. You may disable
-   builds for pushes or pull requests.
-3. In order to avoid forks sending build failures to the upstream mailing list,
-   the notification email recipient is encrypted. If you want to receive email
-   notification for build failures, replace the encrypted string:
-
-   1. Install the travis-ci CLI (Requires ruby >=2.0): gem install travis
-   2. In your Open vSwitch repository: travis encrypt mylist@mydomain.org
-   3. Add/replace the notifications section in .travis.yml and fill in the
-      secure string as returned by travis encrypt::
-
-          notifications:
-            email:
-              recipients:
-                - secure: "....."
-
-  .. note::
-    You may remove/omit the notifications section to fall back to default
-    notification behaviour which is to send an email directly to the author and
-    committer of the failing commit. Note that the email is only sent if the
-    author/committer have commit rights for the particular GitHub repository.
-
-4. Pushing a commit to the repository which breaks the build or the
-   testsuite will now trigger a email sent to mylist@mydomain.org
+pull request against any Open vSwitch GitHub repository.
 
 vsperf
 ------
diff -Nru openvswitch-2.13.1/Documentation/topics/userspace-tso.rst openvswitch-2.13.3/Documentation/topics/userspace-tso.rst
--- openvswitch-2.13.1/Documentation/topics/userspace-tso.rst	2020-08-04 21:41:31.909524451 +0000
+++ openvswitch-2.13.3/Documentation/topics/userspace-tso.rst	2021-02-10 20:04:59.476074628 +0000
@@ -104,6 +104,12 @@
 in client mode will receive TSO packet regardless of TSO being enabled
 or disabled within the guest.
 
+All kernel devices that use the raw socket interface (veth, for example)
+require the kernel commit 9d2f67e43b73 ("net/packet: fix packet drop as of
+virtio gso") in order to work properly. This commit was merged in upstream
+kernel 4.19-rc7, so make sure your kernel is either newer or contains the
+backport.
+
 ~~~~~~~~~~~~~~~~~~
 Performance Tuning
 ~~~~~~~~~~~~~~~~~~
diff -Nru openvswitch-2.13.1/Documentation/tutorials/ipsec.rst openvswitch-2.13.3/Documentation/tutorials/ipsec.rst
--- openvswitch-2.13.1/Documentation/tutorials/ipsec.rst	2020-08-04 21:38:24.789524451 +0000
+++ openvswitch-2.13.3/Documentation/tutorials/ipsec.rst	2021-02-10 20:04:59.476074628 +0000
@@ -298,6 +298,7 @@
                                              Otherwise, error message will
                                              be provided
    Tunnel Type:    gre
+   Local IP:       %defaultroute
    Remote IP:      2.2.2.2
    SKB mark:       None
    Local cert:     None
diff -Nru openvswitch-2.13.1/.github/workflows/build-and-test.yml openvswitch-2.13.3/.github/workflows/build-and-test.yml
--- openvswitch-2.13.1/.github/workflows/build-and-test.yml	1970-01-01 00:00:00.000000000 +0000
+++ openvswitch-2.13.3/.github/workflows/build-and-test.yml	2021-02-10 20:04:59.175074628 +0000
@@ -0,0 +1,205 @@
+name: Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build-linux:
+    env:
+      dependencies: |
+        automake libtool gcc bc libjemalloc1 libjemalloc-dev    \
+        libssl-dev llvm-dev libelf-dev libnuma-dev libpcap-dev  \
+        python3-openssl python3-pip python3-sphinx              \
+        selinux-policy-dev
+      deb_dependencies: |
+        linux-headers-$(uname -r) build-essential fakeroot devscripts equivs
+      AFXDP:       ${{ matrix.afxdp }}
+      CC:          ${{ matrix.compiler }}
+      DEB_PACKAGE: ${{ matrix.deb_package }}
+      DPDK:        ${{ matrix.dpdk }}
+      DPDK_SHARED: ${{ matrix.dpdk_shared }}
+      KERNEL:      ${{ matrix.kernel }}
+      KERNEL_LIST: ${{ matrix.kernel_list }}
+      LIBS:        ${{ matrix.libs }}
+      M32:         ${{ matrix.m32 }}
+      OPTS:        ${{ matrix.opts }}
+      TESTSUITE:   ${{ matrix.testsuite }}
+
+    name: linux ${{ join(matrix.*, ' ') }}
+    runs-on: ubuntu-18.04
+    timeout-minutes: 30
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - compiler:     gcc
+            opts:         --disable-ssl
+          - compiler:     clang
+            opts:         --disable-ssl
+
+          - compiler:     gcc
+            testsuite:    test
+            kernel:       3.16
+          - compiler:     clang
+            testsuite:    test
+            kernel:       3.16
+
+          - compiler:     gcc
+            testsuite:    test
+            opts:         --enable-shared
+          - compiler:     clang
+            testsuite:    test
+            opts:         --enable-shared
+
+          - compiler:     gcc
+            testsuite:    test
+            dpdk:         dpdk
+          - compiler:     clang
+            testsuite:    test
+            dpdk:         dpdk
+
+          - compiler:     gcc
+            testsuite:    test
+            libs:         -ljemalloc
+          - compiler:     clang
+            testsuite:    test
+            libs:         -ljemalloc
+
+          - compiler:     gcc
+            kernel_list:  5.0 4.20 4.19 4.18 4.17 4.16
+          - compiler:     clang
+            kernel_list:  5.0 4.20 4.19 4.18 4.17 4.16
+
+          - compiler:     gcc
+            kernel_list:  4.15 4.14 4.9 4.4 3.16
+          - compiler:     clang
+            kernel_list:  4.15 4.14 4.9 4.4 3.16
+
+          - compiler:     gcc
+            afxdp:        afxdp
+            kernel:       5.3
+          - compiler:     clang
+            afxdp:        afxdp
+            kernel:       5.3
+
+          - compiler:     gcc
+            dpdk:         dpdk
+            opts:         --enable-shared
+          - compiler:     clang
+            dpdk:         dpdk
+            opts:         --enable-shared
+
+          - compiler:     gcc
+            dpdk_shared:  dpdk-shared
+          - compiler:     clang
+            dpdk_shared:  dpdk-shared
+
+          - compiler:     gcc
+            dpdk_shared:  dpdk-shared
+            opts:         --enable-shared
+          - compiler:     clang
+            dpdk_shared:  dpdk-shared
+            opts:         --enable-shared
+
+          - compiler:     gcc
+            m32:          m32
+            opts:         --disable-ssl
+
+          - compiler:     gcc
+            deb_package:  deb
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+
+    - name: create ci signature file for the dpdk cache key
+      if:   matrix.dpdk != '' || matrix.dpdk_shared != ''
+      # This will collect most of DPDK related lines, so hash will be different
+      # if something changed in a way we're building DPDK including DPDK_VER.
+      # This also allows us to use cache from any branch as long as version
+      # and a way we're building DPDK stays the same.
+      run:  |
+        grep -irE 'RTE_|DPDK|meson|ninja' -r .ci/ > dpdk-ci-signature
+        cat dpdk-ci-signature
+
+    - name: cache
+      if:   matrix.dpdk != '' || matrix.dpdk_shared != ''
+      uses: actions/cache@v2
+      env:
+        matrix_key: ${{ matrix.dpdk }}${{ matrix.dpdk_shared }}
+        ci_key:     ${{ hashFiles('dpdk-ci-signature') }}
+      with:
+        path: dpdk-dir
+        key:  ${{ env.matrix_key }}-${{ env.ci_key }}
+
+    - name: update APT cache
+      run:  sudo apt update || true
+    - name: install common dependencies
+      if:   matrix.deb_package == ''
+      run:  sudo apt install -y ${{ env.dependencies }}
+    - name: install dependencies for debian packages
+      if:   matrix.deb_package != ''
+      run:  sudo apt install -y ${{ env.deb_dependencies }}
+    - name: install libunbound libunwind
+      if:   matrix.m32 == ''
+      run:  sudo apt install -y libunbound-dev libunwind-dev
+
+    - name: prepare
+      run:  ./.ci/linux-prepare.sh
+
+    - name: build
+      run:  PATH="$PATH:$HOME/bin" ./.ci/linux-build.sh
+
+    - name: upload deb packages
+      if:   matrix.deb_package != ''
+      uses: actions/upload-artifact@v2
+      with:
+        name: deb-packages
+        path: '/home/runner/work/ovs/*.deb'
+
+    - name: copy logs on failure
+      if: failure() || cancelled()
+      run: |
+        # upload-artifact@v2 throws exceptions if it tries to upload socket
+        # files and we could have some socket files in testsuite.dir.
+        # Also, upload-artifact@v2 doesn't work well enough with wildcards.
+        # So, we're just archiving everything here to avoid any issues.
+        mkdir logs
+        cp config.log ./logs/
+        cp -r ./*/_build/sub/tests/testsuite.* ./logs/ || true
+        tar -czvf logs.tgz logs/
+
+    - name: upload logs on failure
+      if: failure() || cancelled()
+      uses: actions/upload-artifact@v2
+      with:
+        name: logs-linux-${{ join(matrix.*, '-') }}
+        path: logs.tgz
+
+  build-osx:
+    env:
+      CC:    clang
+      OPTS:  --disable-ssl
+
+    name:    osx clang --disable-ssl
+    runs-on: macos-latest
+    timeout-minutes: 30
+
+    strategy:
+      fail-fast: false
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: install dependencies
+      run:  brew install automake libtool
+    - name: prepare
+      run:  ./.ci/osx-prepare.sh
+    - name: build
+      run:  PATH="$PATH:$HOME/bin" ./.ci/osx-build.sh
+    - name: upload logs on failure
+      if: failure()
+      uses: actions/upload-artifact@v2
+      with:
+        name: logs-osx-clang---disable-ssl
+        path: config.log
diff -Nru openvswitch-2.13.1/include/openvswitch/version.h openvswitch-2.13.3/include/openvswitch/version.h
--- openvswitch-2.13.1/include/openvswitch/version.h	2020-08-04 21:41:51.595524451 +0000
+++ openvswitch-2.13.3/include/openvswitch/version.h	2021-02-10 20:05:16.827074628 +0000
@@ -18,8 +18,8 @@
 #ifndef OPENVSWITCH_VERSION_H
 #define OPENVSWITCH_VERSION_H 1
 
-#define OVS_PACKAGE_STRING  "openvswitch 2.13.1"
-#define OVS_PACKAGE_VERSION "2.13.1"
+#define OVS_PACKAGE_STRING  "openvswitch 2.13.3"
+#define OVS_PACKAGE_VERSION "2.13.3"
 
 #define OVS_LIB_VERSION     0
 #define OVS_LIB_REVISION    0
diff -Nru openvswitch-2.13.1/ipsec/ovs-monitor-ipsec.in openvswitch-2.13.3/ipsec/ovs-monitor-ipsec.in
--- openvswitch-2.13.1/ipsec/ovs-monitor-ipsec.in	2020-08-04 21:41:31.925524451 +0000
+++ openvswitch-2.13.3/ipsec/ovs-monitor-ipsec.in	2021-02-10 20:04:59.493074628 +0000
@@ -101,7 +101,7 @@
         proc = subprocess.Popen([self.IP, 'xfrm', 'policy'],
                                 stdout=subprocess.PIPE)
         while True:
-            line = proc.stdout.readline().strip()
+            line = proc.stdout.readline().strip().decode()
             if line == '':
                 break
             a = line.split(" ")
@@ -124,7 +124,7 @@
         proc = subprocess.Popen([self.IP, 'xfrm', 'state'],
                                 stdout=subprocess.PIPE)
         while True:
-            line = proc.stdout.readline().strip()
+            line = proc.stdout.readline().strip().decode()
             if line == '':
                 break
             a = line.split(" ")
@@ -145,10 +145,18 @@
     """This class does StrongSwan specific configurations."""
 
     STRONGSWAN_CONF = """%s
-charon.plugins.kernel-netlink.set_proto_port_transport_sa = yes
-charon.plugins.kernel-netlink.xfrm_ack_expires = 10
-charon.load_modular = yes
-charon.plugins.gcm.load = yes
+charon {
+  plugins {
+    kernel-netlink {
+      set_proto_port_transport_sa = yes
+      xfrm_ack_expires = 10
+    }
+    gcm {
+      load = yes
+    }
+  }
+  load_modular = yes
+}
 """ % (FILE_HEADER)
 
     CONF_HEADER = """%s
@@ -246,7 +254,7 @@
         proc = subprocess.Popen([self.IPSEC, 'status'], stdout=subprocess.PIPE)
 
         while True:
-            line = proc.stdout.readline().strip()
+            line = proc.stdout.readline().strip().decode()
             if line == '':
                 break
             tunnel_name = line.split(":")
@@ -340,7 +348,7 @@
         # about possibility of ovs-monitor-ipsec to block for each tunnel
         # while strongSwan sends IKE messages over Internet.
         conns_dict = self.get_active_conns()
-        for ifname, conns in conns_dict.iteritems():
+        for ifname, conns in conns_dict.items():
             tunnel = monitor.tunnels.get(ifname)
             for conn in conns:
                 # IPsec "connection" names that we choose in strongswan
@@ -408,19 +416,19 @@
 """
 
     auth_tmpl = {"psk": Template("""\
-    left=%defaultroute
+    left=$local_ip
     right=$remote_ip
     authby=secret"""),
                  "pki_remote": Template("""\
-    left=%defaultroute
+    left=$local_ip
     right=$remote_ip
     leftid=@$local_name
     rightid=@$remote_name
-    leftcert="$local_name"
-    rightcert="$remote_name"
+    leftcert="ovs_certkey_$local_name"
+    rightcert="ovs_cert_$remote_name"
     leftrsasigkey=%cert"""),
                  "pki_ca": Template("""\
-    left=%defaultroute
+    left=$local_ip
     right=$remote_ip
     leftid=@$local_name
     rightid=@$remote_name
@@ -536,7 +544,7 @@
 
         # Delete old connections
         conns_dict = self.get_active_conns()
-        for ifname, conns in conns_dict.iteritems():
+        for ifname, conns in conns_dict.items():
             tunnel = monitor.tunnels.get(ifname)
 
             for conn in conns:
@@ -608,7 +616,7 @@
         proc = subprocess.Popen([self.IPSEC, 'status'], stdout=subprocess.PIPE)
 
         while True:
-            line = proc.stdout.readline().strip()
+            line = proc.stdout.readline().strip().decode()
             if line == '':
                 break
 
@@ -617,7 +625,10 @@
                 continue
 
             conn = m.group(1)
-            m = re.match(r"(.*)(-in-\d+|-out-\d+|-\d+)", conn)
+            m = re.match(r"(.*)(-in-\d+|-out-\d+)", conn)
+            if not m:
+                # GRE connections have format <iface>-<ver>
+                m = re.match(r"(.*)(-\d+)", conn)
             if not m:
                 continue
 
@@ -649,7 +660,8 @@
             proc = subprocess.Popen(['certutil', '-L', '-d',
                                     'sql:/etc/ipsec.d/'],
                                     stdout=subprocess.PIPE,
-                                    stderr=subprocess.PIPE)
+                                    stderr=subprocess.PIPE,
+                                    universal_newlines=True)
             lines = proc.stdout.readlines()
 
             for line in lines:
@@ -678,7 +690,7 @@
             if proc.returncode:
                 raise Exception(proc.stderr.read())
         except Exception as e:
-            vlog.err("Failed to import ceretificate into NSS.\n" + str(e))
+            vlog.err("Failed to import certificate into NSS.\n" + str(e))
 
     def _nss_delete_cert(self, name):
         try:
@@ -690,7 +702,7 @@
             if proc.returncode:
                 raise Exception(proc.stderr.read())
         except Exception as e:
-            vlog.err("Failed to delete ceretificate from NSS.\n" + str(e))
+            vlog.err("Failed to delete certificate from NSS.\n" + str(e))
 
     def _nss_import_cert_and_key(self, cert, key, name):
         try:
@@ -742,6 +754,7 @@
 
     unixctl_config_tmpl = Template("""\
   Tunnel Type:    $tunnel_type
+  Local IP:       $local_ip
   Remote IP:      $remote_ip
   SKB mark:       $skb_mark
   Local cert:     $certificate
@@ -782,6 +795,7 @@
         new_conf = {
             "ifname": self.name,
             "tunnel_type": row.type,
+            "local_ip": options.get("local_ip", "%defaultroute"),
             "remote_ip": options.get("remote_ip"),
             "skb_mark": monitor.conf["skb_mark"],
             "certificate": monitor.conf["pki"]["certificate"],
@@ -911,7 +925,7 @@
 class IPsecMonitor(object):
     """This class monitors and configures IPsec tunnels"""
 
-    def __init__(self, root_prefix, ike_daemon):
+    def __init__(self, root_prefix, ike_daemon, restart):
         self.IPSEC = root_prefix + "/usr/sbin/ipsec"
         self.tunnels = {}
 
@@ -941,7 +955,9 @@
                 not os.access(self.IPSEC, os.X_OK):
             vlog.err("IKE daemon is not installed in the system.")
 
-        self.ike_helper.restart_ike_daemon()
+        if restart:
+            vlog.info("Restarting IKE daemon")
+            self.ike_helper.restart_ike_daemon()
 
     def is_tunneling_type_supported(self, tunnel_type):
         """Returns True if we know how to configure IPsec for these
@@ -989,7 +1005,7 @@
         skb_mark = None
         is_valid = False
 
-        for row in data["Open_vSwitch"].rows.itervalues():
+        for row in data["Open_vSwitch"].rows.values():
             pki[0] = row.other_config.get("certificate")
             pki[1] = row.other_config.get("private_key")
             pki[2] = row.other_config.get("ca_cert")
@@ -1016,7 +1032,7 @@
         table."""
         ifaces = set()
 
-        for row in data["Interface"].rows.itervalues():
+        for row in data["Interface"].rows.values():
             if not self.is_tunneling_type_supported(row.type):
                 continue
             if not self.is_ipsec_required(row.options):
@@ -1047,7 +1063,7 @@
             return
         s = ""
         conns = self.ike_helper.get_active_conns()
-        for name, tunnel in self.tunnels.iteritems():
+        for name, tunnel in self.tunnels.items():
             s += tunnel.show(policies, securities, conns)
         unix_conn.reply(s)
 
@@ -1064,7 +1080,7 @@
         if self.ike_helper.config_global(self):
             needs_refresh = True
 
-        for name, tunnel in self.tunnels.iteritems():
+        for name, tunnel in self.tunnels.items():
             if tunnel.last_refreshed_version != tunnel.version:
                 tunnel.last_refreshed_version = tunnel.version
                 needs_refresh = True
@@ -1094,7 +1110,7 @@
             proc.wait()
             if proc.returncode:
                 raise Exception(proc.stderr.read())
-            m = re.search(r"CN=(.+?),", proc.stdout.readline())
+            m = re.search(r"CN=(.+?),", proc.stdout.readline().decode())
             if not m:
                 raise Exception("No CN in the certificate subject.")
         except Exception as e:
@@ -1136,19 +1152,30 @@
     conn.reply(None)
 
 
-def unixctl_exit(conn, unused_argv, unused_aux):
+def unixctl_exit(conn, argv, unused_aux):
     global monitor
     global exiting
+    ret = None
     exiting = True
+    cleanup = True
 
-    # Make sure persistent global states are cleared
-    monitor.update_conf([None, None, None, None], None)
-    # Make sure persistent tunnel states are cleared
-    for tunnel in monitor.tunnels.keys():
-        monitor.del_tunnel(tunnel)
-    monitor.run()
+    for arg in argv:
+        if arg == "--no-cleanup":
+            cleanup = False
+        else:
+            cleanup = False
+            exiting = False
+            ret = str("unrecognized parameter: %s" % arg)
+
+    if cleanup:
+        # Make sure persistent global states are cleared
+        monitor.update_conf([None, None, None, None], None)
+        # Make sure persistent tunnel states are cleared
+        for tunnel in monitor.tunnels.keys():
+            monitor.del_tunnel(tunnel)
+        monitor.run()
 
-    conn.reply(None)
+    conn.reply(ret)
 
 
 def main():
@@ -1161,6 +1188,8 @@
     parser.add_argument("--ike-daemon", metavar="IKE-DAEMON",
                         help="The IKE daemon used for IPsec tunnels"
                         " (either libreswan or strongswan).")
+    parser.add_argument("--no-restart-ike-daemon", action='store_true',
+                        help="Don't restart the IKE daemon on startup.")
 
     ovs.vlog.add_args(parser)
     ovs.daemon.add_args(parser)
@@ -1173,7 +1202,8 @@
 
     root_prefix = args.root_prefix if args.root_prefix else ""
     xfrm = XFRM(root_prefix)
-    monitor = IPsecMonitor(root_prefix, args.ike_daemon)
+    monitor = IPsecMonitor(root_prefix, args.ike_daemon,
+                           not args.no_restart_ike_daemon)
 
     remote = args.database
     schema_helper = ovs.db.idl.SchemaHelper()
@@ -1194,7 +1224,8 @@
     ovs.unixctl.command_register("tunnels/show", "", 0, 0,
                                  unixctl_show, None)
     ovs.unixctl.command_register("refresh", "", 0, 0, unixctl_refresh, None)
-    ovs.unixctl.command_register("exit", "", 0, 0, unixctl_exit, None)
+    ovs.unixctl.command_register("exit", "[--no-cleanup]", 0, 1,
+                                 unixctl_exit, None)
 
     error, unixctl_server = ovs.unixctl.server.UnixctlServer.create(None)
     if error:
diff -Nru openvswitch-2.13.1/lib/classifier.c openvswitch-2.13.3/lib/classifier.c
--- openvswitch-2.13.1/lib/classifier.c	2020-08-04 21:40:41.377524451 +0000
+++ openvswitch-2.13.3/lib/classifier.c	2021-02-10 20:04:13.801074628 +0000
@@ -1370,6 +1370,7 @@
     struct cls_cursor cursor;
     struct cls_subtable *subtable;
 
+    memset(&cursor, 0x0, sizeof cursor);
     cursor.cls = cls;
     cursor.target = target && !cls_rule_is_catchall(target) ? target : NULL;
     cursor.version = version;
diff -Nru openvswitch-2.13.1/lib/conntrack.c openvswitch-2.13.3/lib/conntrack.c
--- openvswitch-2.13.1/lib/conntrack.c	2020-08-04 21:41:31.927524451 +0000
+++ openvswitch-2.13.3/lib/conntrack.c	2021-02-10 20:04:59.495074628 +0000
@@ -813,7 +813,7 @@
 reverse_nat_packet(struct dp_packet *pkt, const struct conn *conn)
 {
     char *tail = dp_packet_tail(pkt);
-    uint8_t pad = dp_packet_l2_pad_size(pkt);
+    uint16_t pad = dp_packet_l2_pad_size(pkt);
     struct conn_key inner_key;
     const char *inner_l4 = NULL;
     uint16_t orig_l3_ofs = pkt->l3_ofs;
diff -Nru openvswitch-2.13.1/lib/conntrack-icmp.c openvswitch-2.13.3/lib/conntrack-icmp.c
--- openvswitch-2.13.1/lib/conntrack-icmp.c	2020-08-04 21:40:41.377524451 +0000
+++ openvswitch-2.13.3/lib/conntrack-icmp.c	2021-02-10 20:04:59.494074628 +0000
@@ -50,10 +50,16 @@
                  struct dp_packet *pkt OVS_UNUSED, bool reply, long long now)
 {
     struct conn_icmp *conn = conn_icmp_cast(conn_);
-    conn->state = reply ? ICMPS_REPLY : ICMPS_FIRST;
-    conn_update_expiration(ct, &conn->up, icmp_timeouts[conn->state], now);
+    enum ct_update_res ret = CT_UPDATE_VALID;
+
+    if (reply && conn->state == ICMPS_FIRST) {
+       conn->state = ICMPS_REPLY;
+    } else if (conn->state == ICMPS_FIRST) {
+        ret = CT_UPDATE_VALID_NEW;
+    }
 
-    return CT_UPDATE_VALID;
+    conn_update_expiration(ct, &conn->up, icmp_timeouts[conn->state], now);
+    return ret;
 }
 
 static bool
diff -Nru openvswitch-2.13.1/lib/dpctl.c openvswitch-2.13.3/lib/dpctl.c
--- openvswitch-2.13.1/lib/dpctl.c	2020-08-04 21:41:31.930524451 +0000
+++ openvswitch-2.13.3/lib/dpctl.c	2021-02-10 20:04:59.499074628 +0000
@@ -2502,15 +2502,16 @@
     { "del-if", "dp iface...", 2, INT_MAX, dpctl_del_if, DP_RW },
     { "set-if", "dp iface...", 2, INT_MAX, dpctl_set_if, DP_RW },
     { "dump-dps", "", 0, 0, dpctl_dump_dps, DP_RO },
-    { "show", "[dp...]", 0, INT_MAX, dpctl_show, DP_RO },
-    { "dump-flows", "[dp] [filter=..] [type=..]",
-      0, 3, dpctl_dump_flows, DP_RO },
+    { "show", "[-s] [dp...]", 0, INT_MAX, dpctl_show, DP_RO },
+    { "dump-flows", "[-m] [--names] [dp] [filter=..] [type=..]",
+      0, 5, dpctl_dump_flows, DP_RO },
     { "add-flow", "[dp] flow actions", 2, 3, dpctl_add_flow, DP_RW },
     { "mod-flow", "[dp] flow actions", 2, 3, dpctl_mod_flow, DP_RW },
     { "get-flow", "[dp] ufid", 1, 2, dpctl_get_flow, DP_RO },
     { "del-flow", "[dp] flow", 1, 2, dpctl_del_flow, DP_RW },
     { "del-flows", "[dp]", 0, 1, dpctl_del_flows, DP_RW },
-    { "dump-conntrack", "[dp] [zone=N]", 0, 2, dpctl_dump_conntrack, DP_RO },
+    { "dump-conntrack", "[-m] [-s] [dp] [zone=N]",
+      0, 4, dpctl_dump_conntrack, DP_RO },
     { "flush-conntrack", "[dp] [zone=N] [ct-tuple]", 0, 3,
       dpctl_flush_conntrack, DP_RW },
     { "ct-stats-show", "[dp] [zone=N]",
diff -Nru openvswitch-2.13.1/lib/dpif-netdev-private.h openvswitch-2.13.3/lib/dpif-netdev-private.h
--- openvswitch-2.13.1/lib/dpif-netdev-private.h	2020-08-04 21:40:41.382524451 +0000
+++ openvswitch-2.13.3/lib/dpif-netdev-private.h	2021-02-10 20:04:59.500074628 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2015 Nicira, Inc.
- * Copyright (c) 2019 Intel Corperation.
+ * Copyright (c) 2019 Intel Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/lib/dp-packet.h openvswitch-2.13.3/lib/dp-packet.h
--- openvswitch-2.13.1/lib/dp-packet.h	2020-08-04 21:41:31.930524451 +0000
+++ openvswitch-2.13.3/lib/dp-packet.h	2021-02-10 20:04:59.498074628 +0000
@@ -81,7 +81,7 @@
 
     /* All the following elements of this struct are copied in a single call
      * of memcpy in dp_packet_clone_with_headroom. */
-    uint8_t l2_pad_size;           /* Detected l2 padding size.
+    uint16_t l2_pad_size;          /* Detected l2 padding size.
                                     * Padding is non-pullable. */
     uint16_t l2_5_ofs;             /* MPLS label stack offset, or UINT16_MAX */
     uint16_t l3_ofs;               /* Network-level header offset,
@@ -118,8 +118,8 @@
 void *dp_packet_resize_l2_5(struct dp_packet *, int increment);
 static inline void *dp_packet_eth(const struct dp_packet *);
 static inline void dp_packet_reset_offsets(struct dp_packet *);
-static inline uint8_t dp_packet_l2_pad_size(const struct dp_packet *);
-static inline void dp_packet_set_l2_pad_size(struct dp_packet *, uint8_t);
+static inline uint16_t dp_packet_l2_pad_size(const struct dp_packet *);
+static inline void dp_packet_set_l2_pad_size(struct dp_packet *, uint16_t);
 static inline void *dp_packet_l2_5(const struct dp_packet *);
 static inline void dp_packet_set_l2_5(struct dp_packet *, void *);
 static inline void *dp_packet_l3(const struct dp_packet *);
@@ -327,14 +327,14 @@
     b->l4_ofs = UINT16_MAX;
 }
 
-static inline uint8_t
+static inline uint16_t
 dp_packet_l2_pad_size(const struct dp_packet *b)
 {
     return b->l2_pad_size;
 }
 
 static inline void
-dp_packet_set_l2_pad_size(struct dp_packet *b, uint8_t pad_size)
+dp_packet_set_l2_pad_size(struct dp_packet *b, uint16_t pad_size)
 {
     ovs_assert(pad_size <= dp_packet_size(b));
     b->l2_pad_size = pad_size;
diff -Nru openvswitch-2.13.1/lib/flow.c openvswitch-2.13.3/lib/flow.c
--- openvswitch-2.13.1/lib/flow.c	2020-08-04 21:41:31.938524451 +0000
+++ openvswitch-2.13.3/lib/flow.c	2021-02-10 20:04:59.505074628 +0000
@@ -655,7 +655,7 @@
 
     tot_len = ntohs(nh->ip_tot_len);
     if (OVS_UNLIKELY(tot_len > size || ip_len > tot_len ||
-                size - tot_len > UINT8_MAX)) {
+                size - tot_len > UINT16_MAX)) {
         return false;
     }
 
@@ -693,8 +693,8 @@
     if (OVS_UNLIKELY(plen + IPV6_HEADER_LEN > size)) {
         return false;
     }
-    /* Jumbo Payload option not supported yet. */
-    if (OVS_UNLIKELY(size - (plen + IPV6_HEADER_LEN) > UINT8_MAX)) {
+
+    if (OVS_UNLIKELY(size - (plen + IPV6_HEADER_LEN) > UINT16_MAX)) {
         return false;
     }
 
diff -Nru openvswitch-2.13.1/lib/ipf.c openvswitch-2.13.3/lib/ipf.c
--- openvswitch-2.13.1/lib/ipf.c	2020-08-04 21:41:31.938524451 +0000
+++ openvswitch-2.13.3/lib/ipf.c	2021-02-10 20:04:59.506074628 +0000
@@ -1153,7 +1153,7 @@
         /* Inner batch loop is constant time since batch size is <=
          * NETDEV_MAX_BURST. */
         DP_PACKET_BATCH_REFILL_FOR_EACH (pb_idx, pb_cnt, pkt, pb) {
-            if (pkt == rp->list->reass_execute_ctx) {
+            if (rp && pkt == rp->list->reass_execute_ctx) {
                 for (int i = 0; i <= rp->list->last_inuse_idx; i++) {
                     rp->list->frag_list[i].pkt->md.ct_label = pkt->md.ct_label;
                     rp->list->frag_list[i].pkt->md.ct_mark = pkt->md.ct_mark;
@@ -1206,6 +1206,7 @@
                 ipf_reassembled_list_remove(rp);
                 dp_packet_delete(rp->pkt);
                 free(rp);
+                rp = NULL;
             } else {
                 dp_packet_batch_refill(pb, pkt, pb_idx);
             }
diff -Nru openvswitch-2.13.1/lib/jsonrpc.c openvswitch-2.13.3/lib/jsonrpc.c
--- openvswitch-2.13.1/lib/jsonrpc.c	2020-08-04 21:40:41.389524451 +0000
+++ openvswitch-2.13.3/lib/jsonrpc.c	2021-02-10 20:04:59.506074628 +0000
@@ -50,6 +50,10 @@
     struct ovs_list output;     /* Contains "struct ofpbuf"s. */
     size_t output_count;        /* Number of elements in "output". */
     size_t backlog;
+
+    /* Limits. */
+    size_t max_output;          /* 'output_count' disconnection threshold. */
+    size_t max_backlog;         /* 'backlog' disconnection threshold. */
 };
 
 /* Rate limit for error messages. */
@@ -178,6 +182,17 @@
     return rpc->status ? 0 : rpc->backlog;
 }
 
+/* Sets thresholds for send backlog.  If send backlog contains more than
+ * 'max_n_msgs' messages or is larger than 'max_backlog_bytes' bytes,
+ * connection will be dropped. */
+void
+jsonrpc_set_backlog_threshold(struct jsonrpc *rpc,
+                              size_t max_n_msgs, size_t max_backlog_bytes)
+{
+    rpc->max_output = max_n_msgs;
+    rpc->max_backlog = max_backlog_bytes;
+}
+
 /* Returns the number of bytes that have been received on 'rpc''s underlying
  * stream.  (The value wraps around if it exceeds UINT_MAX.) */
 unsigned int
@@ -261,9 +276,26 @@
     rpc->backlog += length;
 
     if (rpc->output_count >= 50) {
-        VLOG_INFO_RL(&rl, "excessive sending backlog, jsonrpc: %s, num of"
+        static struct vlog_rate_limit bl_rl = VLOG_RATE_LIMIT_INIT(5, 5);
+        bool disconnect = false;
+
+        VLOG_INFO_RL(&bl_rl, "excessive sending backlog, jsonrpc: %s, num of"
                      " msgs: %"PRIuSIZE", backlog: %"PRIuSIZE".", rpc->name,
                      rpc->output_count, rpc->backlog);
+        if (rpc->max_output && rpc->output_count > rpc->max_output) {
+            disconnect = true;
+            VLOG_WARN("sending backlog exceeded maximum number of messages (%"
+                      PRIuSIZE" > %"PRIuSIZE"), disconnecting, jsonrpc: %s.",
+                      rpc->output_count, rpc->max_output, rpc->name);
+        } else if (rpc->max_backlog && rpc->backlog > rpc->max_backlog) {
+            disconnect = true;
+            VLOG_WARN("sending backlog exceeded maximum size (%"PRIuSIZE" > %"
+                      PRIuSIZE" bytes), disconnecting, jsonrpc: %s.",
+                      rpc->backlog, rpc->max_backlog, rpc->name);
+        }
+        if (disconnect) {
+            jsonrpc_error(rpc, E2BIG);
+        }
     }
 
     if (rpc->backlog == length) {
@@ -787,6 +819,10 @@
     int last_error;
     unsigned int seqno;
     uint8_t dscp;
+
+    /* Limits for jsonrpc. */
+    size_t max_n_msgs;
+    size_t max_backlog_bytes;
 };
 
 static void
@@ -840,6 +876,8 @@
     s->dscp = 0;
     s->last_error = 0;
 
+    jsonrpc_session_set_backlog_threshold(s, 0, 0);
+
     const char *name = reconnect_get_name(s->reconnect);
     if (!pstream_verify_name(name)) {
         reconnect_set_passive(s->reconnect, true, time_msec());
@@ -880,6 +918,7 @@
     s->pstream = NULL;
     s->seqno = 1;
 
+    jsonrpc_session_set_backlog_threshold(s, 0, 0);
     return s;
 }
 
@@ -968,6 +1007,8 @@
             }
             reconnect_connected(s->reconnect, time_msec());
             s->rpc = jsonrpc_open(stream);
+            jsonrpc_set_backlog_threshold(s->rpc, s->max_n_msgs,
+                                                  s->max_backlog_bytes);
             s->seqno++;
         } else if (error != EAGAIN) {
             reconnect_listen_error(s->reconnect, time_msec(), error);
@@ -1008,6 +1049,8 @@
         if (!error) {
             reconnect_connected(s->reconnect, time_msec());
             s->rpc = jsonrpc_open(s->stream);
+            jsonrpc_set_backlog_threshold(s->rpc, s->max_n_msgs,
+                                                  s->max_backlog_bytes);
             s->stream = NULL;
             s->seqno++;
         } else if (error != EAGAIN) {
@@ -1110,13 +1153,16 @@
 
         received_bytes = jsonrpc_get_received_bytes(s->rpc);
         jsonrpc_recv(s->rpc, &msg);
+
+        long long int now = time_msec();
+        reconnect_receive_attempted(s->reconnect, now);
         if (received_bytes != jsonrpc_get_received_bytes(s->rpc)) {
             /* Data was successfully received.
              *
              * Previously we only counted receiving a full message as activity,
              * but with large messages or a slow connection that policy could
              * time out the session mid-message. */
-            reconnect_activity(s->reconnect, time_msec());
+            reconnect_activity(s->reconnect, now);
         }
 
         if (msg) {
@@ -1248,3 +1294,18 @@
         jsonrpc_session_force_reconnect(s);
     }
 }
+
+/* Sets thresholds for send backlog.  If send backlog contains more than
+ * 'max_n_msgs' messages or is larger than 'max_backlog_bytes' bytes,
+ * connection will be closed (then reconnected, if that feature is enabled). */
+void
+jsonrpc_session_set_backlog_threshold(struct jsonrpc_session *s,
+                                      size_t max_n_msgs,
+                                      size_t max_backlog_bytes)
+{
+    s->max_n_msgs = max_n_msgs;
+    s->max_backlog_bytes = max_backlog_bytes;
+    if (s->rpc) {
+        jsonrpc_set_backlog_threshold(s->rpc, max_n_msgs, max_backlog_bytes);
+    }
+}
diff -Nru openvswitch-2.13.1/lib/jsonrpc.h openvswitch-2.13.3/lib/jsonrpc.h
--- openvswitch-2.13.1/lib/jsonrpc.h	2020-08-04 21:33:59.381524451 +0000
+++ openvswitch-2.13.3/lib/jsonrpc.h	2021-02-10 20:04:59.507074628 +0000
@@ -51,6 +51,9 @@
 
 int jsonrpc_get_status(const struct jsonrpc *);
 size_t jsonrpc_get_backlog(const struct jsonrpc *);
+void jsonrpc_set_backlog_threshold(struct jsonrpc *, size_t max_n_msgs,
+                                                     size_t max_backlog_bytes);
+
 unsigned int jsonrpc_get_received_bytes(const struct jsonrpc *);
 const char *jsonrpc_get_name(const struct jsonrpc *);
 
@@ -140,6 +143,9 @@
                                         int probe_interval);
 void jsonrpc_session_set_dscp(struct jsonrpc_session *,
                               uint8_t dscp);
+void jsonrpc_session_set_backlog_threshold(struct jsonrpc_session *,
+                                           size_t max_n_msgs,
+                                           size_t max_backlog_bytes);
 const char *jsonrpc_session_get_id(const struct jsonrpc_session *);
 
 #endif /* jsonrpc.h */
diff -Nru openvswitch-2.13.1/lib/lldp/lldp.c openvswitch-2.13.3/lib/lldp/lldp.c
--- openvswitch-2.13.1/lib/lldp/lldp.c	2020-08-04 21:28:11.230524451 +0000
+++ openvswitch-2.13.3/lib/lldp/lldp.c	2021-02-10 20:00:27.233074628 +0000
@@ -59,7 +59,7 @@
     } while (0)
 #define PEEK_DISCARD_UINT8 PEEK_DISCARD(1)
 #define PEEK_DISCARD_UINT16 PEEK_DISCARD(2)
-#define PEEK_DISCARD_UINT32 PEEK_DISCARD(3)
+#define PEEK_DISCARD_UINT32 PEEK_DISCARD(4)
 #define PEEK_CMP(value, bytes) \
      (length -= (bytes),       \
      pos += (bytes),           \
@@ -341,6 +341,12 @@
 
     return dp_packet_size(p);
 }
+#define CHECK_TLV_MAX_SIZE(x, name)                                 \
+    do { if (tlv_size > (x)) {                                      \
+            VLOG_WARN(name " TLV too large received on %s",         \
+                      hardware->h_ifname);                          \
+            goto malformed;                                         \
+        } } while (0)
 
 int
 lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
@@ -359,7 +365,7 @@
     int length, af;
     bool gotend = false;
     bool ttl_received = false;
-    int tlv_size, tlv_type, tlv_subtype;
+    int tlv_size, tlv_type, tlv_subtype, tlv_count = 0;
     u_int8_t *pos, *tlv;
     void *b;
     struct lldpd_aa_isid_vlan_maps_tlv *isid_vlan_map = NULL;
@@ -411,6 +417,31 @@
                       hardware->h_ifname);
             goto malformed;
         }
+        /* Check order for mandatory TLVs */
+        tlv_count++;
+        switch (tlv_type) {
+        case LLDP_TLV_CHASSIS_ID:
+            if (tlv_count != 1) {
+                VLOG_WARN("first TLV should be a chassis ID on %s, not %d",
+                          hardware->h_ifname, tlv_type);
+                goto malformed;
+            }
+            break;
+        case LLDP_TLV_PORT_ID:
+            if (tlv_count != 2) {
+                VLOG_WARN("second TLV should be a port ID on %s, not %d",
+                          hardware->h_ifname, tlv_type);
+                goto malformed;
+            }
+            break;
+        case LLDP_TLV_TTL:
+            if (tlv_count != 3) {
+                VLOG_WARN("third TLV should be a TTL on %s, not %d",
+                          hardware->h_ifname, tlv_type);
+                goto malformed;
+            }
+            break;
+        }
 
         switch (tlv_type) {
         case LLDP_TLV_END:
@@ -428,7 +459,8 @@
 
         case LLDP_TLV_CHASSIS_ID:
         case LLDP_TLV_PORT_ID:
-            CHECK_TLV_SIZE(2, "Port Id");
+            CHECK_TLV_SIZE(2, "Port/Chassis Id");
+            CHECK_TLV_MAX_SIZE(256, "Port/Chassis Id");
             tlv_subtype = PEEK_UINT8;
             if (tlv_subtype == 0 || tlv_subtype > 7) {
                 VLOG_WARN("unknown subtype for tlv id received on %s",
@@ -438,10 +470,22 @@
             b = xzalloc(tlv_size - 1);
             PEEK_BYTES(b, tlv_size - 1);
             if (tlv_type == LLDP_TLV_PORT_ID) {
+                if (port->p_id != NULL) {
+                    VLOG_WARN("Port ID TLV received twice on %s",
+                              hardware->h_ifname);
+                    free(b);
+                    goto malformed;
+                }
                 port->p_id_subtype = tlv_subtype;
                 port->p_id = b;
                 port->p_id_len = tlv_size - 1;
             } else {
+                if (chassis->c_id != NULL) {
+                    VLOG_WARN("Chassis ID TLV received twice on %s",
+                              hardware->h_ifname);
+                    free(b);
+                    goto malformed;
+                }
                 chassis->c_id_subtype = tlv_subtype;
                 chassis->c_id = b;
                 chassis->c_id_len = tlv_size - 1;
@@ -449,6 +493,11 @@
             break;
 
         case LLDP_TLV_TTL:
+            if (ttl_received) {
+                VLOG_WARN("TTL TLV received twice on %s",
+                          hardware->h_ifname);
+                goto malformed;
+            }
             CHECK_TLV_SIZE(2, "TTL");
             chassis->c_ttl = PEEK_UINT16;
             ttl_received = true;
@@ -464,10 +513,13 @@
             b = xzalloc(tlv_size + 1);
             PEEK_BYTES(b, tlv_size);
             if (tlv_type == LLDP_TLV_PORT_DESCR) {
+                free(port->p_descr);
                 port->p_descr = b;
             } else if (tlv_type == LLDP_TLV_SYSTEM_NAME) {
+                free(chassis->c_name);
                 chassis->c_name = b;
             } else {
+                free(chassis->c_descr);
                 chassis->c_descr = b;
             }
             break;
@@ -481,6 +533,11 @@
         case LLDP_TLV_MGMT_ADDR:
             CHECK_TLV_SIZE(1, "Management address");
             addr_str_length = PEEK_UINT8;
+            if (addr_str_length > sizeof(addr_str_buffer)) {
+                VLOG_WARN("too large management address on %s",
+                          hardware->h_ifname);
+                goto malformed;
+            }
             CHECK_TLV_SIZE(1 + addr_str_length, "Management address");
             PEEK_BYTES(addr_str_buffer, addr_str_length);
             addr_length = addr_str_length - 1;
@@ -505,7 +562,7 @@
             break;
 
         case LLDP_TLV_ORG:
-            CHECK_TLV_SIZE(4, "Organisational");
+            CHECK_TLV_SIZE(1 + sizeof orgid, "Organisational");
             PEEK_BYTES(orgid, sizeof orgid);
             tlv_subtype = PEEK_UINT8;
             if (memcmp(dot1, orgid, sizeof orgid) == 0) {
@@ -625,6 +682,7 @@
             VLOG_WARN("unknown tlv (%d) received on %s",
                       tlv_type,
                       hardware->h_ifname);
+            hardware->h_rx_unrecognized_cnt++;
             goto malformed;
         }
         if (pos > tlv + tlv_size) {
diff -Nru openvswitch-2.13.1/lib/lldp/lldpd.c openvswitch-2.13.3/lib/lldp/lldpd.c
--- openvswitch-2.13.1/lib/lldp/lldpd.c	2020-08-04 21:36:07.476524451 +0000
+++ openvswitch-2.13.3/lib/lldp/lldpd.c	2021-02-10 20:02:51.094074628 +0000
@@ -244,6 +244,7 @@
 
     if (s < sizeof(struct eth_header) + 4) {
         /* Too short, just discard it */
+        hw->h_rx_discarded_cnt++;
         return;
     }
 
@@ -284,6 +285,7 @@
                 VLOG_DBG("function for %s protocol did not "
                          "decode this frame",
                          cfg->g_protocols[i].name);
+                hw->h_rx_discarded_cnt++;
                 return;
             }
             chassis->c_protocol = port->p_protocol = cfg->g_protocols[i].mode;
diff -Nru openvswitch-2.13.1/lib/meta-flow.xml openvswitch-2.13.3/lib/meta-flow.xml
--- openvswitch-2.13.1/lib/meta-flow.xml	2020-08-04 21:41:31.942524451 +0000
+++ openvswitch-2.13.3/lib/meta-flow.xml	2021-02-10 20:04:59.510074628 +0000
@@ -3841,18 +3841,18 @@
 
       <ul>
         <li>
-          When <ref field="mpls_bos"/> is 1, there is another MPLS label
+          When <ref field="mpls_bos"/> is 0, there is another MPLS label
           following this one, so the Ethertype passed to <code>pop_mpls</code>
           should be an MPLS Ethertype.  For example: <code>table=0,
-          dl_type=0x8847, mpls_bos=1, actions=pop_mpls:0x8847,
+          dl_type=0x8847, mpls_bos=0, actions=pop_mpls:0x8847,
           goto_table:1</code>
         </li>
 
         <li>
-          When <ref field="mpls_bos"/> is 0, this MPLS label is the last one,
+          When <ref field="mpls_bos"/> is 1, this MPLS label is the last one,
           so the Ethertype passed to <code>pop_mpls</code> should be a non-MPLS
           Ethertype such as IPv4.  For example: <code>table=1, dl_type=0x8847,
-          mpls_bos=0, actions=pop_mpls:0x0800, goto_table:2</code>
+          mpls_bos=1, actions=pop_mpls:0x0800, goto_table:2</code>
         </li>
       </ul>
     </field>
diff -Nru openvswitch-2.13.1/lib/netdev-dpdk.c openvswitch-2.13.3/lib/netdev-dpdk.c
--- openvswitch-2.13.1/lib/netdev-dpdk.c	2020-08-04 21:41:31.944524451 +0000
+++ openvswitch-2.13.3/lib/netdev-dpdk.c	2021-02-10 20:04:59.511074628 +0000
@@ -164,7 +164,6 @@
 
 static const struct rte_eth_conf port_conf = {
     .rxmode = {
-        .mq_mode = ETH_MQ_RX_RSS,
         .split_hdr_size = 0,
         .offloads = 0,
     },
@@ -986,6 +985,14 @@
 
     rte_eth_dev_info_get(dev->port_id, &info);
 
+    /* As of DPDK 19.11, it is not allowed to set a mq_mode for
+     * virtio PMD driver. */
+    if (!strcmp(info.driver_name, "net_virtio")) {
+        conf.rxmode.mq_mode = ETH_MQ_RX_NONE;
+    } else {
+        conf.rxmode.mq_mode = ETH_MQ_RX_RSS;
+    }
+
     /* As of DPDK 17.11.1 a few PMDs require to explicitly enable
      * scatter to support jumbo RX.
      * Setting scatter for the device is done after checking for
@@ -2708,12 +2715,8 @@
     uint16_t buf_len;
     void *buf;
 
-    if (rte_pktmbuf_tailroom(pkt) >= sizeof *shinfo) {
-        shinfo = rte_pktmbuf_mtod(pkt, struct rte_mbuf_ext_shared_info *);
-    } else {
-        total_len += sizeof *shinfo + sizeof(uintptr_t);
-        total_len = RTE_ALIGN_CEIL(total_len, sizeof(uintptr_t));
-    }
+    total_len += sizeof *shinfo + sizeof(uintptr_t);
+    total_len = RTE_ALIGN_CEIL(total_len, sizeof(uintptr_t));
 
     if (OVS_UNLIKELY(total_len > UINT16_MAX)) {
         VLOG_ERR("Can't copy packet: too big %u", total_len);
@@ -2728,20 +2731,14 @@
     }
 
     /* Initialize shinfo. */
-    if (shinfo) {
-        shinfo->free_cb = netdev_dpdk_extbuf_free;
-        shinfo->fcb_opaque = buf;
-        rte_mbuf_ext_refcnt_set(shinfo, 1);
-    } else {
-        shinfo = rte_pktmbuf_ext_shinfo_init_helper(buf, &buf_len,
-                                                    netdev_dpdk_extbuf_free,
-                                                    buf);
-        if (OVS_UNLIKELY(shinfo == NULL)) {
-            rte_free(buf);
-            VLOG_ERR("Failed to initialize shared info for mbuf while "
-                     "attempting to attach an external buffer.");
-            return NULL;
-        }
+    shinfo = rte_pktmbuf_ext_shinfo_init_helper(buf, &buf_len,
+                                                netdev_dpdk_extbuf_free,
+                                                buf);
+    if (OVS_UNLIKELY(shinfo == NULL)) {
+        rte_free(buf);
+        VLOG_ERR("Failed to initialize shared info for mbuf while "
+                 "attempting to attach an external buffer.");
+        return NULL;
     }
 
     rte_pktmbuf_attach_extbuf(pkt, buf, rte_malloc_virt2iova(buf), buf_len,
diff -Nru openvswitch-2.13.1/lib/netdev-offload-dpdk.c openvswitch-2.13.3/lib/netdev-offload-dpdk.c
--- openvswitch-2.13.1/lib/netdev-offload-dpdk.c	2020-08-04 21:41:31.946524451 +0000
+++ openvswitch-2.13.3/lib/netdev-offload-dpdk.c	2021-02-10 20:04:59.514074628 +0000
@@ -76,7 +76,7 @@
     return NULL;
 }
 
-static inline void
+static inline struct ufid_to_rte_flow_data *
 ufid_to_rte_flow_associate(const ovs_u128 *ufid,
                            struct rte_flow *rte_flow, bool actions_offloaded)
 {
@@ -101,6 +101,7 @@
 
     cmap_insert(&ufid_to_rte_flow,
                 CONST_CAST(struct cmap_node *, &data->node), hash);
+    return data;
 }
 
 static inline void
@@ -565,9 +566,18 @@
     uint8_t proto = 0;
 
     /* Eth */
-    if (match->wc.masks.dl_type ||
-        !eth_addr_is_zero(match->wc.masks.dl_src) ||
-        !eth_addr_is_zero(match->wc.masks.dl_dst)) {
+    if (match->wc.masks.dl_type == OVS_BE16_MAX && is_ip_any(&match->flow)
+        && eth_addr_is_zero(match->wc.masks.dl_dst)
+        && eth_addr_is_zero(match->wc.masks.dl_src)) {
+        /*
+         * This is a temporary work around to fix ethernet pattern for partial
+         * hardware offload for X710 devices. This fix will be reverted once
+         * the issue is fixed within the i40e PMD driver.
+         */
+        add_flow_pattern(patterns, RTE_FLOW_ITEM_TYPE_ETH, NULL, NULL);
+    } else if (match->wc.masks.dl_type ||
+               !eth_addr_is_zero(match->wc.masks.dl_src) ||
+               !eth_addr_is_zero(match->wc.masks.dl_dst)) {
         struct rte_flow_item_eth *spec, *mask;
 
         spec = xzalloc(sizeof *spec);
@@ -1029,7 +1039,7 @@
     return flow;
 }
 
-static int
+static struct ufid_to_rte_flow_data *
 netdev_offload_dpdk_add_flow(struct netdev *netdev,
                              const struct match *match,
                              struct nlattr *nl_actions,
@@ -1038,12 +1048,11 @@
                              struct offload_info *info)
 {
     struct flow_patterns patterns = { .items = NULL, .cnt = 0 };
+    struct ufid_to_rte_flow_data *flows_data = NULL;
     bool actions_offloaded = true;
     struct rte_flow *flow;
-    int ret = 0;
 
-    ret = parse_flow_match(&patterns, match);
-    if (ret) {
+    if (parse_flow_match(&patterns, match)) {
         goto out;
     }
 
@@ -1059,16 +1068,15 @@
     }
 
     if (!flow) {
-        ret = -1;
         goto out;
     }
-    ufid_to_rte_flow_associate(ufid, flow, actions_offloaded);
+    flows_data = ufid_to_rte_flow_associate(ufid, flow, actions_offloaded);
     VLOG_DBG("%s: installed flow %p by ufid "UUID_FMT"\n",
              netdev_get_name(netdev), flow, UUID_ARGS((struct uuid *)ufid));
 
 out:
     free_flow_patterns(&patterns);
-    return ret;
+    return flows_data;
 }
 
 /*
@@ -1171,14 +1179,19 @@
                              struct dpif_flow_stats *stats)
 {
     struct ufid_to_rte_flow_data *rte_flow_data;
+    struct dpif_flow_stats old_stats;
+    bool modification = false;
     int ret;
 
     /*
      * If an old rte_flow exists, it means it's a flow modification.
      * Here destroy the old rte flow first before adding a new one.
+     * Keep the stats for the newly created rule.
      */
     rte_flow_data = ufid_to_rte_flow_data_find(ufid);
     if (rte_flow_data && rte_flow_data->rte_flow) {
+        old_stats = rte_flow_data->stats;
+        modification = true;
         ret = netdev_offload_dpdk_destroy_flow(netdev, ufid,
                                                rte_flow_data->rte_flow);
         if (ret < 0) {
@@ -1191,11 +1204,18 @@
         return ret;
     }
 
+    rte_flow_data = netdev_offload_dpdk_add_flow(netdev, match, actions,
+                                                 actions_len, ufid, info);
+    if (!rte_flow_data) {
+        return -1;
+    }
+    if (modification) {
+        rte_flow_data->stats = old_stats;
+    }
     if (stats) {
-        memset(stats, 0, sizeof *stats);
+        *stats = rte_flow_data->stats;
     }
-    return netdev_offload_dpdk_add_flow(netdev, match, actions,
-                                        actions_len, ufid, info);
+    return 0;
 }
 
 static int
diff -Nru openvswitch-2.13.1/lib/netdev-offload-tc.c openvswitch-2.13.3/lib/netdev-offload-tc.c
--- openvswitch-2.13.1/lib/netdev-offload-tc.c	2020-08-04 21:41:31.947524451 +0000
+++ openvswitch-2.13.3/lib/netdev-offload-tc.c	2021-02-10 20:04:59.515074628 +0000
@@ -198,7 +198,9 @@
     int err;
 
     err = tc_del_filter(id);
-    del_ufid_tc_mapping(ufid);
+    if (!err) {
+        del_ufid_tc_mapping(ufid);
+    }
     return err;
 }
 
@@ -1578,6 +1580,7 @@
                 flower.key.ct_state |= TCA_FLOWER_KEY_CT_FLAGS_NEW;
             }
             flower.mask.ct_state |= TCA_FLOWER_KEY_CT_FLAGS_NEW;
+            mask->ct_state &= ~OVS_CS_F_NEW;
         }
 
         if (mask->ct_state & OVS_CS_F_ESTABLISHED) {
@@ -1585,6 +1588,7 @@
                 flower.key.ct_state |= TCA_FLOWER_KEY_CT_FLAGS_ESTABLISHED;
             }
             flower.mask.ct_state |= TCA_FLOWER_KEY_CT_FLAGS_ESTABLISHED;
+            mask->ct_state &= ~OVS_CS_F_ESTABLISHED;
         }
 
         if (mask->ct_state & OVS_CS_F_TRACKED) {
@@ -1592,14 +1596,13 @@
                 flower.key.ct_state |= TCA_FLOWER_KEY_CT_FLAGS_TRACKED;
             }
             flower.mask.ct_state |= TCA_FLOWER_KEY_CT_FLAGS_TRACKED;
+            mask->ct_state &= ~OVS_CS_F_TRACKED;
         }
 
         if (flower.key.ct_state & TCA_FLOWER_KEY_CT_FLAGS_ESTABLISHED) {
             flower.key.ct_state &= ~(TCA_FLOWER_KEY_CT_FLAGS_NEW);
             flower.mask.ct_state &= ~(TCA_FLOWER_KEY_CT_FLAGS_NEW);
         }
-
-        mask->ct_state = 0;
     }
 
     if (mask->ct_zone) {
diff -Nru openvswitch-2.13.1/lib/netdev-vport.c openvswitch-2.13.3/lib/netdev-vport.c
--- openvswitch-2.13.1/lib/netdev-vport.c	2020-08-04 21:40:41.398524451 +0000
+++ openvswitch-2.13.3/lib/netdev-vport.c	2021-02-10 20:04:59.516074628 +0000
@@ -736,6 +736,14 @@
                     goto out;
                 }
             }
+        } else if (!strcmp(node->key, "remote_cert") ||
+                   !strcmp(node->key, "remote_name") ||
+                   !strcmp(node->key, "psk")) {
+            /* When configuring OVS for IPsec, these keys may be set in the
+               tunnel port's 'options' column. 'ovs-vswitchd' does not directly
+               use them, but they are read by 'ovs-monitor-ipsec'. In order to
+               suppress the "unknown %s argument" warning message below, we
+               handle them here by ignoring them. */
         } else {
             ds_put_format(&errors, "%s: unknown %s argument '%s'\n", name,
                           type, node->key);
diff -Nru openvswitch-2.13.1/lib/netlink.c openvswitch-2.13.3/lib/netlink.c
--- openvswitch-2.13.1/lib/netlink.c	2020-08-04 21:31:55.301524451 +0000
+++ openvswitch-2.13.3/lib/netlink.c	2021-02-10 20:01:34.646074628 +0000
@@ -498,6 +498,7 @@
 nl_msg_end_nested(struct ofpbuf *msg, size_t offset)
 {
     struct nlattr *attr = ofpbuf_at_assert(msg, offset, sizeof *attr);
+    ovs_assert(!nl_attr_oversized(msg->size - offset - NLA_HDRLEN));
     attr->nla_len = msg->size - offset;
 }
 
diff -Nru openvswitch-2.13.1/lib/nx-match.c openvswitch-2.13.3/lib/nx-match.c
--- openvswitch-2.13.1/lib/nx-match.c	2020-08-04 21:40:41.400524451 +0000
+++ openvswitch-2.13.3/lib/nx-match.c	2021-02-10 20:04:13.825074628 +0000
@@ -1133,6 +1133,11 @@
                       mpls_lse_to_bos(flow->mpls_lse[0]));
         }
 
+        if (match->wc.masks.mpls_lse[0] & htonl(MPLS_TTL_MASK)) {
+            nxm_put_8(&ctx, MFF_MPLS_TTL, oxm,
+                      mpls_lse_to_ttl(flow->mpls_lse[0]));
+        }
+
         if (match->wc.masks.mpls_lse[0] & htonl(MPLS_LABEL_MASK)) {
             nxm_put_32(&ctx, MFF_MPLS_LABEL, oxm,
                        htonl(mpls_lse_to_label(flow->mpls_lse[0])));
diff -Nru openvswitch-2.13.1/lib/odp-util.c openvswitch-2.13.3/lib/odp-util.c
--- openvswitch-2.13.1/lib/odp-util.c	2020-08-04 21:41:31.950524451 +0000
+++ openvswitch-2.13.3/lib/odp-util.c	2021-02-10 20:04:59.520074628 +0000
@@ -390,7 +390,8 @@
         break;
     }
     default:
-        OVS_NOT_REACHED();
+        ds_put_cstr(ds, ",<error: unknown mdtype>");
+        break;
     }
     ds_put_format(ds, ")");
 }
@@ -1441,14 +1442,20 @@
         int n1 = -1;
         if (ovs_scan(&s[n], ",tunnel_out_port=%"SCNi32")%n",
                      &tunnel_out_port, &n1)) {
-            odp_put_userspace_action(pid, user_data, user_data_size,
-                                     tunnel_out_port, include_actions, actions);
-            res = n + n1;
+            res = odp_put_userspace_action(pid, user_data, user_data_size,
+                                           tunnel_out_port, include_actions,
+                                           actions, NULL);
+            if (!res) {
+                res = n + n1;
+            }
             goto out;
         } else if (s[n] == ')') {
-            odp_put_userspace_action(pid, user_data, user_data_size,
-                                     ODPP_NONE, include_actions, actions);
-            res = n + 1;
+            res = odp_put_userspace_action(pid, user_data, user_data_size,
+                                           ODPP_NONE, include_actions,
+                                           actions, NULL);
+            if (!res) {
+                res = n + 1;
+            }
             goto out;
         }
     }
@@ -5428,13 +5435,16 @@
         do {                                               \
             len = 0;
 
-#define SCAN_END_NESTED()                               \
-        SCAN_FINISH();                                  \
-        nl_msg_end_nested(key, key_offset);             \
-        if (mask) {                                     \
-            nl_msg_end_nested(mask, mask_offset);       \
-        }                                               \
-        return s - start;                               \
+#define SCAN_END_NESTED()                                                     \
+        SCAN_FINISH();                                                        \
+        if (nl_attr_oversized(key->size - key_offset - NLA_HDRLEN)) {         \
+            return -E2BIG;                                                    \
+        }                                                                     \
+        nl_msg_end_nested(key, key_offset);                                   \
+        if (mask) {                                                           \
+            nl_msg_end_nested(mask, mask_offset);                             \
+        }                                                                     \
+        return s - start;                                                     \
     }
 
 #define SCAN_FIELD_NESTED__(NAME, TYPE, SCAN_AS, ATTR, FUNC)  \
@@ -7422,15 +7432,18 @@
 
 /* Appends an OVS_ACTION_ATTR_USERSPACE action to 'odp_actions' that specifies
  * Netlink PID 'pid'.  If 'userdata' is nonnull, adds a userdata attribute
- * whose contents are the 'userdata_size' bytes at 'userdata' and returns the
- * offset within 'odp_actions' of the start of the cookie.  (If 'userdata' is
- * null, then the return value is not meaningful.) */
-size_t
+ * whose contents are the 'userdata_size' bytes at 'userdata' and sets
+ * 'odp_actions_ofs' if nonnull with the offset within 'odp_actions' of the
+ * start of the cookie.  (If 'userdata' is null, then the 'odp_actions_ofs'
+ * value is not meaningful.)
+ *
+ * Returns negative error code on failure. */
+int
 odp_put_userspace_action(uint32_t pid,
                          const void *userdata, size_t userdata_size,
                          odp_port_t tunnel_out_port,
                          bool include_actions,
-                         struct ofpbuf *odp_actions)
+                         struct ofpbuf *odp_actions, size_t *odp_actions_ofs)
 {
     size_t userdata_ofs;
     size_t offset;
@@ -7438,6 +7451,9 @@
     offset = nl_msg_start_nested(odp_actions, OVS_ACTION_ATTR_USERSPACE);
     nl_msg_put_u32(odp_actions, OVS_USERSPACE_ATTR_PID, pid);
     if (userdata) {
+        if (nl_attr_oversized(userdata_size)) {
+            return -E2BIG;
+        }
         userdata_ofs = odp_actions->size + NLA_HDRLEN;
 
         /* The OVS kernel module before OVS 1.11 and the upstream Linux kernel
@@ -7463,9 +7479,16 @@
     if (include_actions) {
         nl_msg_put_flag(odp_actions, OVS_USERSPACE_ATTR_ACTIONS);
     }
+    if (nl_attr_oversized(odp_actions->size - offset - NLA_HDRLEN)) {
+        return -E2BIG;
+    }
     nl_msg_end_nested(odp_actions, offset);
 
-    return userdata_ofs;
+    if (odp_actions_ofs) {
+        *odp_actions_ofs = userdata_ofs;
+    }
+
+    return 0;
 }
 
 void
diff -Nru openvswitch-2.13.1/lib/odp-util.h openvswitch-2.13.3/lib/odp-util.h
--- openvswitch-2.13.1/lib/odp-util.h	2020-08-04 21:41:31.951524451 +0000
+++ openvswitch-2.13.3/lib/odp-util.h	2021-02-10 20:04:59.520074628 +0000
@@ -356,11 +356,12 @@
 };
 BUILD_ASSERT_DECL(sizeof(struct user_action_cookie) == 48);
 
-size_t odp_put_userspace_action(uint32_t pid,
-                                const void *userdata, size_t userdata_size,
-                                odp_port_t tunnel_out_port,
-                                bool include_actions,
-                                struct ofpbuf *odp_actions);
+int odp_put_userspace_action(uint32_t pid,
+                             const void *userdata, size_t userdata_size,
+                             odp_port_t tunnel_out_port,
+                             bool include_actions,
+                             struct ofpbuf *odp_actions,
+                             size_t *odp_actions_ofs);
 void odp_put_tunnel_action(const struct flow_tnl *tunnel,
                            struct ofpbuf *odp_actions,
                            const char *tnl_type);
diff -Nru openvswitch-2.13.1/lib/ofp-ed-props.c openvswitch-2.13.3/lib/ofp-ed-props.c
--- openvswitch-2.13.1/lib/ofp-ed-props.c	2020-08-04 21:38:24.859524451 +0000
+++ openvswitch-2.13.3/lib/ofp-ed-props.c	2021-02-10 20:03:32.193074628 +0000
@@ -49,7 +49,7 @@
                 return OFPERR_NXBAC_BAD_ED_PROP;
             }
             struct ofpact_ed_prop_nsh_md_type *pnmt =
-                    ofpbuf_put_uninit(out, sizeof(*pnmt));
+                    ofpbuf_put_zeros(out, sizeof *pnmt);
             pnmt->header.prop_class = prop_class;
             pnmt->header.type = prop_type;
             pnmt->header.len = len;
@@ -108,6 +108,7 @@
             opnmt->header.len =
                     offsetof(struct ofp_ed_prop_nsh_md_type, pad);
             opnmt->md_type = pnmt->md_type;
+            memset(opnmt->pad, 0, sizeof opnmt->pad);
             prop_len = sizeof(*pnmt);
             break;
         }
diff -Nru openvswitch-2.13.1/lib/ovsdb-idl.c openvswitch-2.13.3/lib/ovsdb-idl.c
--- openvswitch-2.13.1/lib/ovsdb-idl.c	2020-08-04 21:40:41.415524451 +0000
+++ openvswitch-2.13.3/lib/ovsdb-idl.c	2021-02-10 20:04:13.841074628 +0000
@@ -221,7 +221,7 @@
     struct uuid last_id;
 };
 
-static void ovsdb_idl_db_track_clear(struct ovsdb_idl_db *);
+static void ovsdb_idl_db_track_clear(struct ovsdb_idl_db *, bool flush_all);
 static void ovsdb_idl_db_add_column(struct ovsdb_idl_db *,
                                     const struct ovsdb_idl_column *);
 static void ovsdb_idl_db_omit(struct ovsdb_idl_db *,
@@ -643,7 +643,7 @@
     ovsdb_idl_row_destroy_postprocess(db);
 
     db->cond_seqno = 0;
-    ovsdb_idl_db_track_clear(db);
+    ovsdb_idl_db_track_clear(db, true);
 
     if (changed) {
         db->change_seqno++;
@@ -1547,7 +1547,7 @@
 {
     struct ovsdb_idl_condition *table_cond;
     struct ovsdb_idl_table *table = ovsdb_idl_db_table_from_class(db, tc);
-    unsigned int seqno = db->cond_seqno;
+    unsigned int curr_seqno = db->cond_seqno;
 
     /* Compare the new condition to the last known condition which can be
      * either "new" (not sent yet), "requested" or "acked", in this order.
@@ -1565,10 +1565,11 @@
         ovsdb_idl_condition_clone(&table->new_cond, condition);
         db->cond_changed = true;
         poll_immediate_wake();
-        return seqno + 1;
     }
 
-    return seqno;
+    /* Conditions will be up to date when we receive replies for already
+     * requested and new conditions, if any. */
+    return curr_seqno + (table->new_cond ? 1 : 0) + (table->req_cond ? 1 : 0);
 }
 
 /* Sets the replication condition for 'tc' in 'idl' to 'condition' and
@@ -1872,29 +1873,37 @@
 }
 
 /* Returns the first tracked row in table with class 'table_class'
- * for the specified 'idl'. Returns NULL if there are no tracked rows */
+ * for the specified 'idl'. Returns NULL if there are no tracked rows.
+ * Pure orphan rows, i.e. rows that never had any datum, are skipped. */
 const struct ovsdb_idl_row *
 ovsdb_idl_track_get_first(const struct ovsdb_idl *idl,
                           const struct ovsdb_idl_table_class *table_class)
 {
     struct ovsdb_idl_table *table
         = ovsdb_idl_db_table_from_class(&idl->data, table_class);
+    struct ovsdb_idl_row *row;
 
-    if (!ovs_list_is_empty(&table->track_list)) {
-        return CONTAINER_OF(ovs_list_front(&table->track_list), struct ovsdb_idl_row, track_node);
+    LIST_FOR_EACH (row, track_node, &table->track_list) {
+        if (!ovsdb_idl_row_is_orphan(row) || row->tracked_old_datum) {
+            return row;
+        }
     }
     return NULL;
 }
 
 /* Returns the next tracked row in table after the specified 'row'
- * (in no particular order). Returns NULL if there are no tracked rows */
+ * (in no particular order). Returns NULL if there are no tracked rows.
+ * Pure orphan rows, i.e. rows that never had any datum, are skipped.*/
 const struct ovsdb_idl_row *
 ovsdb_idl_track_get_next(const struct ovsdb_idl_row *row)
 {
-    if (row->track_node.next != &row->table->track_list) {
-        return CONTAINER_OF(row->track_node.next, struct ovsdb_idl_row, track_node);
-    }
+    struct ovsdb_idl_table *table = row->table;
 
+    LIST_FOR_EACH_CONTINUE (row, track_node, &table->track_list) {
+        if (!ovsdb_idl_row_is_orphan(row) || row->tracked_old_datum) {
+            return row;
+        }
+    }
     return NULL;
 }
 
@@ -1927,7 +1936,7 @@
  * loop when it is ready to do ovsdb_idl_run() again.
  */
 static void
-ovsdb_idl_db_track_clear(struct ovsdb_idl_db *db)
+ovsdb_idl_db_track_clear(struct ovsdb_idl_db *db, bool flush_all)
 {
     size_t i;
 
@@ -1942,19 +1951,39 @@
                     free(row->updated);
                     row->updated = NULL;
                 }
+
+                row->change_seqno[OVSDB_IDL_CHANGE_INSERT] =
+                    row->change_seqno[OVSDB_IDL_CHANGE_MODIFY] =
+                    row->change_seqno[OVSDB_IDL_CHANGE_DELETE] = 0;
+
                 ovs_list_remove(&row->track_node);
                 ovs_list_init(&row->track_node);
-                if (ovsdb_idl_row_is_orphan(row) && row->tracked_old_datum) {
+                if (ovsdb_idl_row_is_orphan(row)) {
                     ovsdb_idl_row_unparse(row);
-                    const struct ovsdb_idl_table_class *class =
-                                                        row->table->class_;
-                    for (size_t c = 0; c < class->n_columns; c++) {
-                        ovsdb_datum_destroy(&row->tracked_old_datum[c],
-                                            &class->columns[c].type);
+                    if (row->tracked_old_datum) {
+                        const struct ovsdb_idl_table_class *class =
+                            row->table->class_;
+                        for (size_t c = 0; c < class->n_columns; c++) {
+                            ovsdb_datum_destroy(&row->tracked_old_datum[c],
+                                                &class->columns[c].type);
+                        }
+                        free(row->tracked_old_datum);
+                        row->tracked_old_datum = NULL;
+                    }
+
+                    /* Rows that were reused as orphan after being processed
+                     * for deletion are still in the table hmap and will be
+                     * cleaned up when their src arcs are removed.  These rows
+                     * will not be reported anymore as "deleted" to IDL
+                     * clients.
+                     *
+                     * The exception is when 'destroy' is explicitly set to
+                     * 'true' which usually happens when the complete IDL
+                     * contents are being flushed.
+                     */
+                    if (flush_all || ovs_list_is_empty(&row->dst_arcs)) {
+                        free(row);
                     }
-                    free(row->tracked_old_datum);
-                    row->tracked_old_datum = NULL;
-                    free(row);
                 }
             }
         }
@@ -1969,7 +1998,7 @@
 void
 ovsdb_idl_track_clear(struct ovsdb_idl *idl)
 {
-    ovsdb_idl_db_track_clear(&idl->data);
+    ovsdb_idl_db_track_clear(&idl->data, false);
 }
 
 static void
@@ -2623,22 +2652,25 @@
     return true;
 }
 
-/* Recursively add rows to tracked change lists for current row
- * and the rows that reference this row. */
+/* Recursively add rows to tracked change lists for all rows that reference
+   'row'. */
 static void
 add_tracked_change_for_references(struct ovsdb_idl_row *row)
 {
-    if (ovs_list_is_empty(&row->track_node) &&
-            ovsdb_idl_track_is_set(row->table)) {
-        ovs_list_push_back(&row->table->track_list,
-                           &row->track_node);
-        row->change_seqno[OVSDB_IDL_CHANGE_MODIFY]
-            = row->table->change_seqno[OVSDB_IDL_CHANGE_MODIFY]
-            = row->table->db->change_seqno + 1;
-
-        const struct ovsdb_idl_arc *arc;
-        LIST_FOR_EACH (arc, dst_node, &row->dst_arcs) {
-            add_tracked_change_for_references(arc->src);
+    const struct ovsdb_idl_arc *arc;
+    LIST_FOR_EACH (arc, dst_node, &row->dst_arcs) {
+        struct ovsdb_idl_row *ref = arc->src;
+
+        if (ovs_list_is_empty(&ref->track_node) &&
+            ovsdb_idl_track_is_set(ref->table)) {
+                ovs_list_push_back(&ref->table->track_list,
+                                   &ref->track_node);
+
+            ref->change_seqno[OVSDB_IDL_CHANGE_MODIFY]
+                = ref->table->change_seqno[OVSDB_IDL_CHANGE_MODIFY]
+                = ref->table->db->change_seqno + 1;
+
+            add_tracked_change_for_references(ref);
         }
     }
 }
@@ -2706,7 +2738,14 @@
                     row->change_seqno[change]
                         = row->table->change_seqno[change]
                         = row->table->db->change_seqno + 1;
+
                     if (table->modes[column_idx] & OVSDB_IDL_TRACK) {
+                        if (ovs_list_is_empty(&row->track_node) &&
+                            ovsdb_idl_track_is_set(row->table)) {
+                            ovs_list_push_back(&row->table->track_list,
+                                               &row->track_node);
+                        }
+
                         add_tracked_change_for_references(row);
                         if (!row->updated) {
                             row->updated = bitmap_allocate(class->n_columns);
@@ -3140,7 +3179,7 @@
 {
     ovs_assert(row->old_datum == row->new_datum);
     if (!ovsdb_idl_row_is_orphan(row)) {
-        if (ovsdb_idl_track_is_set(row->table)) {
+        if (ovsdb_idl_track_is_set(row->table) && !row->tracked_old_datum) {
             row->tracked_old_datum = row->old_datum;
         } else {
             const struct ovsdb_idl_table_class *class = row->table->class_;
@@ -4782,6 +4821,7 @@
     hmap_insert(&row->table->rows, &row->hmap_node, uuid_hash(&row->uuid));
     hmap_insert(&txn->txn_rows, &row->txn_node, uuid_hash(&row->uuid));
     ovsdb_idl_add_to_indexes(row);
+
     return row;
 }
 
diff -Nru openvswitch-2.13.1/lib/reconnect.c openvswitch-2.13.3/lib/reconnect.c
--- openvswitch-2.13.1/lib/reconnect.c	2020-08-04 21:34:43.167524451 +0000
+++ openvswitch-2.13.3/lib/reconnect.c	2021-02-10 20:04:59.526074628 +0000
@@ -61,6 +61,7 @@
     long long int last_activity;
     long long int last_connected;
     long long int last_disconnected;
+    long long int last_receive_attempt;
     unsigned int max_tries;
     unsigned int backoff_free_tries;
 
@@ -109,6 +110,7 @@
     fsm->last_activity = now;
     fsm->last_connected = LLONG_MAX;
     fsm->last_disconnected = LLONG_MAX;
+    fsm->last_receive_attempt = now;
     fsm->max_tries = UINT_MAX;
     fsm->creation_time = now;
 
@@ -501,6 +503,19 @@
     fsm->last_activity = now;
 }
 
+/* Tell 'fsm' that some attempt to receive data on the connection was made at
+ * 'now'.  The FSM only allows probe interval timer to expire when some attempt
+ * to receive data on the connection was received after the time when it should
+ * have expired.  This helps in the case where there's a long delay in the poll
+ * loop and then reconnect_run() executes before the code to try to receive
+ * anything from the remote runs.  (To disable this feature, just call
+ * reconnect_receive_attempted(fsm, LLONG_MAX).) */
+void
+reconnect_receive_attempted(struct reconnect *fsm, long long int now)
+{
+    fsm->last_receive_attempt = now;
+}
+
 static void
 reconnect_transition__(struct reconnect *fsm, long long int now,
                        enum state state)
@@ -541,13 +556,19 @@
     case S_ACTIVE:
         if (fsm->probe_interval) {
             long long int base = MAX(fsm->last_activity, fsm->state_entered);
-            return base + fsm->probe_interval;
+            long long int expiration = base + fsm->probe_interval;
+            if (fsm->last_receive_attempt >= expiration) {
+                return expiration;
+            }
         }
         return LLONG_MAX;
 
     case S_IDLE:
         if (fsm->probe_interval) {
-            return fsm->state_entered + fsm->probe_interval;
+            long long int expiration = fsm->state_entered + fsm->probe_interval;
+            if (fsm->last_receive_attempt >= expiration) {
+                return expiration;
+            }
         }
         return LLONG_MAX;
 
diff -Nru openvswitch-2.13.1/lib/reconnect.h openvswitch-2.13.3/lib/reconnect.h
--- openvswitch-2.13.1/lib/reconnect.h	2020-08-04 21:33:59.409524451 +0000
+++ openvswitch-2.13.3/lib/reconnect.h	2021-02-10 20:04:59.526074628 +0000
@@ -83,6 +83,7 @@
 void reconnect_connect_failed(struct reconnect *, long long int now,
                               int error);
 void reconnect_activity(struct reconnect *, long long int now);
+void reconnect_receive_attempted(struct reconnect *, long long int now);
 
 enum reconnect_action {
     RECONNECT_CONNECT = 1,
diff -Nru openvswitch-2.13.1/lib/sha1.c openvswitch-2.13.3/lib/sha1.c
--- openvswitch-2.13.1/lib/sha1.c	2020-08-04 19:11:45.635524451 +0000
+++ openvswitch-2.13.3/lib/sha1.c	2021-02-10 19:58:58.223074628 +0000
@@ -197,7 +197,7 @@
  * inputLen: The length of the input buffer.
  */
 void
-sha1_update(struct sha1_ctx *ctx, const void *buffer_, size_t count)
+sha1_update(struct sha1_ctx *ctx, const void *buffer_, uint32_t count)
 {
     const uint8_t *buffer = buffer_;
     unsigned int i;
@@ -274,7 +274,7 @@
 
 /* Computes the hash of 'n' bytes in 'data' into 'digest'. */
 void
-sha1_bytes(const void *data, size_t n, uint8_t digest[SHA1_DIGEST_SIZE])
+sha1_bytes(const void *data, uint32_t n, uint8_t digest[SHA1_DIGEST_SIZE])
 {
     struct sha1_ctx ctx;
 
diff -Nru openvswitch-2.13.1/lib/sha1.h openvswitch-2.13.3/lib/sha1.h
--- openvswitch-2.13.1/lib/sha1.h	2020-08-04 19:11:45.635524451 +0000
+++ openvswitch-2.13.3/lib/sha1.h	2021-02-10 19:58:58.223074628 +0000
@@ -45,9 +45,9 @@
 };
 
 void sha1_init(struct sha1_ctx *);
-void sha1_update(struct sha1_ctx *, const void *, size_t);
+void sha1_update(struct sha1_ctx *, const void *, uint32_t size);
 void sha1_final(struct sha1_ctx *, uint8_t digest[SHA1_DIGEST_SIZE]);
-void sha1_bytes(const void *, size_t, uint8_t digest[SHA1_DIGEST_SIZE]);
+void sha1_bytes(const void *, uint32_t size, uint8_t digest[SHA1_DIGEST_SIZE]);
 
 #define SHA1_FMT \
         "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" \
diff -Nru openvswitch-2.13.1/lib/tc.c openvswitch-2.13.3/lib/tc.c
--- openvswitch-2.13.1/lib/tc.c	2020-08-04 21:41:31.958524451 +0000
+++ openvswitch-2.13.3/lib/tc.c	2021-02-10 20:04:59.529074628 +0000
@@ -456,7 +456,7 @@
     if (attrs[TCA_FLOWER_KEY_MPLS_BOS]) {
         bos = nl_attr_get_u8(attrs[TCA_FLOWER_KEY_MPLS_BOS]);
         set_mpls_lse_bos(&flower->key.mpls_lse, bos);
-        set_mpls_lse_ttl(&flower->mask.mpls_lse, 0xff);
+        set_mpls_lse_bos(&flower->mask.mpls_lse, 0xff);
     }
 
     if (attrs[TCA_FLOWER_KEY_MPLS_TC]) {
@@ -934,6 +934,7 @@
             int flower_off = m->flower_offset;
             int sz = m->size;
             int mf = m->offset;
+            int ef = ROUND_UP(mf, 4);
 
             if (m->htype != type) {
                continue;
@@ -941,9 +942,10 @@
 
             /* check overlap between current pedit key, which is always
              * 4 bytes (range [off, off + 3]), and a map entry in
-             * flower_pedit_map (range [mf, mf + sz - 1]) */
+             * flower_pedit_map sf = ROUND_DOWN(mf, 4)
+             * (range [sf|mf, (mf + sz - 1)|ef]) */
             if ((keys->off >= mf && keys->off < mf + sz)
-                || (keys->off + 3 >= mf && keys->off + 3 < mf + sz)) {
+                || (keys->off + 3 >= mf && keys->off + 3 < ef)) {
                 int diff = flower_off + (keys->off - mf);
                 ovs_be32 *dst = (void *) (rewrite_key + diff);
                 ovs_be32 *dst_m = (void *) (rewrite_mask + diff);
diff -Nru openvswitch-2.13.1/Makefile.am openvswitch-2.13.3/Makefile.am
--- openvswitch-2.13.1/Makefile.am	2020-08-04 21:41:31.910524451 +0000
+++ openvswitch-2.13.3/Makefile.am	2021-02-10 20:04:59.477074628 +0000
@@ -76,12 +76,12 @@
 	MAINTAINERS.rst \
 	README.rst \
 	NOTICE \
+	.ci/linux-build.sh \
+	.ci/linux-prepare.sh \
+	.ci/osx-build.sh \
+	.ci/osx-prepare.sh \
 	.cirrus.yml \
-	.travis.yml \
-	.travis/linux-build.sh \
-	.travis/linux-prepare.sh \
-	.travis/osx-build.sh \
-	.travis/osx-prepare.sh \
+	.github/workflows/build-and-test.yml \
 	appveyor.yml \
 	boot.sh \
 	poc/builders/Vagrantfile \
diff -Nru openvswitch-2.13.1/Makefile.in openvswitch-2.13.3/Makefile.in
--- openvswitch-2.13.1/Makefile.in	2020-08-04 21:41:54.326524451 +0000
+++ openvswitch-2.13.3/Makefile.in	2021-02-10 20:05:18.704074628 +0000
@@ -1574,8 +1574,8 @@
 	ovsdb/ovsdb-server.1 ovsdb/ovsdb-idlc $(OVSIDL_BUILT) \
 	ovsdb/ovsdb-dot ovsdb/_server.ovsschema.inc \
 	ovsdb/_server.ovsschema.stamp ovsdb/ovsdb-server.5 \
-	vtep/vtep-ctl.8 vtep/ovs-vtep $(am__append_42) vtep/vtep.5 \
-	vtep/vtep.ovsschema.stamp \
+	python/ovs/dirs.py vtep/vtep-ctl.8 vtep/ovs-vtep \
+	$(am__append_42) vtep/vtep.5 vtep/vtep.ovsschema.stamp \
 	$(srcdir)/datapath-windows/include/OvsDpInterface.h \
 	selinux/openvswitch-custom.te selinux/openvswitch-custom.pp \
 	selinux/openvswitch-custom.fc selinux/openvswitch-custom.if
@@ -1614,11 +1614,10 @@
 
 # VTEP schema documentation
 EXTRA_DIST = AUTHORS.rst CONTRIBUTING.rst LICENSE MAINTAINERS.rst \
-	README.rst NOTICE .cirrus.yml .travis.yml \
-	.travis/linux-build.sh .travis/linux-prepare.sh \
-	.travis/osx-build.sh .travis/osx-prepare.sh appveyor.yml \
-	boot.sh poc/builders/Vagrantfile \
-	poc/playbook-centos-builder.yml \
+	README.rst NOTICE .ci/linux-build.sh .ci/linux-prepare.sh \
+	.ci/osx-build.sh .ci/osx-prepare.sh .cirrus.yml \
+	.github/workflows/build-and-test.yml appveyor.yml boot.sh \
+	poc/builders/Vagrantfile poc/playbook-centos-builder.yml \
 	poc/playbook-fedora-builder.yml \
 	poc/playbook-ubuntu-builder.yml $(MAN_FRAGMENTS) $(MAN_ROOTS) \
 	Vagrantfile Vagrantfile-FreeBSD .mailmap \
@@ -7226,7 +7225,8 @@
 # However, current versions of Automake seem to output all variable
 # assignments before any targets, so it doesn't seem to be a problem,
 # at least for now.
-$(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in
+$(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in python/ovs/dirs.py
+ovsdb/ovsdb-doc: python/ovs/dirs.py
 ovsdb/ovsdb-server.$(OBJEXT): ovsdb/_server.ovsschema.inc
 ovsdb/_server.ovsschema.inc: ovsdb/_server.ovsschema $(srcdir)/build-aux/text2c
 	$(AM_V_GEN)$(run_python) $(srcdir)/build-aux/text2c < $< > $@.tmp
@@ -7281,12 +7281,12 @@
 	$(MKDIR_P) python/ovs
 	sed \
 		-e '/^##/d' \
-                -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
-                -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
-                -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
-                -e 's,[@]bindir[@],$(bindir),g' \
-                -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
-                -e 's,[@]DBDIR[@],$(DBDIR),g' \
+		-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+		-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+		-e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+		-e 's,[@]bindir[@],$(bindir),g' \
+		-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+		-e 's,[@]DBDIR[@],$(DBDIR),g' \
 		< $(srcdir)/python/ovs/dirs.py.template \
 		> python/ovs/dirs.py.tmp
 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/python/ovs
@@ -7308,12 +7308,12 @@
 $(srcdir)/python/ovs/dirs.py: python/ovs/dirs.py.template
 	$(AM_V_GEN)sed \
 		-e '/^##/d' \
-                -e 's,[@]pkgdatadir[@],/usr/local/share/openvswitch,g' \
-                -e 's,[@]RUNDIR[@],/var/run,g' \
-                -e 's,[@]LOGDIR[@],/usr/local/var/log,g' \
-                -e 's,[@]bindir[@],/usr/local/bin,g' \
-                -e 's,[@]sysconfdir[@],/usr/local/etc,g' \
-                -e 's,[@]DBDIR[@],/usr/local/etc/openvswitch,g' \
+		-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+		-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+		-e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+		-e 's,[@]bindir[@],$(bindir),g' \
+		-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+		-e 's,[@]DBDIR[@],$(sysconfdir)/openvswitch,g' \
 		< $? > $@.tmp && \
 	mv $@.tmp $@
 sandbox: all
diff -Nru openvswitch-2.13.1/NEWS openvswitch-2.13.3/NEWS
--- openvswitch-2.13.1/NEWS	2020-08-04 21:41:31.910524451 +0000
+++ openvswitch-2.13.3/NEWS	2021-02-10 20:04:59.477074628 +0000
@@ -1,3 +1,31 @@
+v2.13.3 - 10 Feb 2021
+---------------------
+   - Bug fixes
+   - Security:
+     * Fixed packet parsing vulnerability CVE-2020-35498.
+
+v2.13.2 - 13 Jan 2021
+---------------------
+   - Bug fixes
+   - LLDP:
+     * Security fixes for CVE-2015-8011 and CVE-2020-27827.
+   - IPsec:
+     * Fixed support of strongswan 5.7+ in ovs-monitor-ipsec.
+     * Add option '--no-cleanup' to allow ovs-monitor-ipsec to stop without
+       tearing down IPsec tunnels.
+     * Add option '--no-restart-ike-daemon' to allow ovs-monitor-ipsec to start
+       without restarting ipsec daemon.
+   - OVSDB:
+     * New unixctl command 'ovsdb-server/memory-trim-on-compaction on|off'.
+       If turned on, ovsdb-server will try to reclaim all the unused memory
+       after every DB compaction back to OS.  Disabled by default.
+     * Maximum backlog on RAFT connections limited to 500 messages or 4GB.
+       Once threshold reached, connection is dropped (and re-established).
+       Use the 'cluster/set-backlog-threshold' command to change limits.
+     * Fixed SHA-1 hash computation for databases larger than 512 MB.
+   - DPDK:
+     * Fixed support of 'net_virtio' devices.
+
 v2.13.1 - 30 Jul 2020
 ---------------------
    - Bug fixes
@@ -51,6 +79,9 @@
    - 'ovs-appctl dpctl/dump-flows' can now show offloaded=partial for
      partially offloaded flows, dp:dpdk for fully offloaded by dpdk, and
      type filter supports new filters: "dpdk" and "partially-offloaded".
+   - Add new argument '--offload-stats' for command
+     'ovs-appctl bridge/dump-flows',
+     so it can display offloaded packets statistics.
 
 v2.12.0 - 03 Sep 2019
 ---------------------
@@ -125,9 +156,6 @@
      * Add support for conntrack zone-based timeout policy.
    - 'ovs-dpctl dump-flows' is no longer suitable for dumping offloaded flows.
      'ovs-appctl dpctl/dump-flows' should be used instead.
-   - Add new argument '--offload-stats' for command
-     'ovs-appctl bridge/dump-flows',
-     so it can display offloaded packets statistics.
    - Add L2 GRE tunnel over IPv6 support.
 
 v2.11.0 - 19 Feb 2019
diff -Nru openvswitch-2.13.1/ofproto/connmgr.c openvswitch-2.13.3/ofproto/connmgr.c
--- openvswitch-2.13.1/ofproto/connmgr.c	2020-08-04 21:41:31.961524451 +0000
+++ openvswitch-2.13.3/ofproto/connmgr.c	2021-02-10 20:04:59.531074628 +0000
@@ -190,8 +190,8 @@
 
 static void ofservice_run(struct ofservice *);
 static void ofservice_wait(struct ofservice *);
-static void ofservice_reconfigure(struct ofservice *,
-                                  const struct ofproto_controller *)
+static int ofservice_reconfigure(struct ofservice *,
+                                 const struct ofproto_controller *)
     OVS_REQUIRES(ofproto_mutex);
 static void ofservice_create(struct connmgr *mgr, const char *target,
                              const struct ofproto_controller *)
@@ -602,7 +602,15 @@
                       target);
             ofservice_destroy(ofservice);
         } else {
-            ofservice_reconfigure(ofservice, c);
+            if (ofservice_reconfigure(ofservice, c)) {
+                char *target_to_restore = xstrdup(target);
+                VLOG_INFO("%s: Changes to controller \"%s\" "
+                          "expects re-initialization: Re-initializing now.",
+                          mgr->name, target);
+                ofservice_destroy(ofservice);
+                ofservice_create(mgr, target_to_restore, c);
+                free(target_to_restore);
+            }
         }
     }
 
@@ -2011,16 +2019,15 @@
     }
 }
 
-static void
+static int
 ofservice_reconfigure(struct ofservice *ofservice,
                       const struct ofproto_controller *settings)
     OVS_REQUIRES(ofproto_mutex)
 {
-    /* If the allowed OpenFlow versions change, close all of the existing
-     * connections to allow them to reconnect and possibly negotiate a new
-     * version. */
+    /* If the allowed OpenFlow versions change, a full cleanup is needed
+     * for the ofservice and connections. */
     if (ofservice->s.allowed_versions != settings->allowed_versions) {
-        ofservice_close_all(ofservice);
+        return -EINVAL;
     }
 
     ofservice->s = *settings;
@@ -2029,6 +2036,8 @@
     LIST_FOR_EACH (ofconn, ofservice_node, &ofservice->conns) {
         ofconn_reconfigure(ofconn, settings);
     }
+
+    return 0;
 }
 
 /* Finds and returns the ofservice within 'mgr' that has the given
diff -Nru openvswitch-2.13.1/ofproto/ipfix-gen-entities openvswitch-2.13.3/ofproto/ipfix-gen-entities
--- openvswitch-2.13.1/ofproto/ipfix-gen-entities	2020-08-04 21:30:01.514524451 +0000
+++ openvswitch-2.13.3/ofproto/ipfix-gen-entities	2021-02-10 20:04:59.531074628 +0000
@@ -1,6 +1,6 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
 #
-# Copyright (C) 2012 Nicira, Inc.
+# Copyright (C) 2012, 2020 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff -Nru openvswitch-2.13.1/ofproto/ofproto-dpif-upcall.c openvswitch-2.13.3/ofproto/ofproto-dpif-upcall.c
--- openvswitch-2.13.1/ofproto/ofproto-dpif-upcall.c	2020-08-04 21:41:31.963524451 +0000
+++ openvswitch-2.13.3/ofproto/ofproto-dpif-upcall.c	2021-02-10 20:04:59.534074628 +0000
@@ -1093,7 +1093,7 @@
     }
 
     odp_put_userspace_action(pid, &cookie, sizeof cookie,
-                             ODPP_NONE, false, buf);
+                             ODPP_NONE, false, buf, NULL);
 
     if (meter_id != UINT32_MAX) {
         nl_msg_end_nested(buf, ac_offset);
diff -Nru openvswitch-2.13.1/ofproto/ofproto-dpif-xlate.c openvswitch-2.13.3/ofproto/ofproto-dpif-xlate.c
--- openvswitch-2.13.1/ofproto/ofproto-dpif-xlate.c	2020-08-04 21:41:31.965524451 +0000
+++ openvswitch-2.13.3/ofproto/ofproto-dpif-xlate.c	2021-02-10 20:04:59.536074628 +0000
@@ -3093,6 +3093,7 @@
                 xlate_report(ctx, OFT_DETAIL, "MLD query, flooding");
                 xlate_normal_flood(ctx, in_xbundle, &xvlan);
             }
+            return;
         } else {
             if (is_ip_local_multicast(flow, wc)) {
                 /* RFC4541: section 2.1.2, item 2: Packets with a dst IP
@@ -3215,12 +3216,11 @@
     odp_port_t odp_port = ofp_port_to_odp_port(
         ctx->xbridge, ctx->xin->flow.in_port.ofp_port);
     uint32_t pid = dpif_port_get_pid(ctx->xbridge->dpif, odp_port);
-    size_t cookie_offset = odp_put_userspace_action(pid, cookie,
-                                                    sizeof *cookie,
-                                                    tunnel_out_port,
-                                                    include_actions,
-                                                    ctx->odp_actions);
-
+    size_t cookie_offset;
+    int res = odp_put_userspace_action(pid, cookie, sizeof *cookie,
+                                       tunnel_out_port, include_actions,
+                                       ctx->odp_actions, &cookie_offset);
+    ovs_assert(res == 0);
     if (is_sample) {
         nl_msg_end_nested(ctx->odp_actions, actions_offset);
         nl_msg_end_nested(ctx->odp_actions, sample_offset);
@@ -4813,7 +4813,7 @@
                                              ctx->xin->flow.in_port.ofp_port);
     uint32_t pid = dpif_port_get_pid(ctx->xbridge->dpif, odp_port);
     odp_put_userspace_action(pid, &cookie, sizeof cookie, ODPP_NONE,
-                             false, ctx->odp_actions);
+                             false, ctx->odp_actions, NULL);
 }
 
 static void
diff -Nru openvswitch-2.13.1/ovsdb/automake.mk openvswitch-2.13.3/ovsdb/automake.mk
--- openvswitch-2.13.1/ovsdb/automake.mk	2020-08-04 21:33:59.441524451 +0000
+++ openvswitch-2.13.3/ovsdb/automake.mk	2021-02-10 20:04:59.543074628 +0000
@@ -106,11 +106,12 @@
 # However, current versions of Automake seem to output all variable
 # assignments before any targets, so it doesn't seem to be a problem,
 # at least for now.
-$(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in
+$(OVSIDL_BUILT): ovsdb/ovsdb-idlc.in python/ovs/dirs.py
 
 # ovsdb-doc
 EXTRA_DIST += ovsdb/ovsdb-doc
 OVSDB_DOC = $(run_python) $(srcdir)/ovsdb/ovsdb-doc
+ovsdb/ovsdb-doc: python/ovs/dirs.py
 
 # ovsdb-dot
 EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic
diff -Nru openvswitch-2.13.1/ovsdb/dot2pic openvswitch-2.13.3/ovsdb/dot2pic
--- openvswitch-2.13.1/ovsdb/dot2pic	2020-08-04 21:33:59.442524451 +0000
+++ openvswitch-2.13.3/ovsdb/dot2pic	2021-02-10 20:04:59.543074628 +0000
@@ -1,6 +1,6 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright (c) 2009, 2010, 2011, 2013, 2017 Nicira, Inc.
+# Copyright (c) 2009, 2010, 2011, 2013, 2017, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/ovsdb/log.c openvswitch-2.13.3/ovsdb/log.c
--- openvswitch-2.13.1/ovsdb/log.c	2020-08-04 21:36:07.540524451 +0000
+++ openvswitch-2.13.3/ovsdb/log.c	2021-02-10 20:04:59.543074628 +0000
@@ -212,7 +212,7 @@
     if (!strcmp(name, "/dev/stdin") && open_mode == OVSDB_LOG_READ_ONLY) {
         fd = dup(STDIN_FILENO);
     } else {
-        fd = open(name, flags, 0666);
+        fd = open(name, flags, 0660);
     }
     if (fd < 0) {
         const char *op = (open_mode == OVSDB_LOG_CREATE_EXCL ? "create"
diff -Nru openvswitch-2.13.1/ovsdb/ovsdb.c openvswitch-2.13.3/ovsdb/ovsdb.c
--- openvswitch-2.13.1/ovsdb/ovsdb.c	2020-08-04 21:40:41.451524451 +0000
+++ openvswitch-2.13.3/ovsdb/ovsdb.c	2021-02-10 20:04:59.546074628 +0000
@@ -17,6 +17,10 @@
 
 #include "ovsdb.h"
 
+#if HAVE_DECL_MALLOC_TRIM
+#include <malloc.h>
+#endif
+
 #include "column.h"
 #include "file.h"
 #include "monitor.h"
@@ -502,6 +506,10 @@
     }
 
     simap_increase(usage, "cells", cells);
+
+    if (db->storage) {
+        ovsdb_storage_get_memory_usage(db->storage, usage);
+    }
 }
 
 struct ovsdb_table *
@@ -511,7 +519,7 @@
 }
 
 struct ovsdb_error * OVS_WARN_UNUSED_RESULT
-ovsdb_snapshot(struct ovsdb *db)
+ovsdb_snapshot(struct ovsdb *db, bool trim_memory OVS_UNUSED)
 {
     if (!db->storage) {
         return NULL;
@@ -523,6 +531,12 @@
                                                              schema, data);
     json_destroy(schema);
     json_destroy(data);
+
+#if HAVE_DECL_MALLOC_TRIM
+    if (!error && trim_memory) {
+        malloc_trim(0);
+    }
+#endif
     return error;
 }
 
diff -Nru openvswitch-2.13.1/ovsdb/ovsdb-doc openvswitch-2.13.3/ovsdb/ovsdb-doc
--- openvswitch-2.13.1/ovsdb/ovsdb-doc	2020-08-04 21:31:55.352524451 +0000
+++ openvswitch-2.13.3/ovsdb/ovsdb-doc	2021-02-10 20:04:59.544074628 +0000
@@ -1,6 +1,6 @@
-#! /usr/bin/python
+#!/usr/bin/python3
 
-# Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+# Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/ovsdb/ovsdb.h openvswitch-2.13.3/ovsdb/ovsdb.h
--- openvswitch-2.13.1/ovsdb/ovsdb.h	2020-08-04 21:40:41.451524451 +0000
+++ openvswitch-2.13.3/ovsdb/ovsdb.h	2021-02-10 20:04:59.546074628 +0000
@@ -112,7 +112,8 @@
                            long long int elapsed_msec,
                            long long int *timeout_msec);
 
-struct ovsdb_error *ovsdb_snapshot(struct ovsdb *) OVS_WARN_UNUSED_RESULT;
+struct ovsdb_error *ovsdb_snapshot(struct ovsdb *, bool trim_memory)
+    OVS_WARN_UNUSED_RESULT;
 
 void ovsdb_replace(struct ovsdb *dst, struct ovsdb *src);
 
diff -Nru openvswitch-2.13.1/ovsdb/ovsdb-idlc.in openvswitch-2.13.3/ovsdb/ovsdb-idlc.in
--- openvswitch-2.13.1/ovsdb/ovsdb-idlc.in	2020-08-04 21:41:31.972524451 +0000
+++ openvswitch-2.13.3/ovsdb/ovsdb-idlc.in	2021-02-10 20:04:59.545074628 +0000
@@ -279,13 +279,21 @@
              (ROW) = %(s)s_track_get_next(ROW))
 
 
-/* Returns true if 'row' was inserted since the last change tracking reset. */
+/* Returns true if 'row' was inserted since the last change tracking reset.
+ *
+ * Note: This can only be used to test rows of tracked changes. This cannot be
+ * used to test if an uncommitted row that has been added locally is new or it
+ * may given unexpected results. */
 static inline bool %(s)s_is_new(const struct %(s)s *row)
 {
-    return %(s)s_row_get_seqno(row, OVSDB_IDL_CHANGE_MODIFY) == 0;
+    return %(s)s_row_get_seqno(row, OVSDB_IDL_CHANGE_INSERT) > 0;
 }
 
-/* Returns true if 'row' was deleted since the last change tracking reset. */
+/* Returns true if 'row' was deleted since the last change tracking reset.
+ *
+ * Note: This can only be used to test rows of tracked changes. This cannot be
+ * used to test if an uncommitted row that has been added locally has been
+ * deleted or it may given unexpected results. */
 static inline bool %(s)s_is_deleted(const struct %(s)s *row)
 {
     return %(s)s_row_get_seqno(row, OVSDB_IDL_CHANGE_DELETE) > 0;
@@ -333,6 +341,14 @@
 void %(s)s_init(struct %(s)s *);
 void %(s)s_delete(const struct %(s)s *);
 struct %(s)s *%(s)s_insert(struct ovsdb_idl_txn *);
+
+/* Returns true if the tracked column referenced by 'enum %(s)s_column_id' of
+ * the row referenced by 'struct %(s)s *' was updated since the last change
+ * tracking reset.
+ *
+ * Note: This can only be used to test rows of tracked changes. This cannot be
+ * used to test if an uncommitted row that has been added locally has been
+ * updated or it may given unexpected results. */
 bool %(s)s_is_updated(const struct %(s)s *, enum %(s)s_column_id);
 ''' % {'s': structName, 'S': structName.upper()})
 
diff -Nru openvswitch-2.13.1/ovsdb/ovsdb-server.1.in openvswitch-2.13.3/ovsdb/ovsdb-server.1.in
--- openvswitch-2.13.1/ovsdb/ovsdb-server.1.in	2020-08-04 21:41:31.973524451 +0000
+++ openvswitch-2.13.3/ovsdb/ovsdb-server.1.in	2021-02-10 20:04:59.545074628 +0000
@@ -206,6 +206,10 @@
 since the last compaction. It will also be compacted automatically
 after 24 hours since the last compaction if 100 commits were added
 regardless of its size.
+.IP "\fBovsdb\-server/memory-trim-on-compaction\fR \fIon\fR|\fIoff\fR"
+If this option is \fIon\fR, ovsdb-server will try to reclaim all unused
+heap memory back to the system after each successful database compaction
+to reduce the memory consumption of the process.  \fIoff\fR by default.
 .
 .IP "\fBovsdb\-server/reconnect\fR"
 Makes \fBovsdb\-server\fR drop all of the JSON\-RPC
@@ -372,6 +376,11 @@
 cluster.  To see if the change takes effect (committed), use
 \fBcluster/status\fR to show the current setting.  Once a change is committed,
 it persists at server restarts.
+.IP "\fBcluster/set\-backlog\-threshold \fIdb\fR \fIn_msgs\fR \fIn_bytes\fR"
+Sets the backlog limits for \fIdb\fR's RAFT connections to a maximum of
+\fIn_msgs\fR messages or \fIn_bytes\fR bytes.  If the backlog on one of the
+connections reaches the limit, it will be disconnected (and re-established).
+Values are checked only if the backlog contains more than 50 messages.
 .
 .so lib/vlog-unixctl.man
 .so lib/memory-unixctl.man
diff -Nru openvswitch-2.13.1/ovsdb/ovsdb-server.c openvswitch-2.13.3/ovsdb/ovsdb-server.c
--- openvswitch-2.13.1/ovsdb/ovsdb-server.c	2020-08-04 21:41:31.973524451 +0000
+++ openvswitch-2.13.3/ovsdb/ovsdb-server.c	2021-02-10 20:04:59.546074628 +0000
@@ -76,8 +76,12 @@
 static char *ssl_ciphers;
 static bool bootstrap_ca_cert;
 
+/* Try to reclaim heap memory back to system after DB compaction. */
+static bool trim_memory = false;
+
 static unixctl_cb_func ovsdb_server_exit;
 static unixctl_cb_func ovsdb_server_compact;
+static unixctl_cb_func ovsdb_server_memory_trim_on_compaction;
 static unixctl_cb_func ovsdb_server_reconnect;
 static unixctl_cb_func ovsdb_server_perf_counters_clear;
 static unixctl_cb_func ovsdb_server_perf_counters_show;
@@ -242,7 +246,7 @@
                           xasprintf("removing database %s because storage "
                                     "disconnected permanently", node->name));
             } else if (ovsdb_storage_should_snapshot(db->db->storage)) {
-                log_and_free_error(ovsdb_snapshot(db->db));
+                log_and_free_error(ovsdb_snapshot(db->db, trim_memory));
             }
         }
         if (run_process) {
@@ -409,6 +413,9 @@
     unixctl_command_register("exit", "", 0, 0, ovsdb_server_exit, &exiting);
     unixctl_command_register("ovsdb-server/compact", "", 0, 1,
                              ovsdb_server_compact, &all_dbs);
+    unixctl_command_register("ovsdb-server/memory-trim-on-compaction",
+                             "on|off", 1, 1,
+                             ovsdb_server_memory_trim_on_compaction, NULL);
     unixctl_command_register("ovsdb-server/reconnect", "", 0, 0,
                              ovsdb_server_reconnect, jsonrpc);
 
@@ -543,13 +550,14 @@
           const struct ovsdb_schema *schema, const struct json *txn_json,
           const struct uuid *txnid)
 {
-    if (schema && (!db->db->schema || strcmp(schema->version,
-                                             db->db->schema->version))) {
+    if (schema) {
         /* We're replacing the schema (and the data).  Destroy the database
          * (first grabbing its storage), then replace it with the new schema.
          * The transaction must also include the replacement data.
          *
-         * Only clustered database schema changes go through this path. */
+         * Only clustered database schema changes and snapshot installs
+         * go through this path.
+         */
         ovs_assert(txn_json);
         ovs_assert(ovsdb_storage_is_clustered(db->db->storage));
 
@@ -559,11 +567,15 @@
             return error;
         }
 
-        ovsdb_jsonrpc_server_reconnect(
-            config->jsonrpc, false,
-            (db->db->schema
-             ? xasprintf("database %s schema changed", db->db->name)
-             : xasprintf("database %s connected to storage", db->db->name)));
+        if (!db->db->schema ||
+            strcmp(schema->version, db->db->schema->version)) {
+            ovsdb_jsonrpc_server_reconnect(
+                config->jsonrpc, false,
+                (db->db->schema
+                ? xasprintf("database %s schema changed", db->db->name)
+                : xasprintf("database %s connected to storage",
+                            db->db->name)));
+        }
 
         ovsdb_replace(db->db, ovsdb_create(ovsdb_schema_clone(schema), NULL));
 
@@ -1483,7 +1495,8 @@
                 VLOG_INFO("compacting %s database by user request",
                           node->name);
 
-                struct ovsdb_error *error = ovsdb_snapshot(db->db);
+                struct ovsdb_error *error = ovsdb_snapshot(db->db,
+                                                           trim_memory);
                 if (error) {
                     char *s = ovsdb_error_to_string(error);
                     ds_put_format(&reply, "%s\n", s);
@@ -1506,6 +1519,35 @@
     ds_destroy(&reply);
 }
 
+/* "ovsdb-server/memory-trim-on-compaction": controls whether ovsdb-server
+ * tries to reclaim heap memory back to system using malloc_trim() after
+ * compaction.  */
+static void
+ovsdb_server_memory_trim_on_compaction(struct unixctl_conn *conn,
+                                       int argc OVS_UNUSED,
+                                       const char *argv[],
+                                       void *arg OVS_UNUSED)
+{
+    const char *command = argv[1];
+
+#if !HAVE_DECL_MALLOC_TRIM
+    unixctl_command_reply_error(conn, "memory trimming is not supported");
+    return;
+#endif
+
+    if (!strcmp(command, "on")) {
+        trim_memory = true;
+    } else if (!strcmp(command, "off")) {
+        trim_memory = false;
+    } else {
+        unixctl_command_reply_error(conn, "invalid argument");
+        return;
+    }
+    VLOG_INFO("memory trimming after compaction %s.",
+              trim_memory ? "enabled" : "disabled");
+    unixctl_command_reply(conn, NULL);
+}
+
 /* "ovsdb-server/reconnect": makes ovsdb-server drop all of its JSON-RPC
  * connections and reconnect. */
 static void
diff -Nru openvswitch-2.13.1/ovsdb/ovsdb-tool.c openvswitch-2.13.3/ovsdb/ovsdb-tool.c
--- openvswitch-2.13.1/ovsdb/ovsdb-tool.c	2020-08-04 21:40:41.450524451 +0000
+++ openvswitch-2.13.3/ovsdb/ovsdb-tool.c	2021-02-10 20:04:13.876074628 +0000
@@ -720,6 +720,7 @@
                                 ds_init(&s);
                                 ovsdb_datum_to_string(&datum, type, &s);
                                 value_string = ds_steal_cstr(&s);
+                                ovsdb_datum_destroy(&datum, type);
                             } else {
                                 ovsdb_error_destroy(error);
                             }
diff -Nru openvswitch-2.13.1/ovsdb/raft.c openvswitch-2.13.3/ovsdb/raft.c
--- openvswitch-2.13.1/ovsdb/raft.c	2020-08-04 21:41:31.975524451 +0000
+++ openvswitch-2.13.3/ovsdb/raft.c	2021-02-10 20:04:59.548074628 +0000
@@ -36,6 +36,7 @@
 #include "ovsdb/log.h"
 #include "raft-rpc.h"
 #include "random.h"
+#include "simap.h"
 #include "socket-util.h"
 #include "stream.h"
 #include "timeval.h"
@@ -304,6 +305,12 @@
     bool ever_had_leader;       /* There has been leader elected since the raft
                                    is initialized, meaning it is ever
                                    connected. */
+
+    /* Connection backlog limits. */
+#define DEFAULT_MAX_BACKLOG_N_MSGS    500
+#define DEFAULT_MAX_BACKLOG_N_BYTES   UINT32_MAX
+    size_t conn_backlog_max_n_msgs;   /* Number of messages. */
+    size_t conn_backlog_max_n_bytes;  /* Number of bytes. */
 };
 
 /* All Raft structures. */
@@ -411,6 +418,9 @@
 
     raft->election_timer = ELECTION_BASE_MSEC;
 
+    raft->conn_backlog_max_n_msgs = DEFAULT_MAX_BACKLOG_N_MSGS;
+    raft->conn_backlog_max_n_bytes = DEFAULT_MAX_BACKLOG_N_BYTES;
+
     return raft;
 }
 
@@ -939,6 +949,8 @@
     conn->incoming = incoming;
     conn->js_seqno = jsonrpc_session_get_seqno(conn->js);
     jsonrpc_session_set_probe_interval(js, 0);
+    jsonrpc_session_set_backlog_threshold(js, raft->conn_backlog_max_n_msgs,
+                                              raft->conn_backlog_max_n_bytes);
 }
 
 /* Starts the local server in an existing Raft cluster, using the local copy of
@@ -1014,6 +1026,23 @@
     return &raft->sid;
 }
 
+/* Adds memory consumption info to 'usage' for later use by memory_report(). */
+void
+raft_get_memory_usage(const struct raft *raft, struct simap *usage)
+{
+    struct raft_conn *conn;
+    uint64_t backlog = 0;
+    int cnt = 0;
+
+    LIST_FOR_EACH (conn, list_node, &raft->conns) {
+        backlog += jsonrpc_session_get_backlog(conn->js);
+        cnt++;
+    }
+    simap_increase(usage, "raft-backlog-kB", backlog / 1000);
+    simap_increase(usage, "raft-connections", cnt);
+    simap_increase(usage, "raft-log", raft->log_end - raft->log_start);
+}
+
 /* Returns true if 'raft' has completed joining its cluster, has not left or
  * initiated leaving the cluster, does not have failed disk storage, and is
  * apparently connected to the leader in a healthy way (or is itself the
@@ -1027,13 +1056,22 @@
 bool
 raft_is_connected(const struct raft *raft)
 {
+    static bool last_state = false;
     bool ret = (!raft->candidate_retrying
             && !raft->joining
             && !raft->leaving
             && !raft->left
             && !raft->failed
             && raft->ever_had_leader);
-    VLOG_DBG("raft_is_connected: %s\n", ret? "true": "false");
+
+    if (!ret) {
+        static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
+        VLOG_DBG_RL(&rl, "raft_is_connected: false");
+    } else if (!last_state) {
+        VLOG_DBG("raft_is_connected: true");
+    }
+    last_state = ret;
+
     return ret;
 }
 
@@ -1410,12 +1448,11 @@
                            && jsonrpc_session_is_connected(conn->js));
 
     if (reconnected) {
-        /* Clear 'last_install_snapshot_request' since it might not reach the
-         * destination or server was restarted. */
+        /* Clear 'install_snapshot_request_in_progress' since it might not
+         * reach the destination or server was restarted. */
         struct raft_server *server = raft_find_server(raft, &conn->sid);
         if (server) {
-            free(server->last_install_snapshot_request);
-            server->last_install_snapshot_request = NULL;
+            server->install_snapshot_request_in_progress = false;
         }
     }
 
@@ -2536,6 +2573,7 @@
     s->match_index = 0;
     s->phase = RAFT_PHASE_STABLE;
     s->replied = false;
+    s->install_snapshot_request_in_progress = false;
 }
 
 static void
@@ -3293,31 +3331,19 @@
         }
     };
 
-    if (s->last_install_snapshot_request) {
-        struct raft_install_snapshot_request *old, *new;
-
-        old = s->last_install_snapshot_request;
-        new = &rpc.install_snapshot_request;
-        if (   old->term           == new->term
-            && old->last_index     == new->last_index
-            && old->last_term      == new->last_term
-            && old->last_servers   == new->last_servers
-            && old->data           == new->data
-            && old->election_timer == new->election_timer
-            && uuid_equals(&old->last_eid, &new->last_eid)) {
-            static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
+    if (s->install_snapshot_request_in_progress) {
+        static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
 
-            VLOG_WARN_RL(&rl, "not sending exact same install_snapshot_request"
-                              " to server %s again", s->nickname);
-            return;
-        }
+        VLOG_INFO_RL(&rl, "not sending snapshot to server %s, "
+                          "already in progress", s->nickname);
+        return;
     }
-    free(s->last_install_snapshot_request);
-    CONST_CAST(struct raft_server *, s)->last_install_snapshot_request
-        = xmemdup(&rpc.install_snapshot_request,
-                  sizeof rpc.install_snapshot_request);
 
-    raft_send(raft, &rpc);
+    static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
+    VLOG_INFO_RL(&rl, "sending snapshot to server %s, %"PRIu64":%"PRIu64".",
+                      s->nickname, raft->term, raft->log_start - 1);
+    CONST_CAST(struct raft_server *, s)->install_snapshot_request_in_progress
+        = raft_send(raft, &rpc);
 }
 
 static void
@@ -3970,7 +3996,7 @@
     struct ovsdb_error *error = raft_save_snapshot(raft, new_log_start,
                                                    &new_snapshot);
     if (error) {
-        char *error_s = ovsdb_error_to_string(error);
+        char *error_s = ovsdb_error_to_string_free(error);
         VLOG_WARN("could not save snapshot: %s", error_s);
         free(error_s);
         return false;
@@ -4034,6 +4060,8 @@
         }
     }
 
+    s->install_snapshot_request_in_progress = false;
+
     if (rpy->last_index != raft->log_start - 1 ||
         rpy->last_term != raft->snap.term) {
         static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
@@ -4696,6 +4724,42 @@
 }
 
 static void
+raft_unixctl_set_backlog_threshold(struct unixctl_conn *conn,
+                                   int argc OVS_UNUSED, const char *argv[],
+                                   void *aux OVS_UNUSED)
+{
+    const char *cluster_name = argv[1];
+    unsigned long long n_msgs, n_bytes;
+    struct raft_conn *r_conn;
+
+    struct raft *raft = raft_lookup_by_name(cluster_name);
+    if (!raft) {
+        unixctl_command_reply_error(conn, "unknown cluster");
+        return;
+    }
+
+    if (!str_to_ullong(argv[2], 10, &n_msgs)
+        || !str_to_ullong(argv[3], 10, &n_bytes)) {
+        unixctl_command_reply_error(conn, "invalid argument");
+        return;
+    }
+
+    if (n_msgs < 50 || n_msgs > SIZE_MAX || n_bytes > SIZE_MAX) {
+        unixctl_command_reply_error(conn, "values out of range");
+        return;
+    }
+
+    raft->conn_backlog_max_n_msgs = n_msgs;
+    raft->conn_backlog_max_n_bytes = n_bytes;
+
+    LIST_FOR_EACH (r_conn, list_node, &raft->conns) {
+        jsonrpc_session_set_backlog_threshold(r_conn->js, n_msgs, n_bytes);
+    }
+
+    unixctl_command_reply(conn, NULL);
+}
+
+static void
 raft_unixctl_failure_test(struct unixctl_conn *conn OVS_UNUSED,
                           int argc OVS_UNUSED, const char *argv[],
                           void *aux OVS_UNUSED)
@@ -4755,6 +4819,9 @@
                              raft_unixctl_kick, NULL);
     unixctl_command_register("cluster/change-election-timer", "DB TIME", 2, 2,
                              raft_unixctl_change_election_timer, NULL);
+    unixctl_command_register("cluster/set-backlog-threshold",
+                             "DB N_MSGS N_BYTES", 3, 3,
+                             raft_unixctl_set_backlog_threshold, NULL);
     unixctl_command_register("cluster/failure-test", "FAILURE SCENARIO", 1, 1,
                              raft_unixctl_failure_test, NULL);
     ovsthread_once_done(&once);
diff -Nru openvswitch-2.13.1/ovsdb/raft.h openvswitch-2.13.3/ovsdb/raft.h
--- openvswitch-2.13.1/ovsdb/raft.h	2020-08-04 21:40:41.453524451 +0000
+++ openvswitch-2.13.3/ovsdb/raft.h	2021-02-10 20:04:59.548074628 +0000
@@ -67,6 +67,7 @@
 struct json;
 struct ovsdb_log;
 struct raft;
+struct simap;
 struct sset;
 
 #define RAFT_MAGIC "CLUSTER"
@@ -113,6 +114,7 @@
 const struct uuid *raft_get_sid(const struct raft *);
 bool raft_is_connected(const struct raft *);
 bool raft_is_leader(const struct raft *);
+void raft_get_memory_usage(const struct raft *, struct simap *usage);
 
 /* Joining a cluster. */
 bool raft_is_joining(const struct raft *);
diff -Nru openvswitch-2.13.1/ovsdb/raft-private.c openvswitch-2.13.3/ovsdb/raft-private.c
--- openvswitch-2.13.1/ovsdb/raft-private.c	2020-08-04 21:41:31.974524451 +0000
+++ openvswitch-2.13.3/ovsdb/raft-private.c	2021-02-10 20:04:13.876074628 +0000
@@ -137,7 +137,6 @@
     if (s) {
         free(s->address);
         free(s->nickname);
-        free(s->last_install_snapshot_request);
         free(s);
     }
 }
diff -Nru openvswitch-2.13.1/ovsdb/raft-private.h openvswitch-2.13.3/ovsdb/raft-private.h
--- openvswitch-2.13.1/ovsdb/raft-private.h	2020-08-04 21:41:31.974524451 +0000
+++ openvswitch-2.13.3/ovsdb/raft-private.h	2021-02-10 20:04:59.546074628 +0000
@@ -84,8 +84,8 @@
     bool replied;            /* Reply to append_request was received from this
                                 node during current election_timeout interval.
                                 */
-    /* Copy of the last install_snapshot_request sent to this server. */
-    struct raft_install_snapshot_request *last_install_snapshot_request;
+    /* install_snapshot_request has been sent, but there is no response yet. */
+    bool install_snapshot_request_in_progress;
 
     /* For use in adding and removing servers: */
     struct uuid requester_sid;  /* Nonzero if requested via RPC. */
diff -Nru openvswitch-2.13.1/ovsdb/storage.c openvswitch-2.13.3/ovsdb/storage.c
--- openvswitch-2.13.1/ovsdb/storage.c	2020-08-04 21:40:41.453524451 +0000
+++ openvswitch-2.13.3/ovsdb/storage.c	2021-02-10 20:04:59.549074628 +0000
@@ -26,6 +26,7 @@
 #include "ovsdb.h"
 #include "raft.h"
 #include "random.h"
+#include "simap.h"
 #include "timeval.h"
 #include "util.h"
 
@@ -189,6 +190,15 @@
 }
 
 void
+ovsdb_storage_get_memory_usage(const struct ovsdb_storage *storage,
+                               struct simap *usage)
+{
+    if (storage->raft) {
+        raft_get_memory_usage(storage->raft, usage);
+    }
+}
+
+void
 ovsdb_storage_run(struct ovsdb_storage *storage)
 {
     if (storage->raft) {
diff -Nru openvswitch-2.13.1/ovsdb/storage.h openvswitch-2.13.3/ovsdb/storage.h
--- openvswitch-2.13.1/ovsdb/storage.h	2020-08-04 21:40:41.453524451 +0000
+++ openvswitch-2.13.3/ovsdb/storage.h	2021-02-10 20:04:59.549074628 +0000
@@ -23,6 +23,7 @@
 struct json;
 struct ovsdb_schema;
 struct ovsdb_storage;
+struct simap;
 struct uuid;
 
 struct ovsdb_error *ovsdb_storage_open(const char *filename, bool rw,
@@ -39,6 +40,8 @@
 const struct uuid *ovsdb_storage_get_cid(const struct ovsdb_storage *);
 const struct uuid *ovsdb_storage_get_sid(const struct ovsdb_storage *);
 uint64_t ovsdb_storage_get_applied_index(const struct ovsdb_storage *);
+void ovsdb_storage_get_memory_usage(const struct ovsdb_storage *,
+                                    struct simap *usage);
 
 void ovsdb_storage_run(struct ovsdb_storage *);
 void ovsdb_storage_wait(struct ovsdb_storage *);
diff -Nru openvswitch-2.13.1/package.m4 openvswitch-2.13.3/package.m4
--- openvswitch-2.13.1/package.m4	2020-08-04 21:41:57.423524451 +0000
+++ openvswitch-2.13.3/package.m4	2021-02-10 20:05:21.494074628 +0000
@@ -1,6 +1,6 @@
 # Signature of the current package.
 m4_define([AT_PACKAGE_NAME],      [openvswitch])
 m4_define([AT_PACKAGE_TARNAME],   [openvswitch])
-m4_define([AT_PACKAGE_VERSION],   [2.13.1])
-m4_define([AT_PACKAGE_STRING],    [openvswitch 2.13.1])
+m4_define([AT_PACKAGE_VERSION],   [2.13.3])
+m4_define([AT_PACKAGE_STRING],    [openvswitch 2.13.3])
 m4_define([AT_PACKAGE_BUGREPORT], [bugs@openvswitch.org])
diff -Nru openvswitch-2.13.1/python/automake.mk openvswitch-2.13.3/python/automake.mk
--- openvswitch-2.13.1/python/automake.mk	2020-08-04 21:41:31.976524451 +0000
+++ openvswitch-2.13.3/python/automake.mk	2021-02-10 20:04:59.549074628 +0000
@@ -74,12 +74,12 @@
 	$(MKDIR_P) python/ovs
 	sed \
 		-e '/^##/d' \
-                -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
-                -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
-                -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
-                -e 's,[@]bindir[@],$(bindir),g' \
-                -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
-                -e 's,[@]DBDIR[@],$(DBDIR),g' \
+		-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+		-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+		-e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+		-e 's,[@]bindir[@],$(bindir),g' \
+		-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+		-e 's,[@]DBDIR[@],$(DBDIR),g' \
 		< $(srcdir)/python/ovs/dirs.py.template \
 		> python/ovs/dirs.py.tmp
 	$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/python/ovs
@@ -107,12 +107,13 @@
 $(srcdir)/python/ovs/dirs.py: python/ovs/dirs.py.template
 	$(AM_V_GEN)sed \
 		-e '/^##/d' \
-                -e 's,[@]pkgdatadir[@],/usr/local/share/openvswitch,g' \
-                -e 's,[@]RUNDIR[@],/var/run,g' \
-                -e 's,[@]LOGDIR[@],/usr/local/var/log,g' \
-                -e 's,[@]bindir[@],/usr/local/bin,g' \
-                -e 's,[@]sysconfdir[@],/usr/local/etc,g' \
-                -e 's,[@]DBDIR[@],/usr/local/etc/openvswitch,g' \
+		-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+		-e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+		-e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+		-e 's,[@]bindir[@],$(bindir),g' \
+		-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+		-e 's,[@]DBDIR[@],$(sysconfdir)/openvswitch,g' \
 		< $? > $@.tmp && \
 	mv $@.tmp $@
 EXTRA_DIST += python/ovs/dirs.py.template
+CLEANFILES += python/ovs/dirs.py
diff -Nru openvswitch-2.13.1/python/build/soutil.py openvswitch-2.13.3/python/build/soutil.py
--- openvswitch-2.13.1/python/build/soutil.py	2020-08-04 21:33:59.451524451 +0000
+++ openvswitch-2.13.3/python/build/soutil.py	2021-02-10 20:04:59.549074628 +0000
@@ -1,6 +1,6 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright (c) 2008, 2017 Nicira, Inc.
+# Copyright (c) 2008, 2017, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/python/ovs/db/idl.py openvswitch-2.13.3/python/ovs/db/idl.py
--- openvswitch-2.13.1/python/ovs/db/idl.py	2020-08-04 21:41:31.977524451 +0000
+++ openvswitch-2.13.3/python/ovs/db/idl.py	2021-02-10 20:04:59.550074628 +0000
@@ -1567,10 +1567,9 @@
                     for col, val in row._mutations['_inserts'].items():
                         column = row._table.columns[col]
                         if column.type.is_map():
-                            opdat = ["map"]
                             datum = data.Datum.from_python(column.type, val,
                                                            _row_to_uuid)
-                            opdat.append(datum.as_list())
+                            opdat = self._substitute_uuids(datum.to_json())
                         else:
                             opdat = ["set"]
                             inner_opdat = []
diff -Nru openvswitch-2.13.1/python/ovs/dirs.py openvswitch-2.13.3/python/ovs/dirs.py
--- openvswitch-2.13.1/python/ovs/dirs.py	2020-08-04 21:28:48.760524451 +0000
+++ openvswitch-2.13.3/python/ovs/dirs.py	2021-02-10 20:05:19.243074628 +0000
@@ -18,8 +18,8 @@
 
 # Note that the use of """ is to aid in dealing with paths with quotes in them.
 PKGDATADIR = os.environ.get("OVS_PKGDATADIR", """/usr/local/share/openvswitch""")
-RUNDIR = os.environ.get("OVS_RUNDIR", """/var/run""")
-LOGDIR = os.environ.get("OVS_LOGDIR", """/usr/local/var/log""")
+RUNDIR = os.environ.get("OVS_RUNDIR", """/usr/local/var/run/openvswitch""")
+LOGDIR = os.environ.get("OVS_LOGDIR", """/usr/local/var/log/openvswitch""")
 BINDIR = os.environ.get("OVS_BINDIR", """/usr/local/bin""")
 
 DBDIR = os.environ.get("OVS_DBDIR")
diff -Nru openvswitch-2.13.1/python/ovs/stream.py openvswitch-2.13.3/python/ovs/stream.py
--- openvswitch-2.13.1/python/ovs/stream.py	2020-08-04 21:41:31.979524451 +0000
+++ openvswitch-2.13.3/python/ovs/stream.py	2021-02-10 20:04:59.552074628 +0000
@@ -133,6 +133,10 @@
     DSCP_DEFAULT = IPTOS_PREC_INTERNETCONTROL >> 2
 
     @staticmethod
+    def check_connection_completion(sock):
+        return ovs.socket_util.check_connection_completion(sock)
+
+    @staticmethod
     def open(name, dscp=DSCP_DEFAULT):
         """Attempts to connect a stream to a remote peer.  'name' is a
         connection name in the form "TYPE:ARGS", where TYPE is an active stream
@@ -189,7 +193,7 @@
         if error:
             return error, None
         else:
-            err = ovs.socket_util.check_connection_completion(sock)
+            err = cls.check_connection_completion(sock)
             if err == errno.EAGAIN or err == errno.EINPROGRESS:
                 status = errno.EAGAIN
                 err = 0
@@ -261,7 +265,7 @@
 
     def __scs_connecting(self):
         if self.socket is not None:
-            retval = ovs.socket_util.check_connection_completion(self.socket)
+            retval = self.check_connection_completion(self.socket)
             assert retval != errno.EINPROGRESS
         elif sys.platform == 'win32':
             if self.retry_connect:
@@ -762,6 +766,13 @@
 
 class SSLStream(Stream):
     @staticmethod
+    def check_connection_completion(sock):
+        try:
+            return Stream.check_connection_completion(sock)
+        except SSL.SysCallError as e:
+            return ovs.socket_util.get_exception_errno(e)
+
+    @staticmethod
     def needs_probes():
         return True
 
diff -Nru openvswitch-2.13.1/python/ovs/version.py openvswitch-2.13.3/python/ovs/version.py
--- openvswitch-2.13.1/python/ovs/version.py	2020-08-04 21:42:10.882524451 +0000
+++ openvswitch-2.13.3/python/ovs/version.py	2021-02-10 20:05:35.577074628 +0000
@@ -1,2 +1,2 @@
 # Generated automatically -- do not modify!    -*- buffer-read-only: t -*-
-VERSION = "2.13.1"
+VERSION = "2.13.3"
diff -Nru openvswitch-2.13.1/python/setup.py openvswitch-2.13.3/python/setup.py
--- openvswitch-2.13.1/python/setup.py	2020-08-04 21:40:41.456524451 +0000
+++ openvswitch-2.13.3/python/setup.py	2021-02-10 20:04:59.553074628 +0000
@@ -30,6 +30,15 @@
           file=sys.stderr)
     sys.exit(-1)
 
+try:
+    # Try to open generated ovs/dirs.py. However, in this case we
+    # don't need to exec()
+    open("ovs/dirs.py")
+except IOError:
+    print("Ensure dirs.py is created by running make python/ovs/dirs.py",
+          file=sys.stderr)
+    sys.exit(-1)
+
 ext_errors = (CCompilerError, DistutilsExecError, DistutilsPlatformError)
 if sys.platform == 'win32':
     ext_errors += (IOError, ValueError)
diff -Nru openvswitch-2.13.1/README.rst openvswitch-2.13.3/README.rst
--- openvswitch-2.13.1/README.rst	2020-08-04 21:40:41.356524451 +0000
+++ openvswitch-2.13.3/README.rst	2021-02-10 20:04:13.779074628 +0000
@@ -6,8 +6,8 @@
 Open vSwitch
 ============
 
-.. image:: https://travis-ci.org/openvswitch/ovs.png
-    :target: https://travis-ci.org/openvswitch/ovs
+.. image:: https://github.com/openvswitch/ovs/workflows/Build%20and%20Test/badge.svg
+    :target: https://github.com/openvswitch/ovs/actions
 .. image:: https://ci.appveyor.com/api/projects/status/github/openvswitch/ovs?branch=master&svg=true&retina=true
     :target: https://ci.appveyor.com/project/blp/ovs/history
 .. image:: https://api.cirrus-ci.com/github/openvswitch/ovs.svg
diff -Nru openvswitch-2.13.1/rhel/kmod-openvswitch-rhel6.spec openvswitch-2.13.3/rhel/kmod-openvswitch-rhel6.spec
--- openvswitch-2.13.1/rhel/kmod-openvswitch-rhel6.spec	2020-08-04 21:42:10.819524451 +0000
+++ openvswitch-2.13.3/rhel/kmod-openvswitch-rhel6.spec	2021-02-10 20:05:35.528074628 +0000
@@ -12,7 +12,7 @@
 %define oname openvswitch
 
 Name:           kmod-%{oname}
-Version:        2.13.1
+Version:        2.13.3
 Release:        1%{?dist}
 Summary:        Open vSwitch kernel module
 
diff -Nru openvswitch-2.13.1/rhel/openvswitch-dkms.spec openvswitch-2.13.3/rhel/openvswitch-dkms.spec
--- openvswitch-2.13.1/rhel/openvswitch-dkms.spec	2020-08-04 21:42:10.809524451 +0000
+++ openvswitch-2.13.3/rhel/openvswitch-dkms.spec	2021-02-10 20:05:35.521074628 +0000
@@ -11,7 +11,7 @@
 %define oname openvswitch
 
 Name:             %{oname}-dkms
-Version:          2.13.1
+Version:          2.13.3
 Release:          1%{?dist}
 Summary:          Open vSwitch kernel module
 
diff -Nru openvswitch-2.13.1/rhel/openvswitch-fedora.spec openvswitch-2.13.3/rhel/openvswitch-fedora.spec
--- openvswitch-2.13.1/rhel/openvswitch-fedora.spec	2020-08-04 21:42:10.851524451 +0000
+++ openvswitch-2.13.3/rhel/openvswitch-fedora.spec	2021-02-10 20:05:35.551074628 +0000
@@ -47,7 +47,7 @@
 Summary: Open vSwitch
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
-Version: 2.13.1
+Version: 2.13.3
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -319,18 +319,19 @@
 %post
 %if %{with libcapng}
 if [ $1 -eq 1 ]; then
-    sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch
-    sed -i 's:\(.*su\).*:\1 openvswitch openvswitch:' %{_sysconfdir}/logrotate.d/openvswitch
-
 %if %{with dpdk}
-    sed -i \
-        's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:hugetlbfs"@'\
-        /etc/sysconfig/openvswitch
+    %define gname hugetlbfs
+%else
+    %define gname openvswitch
 %endif
-
-    # In the case of upgrade, this is not needed.
-    chown -R openvswitch:openvswitch /etc/openvswitch
-    chown -R openvswitch:openvswitch /var/log/openvswitch
+    sed -i \
+        's@^#OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:%{gname}"@'\
+        %{_sysconfdir}/sysconfig/openvswitch
+    sed -i 's:\(.*su\).*:\1 openvswitch %{gname}:' %{_sysconfdir}/logrotate.d/openvswitch
+
+    # In the case of upgrade, this is not needed
+    chown -R openvswitch:openvswitch %{_sysconfdir}/openvswitch
+    chown -R openvswitch:%{gname} %{_localstatedir}/log/openvswitch
 fi
 %endif
 
diff -Nru openvswitch-2.13.1/rhel/openvswitch-fedora.spec.in openvswitch-2.13.3/rhel/openvswitch-fedora.spec.in
--- openvswitch-2.13.1/rhel/openvswitch-fedora.spec.in	2020-08-04 21:41:31.980524451 +0000
+++ openvswitch-2.13.3/rhel/openvswitch-fedora.spec.in	2021-02-10 20:04:59.554074628 +0000
@@ -318,18 +318,19 @@
 %post
 %if %{with libcapng}
 if [ $1 -eq 1 ]; then
-    sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch
-    sed -i 's:\(.*su\).*:\1 openvswitch openvswitch:' %{_sysconfdir}/logrotate.d/openvswitch
-
 %if %{with dpdk}
-    sed -i \
-        's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:hugetlbfs"@'\
-        /etc/sysconfig/openvswitch
+    %define gname hugetlbfs
+%else
+    %define gname openvswitch
 %endif
+    sed -i \
+        's@^#OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:%{gname}"@'\
+        %{_sysconfdir}/sysconfig/openvswitch
+    sed -i 's:\(.*su\).*:\1 openvswitch %{gname}:' %{_sysconfdir}/logrotate.d/openvswitch
 
-    # In the case of upgrade, this is not needed.
-    chown -R openvswitch:openvswitch /etc/openvswitch
-    chown -R openvswitch:openvswitch /var/log/openvswitch
+    # In the case of upgrade, this is not needed
+    chown -R openvswitch:openvswitch %{_sysconfdir}/openvswitch
+    chown -R openvswitch:%{gname} %{_localstatedir}/log/openvswitch
 fi
 %endif
 
diff -Nru openvswitch-2.13.1/rhel/openvswitch-kmod-fedora.spec openvswitch-2.13.3/rhel/openvswitch-kmod-fedora.spec
--- openvswitch-2.13.1/rhel/openvswitch-kmod-fedora.spec	2020-08-04 21:42:10.830524451 +0000
+++ openvswitch-2.13.3/rhel/openvswitch-kmod-fedora.spec	2021-02-10 20:05:35.535074628 +0000
@@ -30,7 +30,7 @@
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
 Vendor: OpenSource Security Ralf Spenneberg <ralf@os-s.net>
-Version: 2.13.1
+Version: 2.13.3
 
 # The entire source code is ASL 2.0 except datapath/ which is GPLv2
 License: GPLv2
diff -Nru openvswitch-2.13.1/rhel/openvswitch.spec openvswitch-2.13.3/rhel/openvswitch.spec
--- openvswitch-2.13.1/rhel/openvswitch.spec	2020-08-04 21:42:10.841524451 +0000
+++ openvswitch-2.13.3/rhel/openvswitch.spec	2021-02-10 20:05:35.543074628 +0000
@@ -27,7 +27,7 @@
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
 Vendor: Nicira, Inc.
-Version: 2.13.1
+Version: 2.13.3
 
 License: ASL 2.0
 Release: 1
@@ -40,7 +40,7 @@
 BuildRequires: autoconf, automake, libtool
 BuildRequires: python3-sphinx
 BuildRequires: unbound-devel
-BuildRequires: unwind-devel
+BuildRequires: libunwind-devel
 
 %bcond_without check
 %bcond_with check_datapath_kernel
diff -Nru openvswitch-2.13.1/rhel/openvswitch.spec.in openvswitch-2.13.3/rhel/openvswitch.spec.in
--- openvswitch-2.13.1/rhel/openvswitch.spec.in	2020-08-04 21:41:31.980524451 +0000
+++ openvswitch-2.13.3/rhel/openvswitch.spec.in	2021-02-10 20:04:59.554074628 +0000
@@ -39,7 +39,7 @@
 BuildRequires: autoconf, automake, libtool
 BuildRequires: python3-sphinx
 BuildRequires: unbound-devel
-BuildRequires: unwind-devel
+BuildRequires: libunwind-devel
 
 %bcond_without check
 %bcond_with check_datapath_kernel
diff -Nru openvswitch-2.13.1/rhel/usr_lib_systemd_system_ovsdb-server.service openvswitch-2.13.3/rhel/usr_lib_systemd_system_ovsdb-server.service
--- openvswitch-2.13.1/rhel/usr_lib_systemd_system_ovsdb-server.service	2020-08-04 21:40:41.457524451 +0000
+++ openvswitch-2.13.3/rhel/usr_lib_systemd_system_ovsdb-server.service	2021-02-10 20:04:13.882074628 +0000
@@ -11,10 +11,16 @@
 Restart=on-failure
 EnvironmentFile=/etc/openvswitch/default.conf
 EnvironmentFile=-/etc/sysconfig/openvswitch
+EnvironmentFile=-/run/openvswitch.useropts
+
+# Environment is reloaded for each Exec*, make sure to
+# remove openvswitch.useropts first to reload a fresh
+# OVS_USER_ID from default.conf or sysconfig.
+ExecStartPre=/usr/bin/rm -f /run/openvswitch.useropts
+
 ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
-ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch.useropts; /usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
+ExecStartPre=/bin/sh -c '/usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
 ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi'
-EnvironmentFile=-/run/openvswitch.useropts
 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
           --no-ovs-vswitchd --no-monitor --system-id=random \
           ${OVS_USER_OPT} \
diff -Nru openvswitch-2.13.1/selinux/openvswitch-custom.te.in openvswitch-2.13.3/selinux/openvswitch-custom.te.in
--- openvswitch-2.13.1/selinux/openvswitch-custom.te.in	2020-08-04 21:40:41.457524451 +0000
+++ openvswitch-2.13.3/selinux/openvswitch-custom.te.in	2021-02-10 20:04:59.554074628 +0000
@@ -19,6 +19,7 @@
         type kernel_t;
         type hostname_exec_t;
         type modules_conf_t;
+        type modules_dep_t;
         type modules_object_t;
         type passwd_file_t;
         type plymouth_exec_t;
@@ -121,6 +122,7 @@
 allow openvswitch_load_module_t kernel_t:system module_request;
 allow openvswitch_load_module_t modules_conf_t:dir { getattr open read search };
 allow openvswitch_load_module_t modules_conf_t:file { getattr open read };
+allow openvswitch_load_module_t modules_dep_t:file { getattr map open read };
 allow openvswitch_load_module_t modules_object_t:file { map getattr open read };
 allow openvswitch_load_module_t modules_object_t:dir { getattr open read search };
 allow openvswitch_load_module_t openvswitch_load_module_exec_t:file { entrypoint };
diff -Nru openvswitch-2.13.1/tests/bridge.at openvswitch-2.13.3/tests/bridge.at
--- openvswitch-2.13.1/tests/bridge.at	2020-08-04 21:38:24.896524451 +0000
+++ openvswitch-2.13.3/tests/bridge.at	2021-02-10 20:04:13.883074628 +0000
@@ -103,3 +103,20 @@
 OVS_APP_EXIT_AND_WAIT([ovs-vswitchd])
 OVS_APP_EXIT_AND_WAIT([ovsdb-server])
 AT_CLEANUP
+
+AT_SETUP([bridge - change ofproto versions])
+dnl Start vswitch and add a version test bridge
+OVS_VSWITCHD_START(
+    [add-br vr_test0 -- \
+     set bridge vr_test0 datapath-type=dummy \
+                         protocols=OpenFlow10])
+
+dnl set the version to include, say, OpenFlow14
+AT_CHECK([ovs-vsctl set bridge vr_test0 protocols=OpenFlow10,OpenFlow14])
+
+dnl now try to use bundle action on a flow
+AT_CHECK([ovs-ofctl add-flow vr_test0 --bundle actions=normal])
+
+OVS_APP_EXIT_AND_WAIT([ovs-vswitchd])
+OVS_APP_EXIT_AND_WAIT([ovsdb-server])
+AT_CLEANUP
diff -Nru openvswitch-2.13.1/tests/classifier.at openvswitch-2.13.3/tests/classifier.at
--- openvswitch-2.13.1/tests/classifier.at	2020-08-04 21:40:41.458524451 +0000
+++ openvswitch-2.13.3/tests/classifier.at	2021-02-10 20:04:13.883074628 +0000
@@ -304,3 +304,39 @@
 ])
 OVS_VSWITCHD_STOP
 AT_CLEANUP
+
+# Flow classifier a packet with excess of padding.
+AT_SETUP([flow classifier - packet with extra padding])
+OVS_VSWITCHD_START
+add_of_ports br0 1 2
+AT_DATA([flows.txt], [dnl
+priority=5,ip,ip_dst=1.1.1.1,actions=1
+priority=5,ip,ip_dst=1.1.1.2,actions=2
+priority=0,actions=drop
+])
+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+packet=00020202020000010101010008004500001c00010000401176cc01010101010101020d6a00350008ee3a
+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 $packet] , [0], [stdout])
+AT_CHECK([tail -2 stdout], [0],
+  [Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+])
+# normal packet plus 255 bytes of padding (8bit padding).
+# 255 * 2 = 510
+padding=$(printf '%*s' 510 | tr ' ' '0')
+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}] , [0], [stdout])
+AT_CHECK([tail -2 stdout], [0],
+  [Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+])
+# normal packet plus padding up to 65535 bytes of length (16bit limit).
+# 65535 - 43 = 65492
+# 65492 * 2 = 130984
+padding=$(printf '%*s' 130984 | tr ' ' '0')
+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}], [0], [stdout])
+AT_CHECK([tail -2 stdout], [0],
+  [Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+])
+OVS_VSWITCHD_STOP
+AT_CLEANUP
diff -Nru openvswitch-2.13.1/tests/idltest.ovsschema openvswitch-2.13.3/tests/idltest.ovsschema
--- openvswitch-2.13.1/tests/idltest.ovsschema	2020-08-04 21:33:59.455524451 +0000
+++ openvswitch-2.13.3/tests/idltest.ovsschema	2021-02-10 20:04:13.884074628 +0000
@@ -54,6 +54,15 @@
       },
       "isRoot" : true
     },
+    "indexed": {
+      "columns": {
+        "i": {
+          "type": "integer"
+        }
+      },
+      "indexes": [["i"]],
+      "isRoot" : true
+    },
     "simple": {
       "columns": {
         "b": {
@@ -171,6 +180,36 @@
       },
       "isRoot" : false
     },
+    "simple5": {
+      "columns" : {
+        "name": {"type": "string"},
+        "irefmap": {
+          "type": {
+            "key": {"type": "integer"},
+            "value": {"type": "uuid",
+                      "refTable": "simple3"},
+            "min": 0,
+            "max": "unlimited"
+          }
+        }
+      },
+      "isRoot": true
+    },
+    "simple6": {
+      "columns" : {
+        "name": {"type": "string"},
+        "weak_ref": {
+          "type": {
+            "key": {"type": "uuid",
+                    "refTable": "simple",
+                    "refType": "weak"},
+            "min": 0,
+            "max": "unlimited"
+          }
+        }
+      },
+      "isRoot": true
+    },
     "singleton" : {
       "columns" : {
         "name" : {
diff -Nru openvswitch-2.13.1/tests/library.at openvswitch-2.13.3/tests/library.at
--- openvswitch-2.13.1/tests/library.at	2020-08-04 21:41:31.982524451 +0000
+++ openvswitch-2.13.3/tests/library.at	2021-02-10 20:04:59.556074628 +0000
@@ -53,7 +53,8 @@
 AT_CLEANUP
 
 AT_SETUP([SHA-1])
-AT_CHECK([ovstest test-sha1], [0], [.........
+AT_KEYWORDS([sha1])
+AT_CHECK([ovstest test-sha1], [0], [..........
 ])
 AT_CLEANUP
 
diff -Nru openvswitch-2.13.1/tests/odp.at openvswitch-2.13.3/tests/odp.at
--- openvswitch-2.13.1/tests/odp.at	2020-08-04 21:41:31.983524451 +0000
+++ openvswitch-2.13.3/tests/odp.at	2021-02-10 20:04:59.557074628 +0000
@@ -397,6 +397,43 @@
 ])
 AT_CLEANUP
 
+AT_SETUP([OVS datapath actions parsing and formatting - userdata overflow])
+dnl Userdata should fit in a single netlink message, i.e. should be less than
+dnl UINT16_MAX - NLA_HDRLEN = 65535 - 4 = 65531 bytes.  OVS should not accept
+dnl larger userdata.  OTOH, userdata is part of a nested netlink message, that
+dnl should not be oversized too.  'pid' takes NLA_HDRLEN + 4 = 8 bytes.
+dnl Plus NLA_HDRLEN for the nested header.  'actions' flag takes NLA_HDRLEN = 4
+dnl and 'tunnel_out_port' takes NLA_HDRLEN + 4 = 8 bytes.
+dnl So, for the variant with 'actions' maximum length of userdata should be:
+dnl UINT16_MAX -  NLA_HDRLEN   - (NLA_HDRLEN + 4) - NLA_HDRLEN - NLA_HDRLEN
+dnl  total max   nested header        pid             actions     userdata
+dnl Result: 65515 bytes for the actual userdata.
+dnl For the case with 'tunnel_out_port': 65511
+dnl Size of userdata will be rounded up to be multiple of 4, so highest
+dnl acceptable sizes are 65512 and 65508.
+
+dnl String with length 65512 * 2 = 131024 is valid, while 131026 is not.
+data_valid=$(  printf '%*s' 131024 | tr ' ' "a")
+data_invalid=$(printf '%*s' 131026 | tr ' ' "a")
+
+echo "userspace(pid=1234567,userdata(${data_valid}),actions)" > actions.txt
+echo "userspace(pid=1234567,userdata(${data_invalid}),actions)" >> actions.txt
+
+dnl String with length 65508 * 2 = 131016 is valid, while 131018 is not.
+data_valid=$(  printf '%*s' 131016 | tr ' ' "a")
+data_invalid=$(printf '%*s' 131018 | tr ' ' "a")
+
+echo "userspace(pid=1234567,userdata(${data_valid}),tunnel_out_port=10)" >> actions.txt
+echo "userspace(pid=1234567,userdata(${data_invalid}),tunnel_out_port=10)" >> actions.txt
+
+AT_CHECK_UNQUOTED([ovstest test-odp parse-actions < actions.txt], [0], [dnl
+`cat actions.txt | head -1`
+odp_actions_from_string: error
+`cat actions.txt | head -3 | tail -1`
+odp_actions_from_string: error
+])
+AT_CLEANUP
+
 AT_SETUP([OVS datapath keys parsing and formatting - 33 nested encap ])
 AT_DATA([odp-in.txt], [dnl
 encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap()))))))))))))))))))))))))))))))))
diff -Nru openvswitch-2.13.1/tests/ofp-actions.at openvswitch-2.13.3/tests/ofp-actions.at
--- openvswitch-2.13.1/tests/ofp-actions.at	2020-08-04 21:40:41.459524451 +0000
+++ openvswitch-2.13.3/tests/ofp-actions.at	2021-02-10 20:04:13.885074628 +0000
@@ -766,6 +766,17 @@
 & 00000010  00 00 00 10 00 00 00 01-
 0019 0010 80000807 000102030405 000000000010 00000001
 
+dnl Check NSH encap (experimenter extension).
+# actions=encap(nsh(md_type=1))
+ffff 0018 00002320 002e 0000 0001894f 0004 01 05 01 000000
+
+dnl NSH encap with non-zero padding.
+# actions=encap(nsh(md_type=1))
+# 21: 12 -> 00
+# 22: 34 -> 00
+# 23: 56 -> 00
+ffff 0018 00002320 002e 0000 0001894f 0004 01 05 01 123456
+
 ])
 sed '/^[[#&]]/d' < test-data > input.txt
 sed -n 's/^# //p; /^$/p' < test-data > expout
diff -Nru openvswitch-2.13.1/tests/ovsdb-cluster.at openvswitch-2.13.3/tests/ovsdb-cluster.at
--- openvswitch-2.13.1/tests/ovsdb-cluster.at	2020-08-04 21:41:31.992524451 +0000
+++ openvswitch-2.13.3/tests/ovsdb-cluster.at	2021-02-10 20:04:59.565074628 +0000
@@ -332,13 +332,29 @@
     AT_CHECK([ovsdb_client_wait unix:s$i.ovsdb $schema_name connected])
 done
 
+AT_CHECK([ovsdb-client transact unix:s1.ovsdb '[["idltest",
+      {"op": "insert",
+       "table": "indexed",
+       "row": {"i": 0}}]]'], [0], [ignore], [ignore])
+
 # Kill one follower (s2) and write some data to cluster, so that the follower is falling behind
 printf "\ns2: stopping\n"
 OVS_APP_EXIT_AND_WAIT_BY_TARGET([`pwd`/s2], [s2.pid])
 
+# Delete "i":0 and readd it to get a different UUID for it.
+AT_CHECK([ovsdb-client transact unix:s1.ovsdb '[["idltest",
+      {"op": "delete",
+       "table": "indexed",
+       "where": [["i", "==", 0]]}]]'], [0], [ignore], [ignore])
+
 AT_CHECK([ovsdb-client transact unix:s1.ovsdb '[["idltest",
       {"op": "insert",
-       "table": "simple",
+       "table": "indexed",
+       "row": {"i": 0}}]]'], [0], [ignore], [ignore])
+
+AT_CHECK([ovsdb-client transact unix:s1.ovsdb '[["idltest",
+      {"op": "insert",
+       "table": "indexed",
        "row": {"i": 1}}]]'], [0], [ignore], [ignore])
 
 # Compact leader online to generate snapshot
@@ -355,8 +371,18 @@
 # succeed.
 AT_CHECK([ovsdb-client transact unix:s2.ovsdb '[["idltest",
       {"op": "insert",
-       "table": "simple",
-       "row": {"i": 1}}]]'], [0], [ignore], [ignore])
+       "table": "indexed",
+       "row": {"i": 2}}]]'], [0], [ignore], [ignore])
+
+# The snapshot should overwrite the in-memory contents of the DB on S2
+# without generating any constraint violations. All tree records (0, 1, 2)
+# should be in the DB at this point.
+AT_CHECK([ovsdb-client --no-headings dump unix:s2.ovsdb idltest indexed | uuidfilt | sort -k 2], [0], [dnl
+<0> 0
+<1> 1
+<2> 2
+indexed table
+])
 
 for i in `seq $n`; do
     OVS_APP_EXIT_AND_WAIT_BY_TARGET([`pwd`/s$i], [s$i.pid])
@@ -675,7 +701,7 @@
     # Use file instead of var because code inside "while" runs in a subshell.
     echo 0 > phase
     i=0
-    (while :; do echo; sleep 0.1; done) | while read REPLY; do
+    (while :; do echo || exit 0; sleep 0.1; done) | while read REPLY; do
         printf "t=%2d s:" $i
         done=0
         for j in $(seq 0 $(expr $n1 - 1)); do
diff -Nru openvswitch-2.13.1/tests/ovsdb-cluster-testsuite openvswitch-2.13.3/tests/ovsdb-cluster-testsuite
--- openvswitch-2.13.1/tests/ovsdb-cluster-testsuite	2020-08-04 21:42:10.774524451 +0000
+++ openvswitch-2.13.3/tests/ovsdb-cluster-testsuite	2021-02-10 20:05:35.490074628 +0000
@@ -706,39 +706,39 @@
 113;ovsdb-cluster.at:182;OVSDB cluster - initial status should be disconnected;ovsdb server negative unix cluster disconnect;
 114;ovsdb-cluster.at:221;OVSDB cluster - election timer change;ovsdb server positive unix cluster timer;
 115;ovsdb-cluster.at:314;OVSDB cluster - install snapshot RPC;ovsdb server positive unix cluster snapshot;
-116;ovsdb-cluster.at:442;OVSDB cluster - txn on follower-2, leader crash before sending appendReq, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
-117;ovsdb-cluster.at:447;OVSDB cluster - txn on follower-2, leader crash before sending appendReq, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
-118;ovsdb-cluster.at:452;OVSDB cluster - txn on follower-2, leader crash before sending execRep, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
-119;ovsdb-cluster.at:457;OVSDB cluster - txn on follower-2, leader crash before sending execRep, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
-120;ovsdb-cluster.at:462;OVSDB cluster - txn on follower-2, leader crash after sending execRep, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
-121;ovsdb-cluster.at:467;OVSDB cluster - txn on follower-2, leader crash after sending execRep, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
-122;ovsdb-cluster.at:472;OVSDB cluster - txn on leader, leader crash before sending appendReq, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
-123;ovsdb-cluster.at:477;OVSDB cluster - txn on leader, leader crash before sending appendReq, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
-124;ovsdb-cluster.at:482;OVSDB cluster - txn on leader, leader crash after sending appendReq, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
-125;ovsdb-cluster.at:489;OVSDB cluster - txn on leader, leader crash after sending appendReq, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
-126;ovsdb-cluster.at:496;OVSDB cluster - txn on follower-2, follower-2 crash before sending execReq, reconnect to follower-3;ovsdb server negative unix cluster pending-txn;
-127;ovsdb-cluster.at:501;OVSDB cluster - txn on follower-2, follower-2 crash before sending execReq, reconnect to leader;ovsdb server negative unix cluster pending-txn;
-128;ovsdb-cluster.at:506;OVSDB cluster - txn on follower-2, follower-2 crash after sending execReq, reconnect to follower-3;ovsdb server negative unix cluster pending-txn;
-129;ovsdb-cluster.at:513;OVSDB cluster - txn on follower-2, follower-2 crash after sending execReq, reconnect to leader;ovsdb server negative unix cluster pending-txn;
-130;ovsdb-cluster.at:520;OVSDB cluster - txn on leader, follower-2 crash after receiving appendReq for the update;ovsdb server negative unix cluster pending-txn;
-131;ovsdb-cluster.at:525;OVSDB cluster - txn on follower-2, follower-3 crash after receiving appendReq for the update;ovsdb server negative unix cluster pending-txn;
-132;ovsdb-cluster.at:531;OVSDB cluster - competing candidates;ovsdb server negative unix cluster competing-candidates;
-133;ovsdb-cluster.at:743;OVSDB 3-server torture test - kill/restart leader;ovsdb server positive unix cluster cluster3;
-134;ovsdb-cluster.at:747;OVSDB 3-server torture test - kill/restart follower 1;ovsdb server positive unix cluster cluster3;
-135;ovsdb-cluster.at:751;OVSDB 3-server torture test - kill/restart follower 2;ovsdb server positive unix cluster cluster3;
-136;ovsdb-cluster.at:755;OVSDB 5-server torture test - kill/restart leader;ovsdb server positive unix cluster cluster5;
-137;ovsdb-cluster.at:759;OVSDB 5-server torture test - kill/restart follower 1;ovsdb server positive unix cluster cluster5;
-138;ovsdb-cluster.at:763;OVSDB 5-server torture test - kill/restart follower 2;ovsdb server positive unix cluster cluster5;
-139;ovsdb-cluster.at:767;OVSDB 5-server torture test - kill/restart follower 3;ovsdb server positive unix cluster cluster5;
-140;ovsdb-cluster.at:771;OVSDB 5-server torture test - kill/restart follower 4;ovsdb server positive unix cluster cluster5;
-141;ovsdb-cluster.at:776;OVSDB 3-server torture test - remove/re-add leader;ovsdb server positive unix cluster cluster3;
-142;ovsdb-cluster.at:780;OVSDB 3-server torture test - remove/re-add follower 1;ovsdb server positive unix cluster cluster3;
-143;ovsdb-cluster.at:784;OVSDB 3-server torture test - remove/re-add follower 2;ovsdb server positive unix cluster cluster3;
-144;ovsdb-cluster.at:788;OVSDB 5-server torture test - remove/re-add leader;ovsdb server positive unix cluster cluster5;
-145;ovsdb-cluster.at:792;OVSDB 5-server torture test - remove/re-add follower 1;ovsdb server positive unix cluster cluster5;
-146;ovsdb-cluster.at:796;OVSDB 5-server torture test - remove/re-add follower 2;ovsdb server positive unix cluster cluster5;
-147;ovsdb-cluster.at:800;OVSDB 5-server torture test - remove/re-add follower 3;ovsdb server positive unix cluster cluster5;
-148;ovsdb-cluster.at:804;OVSDB 5-server torture test - remove/re-add follower 4;ovsdb server positive unix cluster cluster5;
+116;ovsdb-cluster.at:468;OVSDB cluster - txn on follower-2, leader crash before sending appendReq, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
+117;ovsdb-cluster.at:473;OVSDB cluster - txn on follower-2, leader crash before sending appendReq, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
+118;ovsdb-cluster.at:478;OVSDB cluster - txn on follower-2, leader crash before sending execRep, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
+119;ovsdb-cluster.at:483;OVSDB cluster - txn on follower-2, leader crash before sending execRep, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
+120;ovsdb-cluster.at:488;OVSDB cluster - txn on follower-2, leader crash after sending execRep, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
+121;ovsdb-cluster.at:493;OVSDB cluster - txn on follower-2, leader crash after sending execRep, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
+122;ovsdb-cluster.at:498;OVSDB cluster - txn on leader, leader crash before sending appendReq, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
+123;ovsdb-cluster.at:503;OVSDB cluster - txn on leader, leader crash before sending appendReq, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
+124;ovsdb-cluster.at:508;OVSDB cluster - txn on leader, leader crash after sending appendReq, follower-2 becomes leader;ovsdb server negative unix cluster pending-txn;
+125;ovsdb-cluster.at:515;OVSDB cluster - txn on leader, leader crash after sending appendReq, follower-3 becomes leader;ovsdb server negative unix cluster pending-txn;
+126;ovsdb-cluster.at:522;OVSDB cluster - txn on follower-2, follower-2 crash before sending execReq, reconnect to follower-3;ovsdb server negative unix cluster pending-txn;
+127;ovsdb-cluster.at:527;OVSDB cluster - txn on follower-2, follower-2 crash before sending execReq, reconnect to leader;ovsdb server negative unix cluster pending-txn;
+128;ovsdb-cluster.at:532;OVSDB cluster - txn on follower-2, follower-2 crash after sending execReq, reconnect to follower-3;ovsdb server negative unix cluster pending-txn;
+129;ovsdb-cluster.at:539;OVSDB cluster - txn on follower-2, follower-2 crash after sending execReq, reconnect to leader;ovsdb server negative unix cluster pending-txn;
+130;ovsdb-cluster.at:546;OVSDB cluster - txn on leader, follower-2 crash after receiving appendReq for the update;ovsdb server negative unix cluster pending-txn;
+131;ovsdb-cluster.at:551;OVSDB cluster - txn on follower-2, follower-3 crash after receiving appendReq for the update;ovsdb server negative unix cluster pending-txn;
+132;ovsdb-cluster.at:557;OVSDB cluster - competing candidates;ovsdb server negative unix cluster competing-candidates;
+133;ovsdb-cluster.at:769;OVSDB 3-server torture test - kill/restart leader;ovsdb server positive unix cluster cluster3;
+134;ovsdb-cluster.at:773;OVSDB 3-server torture test - kill/restart follower 1;ovsdb server positive unix cluster cluster3;
+135;ovsdb-cluster.at:777;OVSDB 3-server torture test - kill/restart follower 2;ovsdb server positive unix cluster cluster3;
+136;ovsdb-cluster.at:781;OVSDB 5-server torture test - kill/restart leader;ovsdb server positive unix cluster cluster5;
+137;ovsdb-cluster.at:785;OVSDB 5-server torture test - kill/restart follower 1;ovsdb server positive unix cluster cluster5;
+138;ovsdb-cluster.at:789;OVSDB 5-server torture test - kill/restart follower 2;ovsdb server positive unix cluster cluster5;
+139;ovsdb-cluster.at:793;OVSDB 5-server torture test - kill/restart follower 3;ovsdb server positive unix cluster cluster5;
+140;ovsdb-cluster.at:797;OVSDB 5-server torture test - kill/restart follower 4;ovsdb server positive unix cluster cluster5;
+141;ovsdb-cluster.at:802;OVSDB 3-server torture test - remove/re-add leader;ovsdb server positive unix cluster cluster3;
+142;ovsdb-cluster.at:806;OVSDB 3-server torture test - remove/re-add follower 1;ovsdb server positive unix cluster cluster3;
+143;ovsdb-cluster.at:810;OVSDB 3-server torture test - remove/re-add follower 2;ovsdb server positive unix cluster cluster3;
+144;ovsdb-cluster.at:814;OVSDB 5-server torture test - remove/re-add leader;ovsdb server positive unix cluster cluster5;
+145;ovsdb-cluster.at:818;OVSDB 5-server torture test - remove/re-add follower 1;ovsdb server positive unix cluster cluster5;
+146;ovsdb-cluster.at:822;OVSDB 5-server torture test - remove/re-add follower 2;ovsdb server positive unix cluster cluster5;
+147;ovsdb-cluster.at:826;OVSDB 5-server torture test - remove/re-add follower 3;ovsdb server positive unix cluster cluster5;
+148;ovsdb-cluster.at:830;OVSDB 5-server torture test - remove/re-add follower 4;ovsdb server positive unix cluster cluster5;
 "
 # List of the all the test groups.
 at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -1050,7 +1050,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.13.1 test suite test groups:
+openvswitch 2.13.3 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -1091,7 +1091,7 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.13.1)" &&
+  $as_echo "$as_me (openvswitch 2.13.3)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1129,10 +1129,10 @@
 # Banner 7. ovsdb-cluster.at:312
 # Category starts at test group 115.
 at_banner_text_7="OVSDB cluster install snapshot RPC"
-# Banner 8. ovsdb-cluster.at:440
+# Banner 8. ovsdb-cluster.at:466
 # Category starts at test group 116.
 at_banner_text_8="OVSDB - cluster failure with pending transaction"
-# Banner 9. ovsdb-cluster.at:586
+# Banner 9. ovsdb-cluster.at:612
 # Category starts at test group 133.
 at_banner_text_9="OVSDB - cluster tests"
 
@@ -1295,11 +1295,11 @@
 
 # Banners and logs.
 $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
 {
   $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
   echo
 
@@ -2589,8 +2589,8 @@
     cp $top_srcdir/vswitchd/vswitch.ovsschema schema
     schema=`ovsdb-tool schema-name schema`
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:383: ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db schema unix:s1.raft"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:383"
+$as_echo "$at_srcdir/ovsdb-cluster.at:409: ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db schema unix:s1.raft"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:409"
 ( $at_check_trace; ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db schema unix:s1.raft
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -2599,7 +2599,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:383"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:409"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2614,15 +2614,15 @@
             fi
         done
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:396: ovsdb-tool join-cluster s\$i.db \$schema unix:s\$i.raft \$others"
-at_fn_check_prepare_dynamic "ovsdb-tool join-cluster s$i.db $schema unix:s$i.raft $others" "ovsdb-cluster.at:396"
+$as_echo "$at_srcdir/ovsdb-cluster.at:422: ovsdb-tool join-cluster s\$i.db \$schema unix:s\$i.raft \$others"
+at_fn_check_prepare_dynamic "ovsdb-tool join-cluster s$i.db $schema unix:s$i.raft $others" "ovsdb-cluster.at:422"
 ( $at_check_trace; ovsdb-tool join-cluster s$i.db $schema unix:s$i.raft $others
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:396"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:422"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2631,15 +2631,15 @@
         local i=$1
         printf "\ns$i: starting\n"
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:401: ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i --remote=punix:s\$i.ovsdb s\$i.db"
-at_fn_check_prepare_dynamic "ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db" "ovsdb-cluster.at:401"
+$as_echo "$at_srcdir/ovsdb-cluster.at:427: ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i --remote=punix:s\$i.ovsdb s\$i.db"
+at_fn_check_prepare_dynamic "ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db" "ovsdb-cluster.at:427"
 ( $at_check_trace; ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:401"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:427"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2648,15 +2648,15 @@
         local i=$1
         printf "\ns$i: waiting to connect to storage\n"
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:406: ovsdb_client_wait --log-file=connect\$i.log unix:s\$i.ovsdb \$schema connected"
-at_fn_check_prepare_dynamic "ovsdb_client_wait --log-file=connect$i.log unix:s$i.ovsdb $schema connected" "ovsdb-cluster.at:406"
+$as_echo "$at_srcdir/ovsdb-cluster.at:432: ovsdb_client_wait --log-file=connect\$i.log unix:s\$i.ovsdb \$schema connected"
+at_fn_check_prepare_dynamic "ovsdb_client_wait --log-file=connect$i.log unix:s$i.ovsdb $schema connected" "ovsdb-cluster.at:432"
 ( $at_check_trace; ovsdb_client_wait --log-file=connect$i.log unix:s$i.ovsdb $schema connected
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:406"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:432"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2679,57 +2679,57 @@
             delay_election_node=2
         fi
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:425: ovs-appctl -t \"\`pwd\`\"/s\$delay_election_node cluster/failure-test delay-election"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:425"
+$as_echo "$at_srcdir/ovsdb-cluster.at:451: ovs-appctl -t \"\`pwd\`\"/s\$delay_election_node cluster/failure-test delay-election"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:451"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/s$delay_election_node cluster/failure-test delay-election
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:425"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:451"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
     fi
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:427: ovs-appctl -t \"\`pwd\`\"/s\$crash_node cluster/failure-test \$crash_command"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:427"
+$as_echo "$at_srcdir/ovsdb-cluster.at:453: ovs-appctl -t \"\`pwd\`\"/s\$crash_node cluster/failure-test \$crash_command"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:453"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/s$crash_node cluster/failure-test $crash_command
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:427"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:453"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:428: ovs-vsctl -v --db=\"\$db\" --no-leader-only --no-shuffle-remotes --no-wait create QoS type=x"
-at_fn_check_prepare_dynamic "ovs-vsctl -v --db=\"$db\" --no-leader-only --no-shuffle-remotes --no-wait create QoS type=x" "ovsdb-cluster.at:428"
+$as_echo "$at_srcdir/ovsdb-cluster.at:454: ovs-vsctl -v --db=\"\$db\" --no-leader-only --no-shuffle-remotes --no-wait create QoS type=x"
+at_fn_check_prepare_dynamic "ovs-vsctl -v --db=\"$db\" --no-leader-only --no-shuffle-remotes --no-wait create QoS type=x" "ovsdb-cluster.at:454"
 ( $at_check_trace; ovs-vsctl -v --db="$db" --no-leader-only --no-shuffle-remotes --no-wait create QoS type=x
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:428"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:454"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
     # Make sure that the node really crashed.
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:431: ls s\$crash_node.ovsdb"
-at_fn_check_prepare_dynamic "ls s$crash_node.ovsdb" "ovsdb-cluster.at:431"
+$as_echo "$at_srcdir/ovsdb-cluster.at:457: ls s\$crash_node.ovsdb"
+at_fn_check_prepare_dynamic "ls s$crash_node.ovsdb" "ovsdb-cluster.at:457"
 ( $at_check_trace; ls s$crash_node.ovsdb
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 2 $at_status "$at_srcdir/ovsdb-cluster.at:431"
+at_fn_check_status 2 $at_status "$at_srcdir/ovsdb-cluster.at:457"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2738,8 +2738,8 @@
         db=unix:s$remote_2.ovsdb
     fi
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:436: ovs-vsctl --db=\"\$db\" --no-leader-only --no-wait --columns=type --bare list QoS"
-at_fn_check_prepare_dynamic "ovs-vsctl --db=\"$db\" --no-leader-only --no-wait --columns=type --bare list QoS" "ovsdb-cluster.at:436"
+$as_echo "$at_srcdir/ovsdb-cluster.at:462: ovs-vsctl --db=\"\$db\" --no-leader-only --no-wait --columns=type --bare list QoS"
+at_fn_check_prepare_dynamic "ovs-vsctl --db=\"$db\" --no-leader-only --no-wait --columns=type --bare list QoS" "ovsdb-cluster.at:462"
 ( $at_check_trace; ovs-vsctl --db="$db" --no-leader-only --no-wait --columns=type --bare list QoS
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -2748,7 +2748,7 @@
 echo >>"$at_stdout"; $as_echo "x
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:436"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:462"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2762,8 +2762,8 @@
     cp $top_srcdir/vswitchd/vswitch.ovsschema schema
     schema=`ovsdb-tool schema-name schema`
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:596: ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db schema unix:s1.raft"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:596"
+$as_echo "$at_srcdir/ovsdb-cluster.at:622: ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db schema unix:s1.raft"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:622"
 ( $at_check_trace; ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db schema unix:s1.raft
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -2772,7 +2772,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:596"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:622"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2786,15 +2786,15 @@
             fi
         done
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:608: ovsdb-tool join-cluster s\$i.db \$schema unix:s\$i.raft \$others"
-at_fn_check_prepare_dynamic "ovsdb-tool join-cluster s$i.db $schema unix:s$i.raft $others" "ovsdb-cluster.at:608"
+$as_echo "$at_srcdir/ovsdb-cluster.at:634: ovsdb-tool join-cluster s\$i.db \$schema unix:s\$i.raft \$others"
+at_fn_check_prepare_dynamic "ovsdb-tool join-cluster s$i.db $schema unix:s$i.raft $others" "ovsdb-cluster.at:634"
 ( $at_check_trace; ovsdb-tool join-cluster s$i.db $schema unix:s$i.raft $others
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:608"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:634"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2804,15 +2804,15 @@
         local i=$1
         printf "\ns$i: starting\n"
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:614: ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i --remote=punix:s\$i.ovsdb s\$i.db"
-at_fn_check_prepare_dynamic "ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db" "ovsdb-cluster.at:614"
+$as_echo "$at_srcdir/ovsdb-cluster.at:640: ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i --remote=punix:s\$i.ovsdb s\$i.db"
+at_fn_check_prepare_dynamic "ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db" "ovsdb-cluster.at:640"
 ( $at_check_trace; ovsdb-server -vjsonrpc -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:614"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:640"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2821,29 +2821,29 @@
         local i=$1
         printf "\ns$i: stopping\n"
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:619: test -e s\$i.pid"
-at_fn_check_prepare_dynamic "test -e s$i.pid" "ovsdb-cluster.at:619"
+$as_echo "$at_srcdir/ovsdb-cluster.at:645: test -e s\$i.pid"
+at_fn_check_prepare_dynamic "test -e s$i.pid" "ovsdb-cluster.at:645"
 ( $at_check_trace; test -e s$i.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:619"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:645"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat s$i.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:619: ovs-appctl --target=\`pwd\`/s\$i exit"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:619"
+$as_echo "$at_srcdir/ovsdb-cluster.at:645: ovs-appctl --target=\`pwd\`/s\$i exit"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:645"
 ( $at_check_trace; ovs-appctl --target=`pwd`/s$i exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:619"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:645"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2854,22 +2854,22 @@
     :
 
 }
-ovs_wait "ovsdb-cluster.at:619" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-cluster.at:645" "while kill -0 \$TMPPID 2>/dev/null"
 
     }
     connect_server() {
         local i=$1
         printf "\ns$i: waiting to connect to storage\n"
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:624: ovsdb_client_wait --log-file=connect\$i.log unix:s\$i.ovsdb \$schema connected"
-at_fn_check_prepare_dynamic "ovsdb_client_wait --log-file=connect$i.log unix:s$i.ovsdb $schema connected" "ovsdb-cluster.at:624"
+$as_echo "$at_srcdir/ovsdb-cluster.at:650: ovsdb_client_wait --log-file=connect\$i.log unix:s\$i.ovsdb \$schema connected"
+at_fn_check_prepare_dynamic "ovsdb_client_wait --log-file=connect$i.log unix:s$i.ovsdb $schema connected" "ovsdb-cluster.at:650"
 ( $at_check_trace; ovsdb_client_wait --log-file=connect$i.log unix:s$i.ovsdb $schema connected
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:624"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:650"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2878,29 +2878,29 @@
         local i=$1
         printf "\ns$i: removing from cluster\n"
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:629: ovs-appctl -t \"\`pwd\`\"/s\$i cluster/leave Open_vSwitch"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:629"
+$as_echo "$at_srcdir/ovsdb-cluster.at:655: ovs-appctl -t \"\`pwd\`\"/s\$i cluster/leave Open_vSwitch"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:655"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/s$i cluster/leave Open_vSwitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:655"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
         printf "\ns$i: waiting for removal to complete\n"
         { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:631: ovsdb_client_wait --log-file=remove\$i.log unix:s\$i.ovsdb \$schema removed"
-at_fn_check_prepare_dynamic "ovsdb_client_wait --log-file=remove$i.log unix:s$i.ovsdb $schema removed" "ovsdb-cluster.at:631"
+$as_echo "$at_srcdir/ovsdb-cluster.at:657: ovsdb_client_wait --log-file=remove\$i.log unix:s\$i.ovsdb \$schema removed"
+at_fn_check_prepare_dynamic "ovsdb_client_wait --log-file=remove$i.log unix:s$i.ovsdb $schema removed" "ovsdb-cluster.at:657"
 ( $at_check_trace; ovsdb_client_wait --log-file=remove$i.log unix:s$i.ovsdb $schema removed
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:631"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:657"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2950,7 +2950,7 @@
     # Use file instead of var because code inside "while" runs in a subshell.
     echo 0 > phase
     i=0
-    (while :; do echo; sleep 0.1; done) | while read REPLY; do
+    (while :; do echo || exit 0; sleep 0.1; done) | while read REPLY; do
         printf "t=%2d s:" $i
         done=0
         for j in $(seq 0 $(expr $n1 - 1)); do
@@ -2993,15 +2993,15 @@
     done
     echo "...done"
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:720: if test \$(cat phase) != 2; then exit 77; fi"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "ovsdb-cluster.at:720"
+$as_echo "$at_srcdir/ovsdb-cluster.at:746: if test \$(cat phase) != 2; then exit 77; fi"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "ovsdb-cluster.at:746"
 ( $at_check_trace; if test $(cat phase) != 2; then exit 77; fi
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:720"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:746"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -3015,15 +3015,15 @@
         done
     done | sort > expout
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:730: ovs-vsctl --db=\"\$db\" --no-wait --log-file=finalize.log -vtimeval:off -vfile -vsyslog:off --bare get Open_vSwitch . external-ids | tr ',' '\\n' | sed 's/[{}\"\" ]//g' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:730"
+$as_echo "$at_srcdir/ovsdb-cluster.at:756: ovs-vsctl --db=\"\$db\" --no-wait --log-file=finalize.log -vtimeval:off -vfile -vsyslog:off --bare get Open_vSwitch . external-ids | tr ',' '\\n' | sed 's/[{}\"\" ]//g' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:756"
 ( $at_check_trace; ovs-vsctl --db="$db" --no-wait --log-file=finalize.log -vtimeval:off -vfile -vsyslog:off --bare get Open_vSwitch . external-ids | tr ',' '\n' | sed 's/[{}"" ]//g' | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:730"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:756"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -3036,15 +3036,15 @@
 
     # We ignore stdout because non-fatal warnings get printed there.
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:739: ovsdb-tool check-cluster s*.db"
-at_fn_check_prepare_trace "ovsdb-cluster.at:739"
+$as_echo "$at_srcdir/ovsdb-cluster.at:765: ovsdb-tool check-cluster s*.db"
+at_fn_check_prepare_trace "ovsdb-cluster.at:765"
 ( $at_check_trace; ovsdb-tool check-cluster s*.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:739"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:765"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -3631,7 +3631,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <bugs@openvswitch.org>
-   Subject: [openvswitch 2.13.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.13.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -10639,32 +10639,52 @@
 
 done
 
+{ set +x
+$as_echo "$at_srcdir/ovsdb-cluster.at:335: ovsdb-client transact unix:s1.ovsdb '[\"idltest\",
+      {\"op\": \"insert\",
+       \"table\": \"indexed\",
+       \"row\": {\"i\": 0}}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-cluster.at:335"
+( $at_check_trace; ovsdb-client transact unix:s1.ovsdb '["idltest",
+      {"op": "insert",
+       "table": "indexed",
+       "row": {"i": 0}}]'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:335"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
 # Kill one follower (s2) and write some data to cluster, so that the follower is falling behind
 printf "\ns2: stopping\n"
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:337: test -e s2.pid"
-at_fn_check_prepare_trace "ovsdb-cluster.at:337"
+$as_echo "$at_srcdir/ovsdb-cluster.at:342: test -e s2.pid"
+at_fn_check_prepare_trace "ovsdb-cluster.at:342"
 ( $at_check_trace; test -e s2.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:337"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:342"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat s2.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:337: ovs-appctl --target=\`pwd\`/s2 exit"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:337"
+$as_echo "$at_srcdir/ovsdb-cluster.at:342: ovs-appctl --target=\`pwd\`/s2 exit"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:342"
 ( $at_check_trace; ovs-appctl --target=`pwd`/s2 exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:337"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:342"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -10675,68 +10695,109 @@
     :
 
 }
-ovs_wait "ovsdb-cluster.at:337" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-cluster.at:342" "while kill -0 \$TMPPID 2>/dev/null"
+
+
+# Delete "i":0 and readd it to get a different UUID for it.
+{ set +x
+$as_echo "$at_srcdir/ovsdb-cluster.at:345: ovsdb-client transact unix:s1.ovsdb '[\"idltest\",
+      {\"op\": \"delete\",
+       \"table\": \"indexed\",
+       \"where\": [[\"i\", \"==\", 0]]}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-cluster.at:345"
+( $at_check_trace; ovsdb-client transact unix:s1.ovsdb '["idltest",
+      {"op": "delete",
+       "table": "indexed",
+       "where": [["i", "==", 0]]}]'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:345"
+$at_failed && at_fn_log_failure
+$at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:339: ovsdb-client transact unix:s1.ovsdb '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-cluster.at:350: ovsdb-client transact unix:s1.ovsdb '[\"idltest\",
       {\"op\": \"insert\",
-       \"table\": \"simple\",
+       \"table\": \"indexed\",
+       \"row\": {\"i\": 0}}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-cluster.at:350"
+( $at_check_trace; ovsdb-client transact unix:s1.ovsdb '["idltest",
+      {"op": "insert",
+       "table": "indexed",
+       "row": {"i": 0}}]'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:350"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/ovsdb-cluster.at:355: ovsdb-client transact unix:s1.ovsdb '[\"idltest\",
+      {\"op\": \"insert\",
+       \"table\": \"indexed\",
        \"row\": {\"i\": 1}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-cluster.at:339"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-cluster.at:355"
 ( $at_check_trace; ovsdb-client transact unix:s1.ovsdb '["idltest",
       {"op": "insert",
-       "table": "simple",
+       "table": "indexed",
        "row": {"i": 1}}]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:339"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:355"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 # Compact leader online to generate snapshot
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:345: ovs-appctl -t \"\`pwd\`\"/s1 ovsdb-server/compact"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:345"
+$as_echo "$at_srcdir/ovsdb-cluster.at:361: ovs-appctl -t \"\`pwd\`\"/s1 ovsdb-server/compact"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:361"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/s1 ovsdb-server/compact
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:345"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:361"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 # Start the follower s2 again.
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:348: ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s2.log --pidfile=s2.pid --unixctl=s2 --remote=punix:s2.ovsdb s2.db"
-at_fn_check_prepare_trace "ovsdb-cluster.at:348"
+$as_echo "$at_srcdir/ovsdb-cluster.at:364: ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s2.log --pidfile=s2.pid --unixctl=s2 --remote=punix:s2.ovsdb s2.db"
+at_fn_check_prepare_trace "ovsdb-cluster.at:364"
 ( $at_check_trace; ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s2.log --pidfile=s2.pid --unixctl=s2 --remote=punix:s2.ovsdb s2.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:364"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:349: ovsdb_client_wait unix:s2.ovsdb \$schema_name connected"
-at_fn_check_prepare_dynamic "ovsdb_client_wait unix:s2.ovsdb $schema_name connected" "ovsdb-cluster.at:349"
+$as_echo "$at_srcdir/ovsdb-cluster.at:365: ovsdb_client_wait unix:s2.ovsdb \$schema_name connected"
+at_fn_check_prepare_dynamic "ovsdb_client_wait unix:s2.ovsdb $schema_name connected" "ovsdb-cluster.at:365"
 ( $at_check_trace; ovsdb_client_wait unix:s2.ovsdb $schema_name connected
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:349"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:365"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -10747,50 +10808,72 @@
 # After the install_snapshot RPC process, the transaction through s2 should
 # succeed.
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:356: ovsdb-client transact unix:s2.ovsdb '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-cluster.at:372: ovsdb-client transact unix:s2.ovsdb '[\"idltest\",
       {\"op\": \"insert\",
-       \"table\": \"simple\",
-       \"row\": {\"i\": 1}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-cluster.at:356"
+       \"table\": \"indexed\",
+       \"row\": {\"i\": 2}}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-cluster.at:372"
 ( $at_check_trace; ovsdb-client transact unix:s2.ovsdb '["idltest",
       {"op": "insert",
-       "table": "simple",
-       "row": {"i": 1}}]'
+       "table": "indexed",
+       "row": {"i": 2}}]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:356"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:372"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+# The snapshot should overwrite the in-memory contents of the DB on S2
+# without generating any constraint violations. All tree records (0, 1, 2)
+# should be in the DB at this point.
+{ set +x
+$as_echo "$at_srcdir/ovsdb-cluster.at:380: ovsdb-client --no-headings dump unix:s2.ovsdb idltest indexed | uuidfilt | sort -k 2"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:380"
+( $at_check_trace; ovsdb-client --no-headings dump unix:s2.ovsdb idltest indexed | uuidfilt | sort -k 2
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "<0> 0
+<1> 1
+<2> 2
+indexed table
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:380"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 for i in `seq $n`; do
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:362: test -e s\$i.pid"
-at_fn_check_prepare_dynamic "test -e s$i.pid" "ovsdb-cluster.at:362"
+$as_echo "$at_srcdir/ovsdb-cluster.at:388: test -e s\$i.pid"
+at_fn_check_prepare_dynamic "test -e s$i.pid" "ovsdb-cluster.at:388"
 ( $at_check_trace; test -e s$i.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:362"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:388"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat s$i.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:362: ovs-appctl --target=\`pwd\`/s\$i exit"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:362"
+$as_echo "$at_srcdir/ovsdb-cluster.at:388: ovs-appctl --target=\`pwd\`/s\$i exit"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:388"
 ( $at_check_trace; ovs-appctl --target=`pwd`/s$i exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:362"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:388"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -10801,7 +10884,7 @@
     :
 
 }
-ovs_wait "ovsdb-cluster.at:362" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-cluster.at:388" "while kill -0 \$TMPPID 2>/dev/null"
 
 done
 
@@ -10812,7 +10895,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_115
 #AT_START_116
-at_fn_group_banner 116 'ovsdb-cluster.at:442' \
+at_fn_group_banner 116 'ovsdb-cluster.at:468' \
   "OVSDB cluster - txn on follower-2, leader crash before sending appendReq, follower-2 becomes leader" "" 8
 at_xfail=no
 (
@@ -10831,7 +10914,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_116
 #AT_START_117
-at_fn_group_banner 117 'ovsdb-cluster.at:447' \
+at_fn_group_banner 117 'ovsdb-cluster.at:473' \
   "OVSDB cluster - txn on follower-2, leader crash before sending appendReq, follower-3 becomes leader" "" 8
 at_xfail=no
 (
@@ -10850,7 +10933,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_117
 #AT_START_118
-at_fn_group_banner 118 'ovsdb-cluster.at:452' \
+at_fn_group_banner 118 'ovsdb-cluster.at:478' \
   "OVSDB cluster - txn on follower-2, leader crash before sending execRep, follower-2 becomes leader" "" 8
 at_xfail=no
 (
@@ -10869,7 +10952,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_118
 #AT_START_119
-at_fn_group_banner 119 'ovsdb-cluster.at:457' \
+at_fn_group_banner 119 'ovsdb-cluster.at:483' \
   "OVSDB cluster - txn on follower-2, leader crash before sending execRep, follower-3 becomes leader" "" 8
 at_xfail=no
 (
@@ -10888,7 +10971,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_119
 #AT_START_120
-at_fn_group_banner 120 'ovsdb-cluster.at:462' \
+at_fn_group_banner 120 'ovsdb-cluster.at:488' \
   "OVSDB cluster - txn on follower-2, leader crash after sending execRep, follower-2 becomes leader" "" 8
 at_xfail=no
 (
@@ -10907,7 +10990,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_120
 #AT_START_121
-at_fn_group_banner 121 'ovsdb-cluster.at:467' \
+at_fn_group_banner 121 'ovsdb-cluster.at:493' \
   "OVSDB cluster - txn on follower-2, leader crash after sending execRep, follower-3 becomes leader" "" 8
 at_xfail=no
 (
@@ -10926,7 +11009,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_121
 #AT_START_122
-at_fn_group_banner 122 'ovsdb-cluster.at:472' \
+at_fn_group_banner 122 'ovsdb-cluster.at:498' \
   "OVSDB cluster - txn on leader, leader crash before sending appendReq, follower-2 becomes leader" "" 8
 at_xfail=no
 (
@@ -10945,7 +11028,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_122
 #AT_START_123
-at_fn_group_banner 123 'ovsdb-cluster.at:477' \
+at_fn_group_banner 123 'ovsdb-cluster.at:503' \
   "OVSDB cluster - txn on leader, leader crash before sending appendReq, follower-3 becomes leader" "" 8
 at_xfail=no
 (
@@ -10964,7 +11047,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_123
 #AT_START_124
-at_fn_group_banner 124 'ovsdb-cluster.at:482' \
+at_fn_group_banner 124 'ovsdb-cluster.at:508' \
   "OVSDB cluster - txn on leader, leader crash after sending appendReq, follower-2 becomes leader" "" 8
 at_xfail=no
 (
@@ -10976,15 +11059,15 @@
 
 # XXX: Detect and skip repeated transaction before enabling this test
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:485: exit 77"
-at_fn_check_prepare_trace "ovsdb-cluster.at:485"
+$as_echo "$at_srcdir/ovsdb-cluster.at:511: exit 77"
+at_fn_check_prepare_trace "ovsdb-cluster.at:511"
 ( $at_check_trace; exit 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:485"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:511"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -10996,7 +11079,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_124
 #AT_START_125
-at_fn_group_banner 125 'ovsdb-cluster.at:489' \
+at_fn_group_banner 125 'ovsdb-cluster.at:515' \
   "OVSDB cluster - txn on leader, leader crash after sending appendReq, follower-3 becomes leader" "" 8
 at_xfail=no
 (
@@ -11008,15 +11091,15 @@
 
 # XXX: Detect and skip repeated transaction before enabling this test
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:492: exit 77"
-at_fn_check_prepare_trace "ovsdb-cluster.at:492"
+$as_echo "$at_srcdir/ovsdb-cluster.at:518: exit 77"
+at_fn_check_prepare_trace "ovsdb-cluster.at:518"
 ( $at_check_trace; exit 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:492"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:518"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11028,7 +11111,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_125
 #AT_START_126
-at_fn_group_banner 126 'ovsdb-cluster.at:496' \
+at_fn_group_banner 126 'ovsdb-cluster.at:522' \
   "OVSDB cluster - txn on follower-2, follower-2 crash before sending execReq, reconnect to follower-3" "" 8
 at_xfail=no
 (
@@ -11047,7 +11130,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_126
 #AT_START_127
-at_fn_group_banner 127 'ovsdb-cluster.at:501' \
+at_fn_group_banner 127 'ovsdb-cluster.at:527' \
   "OVSDB cluster - txn on follower-2, follower-2 crash before sending execReq, reconnect to leader" "" 8
 at_xfail=no
 (
@@ -11066,7 +11149,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_127
 #AT_START_128
-at_fn_group_banner 128 'ovsdb-cluster.at:506' \
+at_fn_group_banner 128 'ovsdb-cluster.at:532' \
   "OVSDB cluster - txn on follower-2, follower-2 crash after sending execReq, reconnect to follower-3" "" 8
 at_xfail=no
 (
@@ -11078,15 +11161,15 @@
 
 # XXX: Detect and skip repeated transaction before enabling this test
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:509: exit 77"
-at_fn_check_prepare_trace "ovsdb-cluster.at:509"
+$as_echo "$at_srcdir/ovsdb-cluster.at:535: exit 77"
+at_fn_check_prepare_trace "ovsdb-cluster.at:535"
 ( $at_check_trace; exit 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:509"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:535"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11098,7 +11181,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_128
 #AT_START_129
-at_fn_group_banner 129 'ovsdb-cluster.at:513' \
+at_fn_group_banner 129 'ovsdb-cluster.at:539' \
   "OVSDB cluster - txn on follower-2, follower-2 crash after sending execReq, reconnect to leader" "" 8
 at_xfail=no
 (
@@ -11110,15 +11193,15 @@
 
 # XXX: Detect and skip repeated transaction before enabling this test
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:516: exit 77"
-at_fn_check_prepare_trace "ovsdb-cluster.at:516"
+$as_echo "$at_srcdir/ovsdb-cluster.at:542: exit 77"
+at_fn_check_prepare_trace "ovsdb-cluster.at:542"
 ( $at_check_trace; exit 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:516"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:542"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11130,7 +11213,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_129
 #AT_START_130
-at_fn_group_banner 130 'ovsdb-cluster.at:520' \
+at_fn_group_banner 130 'ovsdb-cluster.at:546' \
   "OVSDB cluster - txn on leader, follower-2 crash after receiving appendReq for the update" "" 8
 at_xfail=no
 (
@@ -11149,7 +11232,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_130
 #AT_START_131
-at_fn_group_banner 131 'ovsdb-cluster.at:525' \
+at_fn_group_banner 131 'ovsdb-cluster.at:551' \
   "OVSDB cluster - txn on follower-2, follower-3 crash after receiving appendReq for the update" "" 8
 at_xfail=no
 (
@@ -11168,7 +11251,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_131
 #AT_START_132
-at_fn_group_banner 132 'ovsdb-cluster.at:531' \
+at_fn_group_banner 132 'ovsdb-cluster.at:557' \
   "OVSDB cluster - competing candidates" "           " 8
 at_xfail=no
 (
@@ -11183,15 +11266,15 @@
 schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
 ordinal_schema > schema
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:537: ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db \$abs_srcdir/idltest.ovsschema unix:s1.raft"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:537"
+$as_echo "$at_srcdir/ovsdb-cluster.at:563: ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db \$abs_srcdir/idltest.ovsschema unix:s1.raft"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-cluster.at:563"
 ( $at_check_trace; ovsdb-tool '-vPATTERN:console:%c|%p|%m' create-cluster s1.db $abs_srcdir/idltest.ovsschema unix:s1.raft
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:537"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:563"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11199,15 +11282,15 @@
 schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
 for i in `seq 2 $n`; do
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:541: ovsdb-tool join-cluster s\$i.db \$schema_name unix:s\$i.raft unix:s1.raft"
-at_fn_check_prepare_dynamic "ovsdb-tool join-cluster s$i.db $schema_name unix:s$i.raft unix:s1.raft" "ovsdb-cluster.at:541"
+$as_echo "$at_srcdir/ovsdb-cluster.at:567: ovsdb-tool join-cluster s\$i.db \$schema_name unix:s\$i.raft unix:s1.raft"
+at_fn_check_prepare_dynamic "ovsdb-tool join-cluster s$i.db $schema_name unix:s$i.raft unix:s1.raft" "ovsdb-cluster.at:567"
 ( $at_check_trace; ovsdb-tool join-cluster s$i.db $schema_name unix:s$i.raft unix:s1.raft
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:541"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:567"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11216,30 +11299,30 @@
 on_exit 'kill `cat *.pid`'
 for i in `seq $n`; do
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:546: ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i --remote=punix:s\$i.ovsdb s\$i.db"
-at_fn_check_prepare_dynamic "ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db" "ovsdb-cluster.at:546"
+$as_echo "$at_srcdir/ovsdb-cluster.at:572: ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i --remote=punix:s\$i.ovsdb s\$i.db"
+at_fn_check_prepare_dynamic "ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db" "ovsdb-cluster.at:572"
 ( $at_check_trace; ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb s$i.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:546"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:572"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 done
 for i in `seq $n`; do
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:549: ovsdb_client_wait unix:s\$i.ovsdb \$schema_name connected"
-at_fn_check_prepare_dynamic "ovsdb_client_wait unix:s$i.ovsdb $schema_name connected" "ovsdb-cluster.at:549"
+$as_echo "$at_srcdir/ovsdb-cluster.at:575: ovsdb_client_wait unix:s\$i.ovsdb \$schema_name connected"
+at_fn_check_prepare_dynamic "ovsdb_client_wait unix:s$i.ovsdb $schema_name connected" "ovsdb-cluster.at:575"
 ( $at_check_trace; ovsdb_client_wait unix:s$i.ovsdb $schema_name connected
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:549"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:575"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11253,28 +11336,28 @@
 # election timer to make sure s3 doesn't send vote-request before s2 enters
 # term 2.
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:559: ovs-appctl -t \"\`pwd\`\"/s2 cluster/failure-test dont-send-vote-request"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:559"
+$as_echo "$at_srcdir/ovsdb-cluster.at:585: ovs-appctl -t \"\`pwd\`\"/s2 cluster/failure-test dont-send-vote-request"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:585"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/s2 cluster/failure-test dont-send-vote-request
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:559"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:585"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:560: ovs-appctl -t \"\`pwd\`\"/s3 cluster/failure-test delay-election"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:560"
+$as_echo "$at_srcdir/ovsdb-cluster.at:586: ovs-appctl -t \"\`pwd\`\"/s3 cluster/failure-test delay-election"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:586"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/s3 cluster/failure-test delay-election
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:560"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:586"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11284,15 +11367,15 @@
 # and the other candidate should step back as follower as again.
 kill -9 `cat s1.pid`
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:566: ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s1.log --pidfile=s1.pid --unixctl=s1 --remote=punix:s1.ovsdb s1.db"
-at_fn_check_prepare_trace "ovsdb-cluster.at:566"
+$as_echo "$at_srcdir/ovsdb-cluster.at:592: ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s1.log --pidfile=s1.pid --unixctl=s1 --remote=punix:s1.ovsdb s1.db"
+at_fn_check_prepare_trace "ovsdb-cluster.at:592"
 ( $at_check_trace; ovsdb-server -v -vconsole:off -vsyslog:off --detach --no-chdir --log-file=s1.log --pidfile=s1.pid --unixctl=s1 --remote=punix:s1.ovsdb s1.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:566"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:592"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11300,15 +11383,15 @@
 # Tell s1 to delay election timer so that it won't start election before s3
 # becomes candidate.
 { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:570: ovs-appctl -t \"\`pwd\`\"/s1 cluster/failure-test delay-election"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:570"
+$as_echo "$at_srcdir/ovsdb-cluster.at:596: ovs-appctl -t \"\`pwd\`\"/s1 cluster/failure-test delay-election"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:596"
 ( $at_check_trace; ovs-appctl -t "`pwd`"/s1 cluster/failure-test delay-election
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:570"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:596"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11320,7 +11403,7 @@
     :
 
 }
-ovs_wait "ovsdb-cluster.at:572" "until ovs-appctl -t \"\`pwd\`\"/s1 cluster/status \$schema_name | grep \"Term: 2\""
+ovs_wait "ovsdb-cluster.at:598" "until ovs-appctl -t \"\`pwd\`\"/s1 cluster/status \$schema_name | grep \"Term: 2\""
 
 
 for i in `seq $n`; do
@@ -11331,18 +11414,18 @@
     :
 
 }
-ovs_wait "ovsdb-cluster.at:575" "while ovs-appctl -t \"\`pwd\`\"/s\$i cluster/status \$schema_name | grep \"candidate\""
+ovs_wait "ovsdb-cluster.at:601" "while ovs-appctl -t \"\`pwd\`\"/s\$i cluster/status \$schema_name | grep \"candidate\""
 
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:576: ovsdb_client_wait unix:s\$i.ovsdb \$schema_name connected"
-at_fn_check_prepare_dynamic "ovsdb_client_wait unix:s$i.ovsdb $schema_name connected" "ovsdb-cluster.at:576"
+$as_echo "$at_srcdir/ovsdb-cluster.at:602: ovsdb_client_wait unix:s\$i.ovsdb \$schema_name connected"
+at_fn_check_prepare_dynamic "ovsdb_client_wait unix:s$i.ovsdb $schema_name connected" "ovsdb-cluster.at:602"
 ( $at_check_trace; ovsdb_client_wait unix:s$i.ovsdb $schema_name connected
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:576"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:602"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11350,29 +11433,29 @@
 
 for i in `seq $n`; do
     { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:580: test -e s\$i.pid"
-at_fn_check_prepare_dynamic "test -e s$i.pid" "ovsdb-cluster.at:580"
+$as_echo "$at_srcdir/ovsdb-cluster.at:606: test -e s\$i.pid"
+at_fn_check_prepare_dynamic "test -e s$i.pid" "ovsdb-cluster.at:606"
 ( $at_check_trace; test -e s$i.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:580"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:606"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat s$i.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-cluster.at:580: ovs-appctl --target=\`pwd\`/s\$i exit"
-at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:580"
+$as_echo "$at_srcdir/ovsdb-cluster.at:606: ovs-appctl --target=\`pwd\`/s\$i exit"
+at_fn_check_prepare_notrace 'a `...` command substitution' "ovsdb-cluster.at:606"
 ( $at_check_trace; ovs-appctl --target=`pwd`/s$i exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:580"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-cluster.at:606"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -11383,7 +11466,7 @@
     :
 
 }
-ovs_wait "ovsdb-cluster.at:580" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-cluster.at:606" "while kill -0 \$TMPPID 2>/dev/null"
 
 done
 
@@ -11394,7 +11477,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_132
 #AT_START_133
-at_fn_group_banner 133 'ovsdb-cluster.at:743' \
+at_fn_group_banner 133 'ovsdb-cluster.at:769' \
   "OVSDB 3-server torture test - kill/restart leader" "" 9
 at_xfail=no
 (
@@ -11413,7 +11496,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_133
 #AT_START_134
-at_fn_group_banner 134 'ovsdb-cluster.at:747' \
+at_fn_group_banner 134 'ovsdb-cluster.at:773' \
   "OVSDB 3-server torture test - kill/restart follower 1" "" 9
 at_xfail=no
 (
@@ -11432,7 +11515,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_134
 #AT_START_135
-at_fn_group_banner 135 'ovsdb-cluster.at:751' \
+at_fn_group_banner 135 'ovsdb-cluster.at:777' \
   "OVSDB 3-server torture test - kill/restart follower 2" "" 9
 at_xfail=no
 (
@@ -11451,7 +11534,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_135
 #AT_START_136
-at_fn_group_banner 136 'ovsdb-cluster.at:755' \
+at_fn_group_banner 136 'ovsdb-cluster.at:781' \
   "OVSDB 5-server torture test - kill/restart leader" "" 9
 at_xfail=no
 (
@@ -11470,7 +11553,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_136
 #AT_START_137
-at_fn_group_banner 137 'ovsdb-cluster.at:759' \
+at_fn_group_banner 137 'ovsdb-cluster.at:785' \
   "OVSDB 5-server torture test - kill/restart follower 1" "" 9
 at_xfail=no
 (
@@ -11489,7 +11572,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_137
 #AT_START_138
-at_fn_group_banner 138 'ovsdb-cluster.at:763' \
+at_fn_group_banner 138 'ovsdb-cluster.at:789' \
   "OVSDB 5-server torture test - kill/restart follower 2" "" 9
 at_xfail=no
 (
@@ -11508,7 +11591,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_138
 #AT_START_139
-at_fn_group_banner 139 'ovsdb-cluster.at:767' \
+at_fn_group_banner 139 'ovsdb-cluster.at:793' \
   "OVSDB 5-server torture test - kill/restart follower 3" "" 9
 at_xfail=no
 (
@@ -11527,7 +11610,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_139
 #AT_START_140
-at_fn_group_banner 140 'ovsdb-cluster.at:771' \
+at_fn_group_banner 140 'ovsdb-cluster.at:797' \
   "OVSDB 5-server torture test - kill/restart follower 4" "" 9
 at_xfail=no
 (
@@ -11546,7 +11629,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_140
 #AT_START_141
-at_fn_group_banner 141 'ovsdb-cluster.at:776' \
+at_fn_group_banner 141 'ovsdb-cluster.at:802' \
   "OVSDB 3-server torture test - remove/re-add leader" "" 9
 at_xfail=no
 (
@@ -11565,7 +11648,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_141
 #AT_START_142
-at_fn_group_banner 142 'ovsdb-cluster.at:780' \
+at_fn_group_banner 142 'ovsdb-cluster.at:806' \
   "OVSDB 3-server torture test - remove/re-add follower 1" "" 9
 at_xfail=no
 (
@@ -11584,7 +11667,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_142
 #AT_START_143
-at_fn_group_banner 143 'ovsdb-cluster.at:784' \
+at_fn_group_banner 143 'ovsdb-cluster.at:810' \
   "OVSDB 3-server torture test - remove/re-add follower 2" "" 9
 at_xfail=no
 (
@@ -11603,7 +11686,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_143
 #AT_START_144
-at_fn_group_banner 144 'ovsdb-cluster.at:788' \
+at_fn_group_banner 144 'ovsdb-cluster.at:814' \
   "OVSDB 5-server torture test - remove/re-add leader" "" 9
 at_xfail=no
 (
@@ -11622,7 +11705,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_144
 #AT_START_145
-at_fn_group_banner 145 'ovsdb-cluster.at:792' \
+at_fn_group_banner 145 'ovsdb-cluster.at:818' \
   "OVSDB 5-server torture test - remove/re-add follower 1" "" 9
 at_xfail=no
 (
@@ -11641,7 +11724,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_145
 #AT_START_146
-at_fn_group_banner 146 'ovsdb-cluster.at:796' \
+at_fn_group_banner 146 'ovsdb-cluster.at:822' \
   "OVSDB 5-server torture test - remove/re-add follower 2" "" 9
 at_xfail=no
 (
@@ -11660,7 +11743,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_146
 #AT_START_147
-at_fn_group_banner 147 'ovsdb-cluster.at:800' \
+at_fn_group_banner 147 'ovsdb-cluster.at:826' \
   "OVSDB 5-server torture test - remove/re-add follower 3" "" 9
 at_xfail=no
 (
@@ -11679,7 +11762,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_147
 #AT_START_148
-at_fn_group_banner 148 'ovsdb-cluster.at:804' \
+at_fn_group_banner 148 'ovsdb-cluster.at:830' \
   "OVSDB 5-server torture test - remove/re-add follower 4" "" 9
 at_xfail=no
 (
diff -Nru openvswitch-2.13.1/tests/ovsdb-idl.at openvswitch-2.13.3/tests/ovsdb-idl.at
--- openvswitch-2.13.1/tests/ovsdb-idl.at	2020-08-04 21:41:31.993524451 +0000
+++ openvswitch-2.13.3/tests/ovsdb-idl.at	2021-02-10 20:04:59.566074628 +0000
@@ -12,25 +12,6 @@
     on_exit 'kill `cat ovsdb-server.pid`'
 }
 
-# ovsdb_cluster_start_idltest [REMOTE] [SCHEMA]
-#
-# Creates a database using SCHEMA (default: idltest.ovsschema) and
-# starts a database cluster listening on punix:socket and REMOTE (if
-# specified).
-ovsdb_cluster_start_idltest () {
-   local n=$1
-   ovsdb-tool create-cluster s1.db $abs_srcdir/idltest.ovsschema unix:s1.raft || return $?
-   cid=`ovsdb-tool db-cid s1.db`
-   schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
-   for i in `seq 2 $n`; do
-     ovsdb-tool join-cluster s$i.db $schema_name unix:s$i.raft unix:s1.raft || return $?
-   done
-   for i in `seq $n`; do
-     ovsdb-server -vraft -vconsole:warn --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb ${2:+--remote=$2} s$i.db || return $?
-   done
-   on_exit 'kill `cat s*.pid`'
-}
-
 # ovsdb_cluster_leader [REMOTES] [DATABASE]
 #
 # Returns the leader of the DATABASE cluster.
@@ -48,6 +29,35 @@
    done
 }])
 
+# OVSDB_CLUSTER_START_IDLTEST([N], [REMOTE])
+#
+# Creates a clustered database using idltest.ovsschema and starts a database
+# cluster of N servers listening on punix:socket and REMOTE (if specified).
+m4_define([OVSDB_CLUSTER_START_IDLTEST],
+  [n=$1
+   AT_CHECK([ovsdb-tool create-cluster s1.db \
+                        $abs_srcdir/idltest.ovsschema unix:s1.raft])
+   cid=$(ovsdb-tool db-cid s1.db)
+   schema_name=$(ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema)
+   for i in $(seq 2 $n); do
+     AT_CHECK([ovsdb-tool join-cluster s$i.db \
+                          $schema_name unix:s$i.raft unix:s1.raft])
+   done
+   on_exit 'kill $(cat s*.pid)'
+   for i in $(seq $n); do
+     AT_CHECK([ovsdb-server -vraft -vconsole:warn --detach --no-chdir \
+                   --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i \
+                   --remote=punix:s$i.ovsdb                           \
+                   m4_if([$2], [], [], [--remote=$2]) s$i.db])
+   done
+
+   for i in $(seq $n); do
+       OVS_WAIT_UNTIL([ovs-appctl -t $(pwd)/s$i cluster/status ${schema_name} \
+                                           | grep -q 'Status: cluster member'])
+   done
+])
+
+
 # OVSDB_CHECK_IDL_C(TITLE, [PRE-IDL-TXN], TRANSACTIONS, OUTPUT, [KEYWORDS],
 #                   [FILTER])
 #
@@ -954,7 +964,10 @@
 
 # Check that ovsdb-idl figured out that table link2 and column l2 are missing.
 AT_CHECK([grep ovsdb_idl stderr | sort], [0], [dnl
+test-ovsdb|ovsdb_idl|idltest database lacks indexed table (database needs upgrade?)
 test-ovsdb|ovsdb_idl|idltest database lacks link2 table (database needs upgrade?)
+test-ovsdb|ovsdb_idl|idltest database lacks simple5 table (database needs upgrade?)
+test-ovsdb|ovsdb_idl|idltest database lacks simple6 table (database needs upgrade?)
 test-ovsdb|ovsdb_idl|idltest database lacks singleton table (database needs upgrade?)
 test-ovsdb|ovsdb_idl|link1 table in idltest database lacks l2 column (database needs upgrade?)
 ])
@@ -1150,6 +1163,7 @@
        "where": [],
        "row": {"b": true}}]']],
   [[000: i=1 r=2 b=true s=mystring u=<0> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<1> <2>] uuid=<3>
+000: inserted row: uuid=<3>
 000: updated columns: b ba i ia r ra s sa u ua
 001: {"error":null,"result":[{"count":2}]}
 002: i=0 r=0 b=true s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<5>
@@ -1158,6 +1172,111 @@
 003: done
 ]])
 
+dnl This test creates database with weak references and checks that orphan
+dnl rows created for weak references are not available for iteration via
+dnl list of tracked changes.
+OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, orphan weak references],
+  [['["idltest",
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row0_s"},
+       "uuid-name": "weak_row0"},
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row1_s"},
+       "uuid-name": "weak_row1"},
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row2_s"},
+       "uuid-name": "weak_row2"},
+      {"op": "insert",
+       "table": "simple6",
+       "row": {"name": "first_row",
+               "weak_ref": ["set",
+                             [["named-uuid", "weak_row0"],
+                              ["named-uuid", "weak_row1"],
+                              ["named-uuid", "weak_row2"]]
+                           ]}}]']],
+  [['condition simple []' \
+    'condition simple [["s","==","row1_s"]]' \
+    '["idltest",
+      {"op": "update",
+      "table": "simple6",
+      "where": [],
+      "row": {"name": "new_name"}}]' \
+    '["idltest",
+      {"op": "delete",
+      "table": "simple6",
+      "where": []}]']],
+  [[000: change conditions
+001: inserted row: uuid=<0>
+001: name=first_row weak_ref=[] uuid=<0>
+001: updated columns: name weak_ref
+002: change conditions
+003: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+003: inserted row: uuid=<2>
+003: name=first_row weak_ref=[<2>] uuid=<0>
+003: updated columns: s
+004: {"error":null,"result":[{"count":1}]}
+005: name=new_name weak_ref=[<2>] uuid=<0>
+005: updated columns: name
+006: {"error":null,"result":[{"count":1}]}
+007: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+008: done
+]])
+
+dnl This test creates database with weak references and checks that the
+dnl content of orphaned rows created for weak references after monitor
+dnl condition change are not leaked when the row is reinserted and deleted.
+OVSDB_CHECK_IDL_TRACK([track, simple idl, initially populated, orphan rows, conditional],
+  [['["idltest",
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row0_s"},
+       "uuid-name": "weak_row0"},
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row1_s"},
+       "uuid-name": "weak_row1"},
+      {"op": "insert",
+       "table": "simple6",
+       "row": {"name": "first_row",
+               "weak_ref": ["set",
+                             [["named-uuid", "weak_row0"]]
+                           ]}}]']],
+  [['condition simple []' \
+    'condition simple [["s","==","row0_s"]]' \
+    'condition simple [["s","==","row1_s"]]' \
+    'condition simple [["s","==","row0_s"]]' \
+    '["idltest",
+      {"op": "delete",
+      "table": "simple6",
+      "where": []}]']],
+  [[000: change conditions
+001: inserted row: uuid=<0>
+001: name=first_row weak_ref=[] uuid=<0>
+001: updated columns: name weak_ref
+002: change conditions
+003: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+003: inserted row: uuid=<2>
+003: name=first_row weak_ref=[<2>] uuid=<0>
+003: updated columns: s
+004: change conditions
+005: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3>
+005: inserted row: uuid=<3>
+005: updated columns: s
+006: change conditions
+007: deleted row: uuid=<3>
+007: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+007: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3>
+007: inserted row: uuid=<2>
+007: name=first_row weak_ref=[<2>] uuid=<0>
+007: updated columns: s
+008: {"error":null,"result":[{"count":1}]}
+009: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+010: done
+]])
+
 OVSDB_CHECK_IDL_TRACK([track, simple idl, initially empty, various ops],
   [],
   [['["idltest",
@@ -1212,6 +1331,7 @@
   [[000: empty
 001: {"error":null,"result":[{"uuid":["uuid","<0>"]},{"uuid":["uuid","<1>"]}]}
 002: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0>
+002: inserted row: uuid=<0>
 002: updated columns: b ba i ia r ra s sa u ua
 003: {"error":null,"result":[{"count":2}]}
 004: i=0 r=0 b=true s= u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1>
@@ -1223,6 +1343,7 @@
 006: updated columns: r
 007: {"error":null,"result":[{"uuid":["uuid","<6>"]}]}
 008: i=-1 r=125 b=false s= u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6>
+008: inserted row: uuid=<6>
 008: updated columns: ba i ia r ra
 009: {"error":null,"result":[{"count":2}]}
 010: i=-1 r=125 b=false s=newstring u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6>
@@ -1230,7 +1351,8 @@
 010: updated columns: s
 010: updated columns: s
 011: {"error":null,"result":[{"count":1}]}
-012: ##deleted## uuid=<1>
+012: deleted row: uuid=<1>
+012: i=0 r=123.5 b=true s=newstring u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1>
 013: reconnect
 014: i=-1 r=125 b=false s=newstring u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6>
 014: i=1 r=123.5 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0>
@@ -1288,6 +1410,18 @@
 009: done
 ]])
 
+OVSDB_CHECK_IDL_PY([partial-map update set refmap idl],
+[['["idltest", {"op":"insert", "table":"simple3", "row":{"name":"myString1"}},
+               {"op":"insert", "table":"simple5", "row":{"name":"myString2"}}]']],
+['partialmapmutateirefmap'],
+[[000: name=myString1 uset=[]
+000: name=myString2 irefmap=[]
+001: commit, status=success
+002: name=myString1 uset=[]
+002: name=myString2 irefmap=[(1 <0>)]
+003: done
+]])
+
 m4_define([OVSDB_CHECK_IDL_PARTIAL_UPDATE_SET_COLUMN],
   [AT_SETUP([$1 - C])
    AT_KEYWORDS([ovsdb server idl partial update set column positive $5])
@@ -1764,33 +1898,25 @@
 ]])
 
 m4_define([CHECK_STREAM_OPEN_BLOCK],
-  [AT_SETUP([Check Stream open block - C - $1])
-   AT_SKIP_IF([test "$1" = "tcp6" && test "$IS_WIN32" = "yes"])
-   AT_SKIP_IF([test "$1" = "tcp6" && test "$HAVE_IPV6" = "no"])
-   AT_KEYWORDS([Check Stream open block $1])
-   AT_CHECK([ovsdb_start_idltest "ptcp:0:$2"])
+  [AT_SETUP([Check stream open block - $1 - $3])
+   AT_SKIP_IF([test "$3" = "tcp6" && test "$IS_WIN32" = "yes"])
+   AT_SKIP_IF([test "$3" = "tcp6" && test "$HAVE_IPV6" = "no"])
+   AT_KEYWORDS([ovsdb server stream open_block $3])
+   AT_CHECK([ovsdb_start_idltest "ptcp:0:$4"])
    PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT])
    WRONG_PORT=$(($TCP_PORT + 101))
-   AT_CHECK([test-stream tcp:$2:$TCP_PORT], [0], [ignore])
-   AT_CHECK([test-stream tcp:$2:$WRONG_PORT], [1], [ignore], [ignore])
+   AT_CHECK([$2 tcp:$4:$TCP_PORT], [0], [ignore])
+   AT_CHECK([$2 tcp:$4:$WRONG_PORT], [1], [ignore], [ignore])
    OVSDB_SERVER_SHUTDOWN
-   AT_CHECK([test-stream tcp:$2:$TCP_PORT], [1], [ignore], [ignore])
+   AT_CHECK([$2 tcp:$4:$TCP_PORT], [1], [ignore], [ignore])
    AT_CLEANUP])
 
-CHECK_STREAM_OPEN_BLOCK([tcp], [127.0.0.1])
-CHECK_STREAM_OPEN_BLOCK([tcp6], [[[::1]]])
-
-m4_define([CHECK_STREAM_OPEN_BLOCK_PY],
-  [AT_SETUP([$1 - Python3])
-   AT_KEYWORDS([Check PY Stream open block - $3])
-   AT_CHECK([ovsdb_start_idltest "ptcp:0:127.0.0.1"])
-   PARSE_LISTENING_PORT([ovsdb-server.log], [TCP_PORT])
-   WRONG_PORT=$(($TCP_PORT + 101))
-   AT_CHECK([$3 $srcdir/test-stream.py tcp:127.0.0.1:$TCP_PORT], [0], [ignore])
-   AT_CHECK([$3 $srcdir/test-stream.py tcp:127.0.0.1:$WRONG_PORT], [1], [ignore])
-   OVSDB_SERVER_SHUTDOWN
-   AT_CHECK([$3 $srcdir/test-stream.py tcp:127.0.0.1:$TCP_PORT], [1], [ignore])
-   AT_CLEANUP])
+CHECK_STREAM_OPEN_BLOCK([C], [test-stream], [tcp], [127.0.0.1])
+CHECK_STREAM_OPEN_BLOCK([C], [test-stream], [tcp6], [[[::1]]])
+CHECK_STREAM_OPEN_BLOCK([Python3], [$PYTHON3 $srcdir/test-stream.py],
+                        [tcp], [127.0.0.1])
+CHECK_STREAM_OPEN_BLOCK([Python3], [$PYTHON3 $srcdir/test-stream.py],
+                        [tcp6], [[[::1]]])
 
 # same as OVSDB_CHECK_IDL but uses Python IDL implementation with tcp
 # with multiple remotes to assert the idl connects to the leader of the Raft cluster
@@ -1798,7 +1924,7 @@
   [AT_SETUP([$1 - Python3 (leader only)])
    AT_KEYWORDS([ovsdb server idl Python leader_only with tcp socket])
    m4_define([LPBK],[127.0.0.1])
-   AT_CHECK([ovsdb_cluster_start_idltest $2 "ptcp:0:"LPBK])
+   OVSDB_CLUSTER_START_IDLTEST([$2], ["ptcp:0:"LPBK])
    PARSE_LISTENING_PORT([s2.log], [TCP_PORT_1])
    PARSE_LISTENING_PORT([s3.log], [TCP_PORT_2])
    PARSE_LISTENING_PORT([s1.log], [TCP_PORT_3])
@@ -1821,7 +1947,7 @@
   [AT_SETUP([$1 - C - tcp])
    AT_KEYWORDS([ovsdb server idl positive tcp socket $5])
    m4_define([LPBK],[127.0.0.1])
-   AT_CHECK([ovsdb_cluster_start_idltest $2 "ptcp:0:"LPBK])
+   OVSDB_CLUSTER_START_IDLTEST([$2], ["ptcp:0:"LPBK])
    PARSE_LISTENING_PORT([s1.log], [TCP_PORT_1])
    PARSE_LISTENING_PORT([s2.log], [TCP_PORT_2])
    PARSE_LISTENING_PORT([s3.log], [TCP_PORT_3])
diff -Nru openvswitch-2.13.1/tests/ovsdb-monitor-sort.py openvswitch-2.13.3/tests/ovsdb-monitor-sort.py
--- openvswitch-2.13.1/tests/ovsdb-monitor-sort.py	2020-08-04 21:33:59.471524451 +0000
+++ openvswitch-2.13.3/tests/ovsdb-monitor-sort.py	2021-02-10 20:04:59.566074628 +0000
@@ -1,4 +1,17 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
+# Copyright (c) 2020 VMware, 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.
 
 # Breaks lines read from stdin into groups using blank lines as
 # group separators, then sorts lines within the groups for
diff -Nru openvswitch-2.13.1/tests/ovs-ofctl.at openvswitch-2.13.3/tests/ovs-ofctl.at
--- openvswitch-2.13.1/tests/ovs-ofctl.at	2020-08-04 21:40:41.473524451 +0000
+++ openvswitch-2.13.3/tests/ovs-ofctl.at	2021-02-10 20:04:13.896074628 +0000
@@ -101,6 +101,7 @@
     'mpls,mpls_label=5                           NXM,OXM,OpenFlow11' \
     'mpls,mpls_tc=1                              NXM,OXM,OpenFlow11' \
     'mpls,mpls_bos=0                             NXM,OXM' \
+    'mpls,mpls_ttl=5                             NXM,OXM' \
     'ip,ip_src=1.2.3.4                           any' \
     'ip,ip_src=192.168.0.0/24                    any' \
     'ip,ip_src=192.0.168.0/255.0.255.0           NXM,OXM,OpenFlow11' \
@@ -434,6 +435,7 @@
 actions=controller(max_len=123,reason=invalid_ttl,id=555)
 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678)
 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678,sampling_port=56789)
+mpls,mpls_label=5,mpls_tc=1,mpls_ttl=1,mpls_bos=0,actions=drop
 ip,actions=ct(commit,zone=5)
 ip,actions=ct(commit,exec(load(1->NXM_NX_CT_MARK[])))
 ip,actions=ct(commit,exec(load(0x1->NXM_NX_CT_LABEL[])))
@@ -490,6 +492,7 @@
 NXT_FLOW_MOD: ADD table:255 actions=controller(reason=invalid_ttl,max_len=123,id=555)
 NXT_FLOW_MOD: ADD table:255 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678)
 NXT_FLOW_MOD: ADD table:255 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678,sampling_port=56789)
+NXT_FLOW_MOD: ADD table:255 mpls,mpls_label=5,mpls_tc=1,mpls_ttl=1,mpls_bos=0 actions=drop
 NXT_FLOW_MOD: ADD table:255 ip actions=ct(commit,zone=5)
 NXT_FLOW_MOD: ADD table:255 ip actions=ct(commit,exec(load:0x1->NXM_NX_CT_MARK[]))
 NXT_FLOW_MOD: ADD table:255 ip actions=ct(commit,exec(load:0x1->NXM_NX_CT_LABEL[0..63],load:0->NXM_NX_CT_LABEL[64..127]))
diff -Nru openvswitch-2.13.1/tests/sendpkt.py openvswitch-2.13.3/tests/sendpkt.py
--- openvswitch-2.13.1/tests/sendpkt.py	2020-08-04 21:36:07.567524451 +0000
+++ openvswitch-2.13.3/tests/sendpkt.py	2021-02-10 20:04:59.568074628 +0000
@@ -1,6 +1,6 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
 
-# Copyright (c) 2018 VMware, Inc.
+# Copyright (c) 2018, 2020 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/tests/system-afxdp-testsuite openvswitch-2.13.3/tests/system-afxdp-testsuite
--- openvswitch-2.13.1/tests/system-afxdp-testsuite	2020-08-04 21:42:10.193524451 +0000
+++ openvswitch-2.13.3/tests/system-afxdp-testsuite	2021-02-10 20:05:34.951074628 +0000
@@ -727,15 +727,16 @@
 120;system-traffic.at:5662;conntrack - DNAT load balancing with NC;;
 121;system-traffic.at:5750;conntrack - floating IP;;
 122;system-traffic.at:5823;conntrack - negative test for recirculation optimization;;
-123;system-traffic.at:5888;802.1ad - vlan_limit;;
-124;system-traffic.at:5917;802.1ad - push/pop outer 802.1ad;;
-125;system-traffic.at:5973;802.1ad - push/pop outer 802.1q;;
-126;system-traffic.at:6029;802.1ad - 802.1q tunnel;;
-127;system-traffic.at:6091;802.1ad - double vlan match;;
-128;system-traffic.at:6129;nsh - encap header;;
-129;system-traffic.at:6161;nsh - decap header;;
-130;system-traffic.at:6191;nsh - replace header;;
-131;system-traffic.at:6226;nsh - forward;;
+123;system-traffic.at:5886;conntrack - Multiple ICMP traverse;;
+124;system-traffic.at:5932;802.1ad - vlan_limit;;
+125;system-traffic.at:5961;802.1ad - push/pop outer 802.1ad;;
+126;system-traffic.at:6017;802.1ad - push/pop outer 802.1q;;
+127;system-traffic.at:6073;802.1ad - 802.1q tunnel;;
+128;system-traffic.at:6135;802.1ad - double vlan match;;
+129;system-traffic.at:6173;nsh - encap header;;
+130;system-traffic.at:6205;nsh - decap header;;
+131;system-traffic.at:6235;nsh - replace header;;
+132;system-traffic.at:6270;nsh - forward;;
 "
 # List of the all the test groups.
 at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -749,7 +750,7 @@
   for at_grp
   do
     eval at_value=\$$at_grp
-    if test $at_value -lt 1 || test $at_value -gt 131; then
+    if test $at_value -lt 1 || test $at_value -gt 132; then
       $as_echo "invalid test group: $at_value" >&2
       exit 1
     fi
@@ -1047,7 +1048,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.13.1 test suite test groups:
+openvswitch 2.13.3 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -1088,7 +1089,7 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.13.1)" &&
+  $as_echo "$as_me (openvswitch 2.13.3)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1134,11 +1135,11 @@
 # Banner 5. system-traffic.at:4103
 # Category starts at test group 92.
 at_banner_text_5="conntrack - NAT"
-# Banner 6. system-traffic.at:5886
-# Category starts at test group 123.
+# Banner 6. system-traffic.at:5930
+# Category starts at test group 124.
 at_banner_text_6="802.1ad"
-# Banner 7. system-traffic.at:6127
-# Category starts at test group 128.
+# Banner 7. system-traffic.at:6171
+# Category starts at test group 129.
 at_banner_text_7="nsh-datapath"
 
 # Take any -C into account.
@@ -1300,11 +1301,11 @@
 
 # Banners and logs.
 $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
 {
   $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
   echo
 
@@ -2604,7 +2605,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <bugs@openvswitch.org>
-   Subject: [openvswitch 2.13.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.13.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -111717,8 +111718,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_122
 #AT_START_123
-at_fn_group_banner 123 'system-traffic.at:5888' \
-  "802.1ad - vlan_limit" "                           " 6
+at_fn_group_banner 123 'system-traffic.at:5886' \
+  "conntrack - Multiple ICMP traverse" "             " 5
 at_xfail=no
 (
   $as_echo "123. $at_setup_line: testing $at_desc ..."
@@ -111727,6 +111728,7 @@
 ovs_init
 
 
+
    ovs_wait_cond () {
     if ip link show ovs-netdev; then return 1; else return 0; fi
 }
@@ -111734,42 +111736,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:5889" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:5890" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5890"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5890"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5890: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5889"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5890"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -111778,37 +111780,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5890"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5890"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -111816,7 +111818,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5890: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -111829,7 +111831,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5889"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5890"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -111848,7 +111850,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111862,41 +111864,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:5889" "while ip link show br0"
+ovs_wait "system-traffic.at:5890" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5889"
-( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:5890"
+( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5890" >"$at_check_line_file"
-at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5890"
+$as_echo "system-traffic.at:5891" >"$at_check_line_file"
+(! grep -q "Datapath supports ct_clear action" ovs-vswitchd.log) \
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5891"
 
 ip netns del at_ns0
 
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5892: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5892"
+$as_echo "$at_srcdir/system-traffic.at:5893: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5893"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5892"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111912,15 +111915,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5892: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5892"
+$as_echo "$at_srcdir/system-traffic.at:5893: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5893"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5892"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111934,7 +111937,6 @@
 
 
 
-
  { set +x
 $as_echo "$at_srcdir/system-traffic.at:5894: ip link add p0 type veth peer name ovs-p0 || return 77"
 at_fn_check_prepare_trace "system-traffic.at:5894"
@@ -112069,14 +112071,14 @@
 $at_traceon; }
 
 
-      if test -n ""; then
+      if test -n ""f0:00:00:01:01:01""; then
          { set +x
 $as_echo "$at_srcdir/system-traffic.at:5894: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0 address
+ip link set dev p0 address \"f0:00:00:01:01:01\"
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5894"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0 address
+ip link set dev p0 address "f0:00:00:01:01:01"
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -112250,14 +112252,14 @@
 $at_traceon; }
 
 
-      if test -n ""; then
+      if test -n ""f0:00:00:01:01:02""; then
          { set +x
 $as_echo "$at_srcdir/system-traffic.at:5895: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1 address
+ip link set dev p1 address \"f0:00:00:01:01:02\"
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5895"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1 address
+ip link set dev p1 address "f0:00:00:01:01:02"
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -112297,12 +112299,825 @@
       on_exit 'ip link del ovs-p1'
 
 
+cat >flows.txt <<'_ATEOF'
+table=0,priority=10  ip,icmp,ct_state=-trk action=ct(zone=1,table=1)
+table=0,priority=0   action=drop
+table=1,priority=10  ct_state=-est+trk+new,ip,ct_zone=1,in_port=1 action=ct(commit,table=2)
+table=1,priority=10  ct_state=+est-new+trk,ct_zone=1,in_port=1 action=resubmit(,2)
+table=1,priority=0   action=drop
+table=2,priority=10  ct_state=+trk+new,in_port=1 action=drop
+table=2,priority=10  ct_state=+trk+est action=drop
+_ATEOF
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5907: ovs-ofctl --bundle add-flows br0 flows.txt"
+at_fn_check_prepare_trace "system-traffic.at:5907"
+( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows.txt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5907"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+# sending icmp pkts, first and second
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5910: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+\$PYTHON3 \$srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5910"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5910"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5912: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+\$PYTHON3 \$srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5912"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5912"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+sleep 1
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5917: ovs-appctl dpctl/dump-conntrack | grep \"dst=10.1.1\" | sed -e 's/port=[0-9]*/port=<cleared>/g' -e 's/id=[0-9]*/id=<cleared>/g' -e 's/state=[0-9_A-Z]*/state=<cleared>/g' | sort | uniq"
+at_fn_check_prepare_notrace 'a shell pipeline' "system-traffic.at:5917"
+( $at_check_trace; ovs-appctl dpctl/dump-conntrack | grep "dst=10.1.1" | sed -e 's/port=[0-9]*/port=<cleared>/g' -e 's/id=[0-9]*/id=<cleared>/g' -e 's/state=[0-9_A-Z]*/state=<cleared>/g' | sort | uniq
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=<cleared>,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=<cleared>,type=0,code=0)
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5917"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5921: ovs-ofctl dump-flows br0 | grep table=2, | sed -e 's/duration=.*s,/duration=<cleared>,/g' -e 's/idle_age=[0-9]*,/idle_age=<cleared>,/g'"
+at_fn_check_prepare_notrace 'a shell pipeline' "system-traffic.at:5921"
+( $at_check_trace; ovs-ofctl dump-flows br0 | grep table=2, | sed -e 's/duration=.*s,/duration=<cleared>,/g' -e 's/idle_age=[0-9]*,/idle_age=<cleared>,/g'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo " cookie=0x0, duration=<cleared>, table=2, n_packets=2, n_bytes=84, idle_age=<cleared>, priority=10,ct_state=+new+trk,in_port=1 actions=drop
+ cookie=0x0, duration=<cleared>, table=2, n_packets=0, n_bytes=0, idle_age=<cleared>, priority=10,ct_state=+est+trk actions=drop
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5921"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+/dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
+/dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
+/dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5927"
+( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
+/dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
+/dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
+/dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5927"
+( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:5927"
+( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5927" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5927"
+( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:5927"
+( $at_check_trace; ovs-appctl -t ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5927" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: :; "
+at_fn_check_prepare_trace "system-traffic.at:5927"
+( $at_check_trace; :;
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_123
+#AT_START_124
+at_fn_group_banner 124 'system-traffic.at:5932' \
+  "802.1ad - vlan_limit" "                           " 6
+at_xfail=no
+(
+  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+
+   ovs_wait_cond () {
+    if ip link show ovs-netdev; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5933" "while ip link show ovs-netdev"
+
+      touch .conf.db.~lock~
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5933"
+( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5933"
+( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   on_exit "kill `cat ovsdb-server.pid`"
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5933"
+( $at_check_trace; sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5933"
+( $at_check_trace; ovs-vsctl --no-wait init
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5933"
+( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+   on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5933"
+( $at_check_trace; sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      ovs_wait_cond () {
+    if ip link show br0; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5933" "while ip link show br0"
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:5933"
+( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+$as_echo "system-traffic.at:5934" >"$at_check_line_file"
+at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5934"
+
+ip netns del at_ns0
+
+
+
+                { set +x
+$as_echo "$at_srcdir/system-traffic.at:5936: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5936"
+( $at_check_trace; ip netns add at_ns0 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+                on_exit 'ip netns del at_ns0
+
+
+'
+                ip netns exec at_ns0 sysctl -w net.netfilter.nf_conntrack_helper=0
+               ip netns del at_ns1
+
+
+
+                { set +x
+$as_echo "$at_srcdir/system-traffic.at:5936: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5936"
+( $at_check_trace; ip netns add at_ns1 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+                on_exit 'ip netns del at_ns1
+
+
+'
+                ip netns exec at_ns1 sysctl -w net.netfilter.nf_conntrack_helper=0
+
+
+
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ethtool -K p0 tx off
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+     { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ethtool -K p0 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ethtool -K p0 txvlan off
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link set p0 netns at_ns0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link set dev ovs-p0 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ovs-vsctl add-port br0 ovs-p0 -- \\
+                set interface ovs-p0 external-ids:iface-id=\"p0\" type=\"afxdp\""
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
+                set interface ovs-p0 external-ids:iface-id="p0" type="afxdp"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add \"10.1.1.1/24\" dev p0
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add "10.1.1.1/24" dev p0
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 up
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 address
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 address
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      on_exit 'ip link del ovs-p0'
+
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5939"
+( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:5939"
+( $at_check_trace; ethtool -K p1 tx off
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+     { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ethtool -K p1 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:5939"
+( $at_check_trace; ethtool -K p1 txvlan off
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:5939"
+( $at_check_trace; ip link set p1 netns at_ns1
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:5939"
+( $at_check_trace; ip link set dev ovs-p1 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ovs-vsctl add-port br0 ovs-p1 -- \\
+                set interface ovs-p1 external-ids:iface-id=\"p1\" type=\"afxdp\""
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
+                set interface ovs-p1 external-ids:iface-id="p1" type="afxdp"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add \"10.1.1.2/24\" dev p1
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add "10.1.1.2/24" dev p1
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 up
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 address
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 address
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      on_exit 'ip link del ovs-p1'
+
+
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -112311,7 +113126,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112319,10 +113134,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC
@@ -112331,7 +113146,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112339,10 +113154,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 \"10.255.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 "10.255.2.1/24"
 NS_EXEC_HEREDOC
@@ -112351,7 +113166,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112359,10 +113174,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -112371,7 +113186,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112381,10 +113196,10 @@
 
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -112393,7 +113208,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112401,10 +113216,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC
@@ -112413,7 +113228,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112421,10 +113236,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 \"10.255.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 "10.255.2.2/24"
 NS_EXEC_HEREDOC
@@ -112433,7 +113248,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112441,10 +113256,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -112453,7 +113268,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112464,10 +113279,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -112476,7 +113291,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112484,10 +113299,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC
@@ -112496,7 +113311,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112504,10 +113319,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -112516,7 +113331,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112526,10 +113341,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -112538,7 +113353,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112548,10 +113363,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -112560,7 +113375,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112568,10 +113383,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC
@@ -112580,7 +113395,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112588,10 +113403,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -112600,7 +113415,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112610,10 +113425,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -112622,7 +113437,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112633,15 +113448,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5903: ovs-ofctl add-flow br0 \"priority=1 action=normal\""
-at_fn_check_prepare_trace "system-traffic.at:5903"
+$as_echo "$at_srcdir/system-traffic.at:5947: ovs-ofctl add-flow br0 \"priority=1 action=normal\""
+at_fn_check_prepare_trace "system-traffic.at:5947"
 ( $at_check_trace; ovs-ofctl add-flow br0 "priority=1 action=normal"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5903"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5947"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112655,59 +113470,59 @@
     :
 
 }
-ovs_wait "system-traffic.at:5905" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:5949" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5908: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "system-traffic.at:5908"
+$as_echo "$at_srcdir/system-traffic.at:5952: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "system-traffic.at:5952"
 ( $at_check_trace; ovs-appctl revalidator/purge
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5908"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5952"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5909: ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1"
-at_fn_check_prepare_trace "system-traffic.at:5909"
+$as_echo "$at_srcdir/system-traffic.at:5953: ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1"
+at_fn_check_prepare_trace "system-traffic.at:5953"
 ( $at_check_trace; ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5909"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5953"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5910: ovs-ofctl add-flow br0 \"priority=100 dl_type=0x8100 action=drop\""
-at_fn_check_prepare_trace "system-traffic.at:5910"
+$as_echo "$at_srcdir/system-traffic.at:5954: ovs-ofctl add-flow br0 \"priority=100 dl_type=0x8100 action=drop\""
+at_fn_check_prepare_trace "system-traffic.at:5954"
 ( $at_check_trace; ovs-ofctl add-flow br0 "priority=100 dl_type=0x8100 action=drop"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5910"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5954"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5911: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5955: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.2.2.2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5911"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5955"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.2.2.2
 NS_EXEC_HEREDOC
@@ -112716,7 +113531,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:5911"
+at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:5955"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112725,11 +113540,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:5957: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5913"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5957"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -112739,22 +113554,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5957"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112762,15 +113577,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:5957"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112783,18 +113598,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5913" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:5957" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5957"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112802,15 +113617,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:5957"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112823,18 +113638,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5913" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:5957" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: :; "
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: :; "
+at_fn_check_prepare_trace "system-traffic.at:5957"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112846,13 +113661,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_123
-#AT_START_124
-at_fn_group_banner 124 'system-traffic.at:5917' \
+#AT_STOP_124
+#AT_START_125
+at_fn_group_banner 125 'system-traffic.at:5961' \
   "802.1ad - push/pop outer 802.1ad" "               " 6
 at_xfail=no
 (
-  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $as_echo "125. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -112865,42 +113680,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:5918" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:5962" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5962"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5962"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5962: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5918"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5962"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -112909,37 +113724,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5962"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5962"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -112947,7 +113762,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5962: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -112960,7 +113775,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5918"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5962"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -112979,7 +113794,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112993,26 +113808,26 @@
     :
 
 }
-ovs_wait "system-traffic.at:5918" "while ip link show br0"
+ovs_wait "system-traffic.at:5962" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:5962"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5919" >"$at_check_line_file"
-at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5919"
+$as_echo "system-traffic.at:5963" >"$at_check_line_file"
+at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5963"
 
 ovs-vsctl add-br br1 -- set Bridge br1 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ovs-vsctl add-br br2 -- set Bridge br2 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
@@ -113021,15 +113836,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5923: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5923"
+$as_echo "$at_srcdir/system-traffic.at:5967: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5967"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5923"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5967"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113045,15 +113860,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5923: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5923"
+$as_echo "$at_srcdir/system-traffic.at:5967: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5967"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5923"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5967"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113069,75 +113884,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5925: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5925"
+$as_echo "$at_srcdir/system-traffic.at:5969: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:5969"
 ( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5925"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5926: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:5926"
+$as_echo "$at_srcdir/system-traffic.at:5970: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:5970"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5926"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5970"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5927: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:5927"
+$as_echo "$at_srcdir/system-traffic.at:5971: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:5971"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5971"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5928: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:5928"
+$as_echo "$at_srcdir/system-traffic.at:5972: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:5972"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5928"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5972"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5929: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5929"
+$as_echo "$at_srcdir/system-traffic.at:5973: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:5973"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5929"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5973"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113146,75 +113961,75 @@
 on_exit 'ip link del ovs-p0'
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5932: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5932"
+$as_echo "$at_srcdir/system-traffic.at:5976: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:5976"
 ( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5932"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5976"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5933: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:5933"
+$as_echo "$at_srcdir/system-traffic.at:5977: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:5977"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5977"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5934: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:5934"
+$as_echo "$at_srcdir/system-traffic.at:5978: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:5978"
 ( $at_check_trace; ip link set dev ovs-p3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5934"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5978"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5935: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:5935"
+$as_echo "$at_srcdir/system-traffic.at:5979: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:5979"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5935"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5936: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5936"
+$as_echo "$at_srcdir/system-traffic.at:5980: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:5980"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5980"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113223,45 +114038,45 @@
 on_exit 'ip link del ovs-p2'
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link add p4 type veth peer name ovs-p4 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5939"
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5983"
 ( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ethtool -K p4 tx off"
-at_fn_check_prepare_trace "system-traffic.at:5939"
+$as_echo "$at_srcdir/system-traffic.at:5983: ethtool -K p4 tx off"
+at_fn_check_prepare_trace "system-traffic.at:5983"
 ( $at_check_trace; ethtool -K p4 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ethtool -K p4 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:5939"
+$as_echo "$at_srcdir/system-traffic.at:5983: ethtool -K p4 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:5983"
 ( $at_check_trace; ethtool -K p4 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113270,39 +114085,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link set p4 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:5939"
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:5983"
 ( $at_check_trace; ip link set p4 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link set dev ovs-p4 up"
-at_fn_check_prepare_trace "system-traffic.at:5939"
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:5983"
 ( $at_check_trace; ip link set dev ovs-p4 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ovs-vsctl add-port br1 ovs-p4 -- \\
+$as_echo "$at_srcdir/system-traffic.at:5983: ovs-vsctl add-port br1 ovs-p4 -- \\
                 set interface ovs-p4 external-ids:iface-id=\"p4\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
                 set interface ovs-p4 external-ids:iface-id="p4" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -113310,17 +114125,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p4
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p4
 NS_EXEC_HEREDOC
@@ -113329,7 +114144,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113337,10 +114152,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC
@@ -113349,7 +114164,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113358,10 +114173,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC
@@ -113370,7 +114185,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113380,10 +114195,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -113392,7 +114207,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113404,45 +114219,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ethtool -K p5 tx off"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ethtool -K p5 tx off"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ethtool -K p5 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ethtool -K p5 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ethtool -K p5 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ethtool -K p5 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113451,39 +114266,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:5984: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -113491,17 +114306,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -113510,7 +114325,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113518,10 +114333,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -113530,7 +114345,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113539,10 +114354,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -113551,7 +114366,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113561,10 +114376,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -113573,7 +114388,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113585,10 +114400,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -113597,7 +114412,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113605,10 +114420,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -113617,7 +114432,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113625,10 +114440,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -113637,7 +114452,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113647,10 +114462,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -113659,7 +114474,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113669,10 +114484,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -113681,7 +114496,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113689,10 +114504,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -113701,7 +114516,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113709,10 +114524,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -113721,7 +114536,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113731,10 +114546,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -113743,7 +114558,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113767,45 +114582,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5955: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:5955"
+$as_echo "$at_srcdir/system-traffic.at:5999: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:5999"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5955"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5999"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5956: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:5956"
+$as_echo "$at_srcdir/system-traffic.at:6000: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6000"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br1 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5956"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5957: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:5957"
+$as_echo "$at_srcdir/system-traffic.at:6001: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6001"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br2 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6001"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113819,14 +114634,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:5959" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6003" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5961: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6005: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5961"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6005"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -113837,7 +114652,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5961"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6005"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113846,10 +114661,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5965: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6009: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5965"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6009"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -113860,7 +114675,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5965"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6009"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113869,11 +114684,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6013: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5969"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6013"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -113883,22 +114698,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6013"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113906,15 +114721,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113927,18 +114742,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5969" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6013" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6013"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113946,15 +114761,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113967,18 +114782,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5969" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6013" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: :; "
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: :; "
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113990,13 +114805,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_124
-#AT_START_125
-at_fn_group_banner 125 'system-traffic.at:5973' \
+#AT_STOP_125
+#AT_START_126
+at_fn_group_banner 126 'system-traffic.at:6017' \
   "802.1ad - push/pop outer 802.1q" "                " 6
 at_xfail=no
 (
-  $as_echo "125. $at_setup_line: testing $at_desc ..."
+  $as_echo "126. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -114009,42 +114824,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:5974" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6018" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6018"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6018"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6018: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5974"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6018"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -114053,37 +114868,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -114091,7 +114906,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6018: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -114104,7 +114919,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5974"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6018"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -114123,7 +114938,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114137,26 +114952,26 @@
     :
 
 }
-ovs_wait "system-traffic.at:5974" "while ip link show br0"
+ovs_wait "system-traffic.at:6018" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5975" >"$at_check_line_file"
-at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5975"
+$as_echo "system-traffic.at:6019" >"$at_check_line_file"
+at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6019"
 
 ovs-vsctl add-br br1 -- set Bridge br1 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ovs-vsctl add-br br2 -- set Bridge br2 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
@@ -114165,15 +114980,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5979: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5979"
+$as_echo "$at_srcdir/system-traffic.at:6023: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6023"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114189,15 +115004,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5979: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5979"
+$as_echo "$at_srcdir/system-traffic.at:6023: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6023"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114213,75 +115028,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5981: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5981"
+$as_echo "$at_srcdir/system-traffic.at:6025: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6025"
 ( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5981"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5982: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:5982"
+$as_echo "$at_srcdir/system-traffic.at:6026: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6026"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5982"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5983: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:5983"
+$as_echo "$at_srcdir/system-traffic.at:6027: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6027"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6027"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5984: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:5984"
+$as_echo "$at_srcdir/system-traffic.at:6028: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:6028"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6028"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5985: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5985"
+$as_echo "$at_srcdir/system-traffic.at:6029: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6029"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114290,75 +115105,75 @@
 on_exit 'ip link del ovs-p0'
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5988: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5988"
+$as_echo "$at_srcdir/system-traffic.at:6032: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6032"
 ( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5989: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:5989"
+$as_echo "$at_srcdir/system-traffic.at:6033: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6033"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5989"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6033"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5990: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:5990"
+$as_echo "$at_srcdir/system-traffic.at:6034: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:6034"
 ( $at_check_trace; ip link set dev ovs-p3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5990"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6034"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5991: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:5991"
+$as_echo "$at_srcdir/system-traffic.at:6035: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:6035"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5991"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5992: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5992"
+$as_echo "$at_srcdir/system-traffic.at:6036: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6036"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5992"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6036"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114367,45 +115182,45 @@
 on_exit 'ip link del ovs-p2'
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link add p4 type veth peer name ovs-p4 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ethtool -K p4 tx off"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ethtool -K p4 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ethtool -K p4 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ethtool -K p4 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ethtool -K p4 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ethtool -K p4 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114414,39 +115229,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link set p4 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link set p4 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link set dev ovs-p4 up"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link set dev ovs-p4 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ovs-vsctl add-port br1 ovs-p4 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6039: ovs-vsctl add-port br1 ovs-p4 -- \\
                 set interface ovs-p4 external-ids:iface-id=\"p4\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
                 set interface ovs-p4 external-ids:iface-id="p4" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -114454,17 +115269,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p4
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p4
 NS_EXEC_HEREDOC
@@ -114473,7 +115288,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114481,10 +115296,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC
@@ -114493,7 +115308,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114502,10 +115317,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC
@@ -114514,7 +115329,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114524,10 +115339,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -114536,7 +115351,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114548,45 +115363,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ethtool -K p5 tx off"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ethtool -K p5 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ethtool -K p5 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ethtool -K p5 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ethtool -K p5 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ethtool -K p5 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114595,39 +115410,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6040: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -114635,17 +115450,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -114654,7 +115469,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114662,10 +115477,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -114674,7 +115489,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114683,10 +115498,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -114695,7 +115510,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114705,10 +115520,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -114717,7 +115532,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114729,10 +115544,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -114741,7 +115556,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114749,10 +115564,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -114761,7 +115576,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114769,10 +115584,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -114781,7 +115596,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114791,10 +115606,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -114803,7 +115618,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114813,10 +115628,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -114825,7 +115640,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114833,10 +115648,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -114845,7 +115660,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114853,10 +115668,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -114865,7 +115680,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114875,10 +115690,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -114887,7 +115702,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114911,45 +115726,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6011: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:6011"
+$as_echo "$at_srcdir/system-traffic.at:6055: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:6055"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6012: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:6012"
+$as_echo "$at_srcdir/system-traffic.at:6056: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6056"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br1 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6012"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6013: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:6013"
+$as_echo "$at_srcdir/system-traffic.at:6057: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6057"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br2 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114963,14 +115778,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6015" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6059" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6017: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6061: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6017"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6061"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -114981,7 +115796,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6017"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6061"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114990,10 +115805,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6021: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6065: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6021"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6065"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -115004,7 +115819,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6021"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6065"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115013,11 +115828,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6069: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6025"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6069"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -115027,22 +115842,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6069"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115050,15 +115865,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115071,18 +115886,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6025" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6069" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6069"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115090,15 +115905,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115111,18 +115926,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6025" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6069" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: :; "
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: :; "
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115134,13 +115949,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_125
-#AT_START_126
-at_fn_group_banner 126 'system-traffic.at:6029' \
+#AT_STOP_126
+#AT_START_127
+at_fn_group_banner 127 'system-traffic.at:6073' \
   "802.1ad - 802.1q tunnel" "                        " 6
 at_xfail=no
 (
-  $as_echo "126. $at_setup_line: testing $at_desc ..."
+  $as_echo "127. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -115153,42 +115968,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6030" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6074" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6074"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6074"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6074: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6030"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6074"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -115197,37 +116012,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -115235,7 +116050,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6074: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -115248,7 +116063,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6030"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6074"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -115267,7 +116082,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115281,26 +116096,26 @@
     :
 
 }
-ovs_wait "system-traffic.at:6030" "while ip link show br0"
+ovs_wait "system-traffic.at:6074" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:6031" >"$at_check_line_file"
-at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6031"
+$as_echo "system-traffic.at:6075" >"$at_check_line_file"
+at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6075"
 
 ovs-vsctl add-br br1 -- set Bridge br1 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ovs-vsctl add-br br2 -- set Bridge br2 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
@@ -115309,15 +116124,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6035: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6035"
+$as_echo "$at_srcdir/system-traffic.at:6079: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6079"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6079"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115333,15 +116148,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6035: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6035"
+$as_echo "$at_srcdir/system-traffic.at:6079: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6079"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6079"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115357,75 +116172,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6037: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:6037"
+$as_echo "$at_srcdir/system-traffic.at:6081: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6081"
 ( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6037"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6081"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6038: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6038"
+$as_echo "$at_srcdir/system-traffic.at:6082: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6082"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6038"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6082"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6039: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6039"
+$as_echo "$at_srcdir/system-traffic.at:6083: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6083"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6083"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6040: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:6040"
+$as_echo "$at_srcdir/system-traffic.at:6084: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:6084"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6084"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6041: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:6041"
+$as_echo "$at_srcdir/system-traffic.at:6085: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6085"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6085"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115434,75 +116249,75 @@
 on_exit 'ip link del ovs-p0'
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6044: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:6044"
+$as_echo "$at_srcdir/system-traffic.at:6088: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6088"
 ( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6044"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6045: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:6045"
+$as_echo "$at_srcdir/system-traffic.at:6089: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6089"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6045"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6089"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6046: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:6046"
+$as_echo "$at_srcdir/system-traffic.at:6090: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:6090"
 ( $at_check_trace; ip link set dev ovs-p3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6046"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6090"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6047: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:6047"
+$as_echo "$at_srcdir/system-traffic.at:6091: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:6091"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6047"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6091"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6048: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:6048"
+$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6092"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6048"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115511,45 +116326,45 @@
 on_exit 'ip link del ovs-p2'
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link add p4 type veth peer name ovs-p4 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ethtool -K p4 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ethtool -K p4 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ethtool -K p4 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ethtool -K p4 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ethtool -K p4 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ethtool -K p4 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115558,39 +116373,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link set p4 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link set p4 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link set dev ovs-p4 up"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link set dev ovs-p4 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ovs-vsctl add-port br1 ovs-p4 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6095: ovs-vsctl add-port br1 ovs-p4 -- \\
                 set interface ovs-p4 external-ids:iface-id=\"p4\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
                 set interface ovs-p4 external-ids:iface-id="p4" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -115598,17 +116413,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p4
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p4
 NS_EXEC_HEREDOC
@@ -115617,7 +116432,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115625,10 +116440,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC
@@ -115637,7 +116452,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115646,10 +116461,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC
@@ -115658,7 +116473,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115668,10 +116483,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -115680,7 +116495,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115692,45 +116507,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ethtool -K p5 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ethtool -K p5 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ethtool -K p5 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ethtool -K p5 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ethtool -K p5 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ethtool -K p5 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115739,39 +116554,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6096: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -115779,17 +116594,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -115798,7 +116613,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115806,10 +116621,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -115818,7 +116633,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115827,10 +116642,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -115839,7 +116654,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115849,10 +116664,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -115861,7 +116676,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115873,10 +116688,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -115885,7 +116700,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115893,10 +116708,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -115905,7 +116720,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115913,10 +116728,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -115925,7 +116740,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115935,10 +116750,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -115947,7 +116762,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115957,10 +116772,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -115969,7 +116784,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115977,10 +116792,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -115989,7 +116804,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115997,10 +116812,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -116009,7 +116824,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116019,10 +116834,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -116031,7 +116846,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116041,10 +116856,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC
@@ -116053,7 +116868,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116061,10 +116876,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.200 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.200 up
 NS_EXEC_HEREDOC
@@ -116073,7 +116888,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116081,10 +116896,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.200 \"10.3.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.200 "10.3.2.1/24"
 NS_EXEC_HEREDOC
@@ -116093,7 +116908,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116103,10 +116918,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.200 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.200 mtu 1492
 NS_EXEC_HEREDOC
@@ -116115,7 +116930,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116125,10 +116940,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC
@@ -116137,7 +116952,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116145,10 +116960,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.200 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.200 up
 NS_EXEC_HEREDOC
@@ -116157,7 +116972,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116165,10 +116980,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.200 \"10.3.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.200 "10.3.2.2/24"
 NS_EXEC_HEREDOC
@@ -116177,7 +116992,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116187,10 +117002,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.200 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.200 mtu 1492
 NS_EXEC_HEREDOC
@@ -116199,7 +117014,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116209,10 +117024,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC
@@ -116221,7 +117036,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116229,10 +117044,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.300 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.300 up
 NS_EXEC_HEREDOC
@@ -116241,7 +117056,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116249,10 +117064,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.300 \"10.4.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.300 "10.4.2.1/24"
 NS_EXEC_HEREDOC
@@ -116261,7 +117076,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116271,10 +117086,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.300 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.300 mtu 1492
 NS_EXEC_HEREDOC
@@ -116283,7 +117098,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116293,10 +117108,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC
@@ -116305,7 +117120,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116313,10 +117128,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.300 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.300 up
 NS_EXEC_HEREDOC
@@ -116325,7 +117140,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116333,10 +117148,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.300 \"10.4.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.300 "10.4.2.2/24"
 NS_EXEC_HEREDOC
@@ -116345,7 +117160,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116355,10 +117170,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.300 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.300 mtu 1492
 NS_EXEC_HEREDOC
@@ -116367,7 +117182,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116378,75 +117193,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6060: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6060"
+$as_echo "$at_srcdir/system-traffic.at:6104: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6104"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6060"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6061: ovs-ofctl add-flow br1 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6061"
+$as_echo "$at_srcdir/system-traffic.at:6105: ovs-ofctl add-flow br1 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6105"
 ( $at_check_trace; ovs-ofctl add-flow br1 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6061"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6105"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6062: ovs-ofctl add-flow br2 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6062"
+$as_echo "$at_srcdir/system-traffic.at:6106: ovs-ofctl add-flow br2 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6106"
 ( $at_check_trace; ovs-ofctl add-flow br2 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6062"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6106"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6063: ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
-at_fn_check_prepare_trace "system-traffic.at:6063"
+$as_echo "$at_srcdir/system-traffic.at:6107: ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
+at_fn_check_prepare_trace "system-traffic.at:6107"
 ( $at_check_trace; ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6063"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6107"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6064: ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
-at_fn_check_prepare_trace "system-traffic.at:6064"
+$as_echo "$at_srcdir/system-traffic.at:6108: ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
+at_fn_check_prepare_trace "system-traffic.at:6108"
 ( $at_check_trace; ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6064"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6108"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116460,7 +117275,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6066" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6110" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 ovs_wait_cond () {
     ip netns exec at_ns0 ping -c 1 10.3.2.2
@@ -116469,14 +117284,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6067" "until ip netns exec at_ns0 ping -c 1 10.3.2.2"
+ovs_wait "system-traffic.at:6111" "until ip netns exec at_ns0 ping -c 1 10.3.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6069: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6113: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6069"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6113"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -116487,7 +117302,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6113"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116496,10 +117311,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6073: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6117: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6073"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6117"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -116510,7 +117325,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6073"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6117"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116519,10 +117334,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6077: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6121: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6077"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6121"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -116533,7 +117348,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6077"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6121"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116542,10 +117357,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6081: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6125: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6081"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6125"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -116556,7 +117371,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6081"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6125"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116565,10 +117380,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6086: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6130: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.4.2.2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6086"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.4.2.2
 NS_EXEC_HEREDOC
@@ -116577,7 +117392,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:6086"
+at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:6130"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116586,11 +117401,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: check_logs \"/dropping VLAN \\(0\\|300\\) packet received on dot1q-tunnel port/d\"\";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6132: check_logs \"/dropping VLAN \\(0\\|300\\) packet received on dot1q-tunnel port/d\"\";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6088"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6132"
 ( $at_check_trace; check_logs "/dropping VLAN \(0\|300\) packet received on dot1q-tunnel port/d"";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -116600,22 +117415,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6132"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116623,15 +117438,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116644,18 +117459,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6088" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6132" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6132"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116663,15 +117478,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116684,18 +117499,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6088" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6132" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: :; "
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: :; "
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116707,13 +117522,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_126
-#AT_START_127
-at_fn_group_banner 127 'system-traffic.at:6091' \
+#AT_STOP_127
+#AT_START_128
+at_fn_group_banner 128 'system-traffic.at:6135' \
   "802.1ad - double vlan match" "                    " 6
 at_xfail=no
 (
-  $as_echo "127. $at_setup_line: testing $at_desc ..."
+  $as_echo "128. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -116726,42 +117541,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6092" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6136" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6136"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6136"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6136: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6092"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6136"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -116770,37 +117585,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -116808,7 +117623,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6136: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -116821,7 +117636,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6092"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6136"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -116840,7 +117655,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116854,41 +117669,41 @@
     :
 
 }
-ovs_wait "system-traffic.at:6092" "while ip link show br0"
+ovs_wait "system-traffic.at:6136" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:6093" >"$at_check_line_file"
-at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6093"
+$as_echo "system-traffic.at:6137" >"$at_check_line_file"
+at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6137"
 
 ip netns del at_ns0
 
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6095: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6095"
+$as_echo "$at_srcdir/system-traffic.at:6139: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6139"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116904,15 +117719,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6095: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6095"
+$as_echo "$at_srcdir/system-traffic.at:6139: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6139"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116928,45 +117743,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ethtool -K p0 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ethtool -K p0 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ethtool -K p0 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116975,39 +117790,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6141: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -117015,17 +117830,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p0
 NS_EXEC_HEREDOC
@@ -117034,7 +117849,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117042,10 +117857,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -117054,7 +117869,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117063,10 +117878,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -117075,7 +117890,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117085,10 +117900,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -117097,7 +117912,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117109,45 +117924,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ethtool -K p1 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ethtool -K p1 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ethtool -K p1 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117156,39 +117971,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6142: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -117196,17 +118011,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p1
 NS_EXEC_HEREDOC
@@ -117215,7 +118030,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117223,10 +118038,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -117235,7 +118050,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117244,10 +118059,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -117256,7 +118071,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117266,10 +118081,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -117278,7 +118093,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117291,10 +118106,10 @@
 
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -117303,7 +118118,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117311,10 +118126,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC
@@ -117323,7 +118138,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117331,10 +118146,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 \"10.255.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 "10.255.2.1/24"
 NS_EXEC_HEREDOC
@@ -117343,7 +118158,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117351,10 +118166,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -117363,7 +118178,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117373,10 +118188,10 @@
 
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -117385,7 +118200,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117393,10 +118208,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC
@@ -117405,7 +118220,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117413,10 +118228,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 \"10.255.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 "10.255.2.2/24"
 NS_EXEC_HEREDOC
@@ -117425,7 +118240,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117433,10 +118248,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -117445,7 +118260,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117456,10 +118271,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -117468,7 +118283,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117476,10 +118291,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC
@@ -117488,7 +118303,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117496,10 +118311,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -117508,7 +118323,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117518,10 +118333,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -117530,7 +118345,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117540,10 +118355,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -117552,7 +118367,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117560,10 +118375,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC
@@ -117572,7 +118387,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117580,10 +118395,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -117592,7 +118407,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117602,10 +118417,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -117614,7 +118429,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117631,15 +118446,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6111: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:6111"
+$as_echo "$at_srcdir/system-traffic.at:6155: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:6155"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6111"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6155"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117653,14 +118468,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6113" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6157" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6115: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6159: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6115"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6159"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -117671,7 +118486,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6115"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6159"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117680,10 +118495,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6119: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6163: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6119"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6163"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -117694,7 +118509,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6119"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6163"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117703,11 +118518,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6167: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6123"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -117717,22 +118532,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6167"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117740,15 +118555,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117761,18 +118576,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6123" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6167" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6167"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117780,15 +118595,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117801,18 +118616,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6123" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6167" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: :; "
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: :; "
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117824,13 +118639,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_127
-#AT_START_128
-at_fn_group_banner 128 'system-traffic.at:6129' \
+#AT_STOP_128
+#AT_START_129
+at_fn_group_banner 129 'system-traffic.at:6173' \
   "nsh - encap header" "                             " 7
 at_xfail=no
 (
-  $as_echo "128. $at_setup_line: testing $at_desc ..."
+  $as_echo "129. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -117843,42 +118658,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6130" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6174" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6174"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6174"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6174: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6174"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -117887,37 +118702,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -117925,7 +118740,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6174: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -117938,7 +118753,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6174"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -117957,7 +118772,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117971,18 +118786,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6130" "while ip link show br0"
+ovs_wait "system-traffic.at:6174" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -117995,15 +118810,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6132: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6132"
+$as_echo "$at_srcdir/system-traffic.at:6176: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6176"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118019,15 +118834,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6132: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6132"
+$as_echo "$at_srcdir/system-traffic.at:6176: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6176"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118043,45 +118858,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ethtool -K p0 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ethtool -K p0 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ethtool -K p0 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118090,39 +118905,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6178: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -118130,17 +118945,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -118149,7 +118964,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118157,10 +118972,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -118169,7 +118984,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118178,10 +118993,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -118190,7 +119005,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118200,10 +119015,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -118212,7 +119027,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118224,45 +119039,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ethtool -K p1 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ethtool -K p1 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ethtool -K p1 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118271,39 +119086,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6179: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -118311,17 +119126,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -118330,7 +119145,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118338,10 +119153,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -118350,7 +119165,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118359,10 +119174,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -118371,7 +119186,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118381,10 +119196,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -118393,7 +119208,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118406,15 +119221,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6139: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6139"
+$as_echo "$at_srcdir/system-traffic.at:6183: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6183"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6183"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118422,10 +119237,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6185: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6185"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -118434,7 +119249,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6185"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118444,10 +119259,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6191: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6191"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -118456,7 +119271,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6191"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118471,7 +119286,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6150" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0fc6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6194" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0fc6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000" 2>&1 1>/dev/null
@@ -118480,7 +119295,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6151" "until cat p1.pcap | egrep \"0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6195" "until cat p1.pcap | egrep \"0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -118489,7 +119304,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6152" "until cat p1.pcap | egrep \"0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6196" "until cat p1.pcap | egrep \"0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -118498,7 +119313,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6153" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6197" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -118507,7 +119322,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6154" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6198" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -118516,15 +119331,15 @@
     :
 
 }
-ovs_wait "system-traffic.at:6155" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6199" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6201: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6157"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6201"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -118534,22 +119349,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6201"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118557,15 +119372,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118578,18 +119393,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6157" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6201" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6201"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118597,15 +119412,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118618,18 +119433,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6157" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6201" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: :; "
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: :; "
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118641,13 +119456,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_128
-#AT_START_129
-at_fn_group_banner 129 'system-traffic.at:6161' \
+#AT_STOP_129
+#AT_START_130
+at_fn_group_banner 130 'system-traffic.at:6205' \
   "nsh - decap header" "                             " 7
 at_xfail=no
 (
-  $as_echo "129. $at_setup_line: testing $at_desc ..."
+  $as_echo "130. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -118660,42 +119475,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6162" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6206" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6206"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6206"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6206: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6162"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6206"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -118704,37 +119519,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -118742,7 +119557,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6206: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -118755,7 +119570,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6162"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6206"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -118774,7 +119589,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118788,18 +119603,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6162" "while ip link show br0"
+ovs_wait "system-traffic.at:6206" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118812,15 +119627,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6164: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6164"
+$as_echo "$at_srcdir/system-traffic.at:6208: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6208"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6164"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118836,15 +119651,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6164: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6164"
+$as_echo "$at_srcdir/system-traffic.at:6208: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6208"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6164"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118860,45 +119675,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ethtool -K p0 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ethtool -K p0 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ethtool -K p0 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118907,39 +119722,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6210: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -118947,17 +119762,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -118966,7 +119781,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118974,10 +119789,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -118986,7 +119801,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -118995,10 +119810,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -119007,7 +119822,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119017,10 +119832,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -119029,7 +119844,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119041,45 +119856,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ethtool -K p1 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ethtool -K p1 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ethtool -K p1 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119088,39 +119903,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6211: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -119128,17 +119943,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -119147,7 +119962,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119155,10 +119970,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -119167,7 +119982,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119176,10 +119991,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -119188,7 +120003,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119198,10 +120013,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -119210,7 +120025,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119223,15 +120038,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6171: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6171"
+$as_echo "$at_srcdir/system-traffic.at:6215: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6215"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6171"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6215"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119239,10 +120054,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6173: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6217: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6173"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6217"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -119251,7 +120066,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6173"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6217"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119261,10 +120076,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6223: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 00 64 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6223"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 00 64 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -119273,7 +120088,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6223"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119288,7 +120103,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6182" "until cat p1.pcap | egrep \"0x0000: *f200 *0000 *0002 *f200 *0000 *0001 *0800 *4500\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6226" "until cat p1.pcap | egrep \"0x0000: *f200 *0000 *0002 *f200 *0000 *0001 *0800 *4500\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00" 2>&1 1>/dev/null
@@ -119297,7 +120112,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6183" "until cat p1.pcap | egrep \"0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6227" "until cat p1.pcap | egrep \"0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002" 2>&1 1>/dev/null
@@ -119306,7 +120121,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6184" "until cat p1.pcap | egrep \"0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6228" "until cat p1.pcap | egrep \"0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -119315,15 +120130,15 @@
     :
 
 }
-ovs_wait "system-traffic.at:6185" "until cat p1.pcap | egrep \"0x0030: *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6229" "until cat p1.pcap | egrep \"0x0030: *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6231: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6187"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -119333,22 +120148,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6231"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119356,15 +120171,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119377,18 +120192,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6187" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6231" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6231"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119396,15 +120211,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119417,18 +120232,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6187" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6231" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: :; "
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: :; "
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119440,13 +120255,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_129
-#AT_START_130
-at_fn_group_banner 130 'system-traffic.at:6191' \
+#AT_STOP_130
+#AT_START_131
+at_fn_group_banner 131 'system-traffic.at:6235' \
   "nsh - replace header" "                           " 7
 at_xfail=no
 (
-  $as_echo "130. $at_setup_line: testing $at_desc ..."
+  $as_echo "131. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -119459,42 +120274,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6192" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6236" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6236"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6236"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6236: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6192"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6236"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -119503,37 +120318,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -119541,7 +120356,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6236: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -119554,7 +120369,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6192"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6236"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -119573,7 +120388,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119587,18 +120402,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6192" "while ip link show br0"
+ovs_wait "system-traffic.at:6236" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119611,15 +120426,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6194: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6194"
+$as_echo "$at_srcdir/system-traffic.at:6238: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6238"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6194"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119635,15 +120450,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6194: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6194"
+$as_echo "$at_srcdir/system-traffic.at:6238: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6238"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6194"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119659,45 +120474,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ethtool -K p0 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ethtool -K p0 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ethtool -K p0 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119706,39 +120521,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6240: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -119746,17 +120561,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -119765,7 +120580,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119773,10 +120588,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -119785,7 +120600,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119794,10 +120609,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -119806,7 +120621,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119816,10 +120631,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -119828,7 +120643,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119840,45 +120655,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ethtool -K p1 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ethtool -K p1 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ethtool -K p1 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119887,39 +120702,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6241: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -119927,17 +120742,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -119946,7 +120761,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119954,10 +120769,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -119966,7 +120781,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119975,10 +120790,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -119987,7 +120802,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -119997,10 +120812,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -120009,7 +120824,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120022,15 +120837,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6203: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6203"
+$as_echo "$at_srcdir/system-traffic.at:6247: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6247"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6203"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6247"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120038,10 +120853,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6205: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6249: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6205"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6249"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -120050,7 +120865,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6249"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120060,10 +120875,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6212: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6256: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6212"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6256"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -120072,7 +120887,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6212"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6256"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120087,7 +120902,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6215" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000* 0001 *894f *01c6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6259" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000* 0001 *894f *01c6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807" 2>&1 1>/dev/null
@@ -120096,7 +120911,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6216" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6260" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -120105,7 +120920,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6217" "until cat p1.pcap | egrep \"0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6261" "until cat p1.pcap | egrep \"0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -120114,7 +120929,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6218" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6262" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -120123,7 +120938,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6219" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6263" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -120132,15 +120947,15 @@
     :
 
 }
-ovs_wait "system-traffic.at:6220" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6264" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6266: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6222"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6266"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -120150,22 +120965,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6266"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120173,15 +120988,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120194,18 +121009,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6222" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6266" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6266"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120213,15 +121028,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120234,18 +121049,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6222" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6266" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: :; "
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: :; "
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120257,13 +121072,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_130
-#AT_START_131
-at_fn_group_banner 131 'system-traffic.at:6226' \
+#AT_STOP_131
+#AT_START_132
+at_fn_group_banner 132 'system-traffic.at:6270' \
   "nsh - forward" "                                  " 7
 at_xfail=no
 (
-  $as_echo "131. $at_setup_line: testing $at_desc ..."
+  $as_echo "132. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -120276,42 +121091,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6227" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6271" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6271"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6271"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6271: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6271"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -120320,37 +121135,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -120358,7 +121173,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6271: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -120371,7 +121186,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6271"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -120390,7 +121205,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120404,18 +121219,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6227" "while ip link show br0"
+ovs_wait "system-traffic.at:6271" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120428,15 +121243,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120452,15 +121267,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120476,15 +121291,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns2 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns2 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns2 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120500,45 +121315,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ethtool -K p0 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ethtool -K p0 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ethtool -K p0 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120547,39 +121362,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6275: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -120587,17 +121402,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -120606,7 +121421,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120614,10 +121429,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -120626,7 +121441,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120635,10 +121450,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -120647,7 +121462,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120657,10 +121472,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -120669,7 +121484,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120681,45 +121496,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ethtool -K p1 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ethtool -K p1 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ethtool -K p1 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120728,39 +121543,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6276: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -120768,17 +121583,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -120787,7 +121602,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120795,10 +121610,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -120807,7 +121622,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120816,10 +121631,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -120828,7 +121643,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120838,10 +121653,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -120850,7 +121665,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120862,45 +121677,45 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link add p2 type veth peer name ovs-p2 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link add p2 type veth peer name ovs-p2 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link add p2 type veth peer name ovs-p2 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ethtool -K p2 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ethtool -K p2 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ethtool -K p2 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
      { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ethtool -K p2 txvlan off"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ethtool -K p2 txvlan off"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ethtool -K p2 txvlan off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120909,39 +121724,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link set p2 netns at_ns2"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link set p2 netns at_ns2"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link set p2 netns at_ns2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ovs-vsctl add-port br0 ovs-p2 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6277: ovs-vsctl add-port br0 ovs-p2 -- \\
                 set interface ovs-p2 external-ids:iface-id=\"p2\" type=\"afxdp\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2 -- \
                 set interface ovs-p2 external-ids:iface-id="p2" type="afxdp"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -120949,17 +121764,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p2
 NS_EXEC_HEREDOC
@@ -120968,7 +121783,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120976,10 +121791,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 up
 NS_EXEC_HEREDOC
@@ -120988,7 +121803,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120997,10 +121812,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 address
 NS_EXEC_HEREDOC
@@ -121009,7 +121824,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121019,10 +121834,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -121031,7 +121846,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121044,30 +121859,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6238: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6238"
+$as_echo "$at_srcdir/system-traffic.at:6282: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6282"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6282"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6239: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2\""
-at_fn_check_prepare_trace "system-traffic.at:6239"
+$as_echo "$at_srcdir/system-traffic.at:6283: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2\""
+at_fn_check_prepare_trace "system-traffic.at:6283"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6239"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6283"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121075,10 +121890,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6285: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6285"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -121087,7 +121902,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6285"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121095,10 +121910,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6242: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6286: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p2 > p2.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6242"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6286"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p2 > p2.pcap &
 NS_EXEC_HEREDOC
@@ -121107,7 +121922,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6242"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6286"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121117,10 +121932,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6246: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6290: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 02 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6246"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6290"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 02 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -121129,7 +121944,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6246"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6290"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121144,7 +121959,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6249" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0206\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6293" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0206\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a" 2>&1 1>/dev/null
@@ -121153,7 +121968,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6250" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6294" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -121162,7 +121977,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6251" "until cat p1.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6295" "until cat p1.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -121171,7 +121986,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6252" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6296" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -121180,7 +121995,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6253" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6297" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -121189,14 +122004,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6254" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6298" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6257: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6301: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p1 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 01 c6 01 03 00 01 00 01 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6257"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6301"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p1 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 01 c6 01 03 00 01 00 01 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -121205,7 +122020,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6257"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121220,7 +122035,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6260" "until cat p2.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *01c6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6304" "until cat p2.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *01c6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a" 2>&1 1>/dev/null
@@ -121229,7 +122044,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6261" "until cat p2.pcap | egrep \"0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6305" "until cat p2.pcap | egrep \"0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -121238,7 +122053,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6262" "until cat p2.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6306" "until cat p2.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -121247,7 +122062,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6263" "until cat p2.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6307" "until cat p2.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -121256,7 +122071,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6264" "until cat p2.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6308" "until cat p2.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -121265,15 +122080,15 @@
     :
 
 }
-ovs_wait "system-traffic.at:6265" "until cat p2.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6309" "until cat p2.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6311: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6267"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6311"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -121283,22 +122098,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6311"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121306,15 +122121,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121327,18 +122142,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6267" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6311" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6311"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121346,15 +122161,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121367,18 +122182,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6267" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6311" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: :; "
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: :; "
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121390,4 +122205,4 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_131
+#AT_STOP_132
diff -Nru openvswitch-2.13.1/tests/system-common-macros.at openvswitch-2.13.3/tests/system-common-macros.at
--- openvswitch-2.13.1/tests/system-common-macros.at	2020-08-04 21:41:31.995524451 +0000
+++ openvswitch-2.13.3/tests/system-common-macros.at	2021-02-10 20:04:59.568074628 +0000
@@ -275,6 +275,12 @@
    ]
 )
 
+# OFPROTO_CLEAR_DURATION_IDLE([])
+#
+# Clear the duration from the piped input which would differ from test to test
+#
+m4_define([OFPROTO_CLEAR_DURATION_IDLE], [[sed -e 's/duration=.*s,/duration=<cleared>,/g' -e 's/idle_age=[0-9]*,/idle_age=<cleared>,/g']])
+
 # OVS_CHECK_VXLAN()
 #
 # Do basic check for vxlan functionality, skip the test if it's not there.
diff -Nru openvswitch-2.13.1/tests/system-dpdk-testsuite openvswitch-2.13.3/tests/system-dpdk-testsuite
--- openvswitch-2.13.1/tests/system-dpdk-testsuite	2020-08-04 21:42:10.518524451 +0000
+++ openvswitch-2.13.3/tests/system-dpdk-testsuite	2021-02-10 20:05:35.250074628 +0000
@@ -921,7 +921,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.13.1 test suite test groups:
+openvswitch 2.13.3 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -962,7 +962,7 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.13.1)" &&
+  $as_echo "$as_me (openvswitch 2.13.3)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1156,11 +1156,11 @@
 
 # Banners and logs.
 $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
 {
   $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
   echo
 
@@ -2460,7 +2460,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <bugs@openvswitch.org>
-   Subject: [openvswitch 2.13.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.13.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
diff -Nru openvswitch-2.13.1/tests/system-kmod-testsuite openvswitch-2.13.3/tests/system-kmod-testsuite
--- openvswitch-2.13.1/tests/system-kmod-testsuite	2020-08-04 21:42:06.433524451 +0000
+++ openvswitch-2.13.3/tests/system-kmod-testsuite	2021-02-10 20:05:30.961074628 +0000
@@ -726,20 +726,21 @@
 119;system-traffic.at:5662;conntrack - DNAT load balancing with NC;;
 120;system-traffic.at:5750;conntrack - floating IP;;
 121;system-traffic.at:5823;conntrack - negative test for recirculation optimization;;
-122;system-traffic.at:5888;802.1ad - vlan_limit;;
-123;system-traffic.at:5917;802.1ad - push/pop outer 802.1ad;;
-124;system-traffic.at:5973;802.1ad - push/pop outer 802.1q;;
-125;system-traffic.at:6029;802.1ad - 802.1q tunnel;;
-126;system-traffic.at:6091;802.1ad - double vlan match;;
-127;system-traffic.at:6129;nsh - encap header;;
-128;system-traffic.at:6161;nsh - decap header;;
-129;system-traffic.at:6191;nsh - replace header;;
-130;system-traffic.at:6226;nsh - forward;;
-131;system-layer3-tunnels.at:3;layer3 - ping over VXLAN-GPE;;
-132;system-layer3-tunnels.at:52;layer3 - ping over GRE;;
-133;system-layer3-tunnels.at:101;layer3 - use non-local port as tunnel endpoint;;
-134;system-interface.at:5;interface - add delete add same interface;;
-135;system-interface.at:30;interface - add route to br and verify clean-up;;
+122;system-traffic.at:5886;conntrack - Multiple ICMP traverse;;
+123;system-traffic.at:5932;802.1ad - vlan_limit;;
+124;system-traffic.at:5961;802.1ad - push/pop outer 802.1ad;;
+125;system-traffic.at:6017;802.1ad - push/pop outer 802.1q;;
+126;system-traffic.at:6073;802.1ad - 802.1q tunnel;;
+127;system-traffic.at:6135;802.1ad - double vlan match;;
+128;system-traffic.at:6173;nsh - encap header;;
+129;system-traffic.at:6205;nsh - decap header;;
+130;system-traffic.at:6235;nsh - replace header;;
+131;system-traffic.at:6270;nsh - forward;;
+132;system-layer3-tunnels.at:3;layer3 - ping over VXLAN-GPE;;
+133;system-layer3-tunnels.at:52;layer3 - ping over GRE;;
+134;system-layer3-tunnels.at:101;layer3 - use non-local port as tunnel endpoint;;
+135;system-interface.at:5;interface - add delete add same interface;;
+136;system-interface.at:30;interface - add route to br and verify clean-up;;
 "
 # List of the all the test groups.
 at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -753,7 +754,7 @@
   for at_grp
   do
     eval at_value=\$$at_grp
-    if test $at_value -lt 1 || test $at_value -gt 135; then
+    if test $at_value -lt 1 || test $at_value -gt 136; then
       $as_echo "invalid test group: $at_value" >&2
       exit 1
     fi
@@ -1051,7 +1052,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.13.1 test suite test groups:
+openvswitch 2.13.3 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -1092,7 +1093,7 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.13.1)" &&
+  $as_echo "$as_me (openvswitch 2.13.3)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1135,17 +1136,17 @@
 # Banner 4. system-traffic.at:4103
 # Category starts at test group 91.
 at_banner_text_4="conntrack - NAT"
-# Banner 5. system-traffic.at:5886
-# Category starts at test group 122.
+# Banner 5. system-traffic.at:5930
+# Category starts at test group 123.
 at_banner_text_5="802.1ad"
-# Banner 6. system-traffic.at:6127
-# Category starts at test group 127.
+# Banner 6. system-traffic.at:6171
+# Category starts at test group 128.
 at_banner_text_6="nsh-datapath"
 # Banner 7. system-layer3-tunnels.at:1
-# Category starts at test group 131.
+# Category starts at test group 132.
 at_banner_text_7="layer3-tunnels"
 # Banner 8. system-interface.at:1
-# Category starts at test group 134.
+# Category starts at test group 135.
 at_banner_text_8="system-inteface"
 
 # Take any -C into account.
@@ -1307,11 +1308,11 @@
 
 # Banners and logs.
 $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
 {
   $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
   echo
 
@@ -2611,7 +2612,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <bugs@openvswitch.org>
-   Subject: [openvswitch 2.13.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.13.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -104396,8 +104397,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_121
 #AT_START_122
-at_fn_group_banner 122 'system-traffic.at:5888' \
-  "802.1ad - vlan_limit" "                           " 5
+at_fn_group_banner 122 'system-traffic.at:5886' \
+  "conntrack - Multiple ICMP traverse" "             " 4
 at_xfail=no
 (
   $as_echo "122. $at_setup_line: testing $at_desc ..."
@@ -104405,16 +104406,29 @@
 
 ovs_init
 
+modprobe nf_conntrack_ipv4 || echo "Module nf_conntrack_ipv4 not loaded."
+                 on_exit 'modprobe -r nf_conntrack_ipv4'
+                modprobe nf_conntrack_ipv6 || echo "Module nf_conntrack_ipv6 not loaded."
+                 on_exit 'modprobe -r nf_conntrack_ipv6'
+                modprobe nf_nat_ftp || echo "Module nf_nat_ftp not loaded."
+                 on_exit 'modprobe -r nf_nat_ftp'
+                modprobe nf_nat_tftp || echo "Module nf_nat_tftp not loaded."
+                 on_exit 'modprobe -r nf_nat_tftp'
+
+     sysctl -w net.netfilter.nf_conntrack_helper=0
+     on_exit 'ovstest test-netlink-conntrack flush'
+
+
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:5890"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -104434,38 +104448,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5890"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5890"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5890: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5889"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5890"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -104474,37 +104488,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5890"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5890"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -104512,7 +104526,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5890: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -104525,7 +104539,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5889"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5890"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -104544,7 +104558,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -104552,42 +104566,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5889"
-( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:5890"
+( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5890" >"$at_check_line_file"
-(! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5890"
-     $as_echo "system-traffic.at:5890" >"$at_check_line_file"
-(test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5890"
+$as_echo "system-traffic.at:5891" >"$at_check_line_file"
+(! grep -q "Datapath supports ct_clear action" ovs-vswitchd.log) \
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5891"
 
 ip netns del at_ns0
 
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5892: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5892"
+$as_echo "$at_srcdir/system-traffic.at:5893: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5893"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5892"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -104603,15 +104614,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5892: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5892"
+$as_echo "$at_srcdir/system-traffic.at:5893: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5893"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5892"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -104625,7 +104636,6 @@
 
 
 
-
  { set +x
 $as_echo "$at_srcdir/system-traffic.at:5894: ip link add p0 type veth peer name ovs-p0 || return 77"
 at_fn_check_prepare_trace "system-traffic.at:5894"
@@ -104729,14 +104739,14 @@
 $at_traceon; }
 
 
-      if test -n ""; then
+      if test -n ""f0:00:00:01:01:01""; then
          { set +x
 $as_echo "$at_srcdir/system-traffic.at:5894: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0 address
+ip link set dev p0 address \"f0:00:00:01:01:01\"
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5894"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0 address
+ip link set dev p0 address "f0:00:00:01:01:01"
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -104879,14 +104889,14 @@
 $at_traceon; }
 
 
-      if test -n ""; then
+      if test -n ""f0:00:00:01:01:02""; then
          { set +x
 $as_echo "$at_srcdir/system-traffic.at:5895: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1 address
+ip link set dev p1 address \"f0:00:00:01:01:02\"
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5895"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1 address
+ip link set dev p1 address "f0:00:00:01:01:02"
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -104926,12 +104936,769 @@
       on_exit 'ip link del ovs-p1'
 
 
+cat >flows.txt <<'_ATEOF'
+table=0,priority=10  ip,icmp,ct_state=-trk action=ct(zone=1,table=1)
+table=0,priority=0   action=drop
+table=1,priority=10  ct_state=-est+trk+new,ip,ct_zone=1,in_port=1 action=ct(commit,table=2)
+table=1,priority=10  ct_state=+est-new+trk,ct_zone=1,in_port=1 action=resubmit(,2)
+table=1,priority=0   action=drop
+table=2,priority=10  ct_state=+trk+new,in_port=1 action=drop
+table=2,priority=10  ct_state=+trk+est action=drop
+_ATEOF
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5907: ovs-ofctl --bundle add-flows br0 flows.txt"
+at_fn_check_prepare_trace "system-traffic.at:5907"
+( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows.txt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5907"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+# sending icmp pkts, first and second
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5910: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+\$PYTHON3 \$srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5910"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5910"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5912: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+\$PYTHON3 \$srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5912"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5912"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+sleep 1
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5917: ovs-appctl dpctl/dump-conntrack | grep \"dst=10.1.1\" | sed -e 's/port=[0-9]*/port=<cleared>/g' -e 's/id=[0-9]*/id=<cleared>/g' -e 's/state=[0-9_A-Z]*/state=<cleared>/g' | sort | uniq"
+at_fn_check_prepare_notrace 'a shell pipeline' "system-traffic.at:5917"
+( $at_check_trace; ovs-appctl dpctl/dump-conntrack | grep "dst=10.1.1" | sed -e 's/port=[0-9]*/port=<cleared>/g' -e 's/id=[0-9]*/id=<cleared>/g' -e 's/state=[0-9_A-Z]*/state=<cleared>/g' | sort | uniq
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=<cleared>,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=<cleared>,type=0,code=0)
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5917"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5921: ovs-ofctl dump-flows br0 | grep table=2, | sed -e 's/duration=.*s,/duration=<cleared>,/g' -e 's/idle_age=[0-9]*,/idle_age=<cleared>,/g'"
+at_fn_check_prepare_notrace 'a shell pipeline' "system-traffic.at:5921"
+( $at_check_trace; ovs-ofctl dump-flows br0 | grep table=2, | sed -e 's/duration=.*s,/duration=<cleared>,/g' -e 's/idle_age=[0-9]*,/idle_age=<cleared>,/g'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo " cookie=0x0, duration=<cleared>, table=2, n_packets=2, n_bytes=84, idle_age=<cleared>, priority=10,ct_state=+new+trk,in_port=1 actions=drop
+ cookie=0x0, duration=<cleared>, table=2, n_packets=0, n_bytes=0, idle_age=<cleared>, priority=10,ct_state=+est+trk actions=drop
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5921"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:5927"
+( $at_check_trace; check_logs
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5927"
+( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:5927"
+( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5927" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5927"
+( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:5927"
+( $at_check_trace; ovs-appctl -t ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5927" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5927: :; "
+at_fn_check_prepare_trace "system-traffic.at:5927"
+( $at_check_trace; :;
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_122
+#AT_START_123
+at_fn_group_banner 123 'system-traffic.at:5932' \
+  "802.1ad - vlan_limit" "                           " 5
+at_xfail=no
+(
+  $as_echo "123. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:5933"
+( $at_check_trace; modprobe openvswitch
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   on_exit 'modprobe -r openvswitch'
+   modprobe -q vport_geneve || echo "Module vport_geneve not loaded."
+               on_exit 'modprobe -q -r vport_geneve'
+              modprobe -q vport_gre || echo "Module vport_gre not loaded."
+               on_exit 'modprobe -q -r vport_gre'
+              modprobe -q vport_lisp || echo "Module vport_lisp not loaded."
+               on_exit 'modprobe -q -r vport_lisp'
+              modprobe -q vport_stt || echo "Module vport_stt not loaded."
+               on_exit 'modprobe -q -r vport_stt'
+              modprobe -q vport_vxlan || echo "Module vport_vxlan not loaded."
+               on_exit 'modprobe -q -r vport_vxlan'
+
+   on_exit 'ovs-dpctl del-dp ovs-system'
+   on_exit 'ovs-appctl dpctl/flush-conntrack'
+      touch .conf.db.~lock~
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5933"
+( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5933"
+( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   on_exit "kill `cat ovsdb-server.pid`"
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5933"
+( $at_check_trace; sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5933"
+( $at_check_trace; ovs-vsctl --no-wait init
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5933"
+( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+   on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5933"
+( $at_check_trace; sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:5933"
+( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+$as_echo "system-traffic.at:5934" >"$at_check_line_file"
+(! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5934"
+     $as_echo "system-traffic.at:5934" >"$at_check_line_file"
+(test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5934"
+
+ip netns del at_ns0
+
+
+
+                { set +x
+$as_echo "$at_srcdir/system-traffic.at:5936: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5936"
+( $at_check_trace; ip netns add at_ns0 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+                on_exit 'ip netns del at_ns0
+
+
+'
+                ip netns exec at_ns0 sysctl -w net.netfilter.nf_conntrack_helper=0
+               ip netns del at_ns1
+
+
+
+                { set +x
+$as_echo "$at_srcdir/system-traffic.at:5936: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5936"
+( $at_check_trace; ip netns add at_ns1 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+                on_exit 'ip netns del at_ns1
+
+
+'
+                ip netns exec at_ns1 sysctl -w net.netfilter.nf_conntrack_helper=0
+
+
+
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link set p0 netns at_ns0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link set dev ovs-p0 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ovs-vsctl add-port br0 ovs-p0 -- \\
+                set interface ovs-p0 external-ids:iface-id=\"p0\""
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
+                set interface ovs-p0 external-ids:iface-id="p0"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add \"10.1.1.1/24\" dev p0
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add "10.1.1.1/24" dev p0
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 up
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 address
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 address
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      on_exit 'ip link del ovs-p0'
+
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5939"
+( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:5939"
+( $at_check_trace; ip link set p1 netns at_ns1
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:5939"
+( $at_check_trace; ip link set dev ovs-p1 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ovs-vsctl add-port br0 ovs-p1 -- \\
+                set interface ovs-p1 external-ids:iface-id=\"p1\""
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
+                set interface ovs-p1 external-ids:iface-id="p1"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add \"10.1.1.2/24\" dev p1
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add "10.1.1.2/24" dev p1
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 up
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 address
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 address
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      on_exit 'ip link del ovs-p1'
+
+
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -104940,7 +105707,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -104948,10 +105715,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC
@@ -104960,7 +105727,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -104968,10 +105735,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 \"10.255.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 "10.255.2.1/24"
 NS_EXEC_HEREDOC
@@ -104980,7 +105747,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -104988,10 +105755,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -105000,7 +105767,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105010,10 +105777,10 @@
 
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -105022,7 +105789,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105030,10 +105797,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC
@@ -105042,7 +105809,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105050,10 +105817,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 \"10.255.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 "10.255.2.2/24"
 NS_EXEC_HEREDOC
@@ -105062,7 +105829,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105070,10 +105837,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -105082,7 +105849,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105093,10 +105860,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -105105,7 +105872,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105113,10 +105880,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC
@@ -105125,7 +105892,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105133,10 +105900,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -105145,7 +105912,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105155,10 +105922,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -105167,7 +105934,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105177,10 +105944,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -105189,7 +105956,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105197,10 +105964,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC
@@ -105209,7 +105976,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105217,10 +105984,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -105229,7 +105996,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105239,10 +106006,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -105251,7 +106018,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105262,15 +106029,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5903: ovs-ofctl add-flow br0 \"priority=1 action=normal\""
-at_fn_check_prepare_trace "system-traffic.at:5903"
+$as_echo "$at_srcdir/system-traffic.at:5947: ovs-ofctl add-flow br0 \"priority=1 action=normal\""
+at_fn_check_prepare_trace "system-traffic.at:5947"
 ( $at_check_trace; ovs-ofctl add-flow br0 "priority=1 action=normal"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5903"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5947"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105284,59 +106051,59 @@
     :
 
 }
-ovs_wait "system-traffic.at:5905" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:5949" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5908: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "system-traffic.at:5908"
+$as_echo "$at_srcdir/system-traffic.at:5952: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "system-traffic.at:5952"
 ( $at_check_trace; ovs-appctl revalidator/purge
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5908"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5952"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5909: ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1"
-at_fn_check_prepare_trace "system-traffic.at:5909"
+$as_echo "$at_srcdir/system-traffic.at:5953: ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1"
+at_fn_check_prepare_trace "system-traffic.at:5953"
 ( $at_check_trace; ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5909"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5953"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5910: ovs-ofctl add-flow br0 \"priority=100 dl_type=0x8100 action=drop\""
-at_fn_check_prepare_trace "system-traffic.at:5910"
+$as_echo "$at_srcdir/system-traffic.at:5954: ovs-ofctl add-flow br0 \"priority=100 dl_type=0x8100 action=drop\""
+at_fn_check_prepare_trace "system-traffic.at:5954"
 ( $at_check_trace; ovs-ofctl add-flow br0 "priority=100 dl_type=0x8100 action=drop"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5910"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5954"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5911: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5955: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.2.2.2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5911"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5955"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.2.2.2
 NS_EXEC_HEREDOC
@@ -105345,7 +106112,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:5911"
+at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:5955"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105354,30 +106121,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: check_logs "
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:5957"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5957"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105385,15 +106152,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:5957"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105406,18 +106173,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5913" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:5957" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5957"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105425,15 +106192,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:5957"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105446,18 +106213,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5913" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:5957" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: :; "
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5957: :; "
+at_fn_check_prepare_trace "system-traffic.at:5957"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105469,27 +106236,27 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_122
-#AT_START_123
-at_fn_group_banner 123 'system-traffic.at:5917' \
+#AT_STOP_123
+#AT_START_124
+at_fn_group_banner 124 'system-traffic.at:5961' \
   "802.1ad - push/pop outer 802.1ad" "               " 5
 at_xfail=no
 (
-  $as_echo "123. $at_setup_line: testing $at_desc ..."
+  $as_echo "124. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:5962"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -105509,38 +106276,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5962"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5962"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5962: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5918"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5962"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -105549,37 +106316,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5962"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5962"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -105587,7 +106354,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5962: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -105600,7 +106367,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5918"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5962"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -105619,7 +106386,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105627,27 +106394,27 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:5962"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5919" >"$at_check_line_file"
+$as_echo "system-traffic.at:5963" >"$at_check_line_file"
 (! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5919"
-     $as_echo "system-traffic.at:5919" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5963"
+     $as_echo "system-traffic.at:5963" >"$at_check_line_file"
 (test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5919"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5963"
 
 ovs-vsctl add-br br1 -- set Bridge br1 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ovs-vsctl add-br br2 -- set Bridge br2 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
@@ -105656,15 +106423,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5923: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5923"
+$as_echo "$at_srcdir/system-traffic.at:5967: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5967"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5923"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5967"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105680,15 +106447,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5923: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5923"
+$as_echo "$at_srcdir/system-traffic.at:5967: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5967"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5923"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5967"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105704,75 +106471,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5925: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5925"
+$as_echo "$at_srcdir/system-traffic.at:5969: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:5969"
 ( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5925"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5926: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:5926"
+$as_echo "$at_srcdir/system-traffic.at:5970: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:5970"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5926"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5970"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5927: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:5927"
+$as_echo "$at_srcdir/system-traffic.at:5971: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:5971"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5971"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5928: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:5928"
+$as_echo "$at_srcdir/system-traffic.at:5972: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:5972"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5928"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5972"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5929: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5929"
+$as_echo "$at_srcdir/system-traffic.at:5973: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:5973"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5929"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5973"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105781,75 +106548,75 @@
 on_exit 'ip link del ovs-p0'
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5932: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5932"
+$as_echo "$at_srcdir/system-traffic.at:5976: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:5976"
 ( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5932"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5976"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5933: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:5933"
+$as_echo "$at_srcdir/system-traffic.at:5977: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:5977"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5977"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5934: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:5934"
+$as_echo "$at_srcdir/system-traffic.at:5978: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:5978"
 ( $at_check_trace; ip link set dev ovs-p3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5934"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5978"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5935: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:5935"
+$as_echo "$at_srcdir/system-traffic.at:5979: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:5979"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5935"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5936: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5936"
+$as_echo "$at_srcdir/system-traffic.at:5980: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:5980"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5980"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105858,15 +106625,15 @@
 on_exit 'ip link del ovs-p2'
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link add p4 type veth peer name ovs-p4 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5939"
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5983"
 ( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105874,39 +106641,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link set p4 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:5939"
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:5983"
 ( $at_check_trace; ip link set p4 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link set dev ovs-p4 up"
-at_fn_check_prepare_trace "system-traffic.at:5939"
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:5983"
 ( $at_check_trace; ip link set dev ovs-p4 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ovs-vsctl add-port br1 ovs-p4 -- \\
+$as_echo "$at_srcdir/system-traffic.at:5983: ovs-vsctl add-port br1 ovs-p4 -- \\
                 set interface ovs-p4 external-ids:iface-id=\"p4\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
                 set interface ovs-p4 external-ids:iface-id="p4"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -105914,17 +106681,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p4
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p4
 NS_EXEC_HEREDOC
@@ -105933,7 +106700,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105941,10 +106708,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC
@@ -105953,7 +106720,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105962,10 +106729,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC
@@ -105974,7 +106741,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -105984,10 +106751,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -105996,7 +106763,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5939"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106008,15 +106775,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106024,39 +106791,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:5984: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -106064,17 +106831,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -106083,7 +106850,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106091,10 +106858,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -106103,7 +106870,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106112,10 +106879,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -106124,7 +106891,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106134,10 +106901,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -106146,7 +106913,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106158,10 +106925,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -106170,7 +106937,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106178,10 +106945,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -106190,7 +106957,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106198,10 +106965,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -106210,7 +106977,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106220,10 +106987,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -106232,7 +106999,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106242,10 +107009,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -106254,7 +107021,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106262,10 +107029,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -106274,7 +107041,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106282,10 +107049,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -106294,7 +107061,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106304,10 +107071,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -106316,7 +107083,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106340,45 +107107,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5955: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:5955"
+$as_echo "$at_srcdir/system-traffic.at:5999: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:5999"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5955"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5999"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5956: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:5956"
+$as_echo "$at_srcdir/system-traffic.at:6000: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6000"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br1 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5956"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5957: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:5957"
+$as_echo "$at_srcdir/system-traffic.at:6001: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6001"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br2 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6001"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106392,14 +107159,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:5959" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6003" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5961: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6005: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5961"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6005"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -106410,7 +107177,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5961"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6005"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106419,10 +107186,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5965: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6009: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5965"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6009"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -106433,7 +107200,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5965"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6009"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106442,30 +107209,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: check_logs "
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6013"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106473,15 +107240,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106494,18 +107261,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5969" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6013" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6013"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106513,15 +107280,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106534,18 +107301,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5969" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6013" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: :; "
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: :; "
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106557,27 +107324,27 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_123
-#AT_START_124
-at_fn_group_banner 124 'system-traffic.at:5973' \
+#AT_STOP_124
+#AT_START_125
+at_fn_group_banner 125 'system-traffic.at:6017' \
   "802.1ad - push/pop outer 802.1q" "                " 5
 at_xfail=no
 (
-  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $as_echo "125. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -106597,38 +107364,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6018"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6018"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6018: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5974"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6018"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -106637,37 +107404,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -106675,7 +107442,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6018: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -106688,7 +107455,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5974"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6018"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -106707,7 +107474,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106715,27 +107482,27 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5975" >"$at_check_line_file"
+$as_echo "system-traffic.at:6019" >"$at_check_line_file"
 (! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5975"
-     $as_echo "system-traffic.at:5975" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6019"
+     $as_echo "system-traffic.at:6019" >"$at_check_line_file"
 (test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5975"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6019"
 
 ovs-vsctl add-br br1 -- set Bridge br1 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ovs-vsctl add-br br2 -- set Bridge br2 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
@@ -106744,15 +107511,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5979: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5979"
+$as_echo "$at_srcdir/system-traffic.at:6023: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6023"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106768,15 +107535,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5979: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5979"
+$as_echo "$at_srcdir/system-traffic.at:6023: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6023"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106792,75 +107559,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5981: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5981"
+$as_echo "$at_srcdir/system-traffic.at:6025: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6025"
 ( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5981"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5982: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:5982"
+$as_echo "$at_srcdir/system-traffic.at:6026: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6026"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5982"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5983: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:5983"
+$as_echo "$at_srcdir/system-traffic.at:6027: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6027"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6027"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5984: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:5984"
+$as_echo "$at_srcdir/system-traffic.at:6028: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:6028"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6028"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5985: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5985"
+$as_echo "$at_srcdir/system-traffic.at:6029: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6029"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106869,75 +107636,75 @@
 on_exit 'ip link del ovs-p0'
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5988: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5988"
+$as_echo "$at_srcdir/system-traffic.at:6032: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6032"
 ( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5989: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:5989"
+$as_echo "$at_srcdir/system-traffic.at:6033: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6033"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5989"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6033"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5990: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:5990"
+$as_echo "$at_srcdir/system-traffic.at:6034: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:6034"
 ( $at_check_trace; ip link set dev ovs-p3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5990"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6034"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5991: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:5991"
+$as_echo "$at_srcdir/system-traffic.at:6035: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:6035"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5991"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5992: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5992"
+$as_echo "$at_srcdir/system-traffic.at:6036: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6036"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5992"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6036"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106946,15 +107713,15 @@
 on_exit 'ip link del ovs-p2'
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link add p4 type veth peer name ovs-p4 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -106962,39 +107729,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link set p4 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link set p4 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link set dev ovs-p4 up"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link set dev ovs-p4 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ovs-vsctl add-port br1 ovs-p4 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6039: ovs-vsctl add-port br1 ovs-p4 -- \\
                 set interface ovs-p4 external-ids:iface-id=\"p4\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
                 set interface ovs-p4 external-ids:iface-id="p4"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -107002,17 +107769,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p4
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p4
 NS_EXEC_HEREDOC
@@ -107021,7 +107788,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107029,10 +107796,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC
@@ -107041,7 +107808,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107050,10 +107817,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC
@@ -107062,7 +107829,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107072,10 +107839,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -107084,7 +107851,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107096,15 +107863,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107112,39 +107879,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6040: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -107152,17 +107919,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -107171,7 +107938,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107179,10 +107946,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -107191,7 +107958,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107200,10 +107967,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -107212,7 +107979,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107222,10 +107989,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -107234,7 +108001,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107246,10 +108013,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -107258,7 +108025,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107266,10 +108033,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -107278,7 +108045,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107286,10 +108053,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -107298,7 +108065,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107308,10 +108075,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -107320,7 +108087,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107330,10 +108097,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -107342,7 +108109,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107350,10 +108117,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -107362,7 +108129,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107370,10 +108137,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -107382,7 +108149,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107392,10 +108159,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -107404,7 +108171,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107428,45 +108195,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6011: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:6011"
+$as_echo "$at_srcdir/system-traffic.at:6055: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:6055"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6012: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:6012"
+$as_echo "$at_srcdir/system-traffic.at:6056: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6056"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br1 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6012"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6013: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:6013"
+$as_echo "$at_srcdir/system-traffic.at:6057: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6057"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br2 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107480,14 +108247,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6015" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6059" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6017: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6061: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6017"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6061"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -107498,7 +108265,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6017"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6061"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107507,10 +108274,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6021: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6065: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6021"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6065"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -107521,7 +108288,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6021"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6065"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107530,30 +108297,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: check_logs "
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6069"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107561,15 +108328,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107582,18 +108349,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6025" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6069" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6069"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107601,15 +108368,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107622,18 +108389,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6025" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6069" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: :; "
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: :; "
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107645,27 +108412,27 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_124
-#AT_START_125
-at_fn_group_banner 125 'system-traffic.at:6029' \
+#AT_STOP_125
+#AT_START_126
+at_fn_group_banner 126 'system-traffic.at:6073' \
   "802.1ad - 802.1q tunnel" "                        " 5
 at_xfail=no
 (
-  $as_echo "125. $at_setup_line: testing $at_desc ..."
+  $as_echo "126. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -107685,38 +108452,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6074"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6074"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6074: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6030"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6074"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -107725,37 +108492,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -107763,7 +108530,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6074: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -107776,7 +108543,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6030"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6074"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -107795,7 +108562,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107803,27 +108570,27 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:6031" >"$at_check_line_file"
+$as_echo "system-traffic.at:6075" >"$at_check_line_file"
 (! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6031"
-     $as_echo "system-traffic.at:6031" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6075"
+     $as_echo "system-traffic.at:6075" >"$at_check_line_file"
 (test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6031"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6075"
 
 ovs-vsctl add-br br1 -- set Bridge br1 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ovs-vsctl add-br br2 -- set Bridge br2 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
@@ -107832,15 +108599,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6035: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6035"
+$as_echo "$at_srcdir/system-traffic.at:6079: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6079"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6079"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107856,15 +108623,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6035: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6035"
+$as_echo "$at_srcdir/system-traffic.at:6079: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6079"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6079"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107880,75 +108647,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6037: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:6037"
+$as_echo "$at_srcdir/system-traffic.at:6081: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6081"
 ( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6037"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6081"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6038: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6038"
+$as_echo "$at_srcdir/system-traffic.at:6082: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6082"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6038"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6082"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6039: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6039"
+$as_echo "$at_srcdir/system-traffic.at:6083: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6083"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6083"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6040: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:6040"
+$as_echo "$at_srcdir/system-traffic.at:6084: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:6084"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6084"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6041: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:6041"
+$as_echo "$at_srcdir/system-traffic.at:6085: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6085"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6085"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107957,75 +108724,75 @@
 on_exit 'ip link del ovs-p0'
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6044: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:6044"
+$as_echo "$at_srcdir/system-traffic.at:6088: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6088"
 ( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6044"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6045: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:6045"
+$as_echo "$at_srcdir/system-traffic.at:6089: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6089"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6045"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6089"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6046: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:6046"
+$as_echo "$at_srcdir/system-traffic.at:6090: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:6090"
 ( $at_check_trace; ip link set dev ovs-p3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6046"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6090"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6047: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:6047"
+$as_echo "$at_srcdir/system-traffic.at:6091: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:6091"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6047"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6091"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6048: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:6048"
+$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6092"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6048"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108034,15 +108801,15 @@
 on_exit 'ip link del ovs-p2'
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link add p4 type veth peer name ovs-p4 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108050,39 +108817,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link set p4 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link set p4 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link set dev ovs-p4 up"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link set dev ovs-p4 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ovs-vsctl add-port br1 ovs-p4 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6095: ovs-vsctl add-port br1 ovs-p4 -- \\
                 set interface ovs-p4 external-ids:iface-id=\"p4\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
                 set interface ovs-p4 external-ids:iface-id="p4"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -108090,17 +108857,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p4
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p4
 NS_EXEC_HEREDOC
@@ -108109,7 +108876,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108117,10 +108884,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC
@@ -108129,7 +108896,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108138,10 +108905,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC
@@ -108150,7 +108917,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108160,10 +108927,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -108172,7 +108939,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108184,15 +108951,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108200,39 +108967,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6096: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -108240,17 +109007,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -108259,7 +109026,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108267,10 +109034,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -108279,7 +109046,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108288,10 +109055,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -108300,7 +109067,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108310,10 +109077,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -108322,7 +109089,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108334,10 +109101,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -108346,7 +109113,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108354,10 +109121,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -108366,7 +109133,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108374,10 +109141,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -108386,7 +109153,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108396,10 +109163,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -108408,7 +109175,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108418,10 +109185,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -108430,7 +109197,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108438,10 +109205,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -108450,7 +109217,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108458,10 +109225,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -108470,7 +109237,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108480,10 +109247,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -108492,7 +109259,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108502,10 +109269,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC
@@ -108514,7 +109281,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108522,10 +109289,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.200 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.200 up
 NS_EXEC_HEREDOC
@@ -108534,7 +109301,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108542,10 +109309,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.200 \"10.3.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.200 "10.3.2.1/24"
 NS_EXEC_HEREDOC
@@ -108554,7 +109321,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108564,10 +109331,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.200 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.200 mtu 1492
 NS_EXEC_HEREDOC
@@ -108576,7 +109343,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108586,10 +109353,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC
@@ -108598,7 +109365,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108606,10 +109373,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.200 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.200 up
 NS_EXEC_HEREDOC
@@ -108618,7 +109385,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108626,10 +109393,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.200 \"10.3.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.200 "10.3.2.2/24"
 NS_EXEC_HEREDOC
@@ -108638,7 +109405,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108648,10 +109415,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.200 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.200 mtu 1492
 NS_EXEC_HEREDOC
@@ -108660,7 +109427,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108670,10 +109437,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC
@@ -108682,7 +109449,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108690,10 +109457,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.300 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.300 up
 NS_EXEC_HEREDOC
@@ -108702,7 +109469,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108710,10 +109477,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.300 \"10.4.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.300 "10.4.2.1/24"
 NS_EXEC_HEREDOC
@@ -108722,7 +109489,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108732,10 +109499,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.300 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.300 mtu 1492
 NS_EXEC_HEREDOC
@@ -108744,7 +109511,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108754,10 +109521,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC
@@ -108766,7 +109533,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108774,10 +109541,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.300 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.300 up
 NS_EXEC_HEREDOC
@@ -108786,7 +109553,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108794,10 +109561,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.300 \"10.4.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.300 "10.4.2.2/24"
 NS_EXEC_HEREDOC
@@ -108806,7 +109573,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108816,10 +109583,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.300 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.300 mtu 1492
 NS_EXEC_HEREDOC
@@ -108828,7 +109595,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108839,75 +109606,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6060: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6060"
+$as_echo "$at_srcdir/system-traffic.at:6104: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6104"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6060"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6061: ovs-ofctl add-flow br1 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6061"
+$as_echo "$at_srcdir/system-traffic.at:6105: ovs-ofctl add-flow br1 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6105"
 ( $at_check_trace; ovs-ofctl add-flow br1 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6061"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6105"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6062: ovs-ofctl add-flow br2 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6062"
+$as_echo "$at_srcdir/system-traffic.at:6106: ovs-ofctl add-flow br2 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6106"
 ( $at_check_trace; ovs-ofctl add-flow br2 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6062"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6106"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6063: ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
-at_fn_check_prepare_trace "system-traffic.at:6063"
+$as_echo "$at_srcdir/system-traffic.at:6107: ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
+at_fn_check_prepare_trace "system-traffic.at:6107"
 ( $at_check_trace; ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6063"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6107"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6064: ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
-at_fn_check_prepare_trace "system-traffic.at:6064"
+$as_echo "$at_srcdir/system-traffic.at:6108: ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
+at_fn_check_prepare_trace "system-traffic.at:6108"
 ( $at_check_trace; ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6064"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6108"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108921,7 +109688,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6066" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6110" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 ovs_wait_cond () {
     ip netns exec at_ns0 ping -c 1 10.3.2.2
@@ -108930,14 +109697,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6067" "until ip netns exec at_ns0 ping -c 1 10.3.2.2"
+ovs_wait "system-traffic.at:6111" "until ip netns exec at_ns0 ping -c 1 10.3.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6069: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6113: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6069"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6113"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -108948,7 +109715,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6113"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108957,10 +109724,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6073: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6117: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6073"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6117"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -108971,7 +109738,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6073"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6117"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108980,10 +109747,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6077: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6121: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6077"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6121"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -108994,7 +109761,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6077"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6121"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109003,10 +109770,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6081: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6125: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6081"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6125"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -109017,7 +109784,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6081"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6125"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109026,10 +109793,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6086: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6130: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.4.2.2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6086"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.4.2.2
 NS_EXEC_HEREDOC
@@ -109038,7 +109805,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:6086"
+at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:6130"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109047,30 +109814,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: check_logs \"/dropping VLAN \\(0\\|300\\) packet received on dot1q-tunnel port/d\""
-at_fn_check_prepare_notrace 'a shell pipeline' "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: check_logs \"/dropping VLAN \\(0\\|300\\) packet received on dot1q-tunnel port/d\""
+at_fn_check_prepare_notrace 'a shell pipeline' "system-traffic.at:6132"
 ( $at_check_trace; check_logs "/dropping VLAN \(0\|300\) packet received on dot1q-tunnel port/d"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6132"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109078,15 +109845,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109099,18 +109866,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6088" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6132" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6132"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109118,15 +109885,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109139,18 +109906,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6088" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6132" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: :; "
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: :; "
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109162,27 +109929,27 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_125
-#AT_START_126
-at_fn_group_banner 126 'system-traffic.at:6091' \
+#AT_STOP_126
+#AT_START_127
+at_fn_group_banner 127 'system-traffic.at:6135' \
   "802.1ad - double vlan match" "                    " 5
 at_xfail=no
 (
-  $as_echo "126. $at_setup_line: testing $at_desc ..."
+  $as_echo "127. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -109202,38 +109969,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6136"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6136"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6136: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6092"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6136"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -109242,37 +110009,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -109280,7 +110047,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6136: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -109293,7 +110060,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6092"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6136"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -109312,7 +110079,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109320,42 +110087,42 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:6093" >"$at_check_line_file"
+$as_echo "system-traffic.at:6137" >"$at_check_line_file"
 (! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6093"
-     $as_echo "system-traffic.at:6093" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6137"
+     $as_echo "system-traffic.at:6137" >"$at_check_line_file"
 (test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6093"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6137"
 
 ip netns del at_ns0
 
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6095: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6095"
+$as_echo "$at_srcdir/system-traffic.at:6139: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6139"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109371,15 +110138,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6095: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6095"
+$as_echo "$at_srcdir/system-traffic.at:6139: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6139"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109395,15 +110162,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109411,39 +110178,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6141: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -109451,17 +110218,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p0
 NS_EXEC_HEREDOC
@@ -109470,7 +110237,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109478,10 +110245,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -109490,7 +110257,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109499,10 +110266,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -109511,7 +110278,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109521,10 +110288,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -109533,7 +110300,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109545,15 +110312,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109561,39 +110328,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6142: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -109601,17 +110368,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p1
 NS_EXEC_HEREDOC
@@ -109620,7 +110387,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109628,10 +110395,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -109640,7 +110407,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109649,10 +110416,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -109661,7 +110428,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109671,10 +110438,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -109683,7 +110450,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109696,10 +110463,10 @@
 
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -109708,7 +110475,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109716,10 +110483,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC
@@ -109728,7 +110495,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109736,10 +110503,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 \"10.255.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 "10.255.2.1/24"
 NS_EXEC_HEREDOC
@@ -109748,7 +110515,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109756,10 +110523,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -109768,7 +110535,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109778,10 +110545,10 @@
 
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -109790,7 +110557,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109798,10 +110565,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC
@@ -109810,7 +110577,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109818,10 +110585,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 \"10.255.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 "10.255.2.2/24"
 NS_EXEC_HEREDOC
@@ -109830,7 +110597,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109838,10 +110605,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -109850,7 +110617,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109861,10 +110628,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -109873,7 +110640,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109881,10 +110648,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC
@@ -109893,7 +110660,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109901,10 +110668,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -109913,7 +110680,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109923,10 +110690,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -109935,7 +110702,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109945,10 +110712,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -109957,7 +110724,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109965,10 +110732,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC
@@ -109977,7 +110744,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109985,10 +110752,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -109997,7 +110764,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110007,10 +110774,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -110019,7 +110786,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110036,15 +110803,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6111: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:6111"
+$as_echo "$at_srcdir/system-traffic.at:6155: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:6155"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6111"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6155"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110058,14 +110825,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6113" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6157" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6115: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6159: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6115"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6159"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -110076,7 +110843,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6115"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6159"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110085,10 +110852,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6119: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6163: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6119"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6163"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -110099,7 +110866,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6119"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6163"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110108,30 +110875,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: check_logs "
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6167"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110139,15 +110906,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110160,18 +110927,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6123" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6167" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6167"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110179,15 +110946,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110200,18 +110967,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6123" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6167" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: :; "
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: :; "
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110223,27 +110990,27 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_126
-#AT_START_127
-at_fn_group_banner 127 'system-traffic.at:6129' \
+#AT_STOP_127
+#AT_START_128
+at_fn_group_banner 128 'system-traffic.at:6173' \
   "nsh - encap header" "                             " 6
 at_xfail=no
 (
-  $as_echo "127. $at_setup_line: testing $at_desc ..."
+  $as_echo "128. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -110263,38 +111030,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6174"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6174"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6174: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6174"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -110303,37 +111070,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -110341,7 +111108,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6174: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -110354,7 +111121,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6174"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -110373,7 +111140,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110381,15 +111148,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110402,15 +111169,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6132: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6132"
+$as_echo "$at_srcdir/system-traffic.at:6176: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6176"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110426,15 +111193,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6132: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6132"
+$as_echo "$at_srcdir/system-traffic.at:6176: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6176"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110450,15 +111217,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110466,39 +111233,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6178: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -110506,17 +111273,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -110525,7 +111292,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110533,10 +111300,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -110545,7 +111312,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110554,10 +111321,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -110566,7 +111333,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110576,10 +111343,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -110588,7 +111355,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110600,15 +111367,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110616,39 +111383,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6179: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -110656,17 +111423,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -110675,7 +111442,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110683,10 +111450,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -110695,7 +111462,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110704,10 +111471,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -110716,7 +111483,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110726,10 +111493,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -110738,7 +111505,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110751,15 +111518,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6139: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6139"
+$as_echo "$at_srcdir/system-traffic.at:6183: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6183"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6183"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110767,10 +111534,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6185: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6185"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -110779,7 +111546,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6185"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110789,10 +111556,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6191: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6191"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -110801,7 +111568,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6191"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110816,7 +111583,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6150" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0fc6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6194" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0fc6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000" 2>&1 1>/dev/null
@@ -110825,7 +111592,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6151" "until cat p1.pcap | egrep \"0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6195" "until cat p1.pcap | egrep \"0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -110834,7 +111601,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6152" "until cat p1.pcap | egrep \"0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6196" "until cat p1.pcap | egrep \"0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -110843,7 +111610,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6153" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6197" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -110852,7 +111619,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6154" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6198" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -110861,34 +111628,34 @@
     :
 
 }
-ovs_wait "system-traffic.at:6155" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6199" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: check_logs "
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6201"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110896,15 +111663,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110917,18 +111684,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6157" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6201" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6201"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110936,15 +111703,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110957,18 +111724,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6157" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6201" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: :; "
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: :; "
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110980,27 +111747,27 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_127
-#AT_START_128
-at_fn_group_banner 128 'system-traffic.at:6161' \
+#AT_STOP_128
+#AT_START_129
+at_fn_group_banner 129 'system-traffic.at:6205' \
   "nsh - decap header" "                             " 6
 at_xfail=no
 (
-  $as_echo "128. $at_setup_line: testing $at_desc ..."
+  $as_echo "129. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -111020,38 +111787,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6206"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6206"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6206: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6162"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6206"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -111060,37 +111827,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -111098,7 +111865,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6206: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -111111,7 +111878,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6162"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6206"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -111130,7 +111897,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111138,15 +111905,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111159,15 +111926,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6164: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6164"
+$as_echo "$at_srcdir/system-traffic.at:6208: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6208"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6164"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111183,15 +111950,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6164: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6164"
+$as_echo "$at_srcdir/system-traffic.at:6208: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6208"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6164"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111207,15 +111974,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111223,39 +111990,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6210: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -111263,17 +112030,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -111282,7 +112049,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111290,10 +112057,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -111302,7 +112069,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111311,10 +112078,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -111323,7 +112090,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111333,10 +112100,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -111345,7 +112112,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111357,15 +112124,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111373,39 +112140,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6211: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -111413,17 +112180,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -111432,7 +112199,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111440,10 +112207,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -111452,7 +112219,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111461,10 +112228,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -111473,7 +112240,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111483,10 +112250,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -111495,7 +112262,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111508,15 +112275,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6171: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6171"
+$as_echo "$at_srcdir/system-traffic.at:6215: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6215"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6171"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6215"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111524,10 +112291,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6173: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6217: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6173"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6217"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -111536,7 +112303,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6173"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6217"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111546,10 +112313,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6223: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 00 64 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6223"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 00 64 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -111558,7 +112325,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6223"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111573,7 +112340,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6182" "until cat p1.pcap | egrep \"0x0000: *f200 *0000 *0002 *f200 *0000 *0001 *0800 *4500\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6226" "until cat p1.pcap | egrep \"0x0000: *f200 *0000 *0002 *f200 *0000 *0001 *0800 *4500\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00" 2>&1 1>/dev/null
@@ -111582,7 +112349,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6183" "until cat p1.pcap | egrep \"0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6227" "until cat p1.pcap | egrep \"0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002" 2>&1 1>/dev/null
@@ -111591,7 +112358,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6184" "until cat p1.pcap | egrep \"0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6228" "until cat p1.pcap | egrep \"0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -111600,34 +112367,34 @@
     :
 
 }
-ovs_wait "system-traffic.at:6185" "until cat p1.pcap | egrep \"0x0030: *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6229" "until cat p1.pcap | egrep \"0x0030: *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: check_logs "
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6231"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111635,15 +112402,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111656,18 +112423,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6187" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6231" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6231"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111675,15 +112442,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111696,18 +112463,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6187" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6231" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: :; "
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: :; "
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111719,27 +112486,27 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_128
-#AT_START_129
-at_fn_group_banner 129 'system-traffic.at:6191' \
+#AT_STOP_129
+#AT_START_130
+at_fn_group_banner 130 'system-traffic.at:6235' \
   "nsh - replace header" "                           " 6
 at_xfail=no
 (
-  $as_echo "129. $at_setup_line: testing $at_desc ..."
+  $as_echo "130. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -111759,38 +112526,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6236"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6236"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6236: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6192"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6236"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -111799,37 +112566,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -111837,7 +112604,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6236: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -111850,7 +112617,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6192"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6236"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -111869,7 +112636,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111877,15 +112644,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111898,15 +112665,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6194: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6194"
+$as_echo "$at_srcdir/system-traffic.at:6238: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6238"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6194"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111922,15 +112689,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6194: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6194"
+$as_echo "$at_srcdir/system-traffic.at:6238: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6238"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6194"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111946,15 +112713,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111962,39 +112729,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6240: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -112002,17 +112769,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -112021,7 +112788,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112029,10 +112796,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -112041,7 +112808,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112050,10 +112817,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -112062,7 +112829,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112072,10 +112839,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -112084,7 +112851,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112096,15 +112863,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112112,39 +112879,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6241: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -112152,17 +112919,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -112171,7 +112938,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112179,10 +112946,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -112191,7 +112958,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112200,10 +112967,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -112212,7 +112979,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112222,10 +112989,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -112234,7 +113001,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112247,15 +113014,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6203: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6203"
+$as_echo "$at_srcdir/system-traffic.at:6247: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6247"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6203"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6247"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112263,10 +113030,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6205: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6249: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6205"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6249"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -112275,7 +113042,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6249"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112285,10 +113052,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6212: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6256: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6212"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6256"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -112297,7 +113064,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6212"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6256"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112312,7 +113079,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6215" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000* 0001 *894f *01c6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6259" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000* 0001 *894f *01c6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807" 2>&1 1>/dev/null
@@ -112321,7 +113088,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6216" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6260" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -112330,7 +113097,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6217" "until cat p1.pcap | egrep \"0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6261" "until cat p1.pcap | egrep \"0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -112339,7 +113106,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6218" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6262" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -112348,7 +113115,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6219" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6263" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -112357,34 +113124,34 @@
     :
 
 }
-ovs_wait "system-traffic.at:6220" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6264" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: check_logs "
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6266"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112392,15 +113159,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112413,18 +113180,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6222" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6266" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6266"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112432,15 +113199,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112453,18 +113220,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6222" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6266" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: :; "
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: :; "
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112476,27 +113243,27 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_129
-#AT_START_130
-at_fn_group_banner 130 'system-traffic.at:6226' \
+#AT_STOP_130
+#AT_START_131
+at_fn_group_banner 131 'system-traffic.at:6270' \
   "nsh - forward" "                                  " 6
 at_xfail=no
 (
-  $as_echo "130. $at_setup_line: testing $at_desc ..."
+  $as_echo "131. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: modprobe openvswitch"
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: modprobe openvswitch"
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; modprobe openvswitch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -112516,38 +113283,38 @@
    on_exit 'ovs-appctl dpctl/flush-conntrack'
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6271"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6271"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6271: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6271"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -112556,37 +113323,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vswitchd  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -112594,7 +113361,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6271: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -112607,7 +113374,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6271"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -112626,7 +113393,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112634,15 +113401,15 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112655,15 +113422,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112679,15 +113446,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112703,15 +113470,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns2 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns2 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns2 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112727,15 +113494,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112743,39 +113510,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6275: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -112783,17 +113550,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -112802,7 +113569,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112810,10 +113577,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -112822,7 +113589,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112831,10 +113598,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -112843,7 +113610,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112853,10 +113620,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -112865,7 +113632,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112877,15 +113644,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112893,39 +113660,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6276: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -112933,17 +113700,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -112952,7 +113719,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112960,10 +113727,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -112972,7 +113739,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112981,10 +113748,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -112993,7 +113760,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113003,10 +113770,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -113015,7 +113782,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113027,15 +113794,15 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link add p2 type veth peer name ovs-p2 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link add p2 type veth peer name ovs-p2 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link add p2 type veth peer name ovs-p2 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113043,39 +113810,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link set p2 netns at_ns2"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link set p2 netns at_ns2"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link set p2 netns at_ns2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ovs-vsctl add-port br0 ovs-p2 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6277: ovs-vsctl add-port br0 ovs-p2 -- \\
                 set interface ovs-p2 external-ids:iface-id=\"p2\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2 -- \
                 set interface ovs-p2 external-ids:iface-id="p2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -113083,17 +113850,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p2
 NS_EXEC_HEREDOC
@@ -113102,7 +113869,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113110,10 +113877,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 up
 NS_EXEC_HEREDOC
@@ -113122,7 +113889,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113131,10 +113898,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 address
 NS_EXEC_HEREDOC
@@ -113143,7 +113910,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113153,10 +113920,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -113165,7 +113932,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113178,30 +113945,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6238: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6238"
+$as_echo "$at_srcdir/system-traffic.at:6282: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6282"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6282"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6239: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2\""
-at_fn_check_prepare_trace "system-traffic.at:6239"
+$as_echo "$at_srcdir/system-traffic.at:6283: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2\""
+at_fn_check_prepare_trace "system-traffic.at:6283"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6239"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6283"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113209,10 +113976,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6285: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6285"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -113221,7 +113988,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6285"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113229,10 +113996,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6242: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6286: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p2 > p2.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6242"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6286"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p2 > p2.pcap &
 NS_EXEC_HEREDOC
@@ -113241,7 +114008,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6242"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6286"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113251,10 +114018,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6246: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6290: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 02 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6246"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6290"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 02 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -113263,7 +114030,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6246"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6290"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113278,7 +114045,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6249" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0206\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6293" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0206\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a" 2>&1 1>/dev/null
@@ -113287,7 +114054,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6250" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6294" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -113296,7 +114063,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6251" "until cat p1.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6295" "until cat p1.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -113305,7 +114072,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6252" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6296" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -113314,7 +114081,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6253" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6297" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -113323,14 +114090,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6254" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6298" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6257: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6301: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p1 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 01 c6 01 03 00 01 00 01 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6257"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6301"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p1 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 01 c6 01 03 00 01 00 01 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -113339,7 +114106,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6257"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113354,7 +114121,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6260" "until cat p2.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *01c6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6304" "until cat p2.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *01c6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a" 2>&1 1>/dev/null
@@ -113363,7 +114130,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6261" "until cat p2.pcap | egrep \"0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6305" "until cat p2.pcap | egrep \"0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -113372,7 +114139,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6262" "until cat p2.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6306" "until cat p2.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -113381,7 +114148,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6263" "until cat p2.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6307" "until cat p2.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -113390,7 +114157,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6264" "until cat p2.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6308" "until cat p2.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -113399,34 +114166,34 @@
     :
 
 }
-ovs_wait "system-traffic.at:6265" "until cat p2.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6309" "until cat p2.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: check_logs "
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: check_logs "
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6311"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113434,15 +114201,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113455,18 +114222,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6267" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6311" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6311"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113474,15 +114241,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113495,18 +114262,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6267" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6311" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: :; "
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: :; "
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113518,13 +114285,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_130
-#AT_START_131
-at_fn_group_banner 131 'system-layer3-tunnels.at:3' \
+#AT_STOP_131
+#AT_START_132
+at_fn_group_banner 132 'system-layer3-tunnels.at:3' \
   "layer3 - ping over VXLAN-GPE" "                   " 7
 at_xfail=no
 (
-  $as_echo "131. $at_setup_line: testing $at_desc ..."
+  $as_echo "132. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -114332,13 +115099,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_131
-#AT_START_132
-at_fn_group_banner 132 'system-layer3-tunnels.at:52' \
+#AT_STOP_132
+#AT_START_133
+at_fn_group_banner 133 'system-layer3-tunnels.at:52' \
   "layer3 - ping over GRE" "                         " 7
 at_xfail=no
 (
-  $as_echo "132. $at_setup_line: testing $at_desc ..."
+  $as_echo "133. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -115143,13 +115910,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_132
-#AT_START_133
-at_fn_group_banner 133 'system-layer3-tunnels.at:101' \
+#AT_STOP_133
+#AT_START_134
+at_fn_group_banner 134 'system-layer3-tunnels.at:101' \
   "layer3 - use non-local port as tunnel endpoint" " " 7
 at_xfail=no
 (
-  $as_echo "133. $at_setup_line: testing $at_desc ..."
+  $as_echo "134. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -115662,13 +116429,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_133
-#AT_START_134
-at_fn_group_banner 134 'system-interface.at:5' \
+#AT_STOP_134
+#AT_START_135
+at_fn_group_banner 135 'system-interface.at:5' \
   "interface - add delete add same interface" "      " 8
 at_xfail=no
 (
-  $as_echo "134. $at_setup_line: testing $at_desc ..."
+  $as_echo "135. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -116042,13 +116809,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_134
-#AT_START_135
-at_fn_group_banner 135 'system-interface.at:30' \
+#AT_STOP_135
+#AT_START_136
+at_fn_group_banner 136 'system-interface.at:30' \
   "interface - add route to br and verify clean-up" "" 8
 at_xfail=no
 (
-  $as_echo "135. $at_setup_line: testing $at_desc ..."
+  $as_echo "136. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -116460,4 +117227,4 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_135
+#AT_STOP_136
diff -Nru openvswitch-2.13.1/tests/system-offloads-testsuite openvswitch-2.13.3/tests/system-offloads-testsuite
--- openvswitch-2.13.1/tests/system-offloads-testsuite	2020-08-04 21:42:10.346524451 +0000
+++ openvswitch-2.13.3/tests/system-offloads-testsuite	2021-02-10 20:05:35.090074628 +0000
@@ -918,7 +918,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.13.1 test suite test groups:
+openvswitch 2.13.3 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -959,7 +959,7 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.13.1)" &&
+  $as_echo "$as_me (openvswitch 2.13.3)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1153,11 +1153,11 @@
 
 # Banners and logs.
 $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
 {
   $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
   echo
 
@@ -2457,7 +2457,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <bugs@openvswitch.org>
-   Subject: [openvswitch 2.13.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.13.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
diff -Nru openvswitch-2.13.1/tests/system-traffic.at openvswitch-2.13.3/tests/system-traffic.at
--- openvswitch-2.13.1/tests/system-traffic.at	2020-08-04 21:41:31.997524451 +0000
+++ openvswitch-2.13.3/tests/system-traffic.at	2021-02-10 20:04:59.570074628 +0000
@@ -5883,6 +5883,50 @@
 OVS_TRAFFIC_VSWITCHD_STOP
 AT_CLEANUP
 
+AT_SETUP([conntrack - Multiple ICMP traverse])
+dnl This tracks sending ICMP packets via conntrack multiple times for the
+dnl same packet
+CHECK_CONNTRACK()
+OVS_TRAFFIC_VSWITCHD_START()
+OVS_CHECK_CT_CLEAR()
+
+ADD_NAMESPACES(at_ns0, at_ns1)
+ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24", "f0:00:00:01:01:01")
+ADD_VETH(p1, at_ns1, br0, "10.1.1.2/24", "f0:00:00:01:01:02")
+dnl setup ct flows
+AT_DATA([flows.txt], [dnl
+table=0,priority=10  ip,icmp,ct_state=-trk action=ct(zone=1,table=1)
+table=0,priority=0   action=drop
+table=1,priority=10  ct_state=-est+trk+new,ip,ct_zone=1,in_port=1 action=ct(commit,table=2)
+table=1,priority=10  ct_state=+est-new+trk,ct_zone=1,in_port=1 action=resubmit(,2)
+table=1,priority=0   action=drop
+table=2,priority=10  ct_state=+trk+new,in_port=1 action=drop
+table=2,priority=10  ct_state=+trk+est action=drop
+])
+
+AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+
+# sending icmp pkts, first and second
+NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null])
+
+NS_CHECK_EXEC([at_ns0], [$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null])
+
+sleep 1
+
+dnl ensure CT picked up the packet
+AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1)], [0], [dnl
+icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=<cleared>,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=<cleared>,type=0,code=0)
+])
+
+AT_CHECK([ovs-ofctl dump-flows br0 | grep table=2, | OFPROTO_CLEAR_DURATION_IDLE],
+         [0], [dnl
+ cookie=0x0, duration=<cleared>, table=2, n_packets=2, n_bytes=84, idle_age=<cleared>, priority=10,ct_state=+new+trk,in_port=1 actions=drop
+ cookie=0x0, duration=<cleared>, table=2, n_packets=0, n_bytes=0, idle_age=<cleared>, priority=10,ct_state=+est+trk actions=drop
+])
+
+OVS_TRAFFIC_VSWITCHD_STOP
+AT_CLEANUP
+
 AT_BANNER([802.1ad])
 
 AT_SETUP([802.1ad - vlan_limit])
diff -Nru openvswitch-2.13.1/tests/system-userspace-packet-type-aware.at openvswitch-2.13.3/tests/system-userspace-packet-type-aware.at
--- openvswitch-2.13.1/tests/system-userspace-packet-type-aware.at	2020-08-04 21:39:56.059524451 +0000
+++ openvswitch-2.13.3/tests/system-userspace-packet-type-aware.at	2021-02-10 20:02:51.194074628 +0000
@@ -129,6 +129,7 @@
     ip addr add 10.0.0.1/24 dev br-p1
     ip link set br-p1 up
 ], [0], [stdout])
+OVS_WAIT_UNTIL([ovs-appctl ovs/route/show | grep -q br-p1])
 
 AT_CHECK([
     ovs-appctl ovs/route/add 10.0.0.0/24 br-p1
@@ -141,6 +142,7 @@
     ip addr add 20.0.0.2/24 dev br-p2
     ip link set br-p2 up
 ], [0], [stdout])
+OVS_WAIT_UNTIL([ovs-appctl ovs/route/show | grep -q br-p2])
 
 AT_CHECK([
     ovs-appctl ovs/route/add 20.0.0.0/24 br-p2
@@ -153,6 +155,7 @@
     ip addr add 30.0.0.3/24 dev br-p3
     ip link set br-p3 up
 ], [0], [stdout])
+OVS_WAIT_UNTIL([ovs-appctl ovs/route/show | grep -q br-p3])
 
 AT_CHECK([
     ovs-appctl ovs/route/add 30.0.0.0/24 br-p3
diff -Nru openvswitch-2.13.1/tests/system-userspace-testsuite openvswitch-2.13.3/tests/system-userspace-testsuite
--- openvswitch-2.13.1/tests/system-userspace-testsuite	2020-08-04 21:42:08.313524451 +0000
+++ openvswitch-2.13.3/tests/system-userspace-testsuite	2021-02-10 20:05:32.970074628 +0000
@@ -726,22 +726,23 @@
 119;system-traffic.at:5662;conntrack - DNAT load balancing with NC;;
 120;system-traffic.at:5750;conntrack - floating IP;;
 121;system-traffic.at:5823;conntrack - negative test for recirculation optimization;;
-122;system-traffic.at:5888;802.1ad - vlan_limit;;
-123;system-traffic.at:5917;802.1ad - push/pop outer 802.1ad;;
-124;system-traffic.at:5973;802.1ad - push/pop outer 802.1q;;
-125;system-traffic.at:6029;802.1ad - 802.1q tunnel;;
-126;system-traffic.at:6091;802.1ad - double vlan match;;
-127;system-traffic.at:6129;nsh - encap header;;
-128;system-traffic.at:6161;nsh - decap header;;
-129;system-traffic.at:6191;nsh - replace header;;
-130;system-traffic.at:6226;nsh - forward;;
-131;system-layer3-tunnels.at:3;layer3 - ping over VXLAN-GPE;;
-132;system-layer3-tunnels.at:52;layer3 - ping over GRE;;
-133;system-layer3-tunnels.at:101;layer3 - use non-local port as tunnel endpoint;;
-134;system-interface.at:5;interface - add delete add same interface;;
-135;system-interface.at:30;interface - add route to br and verify clean-up;;
-136;system-userspace-packet-type-aware.at:3;ptap - triangle bridge setup with L2 and L3 GRE tunnels;;
-137;system-route.at:4;ovs-route - add/remove system route;route;
+122;system-traffic.at:5886;conntrack - Multiple ICMP traverse;;
+123;system-traffic.at:5932;802.1ad - vlan_limit;;
+124;system-traffic.at:5961;802.1ad - push/pop outer 802.1ad;;
+125;system-traffic.at:6017;802.1ad - push/pop outer 802.1q;;
+126;system-traffic.at:6073;802.1ad - 802.1q tunnel;;
+127;system-traffic.at:6135;802.1ad - double vlan match;;
+128;system-traffic.at:6173;nsh - encap header;;
+129;system-traffic.at:6205;nsh - decap header;;
+130;system-traffic.at:6235;nsh - replace header;;
+131;system-traffic.at:6270;nsh - forward;;
+132;system-layer3-tunnels.at:3;layer3 - ping over VXLAN-GPE;;
+133;system-layer3-tunnels.at:52;layer3 - ping over GRE;;
+134;system-layer3-tunnels.at:101;layer3 - use non-local port as tunnel endpoint;;
+135;system-interface.at:5;interface - add delete add same interface;;
+136;system-interface.at:30;interface - add route to br and verify clean-up;;
+137;system-userspace-packet-type-aware.at:3;ptap - triangle bridge setup with L2 and L3 GRE tunnels;;
+138;system-route.at:4;ovs-route - add/remove system route;route;
 "
 # List of the all the test groups.
 at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -755,7 +756,7 @@
   for at_grp
   do
     eval at_value=\$$at_grp
-    if test $at_value -lt 1 || test $at_value -gt 137; then
+    if test $at_value -lt 1 || test $at_value -gt 138; then
       $as_echo "invalid test group: $at_value" >&2
       exit 1
     fi
@@ -1053,7 +1054,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.13.1 test suite test groups:
+openvswitch 2.13.3 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -1094,7 +1095,7 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.13.1)" &&
+  $as_echo "$as_me (openvswitch 2.13.3)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1137,23 +1138,23 @@
 # Banner 4. system-traffic.at:4103
 # Category starts at test group 91.
 at_banner_text_4="conntrack - NAT"
-# Banner 5. system-traffic.at:5886
-# Category starts at test group 122.
+# Banner 5. system-traffic.at:5930
+# Category starts at test group 123.
 at_banner_text_5="802.1ad"
-# Banner 6. system-traffic.at:6127
-# Category starts at test group 127.
+# Banner 6. system-traffic.at:6171
+# Category starts at test group 128.
 at_banner_text_6="nsh-datapath"
 # Banner 7. system-layer3-tunnels.at:1
-# Category starts at test group 131.
+# Category starts at test group 132.
 at_banner_text_7="layer3-tunnels"
 # Banner 8. system-interface.at:1
-# Category starts at test group 134.
+# Category starts at test group 135.
 at_banner_text_8="system-inteface"
 # Banner 9. system-userspace-packet-type-aware.at:1
-# Category starts at test group 136.
+# Category starts at test group 137.
 at_banner_text_9="packet-type-aware pipeline"
 # Banner 10. system-route.at:1
-# Category starts at test group 137.
+# Category starts at test group 138.
 at_banner_text_10="system-route"
 
 # Take any -C into account.
@@ -1315,11 +1316,11 @@
 
 # Banners and logs.
 $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
 {
   $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
   echo
 
@@ -2619,7 +2620,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <bugs@openvswitch.org>
-   Subject: [openvswitch 2.13.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.13.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -107340,8 +107341,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_121
 #AT_START_122
-at_fn_group_banner 122 'system-traffic.at:5888' \
-  "802.1ad - vlan_limit" "                           " 5
+at_fn_group_banner 122 'system-traffic.at:5886' \
+  "conntrack - Multiple ICMP traverse" "             " 4
 at_xfail=no
 (
   $as_echo "122. $at_setup_line: testing $at_desc ..."
@@ -107350,6 +107351,7 @@
 ovs_init
 
 
+
    ovs_wait_cond () {
     if ip link show ovs-netdev; then return 1; else return 0; fi
 }
@@ -107357,42 +107359,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:5889" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:5890" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5890"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5890"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5890: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5889"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5890"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -107401,37 +107403,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5890"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5889"
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5890"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -107439,7 +107441,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5890: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -107452,7 +107454,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5889"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5890"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -107471,7 +107473,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107485,45 +107487,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:5889" "while ip link show br0"
+ovs_wait "system-traffic.at:5890" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5889: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5889"
-( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
+$as_echo "$at_srcdir/system-traffic.at:5890: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:5890"
+( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5889"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5890" >"$at_check_line_file"
-(! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5890"
-     $as_echo "system-traffic.at:5890" >"$at_check_line_file"
-(test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5890"
+$as_echo "system-traffic.at:5891" >"$at_check_line_file"
+(! grep -q "Datapath supports ct_clear action" ovs-vswitchd.log) \
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5891"
 
 ip netns del at_ns0
 
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5892: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5892"
+$as_echo "$at_srcdir/system-traffic.at:5893: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5893"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5892"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107539,15 +107538,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5892: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5892"
+$as_echo "$at_srcdir/system-traffic.at:5893: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5893"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5892"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -107561,7 +107560,6 @@
 
 
 
-
  { set +x
 $as_echo "$at_srcdir/system-traffic.at:5894: ip link add p0 type veth peer name ovs-p0 || return 77"
 at_fn_check_prepare_trace "system-traffic.at:5894"
@@ -107680,14 +107678,14 @@
 $at_traceon; }
 
 
-      if test -n ""; then
+      if test -n ""f0:00:00:01:01:01""; then
          { set +x
 $as_echo "$at_srcdir/system-traffic.at:5894: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0 address
+ip link set dev p0 address \"f0:00:00:01:01:01\"
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5894"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0 address
+ip link set dev p0 address "f0:00:00:01:01:01"
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -107845,14 +107843,14 @@
 $at_traceon; }
 
 
-      if test -n ""; then
+      if test -n ""f0:00:00:01:01:02""; then
          { set +x
 $as_echo "$at_srcdir/system-traffic.at:5895: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1 address
+ip link set dev p1 address \"f0:00:00:01:01:02\"
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5895"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1 address
+ip link set dev p1 address "f0:00:00:01:01:02"
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -107892,226 +107890,48 @@
       on_exit 'ip link del ovs-p1'
 
 
-
-  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0.4094 up
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0.4094 up
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip addr add dev p0.4094 \"10.255.2.1/24\"
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip addr add dev p0.4094 "10.255.2.1/24"
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5897: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set p0.4094 mtu 1496
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5897"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set p0.4094 mtu 1496
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5897"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-
-
-  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
-( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1.4094 up
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
-( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1.4094 up
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip addr add dev p1.4094 \"10.255.2.2/24\"
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
-( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip addr add dev p1.4094 "10.255.2.2/24"
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5898: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set p1.4094 mtu 1496
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5898"
-( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set p1.4094 mtu 1496
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5898"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-
-
-
-   { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
+cat >flows.txt <<'_ATEOF'
+table=0,priority=10  ip,icmp,ct_state=-trk action=ct(zone=1,table=1)
+table=0,priority=0   action=drop
+table=1,priority=10  ct_state=-est+trk+new,ip,ct_zone=1,in_port=1 action=ct(commit,table=2)
+table=1,priority=10  ct_state=+est-new+trk,ct_zone=1,in_port=1 action=resubmit(,2)
+table=1,priority=0   action=drop
+table=2,priority=10  ct_state=+trk+new,in_port=1 action=drop
+table=2,priority=10  ct_state=+trk+est action=drop
+_ATEOF
 
 
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0.4094.100 up
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p0.4094.100 up
-NS_EXEC_HEREDOC
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5907: ovs-ofctl --bundle add-flows br0 flows.txt"
+at_fn_check_prepare_trace "system-traffic.at:5907"
+( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5907"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip addr add dev p0.4094.100 \"10.2.2.1/24\"
+# sending icmp pkts, first and second
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5910: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+\$PYTHON3 \$srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5910"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip addr add dev p0.4094.100 "10.2.2.1/24"
+$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5910"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108119,212 +107939,72 @@
 
 
 
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5900: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set p0.4094.100 mtu 1492
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5912: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+\$PYTHON3 \$srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5900"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5912"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set p0.4094.100 mtu 1492
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5900"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-
-
-   { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
-( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1.4094.100 up
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
-( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set dev p1.4094.100 up
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip addr add dev p1.4094.100 \"10.2.2.2/24\"
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
-( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip addr add dev p1.4094.100 "10.2.2.2/24"
-NS_EXEC_HEREDOC
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-
-
-       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5901: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set p1.4094.100 mtu 1492
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5901"
-( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
-ip link set p1.4094.100 mtu 1492
+$PYTHON3 $srcdir/sendpkt.py p0 f0 00 00 01 01 02 f0 00 00 01 01 01 08 00 45 00 00 1c 00 01 00 00 40 01 64 dc 0a 01 01 01 0a 01 01 02 08 00 f7 ff ff ff ff ff > /dev/null
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5901"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
-
-
-
-
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5903: ovs-ofctl add-flow br0 \"priority=1 action=normal\""
-at_fn_check_prepare_trace "system-traffic.at:5903"
-( $at_check_trace; ovs-ofctl add-flow br0 "priority=1 action=normal"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5903"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5912"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-ovs_wait_cond () {
-    ip netns exec at_ns0 ping -c 1 10.2.2.2
-}
-ovs_wait_failed () {
-    :
-
-}
-ovs_wait "system-traffic.at:5905" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
+sleep 1
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5908: ovs-appctl revalidator/purge"
-at_fn_check_prepare_trace "system-traffic.at:5908"
-( $at_check_trace; ovs-appctl revalidator/purge
+$as_echo "$at_srcdir/system-traffic.at:5917: ovs-appctl dpctl/dump-conntrack | grep \"dst=10.1.1\" | sed -e 's/port=[0-9]*/port=<cleared>/g' -e 's/id=[0-9]*/id=<cleared>/g' -e 's/state=[0-9_A-Z]*/state=<cleared>/g' | sort | uniq"
+at_fn_check_prepare_notrace 'a shell pipeline' "system-traffic.at:5917"
+( $at_check_trace; ovs-appctl dpctl/dump-conntrack | grep "dst=10.1.1" | sed -e 's/port=[0-9]*/port=<cleared>/g' -e 's/id=[0-9]*/id=<cleared>/g' -e 's/state=[0-9_A-Z]*/state=<cleared>/g' | sort | uniq
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5908"
+echo >>"$at_stdout"; $as_echo "icmp,orig=(src=10.1.1.1,dst=10.1.1.2,id=<cleared>,type=8,code=0),reply=(src=10.1.1.2,dst=10.1.1.1,id=<cleared>,type=0,code=0)
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5917"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5909: ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1"
-at_fn_check_prepare_trace "system-traffic.at:5909"
-( $at_check_trace; ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5909"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5910: ovs-ofctl add-flow br0 \"priority=100 dl_type=0x8100 action=drop\""
-at_fn_check_prepare_trace "system-traffic.at:5910"
-( $at_check_trace; ovs-ofctl add-flow br0 "priority=100 dl_type=0x8100 action=drop"
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5910"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
-
- { set +x
-$as_echo "$at_srcdir/system-traffic.at:5911: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ping -q -c 1 -w 3 10.2.2.2
-NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5911"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ping -q -c 1 -w 3 10.2.2.2
-NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5921: ovs-ofctl dump-flows br0 | grep table=2, | sed -e 's/duration=.*s,/duration=<cleared>,/g' -e 's/idle_age=[0-9]*,/idle_age=<cleared>,/g'"
+at_fn_check_prepare_notrace 'a shell pipeline' "system-traffic.at:5921"
+( $at_check_trace; ovs-ofctl dump-flows br0 | grep table=2, | sed -e 's/duration=.*s,/duration=<cleared>,/g' -e 's/idle_age=[0-9]*,/idle_age=<cleared>,/g'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:5911"
+echo >>"$at_stdout"; $as_echo " cookie=0x0, duration=<cleared>, table=2, n_packets=2, n_bytes=84, idle_age=<cleared>, priority=10,ct_state=+new+trk,in_port=1 actions=drop
+ cookie=0x0, duration=<cleared>, table=2, n_packets=0, n_bytes=0, idle_age=<cleared>, priority=10,ct_state=+est+trk actions=drop
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5921"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:5927: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5913"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5927"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -108334,22 +108014,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5927: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5927"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108357,15 +108037,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5927: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:5927"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108378,18 +108058,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5913" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:5927" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5927: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5927"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108397,15 +108077,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5927: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:5927"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108418,18 +108098,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5913" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:5927" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5913: :; "
-at_fn_check_prepare_trace "system-traffic.at:5913"
+$as_echo "$at_srcdir/system-traffic.at:5927: :; "
+at_fn_check_prepare_trace "system-traffic.at:5927"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5913"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108443,8 +108123,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_122
 #AT_START_123
-at_fn_group_banner 123 'system-traffic.at:5917' \
-  "802.1ad - push/pop outer 802.1ad" "               " 5
+at_fn_group_banner 123 'system-traffic.at:5932' \
+  "802.1ad - vlan_limit" "                           " 5
 at_xfail=no
 (
   $as_echo "123. $at_setup_line: testing $at_desc ..."
@@ -108460,42 +108140,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:5918" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:5933" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5933: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5933"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5933: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5933"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5933: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5918"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5933"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -108504,37 +108184,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5933"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5933"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -108542,7 +108222,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:5933: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -108555,7 +108235,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5918"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5933"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -108574,7 +108254,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108588,47 +108268,45 @@
     :
 
 }
-ovs_wait "system-traffic.at:5918" "while ip link show br0"
+ovs_wait "system-traffic.at:5933" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5918: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5918"
+$as_echo "$at_srcdir/system-traffic.at:5933: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:5933"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5918"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5919" >"$at_check_line_file"
+$as_echo "system-traffic.at:5934" >"$at_check_line_file"
 (! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5919"
-     $as_echo "system-traffic.at:5919" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5934"
+     $as_echo "system-traffic.at:5934" >"$at_check_line_file"
 (test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5919"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5934"
 
-ovs-vsctl add-br br1 -- set Bridge br1 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
-ovs-vsctl add-br br2 -- set Bridge br2 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ip netns del at_ns0
 
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5923: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5923"
+$as_echo "$at_srcdir/system-traffic.at:5936: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5936"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5923"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108644,15 +108322,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5923: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5923"
+$as_echo "$at_srcdir/system-traffic.at:5936: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5936"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5923"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -108667,164 +108345,175 @@
 
 
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5925: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5925"
-( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5925"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5926: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:5926"
-( $at_check_trace; ip link set dev ovs-p0 up
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5926"
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5927: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:5927"
-( $at_check_trace; ip link set dev ovs-p1 up
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5927"
-$at_failed && at_fn_log_failure  \
-"ovsdb-server.log" \
-"ovs-vswitchd.log"
-$at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5928: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:5928"
-( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5928"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5929: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5929"
-( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:5938"
+( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5929"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-on_exit 'ip link del ovs-p0'
-
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5932: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5932"
-( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ovs-vsctl add-port br0 ovs-p0 -- \\
+                set interface ovs-p0 external-ids:iface-id=\"p0\""
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
+                set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5932"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5933: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:5933"
-( $at_check_trace; ip link set dev ovs-p2 up
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add \"10.1.1.1/24\" dev p0
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add "10.1.1.1/24" dev p0
+NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5933"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5934: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:5934"
-( $at_check_trace; ip link set dev ovs-p3 up
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 up
+NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5934"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5935: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:5935"
-( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
+
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 address
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0 address
+NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5935"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/system-traffic.at:5936: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5936"
-( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
+
+      fi
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5938: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5938"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5936"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5938"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-on_exit 'ip link del ovs-p2'
+
+      fi
+      on_exit 'ip link del ovs-p0'
+
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link add p4 type veth peer name ovs-p4 || return 77"
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link add p1 type veth peer name ovs-p1 || return 77"
 at_fn_check_prepare_trace "system-traffic.at:5939"
-( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
+( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -108837,9 +108526,9 @@
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ethtool -K p4 tx off"
+$as_echo "$at_srcdir/system-traffic.at:5939: ethtool -K p1 tx off"
 at_fn_check_prepare_trace "system-traffic.at:5939"
-( $at_check_trace; ethtool -K p4 tx off
+( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -108853,9 +108542,9 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link set p4 netns at_ns0"
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link set p1 netns at_ns1"
 at_fn_check_prepare_trace "system-traffic.at:5939"
-( $at_check_trace; ip link set p4 netns at_ns0
+( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -108868,9 +108557,9 @@
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip link set dev ovs-p4 up"
+$as_echo "$at_srcdir/system-traffic.at:5939: ip link set dev ovs-p1 up"
 at_fn_check_prepare_trace "system-traffic.at:5939"
-( $at_check_trace; ip link set dev ovs-p4 up
+( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -108883,11 +108572,11 @@
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ovs-vsctl add-port br1 ovs-p4 -- \\
-                set interface ovs-p4 external-ids:iface-id=\"p4\""
+$as_echo "$at_srcdir/system-traffic.at:5939: ovs-vsctl add-port br0 ovs-p1 -- \\
+                set interface ovs-p1 external-ids:iface-id=\"p1\""
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
-( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
-                set interface ovs-p4 external-ids:iface-id="p4"
+( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
+                set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -108900,12 +108589,12 @@
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip addr add \"10.1.1.1/24\" dev p4
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add \"10.1.1.2/24\" dev p1
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip addr add "10.1.1.1/24" dev p4
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add "10.1.1.2/24" dev p1
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -108920,12 +108609,12 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p4 up
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 up
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p4 up
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 up
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -108941,12 +108630,12 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p4 address
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 address
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
-ip link set dev p4 address
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1 address
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -108963,11 +108652,11 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5939: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
 at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5939"
-( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -108983,74 +108672,1168 @@
 
 
       fi
-      on_exit 'ip link del ovs-p4'
+      on_exit 'ip link del ovs-p1'
 
 
- { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5940"
-( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
+
+  { set +x
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
+NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
-      { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ethtool -K p5 tx off"
-at_fn_check_prepare_trace "system-traffic.at:5940"
-( $at_check_trace; ethtool -K p5 tx off
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0.4094 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0.4094 up
+NS_EXEC_HEREDOC
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add dev p0.4094 \"10.255.2.1/24\"
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add dev p0.4094 "10.255.2.1/24"
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set p0.4094 mtu 1496
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set p0.4094 mtu 1496
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+
+  { set +x
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1.4094 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1.4094 up
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add dev p1.4094 \"10.255.2.2/24\"
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add dev p1.4094 "10.255.2.2/24"
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set p1.4094 mtu 1496
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set p1.4094 mtu 1496
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0.4094.100 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p0.4094.100 up
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add dev p0.4094.100 \"10.2.2.1/24\"
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add dev p0.4094.100 "10.2.2.1/24"
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5944: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set p0.4094.100 mtu 1492
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5944"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set p0.4094.100 mtu 1492
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5944"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1.4094.100 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set dev p1.4094.100 up
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add dev p1.4094.100 \"10.2.2.2/24\"
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip addr add dev p1.4094.100 "10.2.2.2/24"
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5945: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set p1.4094.100 mtu 1492
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5945"
+( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+ip link set p1.4094.100 mtu 1492
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5945"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5947: ovs-ofctl add-flow br0 \"priority=1 action=normal\""
+at_fn_check_prepare_trace "system-traffic.at:5947"
+( $at_check_trace; ovs-ofctl add-flow br0 "priority=1 action=normal"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5947"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+ovs_wait_cond () {
+    ip netns exec at_ns0 ping -c 1 10.2.2.2
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5949" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5952: ovs-appctl revalidator/purge"
+at_fn_check_prepare_trace "system-traffic.at:5952"
+( $at_check_trace; ovs-appctl revalidator/purge
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5952"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5953: ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1"
+at_fn_check_prepare_trace "system-traffic.at:5953"
+( $at_check_trace; ovs-vsctl set Open_vSwitch . other_config:vlan-limit=1
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5953"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5954: ovs-ofctl add-flow br0 \"priority=100 dl_type=0x8100 action=drop\""
+at_fn_check_prepare_trace "system-traffic.at:5954"
+( $at_check_trace; ovs-ofctl add-flow br0 "priority=100 dl_type=0x8100 action=drop"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5954"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5955: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ping -q -c 1 -w 3 10.2.2.2
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5955"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ping -q -c 1 -w 3 10.2.2.2
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:5955"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5957: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+/dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
+/dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
+/dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5957"
+( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
+/dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
+/dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
+/dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5957: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5957"
+( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5957: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:5957"
+( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5957" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5957: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5957"
+( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5957: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:5957"
+( $at_check_trace; ovs-appctl -t ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5957" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5957: :; "
+at_fn_check_prepare_trace "system-traffic.at:5957"
+( $at_check_trace; :;
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_123
+#AT_START_124
+at_fn_group_banner 124 'system-traffic.at:5961' \
+  "802.1ad - push/pop outer 802.1ad" "               " 5
+at_xfail=no
+(
+  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+
+   ovs_wait_cond () {
+    if ip link show ovs-netdev; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5962" "while ip link show ovs-netdev"
+
+      touch .conf.db.~lock~
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5962: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5962"
+( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5962: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5962"
+( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   on_exit "kill `cat ovsdb-server.pid`"
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5962: sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5962"
+( $at_check_trace; sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:5962"
+( $at_check_trace; ovs-vsctl --no-wait init
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:5962"
+( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+   on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5962: sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5962"
+( $at_check_trace; sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      ovs_wait_cond () {
+    if ip link show br0; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-traffic.at:5962" "while ip link show br0"
+
+   { set +x
+$as_echo "$at_srcdir/system-traffic.at:5962: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:5962"
+( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5962"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+$as_echo "system-traffic.at:5963" >"$at_check_line_file"
+(! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5963"
+     $as_echo "system-traffic.at:5963" >"$at_check_line_file"
+(test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5963"
+
+ovs-vsctl add-br br1 -- set Bridge br1 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
+ovs-vsctl add-br br2 -- set Bridge br2 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
+ip netns del at_ns0
+
+
+
+                { set +x
+$as_echo "$at_srcdir/system-traffic.at:5967: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5967"
+( $at_check_trace; ip netns add at_ns0 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5967"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+                on_exit 'ip netns del at_ns0
+
+
+'
+                ip netns exec at_ns0 sysctl -w net.netfilter.nf_conntrack_helper=0
+               ip netns del at_ns1
+
+
+
+                { set +x
+$as_echo "$at_srcdir/system-traffic.at:5967: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5967"
+( $at_check_trace; ip netns add at_ns1 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5967"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+                on_exit 'ip netns del at_ns1
+
+
+'
+                ip netns exec at_ns1 sysctl -w net.netfilter.nf_conntrack_helper=0
+
+
+
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5969: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:5969"
+( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5970: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:5970"
+( $at_check_trace; ip link set dev ovs-p0 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5970"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5971: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:5971"
+( $at_check_trace; ip link set dev ovs-p1 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5971"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5972: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:5972"
+( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5972"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5973: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:5973"
+( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5973"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+on_exit 'ip link del ovs-p0'
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5976: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:5976"
+( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5976"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5977: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:5977"
+( $at_check_trace; ip link set dev ovs-p2 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5977"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5978: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:5978"
+( $at_check_trace; ip link set dev ovs-p3 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5978"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5979: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:5979"
+( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/system-traffic.at:5980: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:5980"
+( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5980"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+on_exit 'ip link del ovs-p2'
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5983"
+( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ethtool -K p4 tx off"
+at_fn_check_prepare_trace "system-traffic.at:5983"
+( $at_check_trace; ethtool -K p4 tx off
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:5983"
+( $at_check_trace; ip link set p4 netns at_ns0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:5983"
+( $at_check_trace; ip link set dev ovs-p4 up
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ovs-vsctl add-port br1 ovs-p4 -- \\
+                set interface ovs-p4 external-ids:iface-id=\"p4\""
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
+( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
+                set interface ovs-p4 external-ids:iface-id="p4"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add \"10.1.1.1/24\" dev p4
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip addr add "10.1.1.1/24" dev p4
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+       { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p4 up
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p4 up
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p4 address
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip link set dev p4 address
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      if test -n ""; then
+         { set +x
+$as_echo "$at_srcdir/system-traffic.at:5983: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5983"
+( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+ip route add default via
+NS_EXEC_HEREDOC
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      fi
+      on_exit 'ip link del ovs-p4'
+
+
+ { set +x
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:5984"
+( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5984: ethtool -K p5 tx off"
+at_fn_check_prepare_trace "system-traffic.at:5984"
+( $at_check_trace; ethtool -K p5 tx off
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:5940"
+$as_echo "$at_srcdir/system-traffic.at:5984: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:5984"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:5984: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -109058,17 +109841,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -109077,7 +109860,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109085,10 +109868,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -109097,7 +109880,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109106,10 +109889,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -109118,7 +109901,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109128,10 +109911,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5940: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5984: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5940"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5984"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -109140,7 +109923,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5940"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109152,10 +109935,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -109164,7 +109947,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109172,10 +109955,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -109184,7 +109967,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109192,10 +109975,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -109204,7 +109987,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109214,10 +109997,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5941: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5985: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5941"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5985"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -109226,7 +110009,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5941"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109236,10 +110019,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -109248,7 +110031,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109256,10 +110039,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -109268,7 +110051,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109276,10 +110059,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -109288,7 +110071,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109298,10 +110081,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5942: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:5986: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5942"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5986"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -109310,7 +110093,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5942"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109334,45 +110117,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5955: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:5955"
+$as_echo "$at_srcdir/system-traffic.at:5999: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:5999"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5955"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5999"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5956: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:5956"
+$as_echo "$at_srcdir/system-traffic.at:6000: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6000"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br1 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5956"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5957: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:5957"
+$as_echo "$at_srcdir/system-traffic.at:6001: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6001"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br2 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5957"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6001"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109386,14 +110169,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:5959" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6003" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5961: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6005: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5961"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6005"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -109404,7 +110187,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5961"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6005"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109413,10 +110196,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5965: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6009: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5965"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6009"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -109427,7 +110210,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5965"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6009"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109436,11 +110219,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6013: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5969"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6013"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -109450,22 +110233,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6013"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109473,15 +110256,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109494,18 +110277,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5969" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6013" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6013"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109513,15 +110296,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109534,18 +110317,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:5969" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6013" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5969: :; "
-at_fn_check_prepare_trace "system-traffic.at:5969"
+$as_echo "$at_srcdir/system-traffic.at:6013: :; "
+at_fn_check_prepare_trace "system-traffic.at:6013"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5969"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109557,13 +110340,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_123
-#AT_START_124
-at_fn_group_banner 124 'system-traffic.at:5973' \
+#AT_STOP_124
+#AT_START_125
+at_fn_group_banner 125 'system-traffic.at:6017' \
   "802.1ad - push/pop outer 802.1q" "                " 5
 at_xfail=no
 (
-  $as_echo "124. $at_setup_line: testing $at_desc ..."
+  $as_echo "125. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109576,42 +110359,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:5974" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6018" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6018"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6018"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6018: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5974"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6018"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -109620,37 +110403,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -109658,7 +110441,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6018: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -109671,7 +110454,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5974"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6018"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -109690,7 +110473,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109704,30 +110487,30 @@
     :
 
 }
-ovs_wait "system-traffic.at:5974" "while ip link show br0"
+ovs_wait "system-traffic.at:6018" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5974: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:5974"
+$as_echo "$at_srcdir/system-traffic.at:6018: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6018"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5974"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:5975" >"$at_check_line_file"
+$as_echo "system-traffic.at:6019" >"$at_check_line_file"
 (! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5975"
-     $as_echo "system-traffic.at:5975" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6019"
+     $as_echo "system-traffic.at:6019" >"$at_check_line_file"
 (test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:5975"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6019"
 
 ovs-vsctl add-br br1 -- set Bridge br1 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ovs-vsctl add-br br2 -- set Bridge br2 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
@@ -109736,15 +110519,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5979: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5979"
+$as_echo "$at_srcdir/system-traffic.at:6023: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6023"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109760,15 +110543,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5979: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5979"
+$as_echo "$at_srcdir/system-traffic.at:6023: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6023"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5979"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6023"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109784,75 +110567,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5981: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5981"
+$as_echo "$at_srcdir/system-traffic.at:6025: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6025"
 ( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5981"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5982: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:5982"
+$as_echo "$at_srcdir/system-traffic.at:6026: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6026"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5982"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6026"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5983: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:5983"
+$as_echo "$at_srcdir/system-traffic.at:6027: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6027"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5983"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6027"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5984: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:5984"
+$as_echo "$at_srcdir/system-traffic.at:6028: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:6028"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5984"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6028"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5985: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:5985"
+$as_echo "$at_srcdir/system-traffic.at:6029: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6029"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5985"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6029"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109861,75 +110644,75 @@
 on_exit 'ip link del ovs-p0'
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5988: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5988"
+$as_echo "$at_srcdir/system-traffic.at:6032: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6032"
 ( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5988"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6032"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5989: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:5989"
+$as_echo "$at_srcdir/system-traffic.at:6033: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6033"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5989"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6033"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5990: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:5990"
+$as_echo "$at_srcdir/system-traffic.at:6034: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:6034"
 ( $at_check_trace; ip link set dev ovs-p3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5990"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6034"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5991: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:5991"
+$as_echo "$at_srcdir/system-traffic.at:6035: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:6035"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5991"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:5992: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:5992"
+$as_echo "$at_srcdir/system-traffic.at:6036: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6036"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5992"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6036"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109938,30 +110721,30 @@
 on_exit 'ip link del ovs-p2'
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link add p4 type veth peer name ovs-p4 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ethtool -K p4 tx off"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ethtool -K p4 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ethtool -K p4 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -109969,39 +110752,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link set p4 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link set p4 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip link set dev ovs-p4 up"
-at_fn_check_prepare_trace "system-traffic.at:5995"
+$as_echo "$at_srcdir/system-traffic.at:6039: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:6039"
 ( $at_check_trace; ip link set dev ovs-p4 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ovs-vsctl add-port br1 ovs-p4 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6039: ovs-vsctl add-port br1 ovs-p4 -- \\
                 set interface ovs-p4 external-ids:iface-id=\"p4\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
                 set interface ovs-p4 external-ids:iface-id="p4"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -110009,17 +110792,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p4
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p4
 NS_EXEC_HEREDOC
@@ -110028,7 +110811,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110036,10 +110819,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC
@@ -110048,7 +110831,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110057,10 +110840,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC
@@ -110069,7 +110852,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110079,10 +110862,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5995: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6039: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5995"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6039"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -110091,7 +110874,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5995"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110103,30 +110886,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ethtool -K p5 tx off"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ethtool -K p5 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ethtool -K p5 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110134,39 +110917,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:5996"
+$as_echo "$at_srcdir/system-traffic.at:6040: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:6040"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6040: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -110174,17 +110957,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -110193,7 +110976,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110201,10 +110984,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -110213,7 +110996,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110222,10 +111005,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -110234,7 +111017,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110244,10 +111027,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:5996: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6040: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5996"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6040"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -110256,7 +111039,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5996"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110268,10 +111051,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -110280,7 +111063,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110288,10 +111071,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -110300,7 +111083,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110308,10 +111091,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -110320,7 +111103,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110330,10 +111113,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5997: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6041: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5997"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6041"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -110342,7 +111125,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5997"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110352,10 +111135,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -110364,7 +111147,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110372,10 +111155,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -110384,7 +111167,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110392,10 +111175,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -110404,7 +111187,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110414,10 +111197,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:5998: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6042: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:5998"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6042"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -110426,7 +111209,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:5998"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6042"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110450,45 +111233,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6011: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:6011"
+$as_echo "$at_srcdir/system-traffic.at:6055: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:6055"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6011"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6012: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:6012"
+$as_echo "$at_srcdir/system-traffic.at:6056: ovs-ofctl --bundle add-flows br1 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6056"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br1 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6012"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6013: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
-at_fn_check_prepare_trace "system-traffic.at:6013"
+$as_echo "$at_srcdir/system-traffic.at:6057: ovs-ofctl --bundle add-flows br2 flows-customer-br.txt"
+at_fn_check_prepare_trace "system-traffic.at:6057"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br2 flows-customer-br.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6013"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110502,14 +111285,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6015" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6059" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6017: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6061: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6017"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6061"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -110520,7 +111303,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6017"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6061"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110529,10 +111312,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6021: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6065: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6021"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6065"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -110543,7 +111326,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6021"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6065"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110552,11 +111335,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6069: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6025"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6069"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -110566,22 +111349,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6069"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110589,15 +111372,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110610,18 +111393,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6025" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6069" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6069"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110629,15 +111412,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110650,18 +111433,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6025" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6069" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6025: :; "
-at_fn_check_prepare_trace "system-traffic.at:6025"
+$as_echo "$at_srcdir/system-traffic.at:6069: :; "
+at_fn_check_prepare_trace "system-traffic.at:6069"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6025"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110673,13 +111456,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_124
-#AT_START_125
-at_fn_group_banner 125 'system-traffic.at:6029' \
+#AT_STOP_125
+#AT_START_126
+at_fn_group_banner 126 'system-traffic.at:6073' \
   "802.1ad - 802.1q tunnel" "                        " 5
 at_xfail=no
 (
-  $as_echo "125. $at_setup_line: testing $at_desc ..."
+  $as_echo "126. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -110692,42 +111475,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6030" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6074" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6074"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6074"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6074: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6030"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6074"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -110736,37 +111519,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -110774,7 +111557,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6074: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -110787,7 +111570,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6030"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6074"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -110806,7 +111589,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110820,30 +111603,30 @@
     :
 
 }
-ovs_wait "system-traffic.at:6030" "while ip link show br0"
+ovs_wait "system-traffic.at:6074" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6030: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:6030"
+$as_echo "$at_srcdir/system-traffic.at:6074: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6074"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6030"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:6031" >"$at_check_line_file"
+$as_echo "system-traffic.at:6075" >"$at_check_line_file"
 (! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6031"
-     $as_echo "system-traffic.at:6031" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6075"
+     $as_echo "system-traffic.at:6075" >"$at_check_line_file"
 (test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6031"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6075"
 
 ovs-vsctl add-br br1 -- set Bridge br1 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ovs-vsctl add-br br2 -- set Bridge br2 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
@@ -110852,15 +111635,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6035: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6035"
+$as_echo "$at_srcdir/system-traffic.at:6079: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6079"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6079"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110876,15 +111659,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6035: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6035"
+$as_echo "$at_srcdir/system-traffic.at:6079: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6079"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6035"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6079"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110900,75 +111683,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6037: ip link add ovs-p0 type veth peer name ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:6037"
+$as_echo "$at_srcdir/system-traffic.at:6081: ip link add ovs-p0 type veth peer name ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6081"
 ( $at_check_trace; ip link add ovs-p0 type veth peer name ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6037"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6081"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6038: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6038"
+$as_echo "$at_srcdir/system-traffic.at:6082: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6082"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6038"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6082"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6039: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6039"
+$as_echo "$at_srcdir/system-traffic.at:6083: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6083"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6039"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6083"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6040: ovs-vsctl add-port br0 ovs-p0"
-at_fn_check_prepare_trace "system-traffic.at:6040"
+$as_echo "$at_srcdir/system-traffic.at:6084: ovs-vsctl add-port br0 ovs-p0"
+at_fn_check_prepare_trace "system-traffic.at:6084"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6040"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6084"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6041: ovs-vsctl add-port br1 ovs-p1"
-at_fn_check_prepare_trace "system-traffic.at:6041"
+$as_echo "$at_srcdir/system-traffic.at:6085: ovs-vsctl add-port br1 ovs-p1"
+at_fn_check_prepare_trace "system-traffic.at:6085"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6041"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6085"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -110977,75 +111760,75 @@
 on_exit 'ip link del ovs-p0'
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6044: ip link add ovs-p2 type veth peer name ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:6044"
+$as_echo "$at_srcdir/system-traffic.at:6088: ip link add ovs-p2 type veth peer name ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6088"
 ( $at_check_trace; ip link add ovs-p2 type veth peer name ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6044"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6045: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:6045"
+$as_echo "$at_srcdir/system-traffic.at:6089: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6089"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6045"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6089"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6046: ip link set dev ovs-p3 up"
-at_fn_check_prepare_trace "system-traffic.at:6046"
+$as_echo "$at_srcdir/system-traffic.at:6090: ip link set dev ovs-p3 up"
+at_fn_check_prepare_trace "system-traffic.at:6090"
 ( $at_check_trace; ip link set dev ovs-p3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6046"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6090"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6047: ovs-vsctl add-port br0 ovs-p2"
-at_fn_check_prepare_trace "system-traffic.at:6047"
+$as_echo "$at_srcdir/system-traffic.at:6091: ovs-vsctl add-port br0 ovs-p2"
+at_fn_check_prepare_trace "system-traffic.at:6091"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6047"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6091"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6048: ovs-vsctl add-port br2 ovs-p3"
-at_fn_check_prepare_trace "system-traffic.at:6048"
+$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl add-port br2 ovs-p3"
+at_fn_check_prepare_trace "system-traffic.at:6092"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6048"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111054,30 +111837,30 @@
 on_exit 'ip link del ovs-p2'
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link add p4 type veth peer name ovs-p4 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link add p4 type veth peer name ovs-p4 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link add p4 type veth peer name ovs-p4 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ethtool -K p4 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ethtool -K p4 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ethtool -K p4 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111085,39 +111868,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link set p4 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link set p4 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link set p4 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip link set dev ovs-p4 up"
-at_fn_check_prepare_trace "system-traffic.at:6051"
+$as_echo "$at_srcdir/system-traffic.at:6095: ip link set dev ovs-p4 up"
+at_fn_check_prepare_trace "system-traffic.at:6095"
 ( $at_check_trace; ip link set dev ovs-p4 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ovs-vsctl add-port br1 ovs-p4 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6095: ovs-vsctl add-port br1 ovs-p4 -- \\
                 set interface ovs-p4 external-ids:iface-id=\"p4\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ovs-vsctl add-port br1 ovs-p4 -- \
                 set interface ovs-p4 external-ids:iface-id="p4"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -111125,17 +111908,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p4
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p4
 NS_EXEC_HEREDOC
@@ -111144,7 +111927,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111152,10 +111935,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 up
 NS_EXEC_HEREDOC
@@ -111164,7 +111947,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111173,10 +111956,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4 address
 NS_EXEC_HEREDOC
@@ -111185,7 +111968,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111195,10 +111978,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6051: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6095: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6051"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6095"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -111207,7 +111990,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6051"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111219,30 +112002,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link add p5 type veth peer name ovs-p5 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link add p5 type veth peer name ovs-p5 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link add p5 type veth peer name ovs-p5 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ethtool -K p5 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ethtool -K p5 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ethtool -K p5 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111250,39 +112033,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link set p5 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link set p5 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link set p5 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip link set dev ovs-p5 up"
-at_fn_check_prepare_trace "system-traffic.at:6052"
+$as_echo "$at_srcdir/system-traffic.at:6096: ip link set dev ovs-p5 up"
+at_fn_check_prepare_trace "system-traffic.at:6096"
 ( $at_check_trace; ip link set dev ovs-p5 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ovs-vsctl add-port br2 ovs-p5 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6096: ovs-vsctl add-port br2 ovs-p5 -- \\
                 set interface ovs-p5 external-ids:iface-id=\"p5\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ovs-vsctl add-port br2 ovs-p5 -- \
                 set interface ovs-p5 external-ids:iface-id="p5"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -111290,17 +112073,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p5
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p5
 NS_EXEC_HEREDOC
@@ -111309,7 +112092,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111317,10 +112100,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 up
 NS_EXEC_HEREDOC
@@ -111329,7 +112112,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111338,10 +112121,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5 address
 NS_EXEC_HEREDOC
@@ -111350,7 +112133,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111360,10 +112143,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6052: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6096: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6052"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6096"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -111372,7 +112155,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6052"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6096"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111384,10 +112167,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -111396,7 +112179,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111404,10 +112187,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.100 up
 NS_EXEC_HEREDOC
@@ -111416,7 +112199,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111424,10 +112207,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -111436,7 +112219,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111446,10 +112229,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6053: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6053"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -111458,7 +112241,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6053"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111468,10 +112251,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -111480,7 +112263,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111488,10 +112271,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.100 up
 NS_EXEC_HEREDOC
@@ -111500,7 +112283,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111508,10 +112291,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -111520,7 +112303,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111530,10 +112313,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6054: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6054"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -111542,7 +112325,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6054"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111552,10 +112335,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC
@@ -111564,7 +112347,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111572,10 +112355,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.200 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.200 up
 NS_EXEC_HEREDOC
@@ -111584,7 +112367,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111592,10 +112375,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.200 \"10.3.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.200 "10.3.2.1/24"
 NS_EXEC_HEREDOC
@@ -111604,7 +112387,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111614,10 +112397,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6055: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6099: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.200 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6055"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6099"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.200 mtu 1492
 NS_EXEC_HEREDOC
@@ -111626,7 +112409,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6055"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6099"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111636,10 +112419,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.200 type vlan proto 802.1q id 200
 NS_EXEC_HEREDOC
@@ -111648,7 +112431,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111656,10 +112439,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.200 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.200 up
 NS_EXEC_HEREDOC
@@ -111668,7 +112451,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111676,10 +112459,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.200 \"10.3.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.200 "10.3.2.2/24"
 NS_EXEC_HEREDOC
@@ -111688,7 +112471,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111698,10 +112481,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6056: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.200 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6056"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.200 mtu 1492
 NS_EXEC_HEREDOC
@@ -111710,7 +112493,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6056"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111720,10 +112503,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p4 name p4.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC
@@ -111732,7 +112515,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111740,10 +112523,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.300 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p4.300 up
 NS_EXEC_HEREDOC
@@ -111752,7 +112535,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111760,10 +112543,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.300 \"10.4.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p4.300 "10.4.2.1/24"
 NS_EXEC_HEREDOC
@@ -111772,7 +112555,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111782,10 +112565,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6057: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.300 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6057"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p4.300 mtu 1492
 NS_EXEC_HEREDOC
@@ -111794,7 +112577,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6057"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111804,10 +112587,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p5 name p5.300 type vlan proto 802.1q id 300
 NS_EXEC_HEREDOC
@@ -111816,7 +112599,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111824,10 +112607,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.300 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p5.300 up
 NS_EXEC_HEREDOC
@@ -111836,7 +112619,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111844,10 +112627,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.300 \"10.4.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p5.300 "10.4.2.2/24"
 NS_EXEC_HEREDOC
@@ -111856,7 +112639,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111866,10 +112649,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6058: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6102: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.300 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6058"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6102"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p5.300 mtu 1492
 NS_EXEC_HEREDOC
@@ -111878,7 +112661,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6058"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6102"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111889,75 +112672,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6060: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6060"
+$as_echo "$at_srcdir/system-traffic.at:6104: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6104"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6060"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6061: ovs-ofctl add-flow br1 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6061"
+$as_echo "$at_srcdir/system-traffic.at:6105: ovs-ofctl add-flow br1 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6105"
 ( $at_check_trace; ovs-ofctl add-flow br1 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6061"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6105"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6062: ovs-ofctl add-flow br2 action=normal"
-at_fn_check_prepare_trace "system-traffic.at:6062"
+$as_echo "$at_srcdir/system-traffic.at:6106: ovs-ofctl add-flow br2 action=normal"
+at_fn_check_prepare_trace "system-traffic.at:6106"
 ( $at_check_trace; ovs-ofctl add-flow br2 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6062"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6106"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6063: ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
-at_fn_check_prepare_trace "system-traffic.at:6063"
+$as_echo "$at_srcdir/system-traffic.at:6107: ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
+at_fn_check_prepare_trace "system-traffic.at:6107"
 ( $at_check_trace; ovs-vsctl set port ovs-p0 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6063"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6107"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6064: ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
-at_fn_check_prepare_trace "system-traffic.at:6064"
+$as_echo "$at_srcdir/system-traffic.at:6108: ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200"
+at_fn_check_prepare_trace "system-traffic.at:6108"
 ( $at_check_trace; ovs-vsctl set port ovs-p2 vlan_mode=dot1q-tunnel tag=4094 cvlans=100,200
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6064"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6108"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -111971,7 +112754,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6066" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6110" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 ovs_wait_cond () {
     ip netns exec at_ns0 ping -c 1 10.3.2.2
@@ -111980,14 +112763,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6067" "until ip netns exec at_ns0 ping -c 1 10.3.2.2"
+ovs_wait "system-traffic.at:6111" "until ip netns exec at_ns0 ping -c 1 10.3.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6069: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6113: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6069"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6113"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -111998,7 +112781,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6069"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6113"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112007,10 +112790,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6073: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6117: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6073"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6117"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -112021,7 +112804,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6073"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6117"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112030,10 +112813,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6077: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6121: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6077"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6121"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -112044,7 +112827,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6077"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6121"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112053,10 +112836,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6081: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6125: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6081"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6125"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.3.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -112067,7 +112850,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6081"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6125"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112076,10 +112859,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6086: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6130: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.4.2.2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6086"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 1 -w 3 10.4.2.2
 NS_EXEC_HEREDOC
@@ -112088,7 +112871,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:6086"
+at_fn_check_status 1 $at_status "$at_srcdir/system-traffic.at:6130"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112097,11 +112880,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: check_logs \"/dropping VLAN \\(0\\|300\\) packet received on dot1q-tunnel port/d\"\";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6132: check_logs \"/dropping VLAN \\(0\\|300\\) packet received on dot1q-tunnel port/d\"\";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6088"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6132"
 ( $at_check_trace; check_logs "/dropping VLAN \(0\|300\) packet received on dot1q-tunnel port/d"";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -112111,22 +112894,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6132"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112134,15 +112917,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112155,18 +112938,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6088" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6132" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6132"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112174,15 +112957,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112195,18 +112978,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6088" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6132" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6088: :; "
-at_fn_check_prepare_trace "system-traffic.at:6088"
+$as_echo "$at_srcdir/system-traffic.at:6132: :; "
+at_fn_check_prepare_trace "system-traffic.at:6132"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6088"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112218,13 +113001,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_125
-#AT_START_126
-at_fn_group_banner 126 'system-traffic.at:6091' \
+#AT_STOP_126
+#AT_START_127
+at_fn_group_banner 127 'system-traffic.at:6135' \
   "802.1ad - double vlan match" "                    " 5
 at_xfail=no
 (
-  $as_echo "126. $at_setup_line: testing $at_desc ..."
+  $as_echo "127. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -112237,42 +113020,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6092" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6136" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6136"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6136"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6136: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6092"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6136"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -112281,37 +113064,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -112319,7 +113102,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6136: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -112332,7 +113115,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6092"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6136"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -112351,7 +113134,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112365,45 +113148,45 @@
     :
 
 }
-ovs_wait "system-traffic.at:6092" "while ip link show br0"
+ovs_wait "system-traffic.at:6136" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6092: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
-at_fn_check_prepare_trace "system-traffic.at:6092"
+$as_echo "$at_srcdir/system-traffic.at:6136: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0 "
+at_fn_check_prepare_trace "system-traffic.at:6136"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  -- set Open_vSwitch . other_config:vlan-limit=0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6092"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6136"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 
-$as_echo "system-traffic.at:6093" >"$at_check_line_file"
+$as_echo "system-traffic.at:6137" >"$at_check_line_file"
 (! grep -q "VLAN header stack length probed as" ovs-vswitchd.log) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6093"
-     $as_echo "system-traffic.at:6093" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6137"
+     $as_echo "system-traffic.at:6137" >"$at_check_line_file"
 (test `sed -n 's/.*VLAN header stack length probed as \([0-9]\+\).*/\1/p' ovs-vswitchd.log` -lt 2) \
-  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6093"
+  && at_fn_check_skip 77 "$at_srcdir/system-traffic.at:6137"
 
 ip netns del at_ns0
 
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6095: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6095"
+$as_echo "$at_srcdir/system-traffic.at:6139: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6139"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112419,15 +113202,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6095: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6095"
+$as_echo "$at_srcdir/system-traffic.at:6139: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6139"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6095"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112443,30 +113226,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112474,39 +113257,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6097"
+$as_echo "$at_srcdir/system-traffic.at:6141: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6141"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6141: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -112514,17 +113297,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.1/24\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.1/24" dev p0
 NS_EXEC_HEREDOC
@@ -112533,7 +113316,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112541,10 +113324,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -112553,7 +113336,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112562,10 +113345,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -112574,7 +113357,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112584,10 +113367,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6097: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6097"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -112596,7 +113379,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6097"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112608,30 +113391,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112639,39 +113422,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6098"
+$as_echo "$at_srcdir/system-traffic.at:6142: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6142"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6142: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -112679,17 +113462,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"10.1.1.2/24\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "10.1.1.2/24" dev p1
 NS_EXEC_HEREDOC
@@ -112698,7 +113481,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112706,10 +113489,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -112718,7 +113501,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112727,10 +113510,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -112739,7 +113522,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112749,10 +113532,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6098: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6142: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6098"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6142"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -112761,7 +113544,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6098"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6142"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112774,10 +113557,10 @@
 
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0 name p0.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -112786,7 +113569,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112794,10 +113577,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094 up
 NS_EXEC_HEREDOC
@@ -112806,7 +113589,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112814,10 +113597,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 \"10.255.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094 "10.255.2.1/24"
 NS_EXEC_HEREDOC
@@ -112826,7 +113609,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112834,10 +113617,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6100: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6144: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6100"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6144"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -112846,7 +113629,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6100"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6144"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112856,10 +113639,10 @@
 
 
   { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1 name p1.4094 type vlan proto 802.1ad id 4094
 NS_EXEC_HEREDOC
@@ -112868,7 +113651,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112876,10 +113659,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094 up
 NS_EXEC_HEREDOC
@@ -112888,7 +113671,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112896,10 +113679,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 \"10.255.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094 "10.255.2.2/24"
 NS_EXEC_HEREDOC
@@ -112908,7 +113691,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112916,10 +113699,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6101: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6145: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6101"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6145"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094 mtu 1496
 NS_EXEC_HEREDOC
@@ -112928,7 +113711,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6101"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6145"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112939,10 +113722,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link add link p0.4094 name p0.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -112951,7 +113734,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112959,10 +113742,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0.4094.100 up
 NS_EXEC_HEREDOC
@@ -112971,7 +113754,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -112979,10 +113762,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 \"10.2.2.1/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add dev p0.4094.100 "10.2.2.1/24"
 NS_EXEC_HEREDOC
@@ -112991,7 +113774,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113001,10 +113784,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6103: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6103"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set p0.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -113013,7 +113796,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6103"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113023,10 +113806,10 @@
 
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link add link p1.4094 name p1.4094.100 type vlan proto 802.1q id 100
 NS_EXEC_HEREDOC
@@ -113035,7 +113818,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113043,10 +113826,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1.4094.100 up
 NS_EXEC_HEREDOC
@@ -113055,7 +113838,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113063,10 +113846,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 \"10.2.2.2/24\"
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add dev p1.4094.100 "10.2.2.2/24"
 NS_EXEC_HEREDOC
@@ -113075,7 +113858,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113085,10 +113868,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6104: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6148: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6104"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6148"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set p1.4094.100 mtu 1492
 NS_EXEC_HEREDOC
@@ -113097,7 +113880,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6104"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6148"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113114,15 +113897,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6111: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
-at_fn_check_prepare_trace "system-traffic.at:6111"
+$as_echo "$at_srcdir/system-traffic.at:6155: ovs-ofctl --bundle add-flows br0 flows-br0.txt"
+at_fn_check_prepare_trace "system-traffic.at:6155"
 ( $at_check_trace; ovs-ofctl --bundle add-flows br0 flows-br0.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6111"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6155"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113136,14 +113919,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6113" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
+ovs_wait "system-traffic.at:6157" "until ip netns exec at_ns0 ping -c 1 10.2.2.2"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6115: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6159: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6115"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6159"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -113154,7 +113937,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6115"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6159"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113163,10 +113946,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6119: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6163: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6119"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6163"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ping -s 1600 -q -c 3 -i 0.3 -w 2 10.2.2.2 | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -113177,7 +113960,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6119"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6163"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113186,11 +113969,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6167: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6123"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -113200,22 +113983,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6167"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113223,15 +114006,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113244,18 +114027,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6123" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6167" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6167"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113263,15 +114046,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113284,18 +114067,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6123" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6167" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6123: :; "
-at_fn_check_prepare_trace "system-traffic.at:6123"
+$as_echo "$at_srcdir/system-traffic.at:6167: :; "
+at_fn_check_prepare_trace "system-traffic.at:6167"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6123"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113307,13 +114090,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_126
-#AT_START_127
-at_fn_group_banner 127 'system-traffic.at:6129' \
+#AT_STOP_127
+#AT_START_128
+at_fn_group_banner 128 'system-traffic.at:6173' \
   "nsh - encap header" "                             " 6
 at_xfail=no
 (
-  $as_echo "127. $at_setup_line: testing $at_desc ..."
+  $as_echo "128. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -113326,42 +114109,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6130" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6174" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6174"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6174"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6174: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6174"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -113370,37 +114153,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -113408,7 +114191,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6174: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -113421,7 +114204,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6130"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6174"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -113440,7 +114223,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113454,18 +114237,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6130" "while ip link show br0"
+ovs_wait "system-traffic.at:6174" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6130: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6130"
+$as_echo "$at_srcdir/system-traffic.at:6174: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6174"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6130"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6174"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113478,15 +114261,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6132: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6132"
+$as_echo "$at_srcdir/system-traffic.at:6176: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6176"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113502,15 +114285,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6132: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6132"
+$as_echo "$at_srcdir/system-traffic.at:6176: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6176"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6132"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113526,30 +114309,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113557,39 +114340,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6134"
+$as_echo "$at_srcdir/system-traffic.at:6178: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6178"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6178: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -113597,17 +114380,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -113616,7 +114399,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113624,10 +114407,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -113636,7 +114419,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113645,10 +114428,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -113657,7 +114440,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113667,10 +114450,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6134: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6178: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6134"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6178"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -113679,7 +114462,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6134"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6178"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113691,30 +114474,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113722,39 +114505,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6135"
+$as_echo "$at_srcdir/system-traffic.at:6179: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6179"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6179: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -113762,17 +114545,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -113781,7 +114564,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113789,10 +114572,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -113801,7 +114584,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113810,10 +114593,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -113822,7 +114605,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113832,10 +114615,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6135: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6135"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -113844,7 +114627,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6135"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113857,15 +114640,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6139: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6139"
+$as_echo "$at_srcdir/system-traffic.at:6183: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6183"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,ip,actions=encap(nsh(md_type=1)),set_field:0x1234->nsh_spi,set_field:0x11223344->nsh_c1,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6139"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6183"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113873,10 +114656,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6141: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6185: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6141"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6185"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -113885,7 +114668,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6141"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6185"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113895,10 +114678,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6147: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6191: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6147"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6191"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -113907,7 +114690,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6147"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6191"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -113922,7 +114705,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6150" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0fc6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6194" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0fc6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000" 2>&1 1>/dev/null
@@ -113931,7 +114714,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6151" "until cat p1.pcap | egrep \"0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6195" "until cat p1.pcap | egrep \"0x0010: *0103 *0012 *34ff *1122 *3344 *0000 *0000 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -113940,7 +114723,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6152" "until cat p1.pcap | egrep \"0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6196" "until cat p1.pcap | egrep \"0x0020: *0000 *0000 *0000 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -113949,7 +114732,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6153" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6197" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -113958,7 +114741,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6154" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6198" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -113967,15 +114750,15 @@
     :
 
 }
-ovs_wait "system-traffic.at:6155" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6199" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6201: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6157"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6201"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -113985,22 +114768,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6201"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114008,15 +114791,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114029,18 +114812,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6157" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6201" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6201"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114048,15 +114831,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114069,18 +114852,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6157" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6201" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6157: :; "
-at_fn_check_prepare_trace "system-traffic.at:6157"
+$as_echo "$at_srcdir/system-traffic.at:6201: :; "
+at_fn_check_prepare_trace "system-traffic.at:6201"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6201"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114092,13 +114875,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_127
-#AT_START_128
-at_fn_group_banner 128 'system-traffic.at:6161' \
+#AT_STOP_128
+#AT_START_129
+at_fn_group_banner 129 'system-traffic.at:6205' \
   "nsh - decap header" "                             " 6
 at_xfail=no
 (
-  $as_echo "128. $at_setup_line: testing $at_desc ..."
+  $as_echo "129. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -114111,42 +114894,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6162" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6206" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6206"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6206"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6206: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6162"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6206"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -114155,37 +114938,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -114193,7 +114976,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6206: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -114206,7 +114989,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6162"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6206"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -114225,7 +115008,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114239,18 +115022,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6162" "while ip link show br0"
+ovs_wait "system-traffic.at:6206" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6162: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6162"
+$as_echo "$at_srcdir/system-traffic.at:6206: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6206"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6162"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6206"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114263,15 +115046,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6164: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6164"
+$as_echo "$at_srcdir/system-traffic.at:6208: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6208"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6164"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114287,15 +115070,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6164: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6164"
+$as_echo "$at_srcdir/system-traffic.at:6208: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6208"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6164"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114311,30 +115094,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114342,39 +115125,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6166"
+$as_echo "$at_srcdir/system-traffic.at:6210: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6210"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6210: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -114382,17 +115165,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -114401,7 +115184,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114409,10 +115192,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -114421,7 +115204,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114430,10 +115213,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -114442,7 +115225,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114452,10 +115235,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6166: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6210: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6166"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6210"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -114464,7 +115247,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6166"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6210"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114476,30 +115259,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114507,39 +115290,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6167"
+$as_echo "$at_srcdir/system-traffic.at:6211: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6211"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6211: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -114547,17 +115330,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -114566,7 +115349,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114574,10 +115357,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -114586,7 +115369,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114595,10 +115378,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -114607,7 +115390,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114617,10 +115400,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6167: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6211: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6167"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6211"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -114629,7 +115412,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6167"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6211"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114642,15 +115425,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6171: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6171"
+$as_echo "$at_srcdir/system-traffic.at:6215: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6215"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f, actions=decap(),decap(), ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6171"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6215"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114658,10 +115441,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6173: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6217: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6173"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6217"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -114670,7 +115453,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6173"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6217"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114680,10 +115463,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6179: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6223: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 00 64 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6179"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6223"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 00 64 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -114692,7 +115475,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6179"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6223"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114707,7 +115490,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6182" "until cat p1.pcap | egrep \"0x0000: *f200 *0000 *0002 *f200 *0000 *0001 *0800 *4500\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6226" "until cat p1.pcap | egrep \"0x0000: *f200 *0000 *0002 *f200 *0000 *0001 *0800 *4500\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00" 2>&1 1>/dev/null
@@ -114716,7 +115499,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6183" "until cat p1.pcap | egrep \"0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6227" "until cat p1.pcap | egrep \"0x0010: *0028 *0001 *0000 *4006 *b013 *c0a8 *000a *0a00\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002" 2>&1 1>/dev/null
@@ -114725,7 +115508,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6184" "until cat p1.pcap | egrep \"0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6228" "until cat p1.pcap | egrep \"0x0020: *000a *0400 *0800 *0000 *00c8 *0000 *0000 *5002\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -114734,15 +115517,15 @@
     :
 
 }
-ovs_wait "system-traffic.at:6185" "until cat p1.pcap | egrep \"0x0030: *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6229" "until cat p1.pcap | egrep \"0x0030: *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6231: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6187"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -114752,22 +115535,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6231"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114775,15 +115558,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114796,18 +115579,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6187" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6231" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6231"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114815,15 +115598,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114836,18 +115619,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6187" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6231" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6187: :; "
-at_fn_check_prepare_trace "system-traffic.at:6187"
+$as_echo "$at_srcdir/system-traffic.at:6231: :; "
+at_fn_check_prepare_trace "system-traffic.at:6231"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6187"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -114859,13 +115642,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_128
-#AT_START_129
-at_fn_group_banner 129 'system-traffic.at:6191' \
+#AT_STOP_129
+#AT_START_130
+at_fn_group_banner 130 'system-traffic.at:6235' \
   "nsh - replace header" "                           " 6
 at_xfail=no
 (
-  $as_echo "129. $at_setup_line: testing $at_desc ..."
+  $as_echo "130. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -114878,42 +115661,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6192" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6236" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6236"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6236"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6236: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6192"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6236"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -114922,37 +115705,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -114960,7 +115743,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6236: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -114973,7 +115756,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6192"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6236"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -114992,7 +115775,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115006,18 +115789,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6192" "while ip link show br0"
+ovs_wait "system-traffic.at:6236" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6192: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6192"
+$as_echo "$at_srcdir/system-traffic.at:6236: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6236"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6192"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6236"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115030,15 +115813,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6194: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6194"
+$as_echo "$at_srcdir/system-traffic.at:6238: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6238"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6194"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115054,15 +115837,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6194: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6194"
+$as_echo "$at_srcdir/system-traffic.at:6238: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6238"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6194"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115078,30 +115861,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115109,39 +115892,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6196"
+$as_echo "$at_srcdir/system-traffic.at:6240: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6240"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6240: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -115149,17 +115932,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -115168,7 +115951,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115176,10 +115959,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -115188,7 +115971,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115197,10 +115980,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -115209,7 +115992,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115219,10 +116002,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6196: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6240: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6196"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6240"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -115231,7 +116014,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6196"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6240"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115243,30 +116026,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115274,39 +116057,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6197"
+$as_echo "$at_srcdir/system-traffic.at:6241: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6241"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6241: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -115314,17 +116097,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -115333,7 +116116,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115341,10 +116124,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -115353,7 +116136,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115362,10 +116145,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -115374,7 +116157,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115384,10 +116167,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6197: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6197"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -115396,7 +116179,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6197"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115409,15 +116192,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6203: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6203"
+$as_echo "$at_srcdir/system-traffic.at:6247: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6247"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,in_port=ovs-p0,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x03,actions=decap(),decap(),encap(nsh(md_type=1)),set_field:0x07->nsh_ttl,set_field:0x0101->nsh_spi,set_field:0x04->nsh_si,set_field:0x100f0e0d->nsh_c1,set_field:0x0c0b0a09->nsh_c2,set_field:0x08070605->nsh_c3,set_field:0x04030201->nsh_c4,encap(ethernet),set_field:f2:ff:00:00:00:02->dl_dst,set_field:f2:ff:00:00:00:01->dl_src,ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6203"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6247"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115425,10 +116208,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6205: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6249: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6205"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6249"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -115437,7 +116220,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6205"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6249"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115447,10 +116230,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6212: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6256: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6212"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6256"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 03 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -115459,7 +116242,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6212"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6256"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115474,7 +116257,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6215" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000* 0001 *894f *01c6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6259" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000* 0001 *894f *01c6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807" 2>&1 1>/dev/null
@@ -115483,7 +116266,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6216" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6260" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0104 *100f *0e0d *0c0b *0a09 *0807\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -115492,7 +116275,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6217" "until cat p1.pcap | egrep \"0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6261" "until cat p1.pcap | egrep \"0x0020: *0605 *0403 *0201 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -115501,7 +116284,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6218" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6262" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -115510,7 +116293,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6219" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6263" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -115519,15 +116302,15 @@
     :
 
 }
-ovs_wait "system-traffic.at:6220" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6264" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6266: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6222"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6266"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -115537,22 +116320,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6266"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115560,15 +116343,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115581,18 +116364,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6222" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6266" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6266"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115600,15 +116383,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115621,18 +116404,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6222" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6266" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6222: :; "
-at_fn_check_prepare_trace "system-traffic.at:6222"
+$as_echo "$at_srcdir/system-traffic.at:6266: :; "
+at_fn_check_prepare_trace "system-traffic.at:6266"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6222"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115644,13 +116427,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_129
-#AT_START_130
-at_fn_group_banner 130 'system-traffic.at:6226' \
+#AT_STOP_130
+#AT_START_131
+at_fn_group_banner 131 'system-traffic.at:6270' \
   "nsh - forward" "                                  " 6
 at_xfail=no
 (
-  $as_echo "130. $at_setup_line: testing $at_desc ..."
+  $as_echo "131. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -115663,42 +116446,42 @@
     :
 
 }
-ovs_wait "system-traffic.at:6227" "while ip link show ovs-netdev"
+ovs_wait "system-traffic.at:6271" "while ip link show ovs-netdev"
 
       touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "system-traffic.at:6271"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "system-traffic.at:6271"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6271: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6271"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -115707,37 +116490,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vswitchd --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -115745,7 +116528,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: sed < stderr '
+$as_echo "$at_srcdir/system-traffic.at:6271: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -115758,7 +116541,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6227"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6271"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -115777,7 +116560,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115791,18 +116574,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6227" "while ip link show br0"
+ovs_wait "system-traffic.at:6271" "while ip link show br0"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6227: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
-at_fn_check_prepare_trace "system-traffic.at:6227"
+$as_echo "$at_srcdir/system-traffic.at:6271: ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type=\"netdev\" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --  "
+at_fn_check_prepare_trace "system-traffic.at:6271"
 ( $at_check_trace; ovs-vsctl -- add-br br0 -- set Bridge br0 datapath_type="netdev" protocols=OpenFlow10,OpenFlow11,OpenFlow12,OpenFlow13,OpenFlow14,OpenFlow15 fail-mode=secure  --
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6227"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6271"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115815,15 +116598,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115839,15 +116622,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115863,15 +116646,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6229: ip netns add at_ns2 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6229"
+$as_echo "$at_srcdir/system-traffic.at:6273: ip netns add at_ns2 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6273"
 ( $at_check_trace; ip netns add at_ns2 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115887,30 +116670,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link add p0 type veth peer name ovs-p0 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link add p0 type veth peer name ovs-p0 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link add p0 type veth peer name ovs-p0 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ethtool -K p0 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ethtool -K p0 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ethtool -K p0 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115918,39 +116701,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link set p0 netns at_ns0"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link set p0 netns at_ns0"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link set p0 netns at_ns0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip link set dev ovs-p0 up"
-at_fn_check_prepare_trace "system-traffic.at:6231"
+$as_echo "$at_srcdir/system-traffic.at:6275: ip link set dev ovs-p0 up"
+at_fn_check_prepare_trace "system-traffic.at:6275"
 ( $at_check_trace; ip link set dev ovs-p0 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ovs-vsctl add-port br0 ovs-p0 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6275: ovs-vsctl add-port br0 ovs-p0 -- \\
                 set interface ovs-p0 external-ids:iface-id=\"p0\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p0 -- \
                 set interface ovs-p0 external-ids:iface-id="p0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -115958,17 +116741,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p0
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p0
 NS_EXEC_HEREDOC
@@ -115977,7 +116760,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -115985,10 +116768,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 up
 NS_EXEC_HEREDOC
@@ -115997,7 +116780,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116006,10 +116789,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip link set dev p0 address
 NS_EXEC_HEREDOC
@@ -116018,7 +116801,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116028,10 +116811,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6231: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6275: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6275"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -116040,7 +116823,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6275"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116052,30 +116835,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link add p1 type veth peer name ovs-p1 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link add p1 type veth peer name ovs-p1 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link add p1 type veth peer name ovs-p1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ethtool -K p1 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ethtool -K p1 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ethtool -K p1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116083,39 +116866,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link set p1 netns at_ns1"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link set p1 netns at_ns1"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link set p1 netns at_ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip link set dev ovs-p1 up"
-at_fn_check_prepare_trace "system-traffic.at:6232"
+$as_echo "$at_srcdir/system-traffic.at:6276: ip link set dev ovs-p1 up"
+at_fn_check_prepare_trace "system-traffic.at:6276"
 ( $at_check_trace; ip link set dev ovs-p1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ovs-vsctl add-port br0 ovs-p1 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6276: ovs-vsctl add-port br0 ovs-p1 -- \\
                 set interface ovs-p1 external-ids:iface-id=\"p1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p1 -- \
                 set interface ovs-p1 external-ids:iface-id="p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -116123,17 +116906,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p1
 NS_EXEC_HEREDOC
@@ -116142,7 +116925,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116150,10 +116933,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 up
 NS_EXEC_HEREDOC
@@ -116162,7 +116945,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116171,10 +116954,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip link set dev p1 address
 NS_EXEC_HEREDOC
@@ -116183,7 +116966,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116193,10 +116976,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6232: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6276: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6276"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -116205,7 +116988,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116217,30 +117000,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link add p2 type veth peer name ovs-p2 || return 77"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link add p2 type veth peer name ovs-p2 || return 77"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link add p2 type veth peer name ovs-p2 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ethtool -K p2 tx off"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ethtool -K p2 tx off"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ethtool -K p2 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116248,39 +117031,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link set p2 netns at_ns2"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link set p2 netns at_ns2"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link set p2 netns at_ns2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip link set dev ovs-p2 up"
-at_fn_check_prepare_trace "system-traffic.at:6233"
+$as_echo "$at_srcdir/system-traffic.at:6277: ip link set dev ovs-p2 up"
+at_fn_check_prepare_trace "system-traffic.at:6277"
 ( $at_check_trace; ip link set dev ovs-p2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ovs-vsctl add-port br0 ovs-p2 -- \\
+$as_echo "$at_srcdir/system-traffic.at:6277: ovs-vsctl add-port br0 ovs-p2 -- \\
                 set interface ovs-p2 external-ids:iface-id=\"p2\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ovs-vsctl add-port br0 ovs-p2 -- \
                 set interface ovs-p2 external-ids:iface-id="p2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -116288,17 +117071,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip addr add \"0.0.0.0\" dev p2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip addr add "0.0.0.0" dev p2
 NS_EXEC_HEREDOC
@@ -116307,7 +117090,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116315,10 +117098,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 up
 NS_EXEC_HEREDOC
@@ -116327,7 +117110,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116336,10 +117119,10 @@
 
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 address
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip link set dev p2 address
 NS_EXEC_HEREDOC
@@ -116348,7 +117131,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116358,10 +117141,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-traffic.at:6233: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6277: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6233"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6277"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -116370,7 +117153,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6233"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6277"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116383,30 +117166,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6238: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1\""
-at_fn_check_prepare_trace "system-traffic.at:6238"
+$as_echo "$at_srcdir/system-traffic.at:6282: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1\""
+at_fn_check_prepare_trace "system-traffic.at:6282"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x02,actions=ovs-p1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6238"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6282"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6239: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2\""
-at_fn_check_prepare_trace "system-traffic.at:6239"
+$as_echo "$at_srcdir/system-traffic.at:6283: ovs-ofctl -Oopenflow13 add-flow br0 \"table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2\""
+at_fn_check_prepare_trace "system-traffic.at:6283"
 ( $at_check_trace; ovs-ofctl -Oopenflow13 add-flow br0 "table=0,priority=100,dl_type=0x894f,nsh_spi=0x100,nsh_si=0x01,actions=ovs-p2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6239"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6283"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116414,10 +117197,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6241: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6285: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6241"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6285"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p1 > p1.pcap &
 NS_EXEC_HEREDOC
@@ -116426,7 +117209,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6241"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6285"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116434,10 +117217,10 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6242: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6286: ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p2 > p2.pcap &
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6242"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6286"
 ( $at_check_trace; ip netns exec at_ns2 sh << NS_EXEC_HEREDOC
 tcpdump -l -n -xx -U -i p2 > p2.pcap &
 NS_EXEC_HEREDOC
@@ -116446,7 +117229,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6242"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6286"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116456,10 +117239,10 @@
 sleep 1
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6246: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6290: ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 02 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6246"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6290"
 ( $at_check_trace; ip netns exec at_ns0 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p0 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 02 06 01 03 00 01 00 02 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -116468,7 +117251,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6246"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6290"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116483,7 +117266,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6249" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0206\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6293" "until cat p1.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *0206\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a" 2>&1 1>/dev/null
@@ -116492,7 +117275,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6250" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6294" "until cat p1.pcap | egrep \"0x0010: *0103 *0001 *0002 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -116501,7 +117284,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6251" "until cat p1.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6295" "until cat p1.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -116510,7 +117293,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6252" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6296" "until cat p1.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -116519,7 +117302,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6253" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6297" "until cat p1.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p1.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -116528,14 +117311,14 @@
     :
 
 }
-ovs_wait "system-traffic.at:6254" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6298" "until cat p1.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
  { set +x
-$as_echo "$at_srcdir/system-traffic.at:6257: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-traffic.at:6301: ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 \$PYTHON3 \$srcdir/sendpkt.py p1 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 01 c6 01 03 00 01 00 01 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6257"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6301"
 ( $at_check_trace; ip netns exec at_ns1 sh << NS_EXEC_HEREDOC
 $PYTHON3 $srcdir/sendpkt.py p1 f2 ff 00 00 00 02 f2 ff 00 00 00 01 89 4f 01 c6 01 03 00 01 00 01 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 f2 00 00 00 00 02 f2 00 00 00 00 01 08 00 45 00 00 28 00 01 00 00 40 06 b0 13 c0 a8 00 0a 0a 00 00 0a 04 00 08 00 00 00 00 c8 00 00 00 00 50 02 20 00 b8 5e 00 00 > /dev/null
 NS_EXEC_HEREDOC
@@ -116544,7 +117327,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6257"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6301"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116559,7 +117342,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6260" "until cat p2.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *01c6\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6304" "until cat p2.pcap | egrep \"0x0000: *f2ff *0000 *0002 *f2ff *0000 *0001 *894f *01c6\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a" 2>&1 1>/dev/null
@@ -116568,7 +117351,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6261" "until cat p2.pcap | egrep \"0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6305" "until cat p2.pcap | egrep \"0x0010: *0103 *0001 *0001 *0102 *0304 *0506 *0708 *090a\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000" 2>&1 1>/dev/null
@@ -116577,7 +117360,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6262" "until cat p2.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6306" "until cat p2.pcap | egrep \"0x0020: *0b0c *0d0e *0f10 *f200 *0000 *0002 *f200 *0000\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013" 2>&1 1>/dev/null
@@ -116586,7 +117369,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6263" "until cat p2.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6307" "until cat p2.pcap | egrep \"0x0030: *0001 *0800 *4500 *0028 *0001 *0000 *4006 *b013\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8" 2>&1 1>/dev/null
@@ -116595,7 +117378,7 @@
     :
 
 }
-ovs_wait "system-traffic.at:6264" "until cat p2.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6308" "until cat p2.pcap | egrep \"0x0040: *c0a8 *000a *0a00 *000a *0400 *0800 *0000 *00c8\" 2>&1 1>/dev/null"
 
 ovs_wait_cond () {
     cat p2.pcap | egrep "0x0050: *0000 *0000 *5002 *2000 *b85e *0000" 2>&1 1>/dev/null
@@ -116604,15 +117387,15 @@
     :
 
 }
-ovs_wait "system-traffic.at:6265" "until cat p2.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
+ovs_wait "system-traffic.at:6309" "until cat p2.pcap | egrep \"0x0050: *0000 *0000 *5002 *2000 *b85e *0000\" 2>&1 1>/dev/null"
 
 
 { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-traffic.at:6311: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6267"
+at_fn_check_prepare_notrace 'an embedded newline' "system-traffic.at:6311"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -116622,22 +117405,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-traffic.at:6311"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116645,15 +117428,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116666,18 +117449,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6267" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6311" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-traffic.at:6311"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116685,15 +117468,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116706,18 +117489,18 @@
     :
 
 }
-ovs_wait "system-traffic.at:6267" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-traffic.at:6311" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-traffic.at:6267: :; "
-at_fn_check_prepare_trace "system-traffic.at:6267"
+$as_echo "$at_srcdir/system-traffic.at:6311: :; "
+at_fn_check_prepare_trace "system-traffic.at:6311"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6267"
+at_fn_check_status 0 $at_status "$at_srcdir/system-traffic.at:6311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -116729,13 +117512,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_130
-#AT_START_131
-at_fn_group_banner 131 'system-layer3-tunnels.at:3' \
+#AT_STOP_131
+#AT_START_132
+at_fn_group_banner 132 'system-layer3-tunnels.at:3' \
   "layer3 - ping over VXLAN-GPE" "                   " 7
 at_xfail=no
 (
-  $as_echo "131. $at_setup_line: testing $at_desc ..."
+  $as_echo "132. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -117556,13 +118339,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_131
-#AT_START_132
-at_fn_group_banner 132 'system-layer3-tunnels.at:52' \
+#AT_STOP_132
+#AT_START_133
+at_fn_group_banner 133 'system-layer3-tunnels.at:52' \
   "layer3 - ping over GRE" "                         " 7
 at_xfail=no
 (
-  $as_echo "132. $at_setup_line: testing $at_desc ..."
+  $as_echo "133. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -118380,13 +119163,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_132
-#AT_START_133
-at_fn_group_banner 133 'system-layer3-tunnels.at:101' \
+#AT_STOP_133
+#AT_START_134
+at_fn_group_banner 134 'system-layer3-tunnels.at:101' \
   "layer3 - use non-local port as tunnel endpoint" " " 7
 at_xfail=no
 (
-  $as_echo "133. $at_setup_line: testing $at_desc ..."
+  $as_echo "134. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -118899,13 +119682,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_133
-#AT_START_134
-at_fn_group_banner 134 'system-interface.at:5' \
+#AT_STOP_134
+#AT_START_135
+at_fn_group_banner 135 'system-interface.at:5' \
   "interface - add delete add same interface" "      " 8
 at_xfail=no
 (
-  $as_echo "134. $at_setup_line: testing $at_desc ..."
+  $as_echo "135. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -119277,13 +120060,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_134
-#AT_START_135
-at_fn_group_banner 135 'system-interface.at:30' \
+#AT_STOP_135
+#AT_START_136
+at_fn_group_banner 136 'system-interface.at:30' \
   "interface - add route to br and verify clean-up" "" 8
 at_xfail=no
 (
-  $as_echo "135. $at_setup_line: testing $at_desc ..."
+  $as_echo "136. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -119693,13 +120476,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_135
-#AT_START_136
-at_fn_group_banner 136 'system-userspace-packet-type-aware.at:3' \
+#AT_STOP_136
+#AT_START_137
+at_fn_group_banner 137 'system-userspace-packet-type-aware.at:3' \
   "ptap - triangle bridge setup with L2 and L3 GRE tunnels" "" 9
 at_xfail=no
 (
-  $as_echo "136. $at_setup_line: testing $at_desc ..."
+  $as_echo "137. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -120293,15 +121076,24 @@
 "ovs-vswitchd.log"
 $at_traceon; }
 
+ovs_wait_cond () {
+    ovs-appctl ovs/route/show | grep -q br-p1
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-userspace-packet-type-aware.at:132" "until ovs-appctl ovs/route/show | grep -q br-p1"
+
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:133:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:134:
     ovs-appctl ovs/route/add 10.0.0.0/24 br-p1
     ovs-appctl tnl/arp/set br-p1 10.0.0.1 \$HWADDR_BRP1
     ovs-appctl tnl/arp/set br-p1 10.0.0.2 \$HWADDR_BRP2
     ovs-appctl tnl/arp/set br-p1 10.0.0.3 \$HWADDR_BRP3
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:133"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:134"
 ( $at_check_trace;
     ovs-appctl ovs/route/add 10.0.0.0/24 br-p1
     ovs-appctl tnl/arp/set br-p1 10.0.0.1 $HWADDR_BRP1
@@ -120313,7 +121105,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:133"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:134"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120321,11 +121113,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:140:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:141:
     ip addr add 20.0.0.2/24 dev br-p2
     ip link set br-p2 up
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:140"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:141"
 ( $at_check_trace;
     ip addr add 20.0.0.2/24 dev br-p2
     ip link set br-p2 up
@@ -120335,21 +121127,30 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:140"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:141"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
+ovs_wait_cond () {
+    ovs-appctl ovs/route/show | grep -q br-p2
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-userspace-packet-type-aware.at:145" "until ovs-appctl ovs/route/show | grep -q br-p2"
+
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:145:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:147:
     ovs-appctl ovs/route/add 20.0.0.0/24 br-p2
     ovs-appctl tnl/arp/set br-p2 20.0.0.1 \$HWADDR_BRP1
     ovs-appctl tnl/arp/set br-p2 20.0.0.2 \$HWADDR_BRP2
     ovs-appctl tnl/arp/set br-p2 20.0.0.3 \$HWADDR_BRP3
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:145"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:147"
 ( $at_check_trace;
     ovs-appctl ovs/route/add 20.0.0.0/24 br-p2
     ovs-appctl tnl/arp/set br-p2 20.0.0.1 $HWADDR_BRP1
@@ -120361,7 +121162,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:145"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:147"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120369,11 +121170,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:152:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:154:
     ip addr add 30.0.0.3/24 dev br-p3
     ip link set br-p3 up
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:152"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:154"
 ( $at_check_trace;
     ip addr add 30.0.0.3/24 dev br-p3
     ip link set br-p3 up
@@ -120383,21 +121184,30 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:152"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:154"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
+ovs_wait_cond () {
+    ovs-appctl ovs/route/show | grep -q br-p3
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "system-userspace-packet-type-aware.at:158" "until ovs-appctl ovs/route/show | grep -q br-p3"
+
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:157:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:160:
     ovs-appctl ovs/route/add 30.0.0.0/24 br-p3
     ovs-appctl tnl/arp/set br-p3 30.0.0.1 \$HWADDR_BRP1
     ovs-appctl tnl/arp/set br-p3 30.0.0.2 \$HWADDR_BRP2
     ovs-appctl tnl/arp/set br-p3 30.0.0.3 \$HWADDR_BRP3
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:157"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:160"
 ( $at_check_trace;
     ovs-appctl ovs/route/add 30.0.0.0/24 br-p3
     ovs-appctl tnl/arp/set br-p3 30.0.0.1 $HWADDR_BRP1
@@ -120409,7 +121219,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:157"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:160"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120417,10 +121227,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:164:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:167:
     ovs-appctl ovs/route/show | grep User:
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:164"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:167"
 ( $at_check_trace;
     ovs-appctl ovs/route/show | grep User:
 
@@ -120433,7 +121243,7 @@
 User: 30.0.0.0/24 dev br-p3 SRC 30.0.0.3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:164"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:167"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120441,10 +121251,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:172:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:175:
     ovs-appctl tnl/neigh/show | grep br-p | sort
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:172"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:175"
 ( $at_check_trace;
     ovs-appctl tnl/neigh/show | grep br-p | sort
 
@@ -120453,7 +121263,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:172"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:175"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120463,7 +121273,7 @@
 
 ### Flows in br-p<x>to twist TEP IP addresses in tunnel IP headers
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:178:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:181:
     ovs-ofctl add-flow br-p1 in_port:LOCAL,ip,actions=2
     ovs-ofctl add-flow br-p1 in_port:2,ip,nw_dst:20.0.0.1,actions=mod_nw_dst:10.0.0.1,mod_nw_src:10.0.0.2,LOCAL
     ovs-ofctl add-flow br-p1 in_port:2,ip,nw_dst:30.0.0.1,actions=mod_nw_dst:10.0.0.1,mod_nw_src:10.0.0.3,LOCAL
@@ -120476,7 +121286,7 @@
     ovs-ofctl add-flow br-p3 in_port:2,ip,nw_dst:10.0.0.3,actions=mod_nw_dst:30.0.0.3,mod_nw_src:30.0.0.1,LOCAL
     ovs-ofctl add-flow br-p3 in_port:2,ip,nw_dst:20.0.0.3,actions=mod_nw_dst:30.0.0.3,mod_nw_src:30.0.0.2,LOCAL
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:178"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:181"
 ( $at_check_trace;
     ovs-ofctl add-flow br-p1 in_port:LOCAL,ip,actions=2
     ovs-ofctl add-flow br-p1 in_port:2,ip,nw_dst:20.0.0.1,actions=mod_nw_dst:10.0.0.1,mod_nw_src:10.0.0.2,LOCAL
@@ -120495,7 +121305,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:178"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:181"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120513,12 +121323,12 @@
 }
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:202:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:205:
     ovs-ofctl dump-flows br-p1 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
     ovs-ofctl dump-flows br-p2 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
     ovs-ofctl dump-flows br-p3 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:202"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:205"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-p1 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
     ovs-ofctl dump-flows br-p2 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
@@ -120539,7 +121349,7 @@
  ip,in_port=LOCAL actions=output:2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:202"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:205"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120562,15 +121372,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:229: ip netns add ns1 || return 77"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:229"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip netns add ns1 || return 77"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:232"
 ( $at_check_trace; ip netns add ns1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120586,15 +121396,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:229: ip netns add ns2 || return 77"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:229"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip netns add ns2 || return 77"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:232"
 ( $at_check_trace; ip netns add ns2 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120610,15 +121420,15 @@
 
 
                 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:229: ip netns add ns3 || return 77"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:229"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip netns add ns3 || return 77"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:232"
 ( $at_check_trace; ip netns add ns3 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:229"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120633,30 +121443,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ip link add n1 type veth peer name ovs-n1 || return 77"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:230"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ip link add n1 type veth peer name ovs-n1 || return 77"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ip link add n1 type veth peer name ovs-n1 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ethtool -K n1 tx off"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:230"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ethtool -K n1 tx off"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ethtool -K n1 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120664,39 +121474,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ip link set n1 netns ns1"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:230"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ip link set n1 netns ns1"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ip link set n1 netns ns1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ip link set dev ovs-n1 up"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:230"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ip link set dev ovs-n1 up"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ip link set dev ovs-n1 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ovs-vsctl add-port br-in1 ovs-n1 -- \\
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ovs-vsctl add-port br-in1 ovs-n1 -- \\
                 set interface ovs-n1 external-ids:iface-id=\"n1\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:230"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ovs-vsctl add-port br-in1 ovs-n1 -- \
                 set interface ovs-n1 external-ids:iface-id="n1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -120704,17 +121514,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ip netns exec ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ip addr add \"\$N1_IP/24\" dev n1
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:230"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ip addr add "$N1_IP/24" dev n1
 NS_EXEC_HEREDOC
@@ -120723,7 +121533,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120731,10 +121541,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ip netns exec ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ip link set dev n1 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:230"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ip link set dev n1 up
 NS_EXEC_HEREDOC
@@ -120743,7 +121553,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120752,10 +121562,10 @@
 
       if test -n "$N1_MAC"; then
          { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ip netns exec ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ip link set dev n1 address \$N1_MAC
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:230"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ip link set dev n1 address $N1_MAC
 NS_EXEC_HEREDOC
@@ -120764,7 +121574,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120774,10 +121584,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:230: ip netns exec ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:233: ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:230"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:233"
 ( $at_check_trace; ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -120786,7 +121596,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:230"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:233"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120798,30 +121608,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ip link add n2 type veth peer name ovs-n2 || return 77"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:231"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ip link add n2 type veth peer name ovs-n2 || return 77"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ip link add n2 type veth peer name ovs-n2 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ethtool -K n2 tx off"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:231"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ethtool -K n2 tx off"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ethtool -K n2 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120829,39 +121639,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ip link set n2 netns ns2"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:231"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ip link set n2 netns ns2"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ip link set n2 netns ns2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ip link set dev ovs-n2 up"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:231"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ip link set dev ovs-n2 up"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ip link set dev ovs-n2 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ovs-vsctl add-port br-in2 ovs-n2 -- \\
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ovs-vsctl add-port br-in2 ovs-n2 -- \\
                 set interface ovs-n2 external-ids:iface-id=\"n2\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ovs-vsctl add-port br-in2 ovs-n2 -- \
                 set interface ovs-n2 external-ids:iface-id="n2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -120869,17 +121679,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ip netns exec ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ip netns exec ns2 sh << NS_EXEC_HEREDOC
 ip addr add \"\$N2_IP/24\" dev n2
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ip netns exec ns2 sh << NS_EXEC_HEREDOC
 ip addr add "$N2_IP/24" dev n2
 NS_EXEC_HEREDOC
@@ -120888,7 +121698,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120896,10 +121706,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ip netns exec ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ip netns exec ns2 sh << NS_EXEC_HEREDOC
 ip link set dev n2 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ip netns exec ns2 sh << NS_EXEC_HEREDOC
 ip link set dev n2 up
 NS_EXEC_HEREDOC
@@ -120908,7 +121718,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120917,10 +121727,10 @@
 
       if test -n "$N2_MAC"; then
          { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ip netns exec ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ip netns exec ns2 sh << NS_EXEC_HEREDOC
 ip link set dev n2 address \$N2_MAC
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ip netns exec ns2 sh << NS_EXEC_HEREDOC
 ip link set dev n2 address $N2_MAC
 NS_EXEC_HEREDOC
@@ -120929,7 +121739,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120939,10 +121749,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:231: ip netns exec ns2 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:234: ip netns exec ns2 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:231"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:234"
 ( $at_check_trace; ip netns exec ns2 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -120951,7 +121761,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:234"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120963,30 +121773,30 @@
 
 
  { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip link add n3 type veth peer name ovs-n3 || return 77"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:232"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ip link add n3 type veth peer name ovs-n3 || return 77"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ip link add n3 type veth peer name ovs-n3 || return 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ethtool -K n3 tx off"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:232"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ethtool -K n3 tx off"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ethtool -K n3 tx off
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -120994,39 +121804,39 @@
 
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip link set n3 netns ns3"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:232"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ip link set n3 netns ns3"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ip link set n3 netns ns3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip link set dev ovs-n3 up"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:232"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ip link set dev ovs-n3 up"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ip link set dev ovs-n3 up
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
       { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ovs-vsctl add-port br-in3 ovs-n3 -- \\
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ovs-vsctl add-port br-in3 ovs-n3 -- \\
                 set interface ovs-n3 external-ids:iface-id=\"n3\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ovs-vsctl add-port br-in3 ovs-n3 -- \
                 set interface ovs-n3 external-ids:iface-id="n3"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -121034,17 +121844,17 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
        { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip netns exec ns3 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ip addr add \"\$N3_IP/24\" dev n3
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ip addr add "$N3_IP/24" dev n3
 NS_EXEC_HEREDOC
@@ -121053,7 +121863,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121061,10 +121871,10 @@
 
 
        { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip netns exec ns3 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ip link set dev n3 up
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ip link set dev n3 up
 NS_EXEC_HEREDOC
@@ -121073,7 +121883,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121082,10 +121892,10 @@
 
       if test -n "$N3_MAC"; then
          { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip netns exec ns3 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ip link set dev n3 address \$N3_MAC
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ip link set dev n3 address $N3_MAC
 NS_EXEC_HEREDOC
@@ -121094,7 +121904,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121104,10 +121914,10 @@
       fi
       if test -n ""; then
          { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:232: ip netns exec ns3 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:235: ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:232"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:235"
 ( $at_check_trace; ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ip route add default via
 NS_EXEC_HEREDOC
@@ -121116,7 +121926,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:235"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121150,12 +121960,12 @@
 NS_EXEC_HEREDOC
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:243:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:246:
     ovs-vsctl set interface ovs-n1 ofport_request=\$N1_OFPORT
     ovs-vsctl set interface ovs-n2 ofport_request=\$N2_OFPORT
     ovs-vsctl set interface ovs-n3 ofport_request=\$N3_OFPORT
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:243"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:246"
 ( $at_check_trace;
     ovs-vsctl set interface ovs-n1 ofport_request=$N1_OFPORT
     ovs-vsctl set interface ovs-n2 ofport_request=$N2_OFPORT
@@ -121166,7 +121976,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:243"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:246"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121179,10 +121989,10 @@
 
 ### Verify datapath configuration
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:254:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:257:
     ovs-appctl dpif/show | grep -v hit
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:254"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:257"
 ( $at_check_trace;
     ovs-appctl dpif/show | grep -v hit
 
@@ -121223,7 +122033,7 @@
     p0-3 30/13: (system)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:254"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:257"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121232,7 +122042,7 @@
 
 ### Test L3 forwarding flows
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:291:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:294:
     ovs-ofctl add-flow br-in1 ip,nw_dst=\$N1_IP,actions=mod_dl_dst:\$N1_MAC,\$N1_OFPORT # Local route to N1
     ovs-ofctl add-flow br-in1 ip,nw_dst=\$N2_IP,actions=1020 # Route to N2 via the L2 tunnel to br-in2
     ovs-ofctl add-flow br-in1 ip,nw_dst=\$N3_IP,actions=1030 # Route to N3 direct through L2 tunnel
@@ -121247,7 +122057,7 @@
     ovs-ofctl add-flow br-in3 ip,nw_dst=\$N2_IP,actions=3020 # Route to N2 via the L2 tunnel
     ovs-ofctl add-flow br-in3 ip,nw_dst=\$N1_IP,actions=3021 # Route to N1 via br-in2 through L3 tunnel
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:291"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:294"
 ( $at_check_trace;
     ovs-ofctl add-flow br-in1 ip,nw_dst=$N1_IP,actions=mod_dl_dst:$N1_MAC,$N1_OFPORT # Local route to N1
     ovs-ofctl add-flow br-in1 ip,nw_dst=$N2_IP,actions=1020 # Route to N2 via the L2 tunnel to br-in2
@@ -121268,7 +122078,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:291"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:294"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121276,10 +122086,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:307:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:310:
     ovs-ofctl dump-flows br-in1 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:307"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:310"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in1 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
 
@@ -121292,7 +122102,7 @@
  ip,nw_dst=192.168.10.30 actions=output:1030
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:307"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:310"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121300,10 +122110,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:315:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:318:
     ovs-ofctl dump-flows br-in2 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:315"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:318"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in2 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
 
@@ -121318,7 +122128,7 @@
  packet_type=(1,0x800),nw_dst=192.168.10.30 actions=output:2030
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:315"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:318"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121326,10 +122136,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:325:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:328:
     ovs-ofctl dump-flows br-in3 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:325"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:328"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in3 | ofctl_strip | strip_n_packets | strip_n_bytes | sort | grep actions
 
@@ -121342,7 +122152,7 @@
  ip,nw_dst=192.168.10.30 actions=mod_dl_dst:aa:55:aa:55:00:03,output:30
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:325"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:328"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121352,10 +122162,10 @@
 
 # Ping between N1 and N3, via the L2 GRE tunnel between br-in1 and br-in3
  { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:335: ip netns exec ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:338: ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 \$N3_IP | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:335"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:338"
 ( $at_check_trace; ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 $N3_IP | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -121366,7 +122176,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:335"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:338"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121377,10 +122187,10 @@
 sleep 1
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:341:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:344:
     ovs-ofctl dump-flows br-in1 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:341"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:344"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in1 | ofctl_strip | sort | grep n_packets
 
@@ -121392,7 +122202,7 @@
  n_packets=3, n_bytes=294, ip,nw_dst=192.168.10.30 actions=output:1030
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:341"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:344"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121400,10 +122210,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:348:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:351:
     ovs-ofctl dump-flows br-in2 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:348"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:351"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in2 | ofctl_strip | sort | grep n_packets
 
@@ -121414,7 +122224,7 @@
 echo >>"$at_stdout"; $as_echo " n_packets=3, n_bytes=252, packet_type=(1,0x800),nw_dst=192.168.10.10 actions=output:2010
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:348"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:351"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121422,10 +122232,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:354:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:357:
     ovs-ofctl dump-flows br-in3 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:354"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:357"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in3 | ofctl_strip | sort | grep n_packets
 
@@ -121437,7 +122247,7 @@
  n_packets=3, n_bytes=294, ip,nw_dst=192.168.10.30 actions=mod_dl_dst:aa:55:aa:55:00:03,output:30
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:354"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:357"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121447,10 +122257,10 @@
 
 # Ping between N1 and N2, via the L2 GRE tunnel between br-in1 and br-in2
  { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:363: ip netns exec ns1 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:366: ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 \$N2_IP | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:363"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:366"
 ( $at_check_trace; ip netns exec ns1 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 $N2_IP | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -121461,7 +122271,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:366"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121472,10 +122282,10 @@
 sleep 1
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:369:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:372:
     ovs-ofctl dump-flows br-in1 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:369"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:372"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in1 | ofctl_strip | sort | grep n_packets
 
@@ -121488,7 +122298,7 @@
  n_packets=6, n_bytes=546, ip,nw_dst=192.168.10.10 actions=mod_dl_dst:aa:55:aa:55:00:01,output:10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:369"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:372"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121496,10 +122306,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:377:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:380:
     ovs-ofctl dump-flows br-in2 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:377"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:380"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in2 | ofctl_strip | sort | grep n_packets
 
@@ -121512,7 +122322,7 @@
  n_packets=3, n_bytes=294, ip,nw_dst=192.168.10.20 actions=mod_dl_dst:aa:55:aa:55:00:02,output:20
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:377"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:380"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121520,10 +122330,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:385:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:388:
     ovs-ofctl dump-flows br-in3 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:385"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:388"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in3 | ofctl_strip | sort | grep n_packets
 
@@ -121535,7 +122345,7 @@
  n_packets=3, n_bytes=294, ip,nw_dst=192.168.10.30 actions=mod_dl_dst:aa:55:aa:55:00:03,output:30
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:385"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:388"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121545,10 +122355,10 @@
 
 # Ping between N3 and N2, via the L3 GRE tunnel between br-in3 and br-in2
  { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:394: ip netns exec ns3 sh << NS_EXEC_HEREDOC
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:397: ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 \$N1_IP | grep \"transmitted\" | sed 's/time.*ms\$/time 0ms/'
 NS_EXEC_HEREDOC"
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:394"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:397"
 ( $at_check_trace; ip netns exec ns3 sh << NS_EXEC_HEREDOC
 ping -q -c 3 -i 0.3 -w 2 $N1_IP | grep "transmitted" | sed 's/time.*ms$/time 0ms/'
 NS_EXEC_HEREDOC
@@ -121559,7 +122369,7 @@
 echo >>"$at_stdout"; $as_echo "3 packets transmitted, 3 received, 0% packet loss, time 0ms
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:394"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:397"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121570,10 +122380,10 @@
 sleep 1
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:400:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:403:
     ovs-ofctl dump-flows br-in1 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:400"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:403"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in1 | ofctl_strip | sort | grep n_packets
 
@@ -121586,7 +122396,7 @@
  n_packets=9, n_bytes=798, ip,nw_dst=192.168.10.10 actions=mod_dl_dst:aa:55:aa:55:00:01,output:10
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:400"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:403"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121594,10 +122404,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:408:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:411:
     ovs-ofctl dump-flows br-in2 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:408"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:411"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in2 | ofctl_strip | sort | grep n_packets
 
@@ -121610,7 +122420,7 @@
  n_packets=6, n_bytes=504, packet_type=(1,0x800),nw_dst=192.168.10.10 actions=output:2010
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:408"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121618,10 +122428,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:416:
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:419:
     ovs-ofctl dump-flows br-in3 | ofctl_strip | sort | grep n_packets
 "
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:416"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:419"
 ( $at_check_trace;
     ovs-ofctl dump-flows br-in3 | ofctl_strip | sort | grep n_packets
 
@@ -121633,7 +122443,7 @@
  n_packets=6, n_bytes=588, ip,nw_dst=192.168.10.30 actions=mod_dl_dst:aa:55:aa:55:00:03,output:30
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:416"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:419"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121642,11 +122452,11 @@
 
 
 { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:424: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:427: check_logs \";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
 /dpif(revalidator.*)|WARN|netdev@ovs-netdev: failed to.*proto=2.*/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:424"
+at_fn_check_prepare_notrace 'an embedded newline' "system-userspace-packet-type-aware.at:427"
 ( $at_check_trace; check_logs ";/netdev_linux.*obtaining netdev stats via vport failed/d
 /dpif_netlink.*Generic Netlink family 'ovs_datapath' does not exist. The Open vSwitch kernel module is probably not loaded./d
 /dpif_netdev(revalidator.*)|ERR|internal error parsing flow key.*proto=2.*/d
@@ -121656,22 +122466,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:424"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:424: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-userspace-packet-type-aware.at:424"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:427: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "system-userspace-packet-type-aware.at:427"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:424"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121679,15 +122489,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:424: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:424"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:427: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:427"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:424"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121700,18 +122510,18 @@
     :
 
 }
-ovs_wait "system-userspace-packet-type-aware.at:424" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-userspace-packet-type-aware.at:427" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:424: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-userspace-packet-type-aware.at:424"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:427: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "system-userspace-packet-type-aware.at:427"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:424"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121719,15 +122529,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:424: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:424"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:427: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:427"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:424"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121740,18 +122550,18 @@
     :
 
 }
-ovs_wait "system-userspace-packet-type-aware.at:424" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "system-userspace-packet-type-aware.at:427" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:424: :; "
-at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:424"
+$as_echo "$at_srcdir/system-userspace-packet-type-aware.at:427: :; "
+at_fn_check_prepare_trace "system-userspace-packet-type-aware.at:427"
 ( $at_check_trace; :;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:424"
+at_fn_check_status 0 $at_status "$at_srcdir/system-userspace-packet-type-aware.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -121763,13 +122573,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_136
-#AT_START_137
-at_fn_group_banner 137 'system-route.at:4' \
+#AT_STOP_137
+#AT_START_138
+at_fn_group_banner 138 'system-route.at:4' \
   "ovs-route - add/remove system route" "            " 10
 at_xfail=no
 (
-  $as_echo "137. $at_setup_line: testing $at_desc ..."
+  $as_echo "138. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -122135,4 +122945,4 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_137
+#AT_STOP_138
diff -Nru openvswitch-2.13.1/tests/test-conntrack.c openvswitch-2.13.3/tests/test-conntrack.c
--- openvswitch-2.13.1/tests/test-conntrack.c	2020-08-04 21:40:41.477524451 +0000
+++ openvswitch-2.13.3/tests/test-conntrack.c	2021-02-10 20:04:59.571074628 +0000
@@ -82,6 +82,7 @@
 {
     struct thread_aux *aux = aux_;
     struct dp_packet_batch *pkt_batch;
+    struct dp_packet *pkt;
     ovs_be16 dl_type;
     size_t i;
     long long now = time_msec();
@@ -91,6 +92,9 @@
     for (i = 0; i < n_pkts; i += batch_size) {
         conntrack_execute(ct, pkt_batch, dl_type, false, true, 0, NULL, NULL,
                           0, 0, NULL, NULL, now);
+        DP_PACKET_BATCH_FOR_EACH (j, pkt, pkt_batch) {
+            pkt_metadata_init_conn(&pkt->md);
+        }
     }
     ovs_barrier_block(&barrier);
     destroy_packets(pkt_batch);
diff -Nru openvswitch-2.13.1/tests/test-l7.py openvswitch-2.13.3/tests/test-l7.py
--- openvswitch-2.13.1/tests/test-l7.py	2020-08-04 21:30:01.569524451 +0000
+++ openvswitch-2.13.3/tests/test-l7.py	2021-02-10 20:04:59.571074628 +0000
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright (c) 2015, 2016 Nicira, Inc.
+#!/usr/bin/env python3
+# Copyright (c) 2015, 2016, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/tests/test-ovsdb.c openvswitch-2.13.3/tests/test-ovsdb.c
--- openvswitch-2.13.1/tests/test-ovsdb.c	2020-08-04 21:40:41.478524451 +0000
+++ openvswitch-2.13.3/tests/test-ovsdb.c	2021-02-10 20:04:13.901074628 +0000
@@ -1905,6 +1905,26 @@
 }
 
 static void
+print_idl_row_updated_simple6(const struct idltest_simple6 *s6, int step)
+{
+    size_t i;
+    bool updated = false;
+
+    for (i = 0; i < IDLTEST_SIMPLE6_N_COLUMNS; i++) {
+        if (idltest_simple6_is_updated(s6, i)) {
+            if (!updated) {
+                printf("%03d: updated columns:", step);
+                updated = true;
+            }
+            printf(" %s", idltest_simple6_columns[i].name);
+        }
+    }
+    if (updated) {
+        printf("\n");
+    }
+}
+
+static void
 print_idl_row_updated_singleton(const struct idltest_singleton *sng, int step)
 {
     size_t i;
@@ -1992,6 +2012,22 @@
 }
 
 static void
+print_idl_row_simple6(const struct idltest_simple6 *s6, int step)
+{
+    int i;
+
+    printf("%03d: name=%s ", step, s6->name);
+    printf("weak_ref=[");
+    for (i = 0; i < s6->n_weak_ref; i++) {
+        printf("%s"UUID_FMT, i ? " " : "",
+               UUID_ARGS(&s6->weak_ref[i]->header_.uuid));
+    }
+
+    printf("] uuid="UUID_FMT"\n", UUID_ARGS(&s6->header_.uuid));
+    print_idl_row_updated_simple6(s6, step);
+}
+
+static void
 print_idl_row_singleton(const struct idltest_singleton *sng, int step)
 {
     printf("%03d: name=%s", step, sng->name);
@@ -2030,37 +2066,64 @@
 }
 
 static void
-print_idl_track(struct ovsdb_idl *idl, int step, unsigned int seqno)
+print_idl_track(struct ovsdb_idl *idl, int step)
 {
+    const struct idltest_simple6 *s6;
     const struct idltest_simple *s;
     const struct idltest_link1 *l1;
     const struct idltest_link2 *l2;
     int n = 0;
 
     IDLTEST_SIMPLE_FOR_EACH_TRACKED (s, idl) {
-        if (idltest_simple_row_get_seqno(s, OVSDB_IDL_CHANGE_DELETE) >= seqno) {
-            printf("%03d: ##deleted## uuid="UUID_FMT"\n", step, UUID_ARGS(&s->header_.uuid));
-        } else {
-            print_idl_row_simple(s, step);
+        print_idl_row_simple(s, step);
+        if (idltest_simple_is_deleted(s)) {
+            printf("%03d: deleted row: uuid="UUID_FMT"\n", step,
+                   UUID_ARGS(&s->header_.uuid));
+        } else if (idltest_simple_is_new(s)) {
+            printf("%03d: inserted row: uuid="UUID_FMT"\n", step,
+                   UUID_ARGS(&s->header_.uuid));
         }
         n++;
     }
     IDLTEST_LINK1_FOR_EACH_TRACKED (l1, idl) {
-        if (idltest_simple_row_get_seqno(s, OVSDB_IDL_CHANGE_DELETE) >= seqno) {
-            printf("%03d: ##deleted## uuid="UUID_FMT"\n", step, UUID_ARGS(&s->header_.uuid));
+        if (idltest_link1_is_deleted(l1)) {
+            printf("%03d: deleted row: uuid="UUID_FMT"\n", step,
+                   UUID_ARGS(&l1->header_.uuid));
         } else {
             print_idl_row_link1(l1, step);
+            if (idltest_link1_is_new(l1)) {
+                printf("%03d: inserted row: uuid="UUID_FMT"\n", step,
+                       UUID_ARGS(&l1->header_.uuid));
+            }
         }
         n++;
     }
     IDLTEST_LINK2_FOR_EACH_TRACKED (l2, idl) {
-        if (idltest_simple_row_get_seqno(s, OVSDB_IDL_CHANGE_DELETE) >= seqno) {
-            printf("%03d: ##deleted## uuid="UUID_FMT"\n", step, UUID_ARGS(&s->header_.uuid));
+        if (idltest_link2_is_deleted(l2)) {
+            printf("%03d: deleted row: uuid="UUID_FMT"\n", step,
+                   UUID_ARGS(&l2->header_.uuid));
         } else {
             print_idl_row_link2(l2, step);
+            if (idltest_link2_is_new(l2)) {
+                printf("%03d: inserted row: uuid="UUID_FMT"\n", step,
+                       UUID_ARGS(&l2->header_.uuid));
+            }
+
+        }
+        n++;
+    }
+    IDLTEST_SIMPLE6_FOR_EACH_TRACKED (s6, idl) {
+        print_idl_row_simple6(s6, step);
+        if (idltest_simple6_is_deleted(s6)) {
+            printf("%03d: deleted row: uuid="UUID_FMT"\n", step,
+                   UUID_ARGS(&s6->header_.uuid));
+        } else if (idltest_simple6_is_new(s6)) {
+            printf("%03d: inserted row: uuid="UUID_FMT"\n", step,
+                   UUID_ARGS(&s6->header_.uuid));
         }
         n++;
     }
+
     if (!n) {
         printf("%03d: empty\n", step);
     }
@@ -2282,6 +2345,8 @@
         return &idltest_table_link1;
     } else if (!strcmp(name, "link2")) {
         return &idltest_table_link2;
+    } else if (!strcmp(name, "simple6")) {
+        return &idltest_table_simple6;
     }
     return NULL;
 }
@@ -2391,6 +2456,10 @@
         if (seqno == next_seqno ) {
             ovs_fatal(0, "condition unchanged");
         }
+        unsigned int new_next_seqno = ovsdb_idl_set_condition(idl, tc, &cond);
+        if (next_seqno != new_next_seqno) {
+            ovs_fatal(0, "condition expected seqno changed");
+        }
         ovsdb_idl_condition_destroy(&cond);
         json_destroy(json);
     }
@@ -2465,7 +2534,7 @@
 
             /* Print update. */
             if (track) {
-                print_idl_track(idl, step++, ovsdb_idl_get_seqno(idl));
+                print_idl_track(idl, step++);
                 ovsdb_idl_track_clear(idl);
             } else {
                 print_idl(idl, step++);
diff -Nru openvswitch-2.13.1/tests/test-ovsdb.py openvswitch-2.13.3/tests/test-ovsdb.py
--- openvswitch-2.13.1/tests/test-ovsdb.py	2020-08-04 21:41:31.998524451 +0000
+++ openvswitch-2.13.3/tests/test-ovsdb.py	2021-02-10 20:04:59.571074628 +0000
@@ -28,6 +28,7 @@
 import ovs.vlog
 from ovs.db import data
 from ovs.db import error
+from ovs.db.idl import _row_to_uuid as row_to_uuid
 from ovs.fatal_signal import signal_alarm
 
 vlog = ovs.vlog.Vlog("test-ovsdb")
@@ -159,7 +160,8 @@
                                          is ovs.db.data.Atom):
             value = getattr(row, column)
             if isinstance(value, dict):
-                value = sorted(value.items())
+                value = sorted((row_to_uuid(k), row_to_uuid(v))
+                               for k, v in value.items())
             s += "%s=%s " % (column, value)
     s = s.strip()
     s = re.sub('""|,|u?\'', "", s)
@@ -212,6 +214,14 @@
             print(s)
             n += 1
 
+    if "simple5" in idl.tables:
+        simple5 = idl.tables["simple5"].rows
+        for row in simple5.values():
+            s = "%03d: " % step
+            s += get_simple_printable_row_string(row, ["name", "irefmap"])
+            print(s)
+            n += 1
+
     if "link1" in idl.tables:
         l1 = idl.tables["link1"].rows
         for row in l1.values():
@@ -303,6 +313,11 @@
     return next(idl.index_equal("simple3", "simple3_by_name", i), None)
 
 
+def idltest_find(idl, table, col, match):
+    return next((r for r in idl.tables[table].rows.values() if
+                getattr(r, col) == match), None)
+
+
 def idl_set(idl, commands, step):
     txn = ovs.db.idl.Transaction(idl)
     increment = False
@@ -524,6 +539,12 @@
             setattr(new_row3, 'name', 'String3')
             new_row3.addvalue('uset', new_row41.uuid)
             assert len(getattr(new_row3, 'uset', [])) == 1
+        elif name == 'partialmapmutateirefmap':
+            row3 = idltest_find_simple3(idl, "myString1")
+            row5 = idltest_find(idl, "simple5", "name", "myString2")
+            row5.setkey('irefmap', 1, row3.uuid)
+            maplen = len(row5.irefmap)
+            assert maplen == 1, "expected 1, got %d" % maplen
         else:
             sys.stderr.write("unknown command %s\n" % name)
             sys.exit(1)
diff -Nru openvswitch-2.13.1/tests/test-reconnect.c openvswitch-2.13.3/tests/test-reconnect.c
--- openvswitch-2.13.1/tests/test-reconnect.c	2020-08-04 21:33:59.480524451 +0000
+++ openvswitch-2.13.3/tests/test-reconnect.c	2021-02-10 20:04:59.572074628 +0000
@@ -48,6 +48,7 @@
 
     now = 1000;
     reconnect = reconnect_create(now);
+    reconnect_receive_attempted(reconnect, LLONG_MAX);
     reconnect_set_name(reconnect, "remote");
     reconnect_get_stats(reconnect, now, &prev);
     printf("### t=%d ###\n", now);
diff -Nru openvswitch-2.13.1/tests/test-sha1.c openvswitch-2.13.3/tests/test-sha1.c
--- openvswitch-2.13.1/tests/test-sha1.c	2020-08-04 19:11:45.718524451 +0000
+++ openvswitch-2.13.3/tests/test-sha1.c	2021-02-10 19:58:58.307074628 +0000
@@ -138,6 +138,42 @@
 }
 
 static void
+test_huge_vector(void)
+{
+    enum { SIZE = 1000000000 };
+    struct test_vector vec = {
+        NULL, SIZE,
+        /* Computed by the sha1sum utility for a file with 10^9 symbols 'a'. */
+        { 0xD0, 0xF3, 0xE4, 0xF2, 0xF3, 0x1C, 0x66, 0x5A, 0xBB, 0xD8,
+          0xF5, 0x18, 0xE8, 0x48, 0xD5, 0xCB, 0x80, 0xCA, 0x78, 0xF7 }
+    };
+    int chunk = random_range(SIZE / 10000);
+    uint8_t md[SHA1_DIGEST_SIZE];
+    struct sha1_ctx sha1;
+    size_t i, sz;
+
+    /* It's not user-friendly to allocate 1GB of memory for a unit test,
+     * so we're allocating only a small chunk and re-using it. */
+    vec.data = xmalloc(chunk);
+    for (i = 0; i < chunk; i++) {
+        vec.data[i] = 'a';
+    }
+
+    sha1_init(&sha1);
+    for (sz = 0; sz < SIZE; sz += chunk) {
+        int n = sz + chunk < SIZE ? chunk : SIZE - sz;
+
+        sha1_update(&sha1, vec.data, n);
+    }
+    sha1_final(&sha1, md);
+    ovs_assert(!memcmp(md, vec.output, SHA1_DIGEST_SIZE));
+
+    free(vec.data);
+    putchar('.');
+    fflush(stdout);
+}
+
+static void
 test_shar1_main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 {
     int i;
@@ -147,6 +183,7 @@
     }
 
     test_big_vector();
+    test_huge_vector();
 
     putchar('\n');
 }
diff -Nru openvswitch-2.13.1/tests/testsuite openvswitch-2.13.3/tests/testsuite
--- openvswitch-2.13.1/tests/testsuite	2020-08-04 21:42:04.622524451 +0000
+++ openvswitch-2.13.3/tests/testsuite	2021-02-10 20:05:29.055074628 +0000
@@ -661,36 +661,36 @@
 54;library.at:42;atomic operations;;
 55;library.at:46;test linked lists;;
 56;library.at:51;packet library;;
-57;library.at:55;SHA-1;;
-58;library.at:60;test skiplist;skiplist;
-59;library.at:71;type properties;;
-60;library.at:75;strtok_r bug fix;;
-61;library.at:80;byte order conversion;byte order;
-62;library.at:85;random number generator;;
-63;library.at:137;ctz() function;ctz;
-64;library.at:137;clz() function;clz;
-65;library.at:137;round_up_pow2() function;round_up_pow2;
-66;library.at:137;round_down_pow2() function;round_down_pow2;
-67;library.at:137;count_1bits() function;count_1bits;
-68;library.at:137;log_2_floor() function;log_2_floor;
-69;library.at:137;bitwise_copy() function;bitwise_copy;
-70;library.at:137;bitwise_zero() function;bitwise_zero;
-71;library.at:137;bitwise_one() function;bitwise_one;
-72;library.at:137;bitwise_is_all_zeros() function;bitwise_is_all_zeros;
-73;library.at:137;bitwise_rscan() function;bitwise_rscan;
-74;library.at:137;ovs_scan() function;ovs_scan;
-75;library.at:156;unix socket, short pathname - C;;
-76;library.at:166;unix socket, long pathname - C;;
-77;library.at:179;unix socket, short pathname - Python3;python unixsocket;
-78;library.at:190;unix socket, long pathname - Python3;python unixsocket;
-79;library.at:203;ovs_assert;;
-80;library.at:226;saturating arithmetic;sat math sat_math;
-81;library.at:231;snprintf;;
-82;library.at:235;bitmap functions;;
-83;library.at:240;use of public headers;;
-84;library.at:244;ofpbuf module;;
-85;library.at:248;rcu;;
-86;library.at:252;stopwatch module;;
+57;library.at:55;SHA-1;sha1;
+58;library.at:61;test skiplist;skiplist;
+59;library.at:72;type properties;;
+60;library.at:76;strtok_r bug fix;;
+61;library.at:81;byte order conversion;byte order;
+62;library.at:86;random number generator;;
+63;library.at:138;ctz() function;ctz;
+64;library.at:138;clz() function;clz;
+65;library.at:138;round_up_pow2() function;round_up_pow2;
+66;library.at:138;round_down_pow2() function;round_down_pow2;
+67;library.at:138;count_1bits() function;count_1bits;
+68;library.at:138;log_2_floor() function;log_2_floor;
+69;library.at:138;bitwise_copy() function;bitwise_copy;
+70;library.at:138;bitwise_zero() function;bitwise_zero;
+71;library.at:138;bitwise_one() function;bitwise_one;
+72;library.at:138;bitwise_is_all_zeros() function;bitwise_is_all_zeros;
+73;library.at:138;bitwise_rscan() function;bitwise_rscan;
+74;library.at:138;ovs_scan() function;ovs_scan;
+75;library.at:157;unix socket, short pathname - C;;
+76;library.at:167;unix socket, long pathname - C;;
+77;library.at:180;unix socket, short pathname - Python3;python unixsocket;
+78;library.at:191;unix socket, long pathname - Python3;python unixsocket;
+79;library.at:204;ovs_assert;;
+80;library.at:227;saturating arithmetic;sat math sat_math;
+81;library.at:232;snprintf;;
+82;library.at:236;bitmap functions;;
+83;library.at:241;use of public headers;;
+84;library.at:245;ofpbuf module;;
+85;library.at:249;rcu;;
+86;library.at:253;stopwatch module;;
 87;heap.at:8;heap library -- insert delete same order;;
 88;heap.at:9;heap library -- insert delete reverse order;;
 89;heap.at:10;heap library -- insert delete every order;;
@@ -736,2147 +736,2156 @@
 129;classifier.at:171;multiple conjunctive match;;
 130;classifier.at:247;conjunctive match priority fallback;;
 131;classifier.at:293;conjunctive match and other actions;;
-132;check-structs.at:10;check struct tail padding;check-structs;
-133;check-structs.at:20;check struct internal alignment;check-structs;
-134;check-structs.at:31;check struct declared size;check-structs;
-135;check-structs.at:43;check wrong struct's declared size;check-structs;
-136;daemon.at:48;daemon;;
-137;daemon.at:78;daemon --monitor;;
-138;daemon.at:121;daemon --detach;;
-139;daemon.at:146;daemon --detach --monitor;;
-140;daemon.at:185;daemon --detach startup errors;;
-141;daemon.at:193;daemon --detach --monitor startup errors;;
-142;daemon.at:202;daemon --service;windows-service;
-143;daemon-py.at:3;daemon - Python3;python daemon;
-144;daemon-py.at:26;daemon --monitor - Python3;;
-145;daemon-py.at:60;daemon --monitor restart exit code - Python3;;
-146;daemon-py.at:94;daemon --detach - Python3;;
-147;daemon-py.at:116;daemon --detach --monitor - Python3;;
-148;daemon-py.at:155;daemon --detach startup errors - Python3;;
-149;daemon-py.at:162;daemon --detach --monitor startup errors - Python3;;
-150;daemon-py.at:170;daemon --detach closes standard fds - Python3;;
-151;daemon-py.at:189;daemon --detach --monitor closes standard fds - Python3;;
-152;ofp-actions.at:3;OpenFlow 1.0 action translation;ofp-actions of1.0;
-153;ofp-actions.at:331;OpenFlow 1.0 \"instruction\" translations;ofp-actions of1.0 instruction;
-154;ofp-actions.at:361;OpenFlow 1.1 action translation;ofp-actions of1.1;
-155;ofp-actions.at:504;OpenFlow 1.1 instruction translation;of1.1 instruction ofp-actions;
-156;ofp-actions.at:715;OpenFlow 1.2 action translation;ofp-actions of1.2;
-157;ofp-actions.at:741;OpenFlow 1.3 action translation;ofp-actions of1.3;
-158;ofp-actions.at:783;OpenFlow 1.5 action translation;ofp-actions of1.5;
-159;ofp-actions.at:810;ofp-actions - inconsistent MPLS actions;;
-160;ofp-actions.at:822;reg_load <-> set_field translation corner case;ofp-actions;
-161;ofp-actions.at:837;enqueue action for OF1.1+;ofp-actions;
-162;ofp-actions.at:854;mod_nw_ttl action for OF1.0;ofp-actions;
-163;ofp-actions.at:871;mod_nw_ecn action translation;ofp-actions;
-164;ofp-actions.at:916;action parsing errors;;
-165;ofp-print.at:3;empty;ofp-print;
-166;ofp-print.at:9;too short;ofp-print;
-167;ofp-print.at:17;wrong OpenFlow version;ofp-print;
-168;ofp-print.at:27;truncated message;ofp-print;
-169;ofp-print.at:35;message only uses part of buffer;ofp-print;
-170;ofp-print.at:44;OFPT_HELLO - ordinary;ofp-print;
-171;ofp-print.at:52;OFPT_HELLO with extra data;ofp-print;
-172;ofp-print.at:64;OFPT_HELLO with version bitmap;ofp-print;
-173;ofp-print.at:73;OFPT_HELLO with version bitmap and extra data;ofp-print;
-174;ofp-print.at:87;OFPT_HELLO with higher than supported version;ofp-print;
-175;ofp-print.at:106;OFPT_HELLO with contradictory version bitmaps;ofp-print;
-176;ofp-print.at:148;OFPT_ECHO_REQUEST, empty payload;ofp-print;
-177;ofp-print.at:155;OFPT_ECHO_REQUEST, 5-byte payload;ofp-print;
-178;ofp-print.at:163;OFPT_ECHO_REPLY, empty payload;ofp-print;
-179;ofp-print.at:170;OFPT_ECHO_REPLY, 5-byte payload;ofp-print;
-180;ofp-print.at:178;OFPT_FEATURES_REQUEST;ofp-print;
-181;ofp-print.at:185;OFPT_FEATURES_REPLY - OF1.0;ofp-print;
-182;ofp-print.at:235;OFPT_FEATURES_REPLY cut off mid-port - OF1.0;ofp-print;
-183;ofp-print.at:274;OFPT_FEATURES_REPLY - OF1.1;ofp-print;
-184;ofp-print.at:305;OFPT_FEATURES_REPLY cut off mid-port - OF1.1;ofp-print;
-185;ofp-print.at:334;OFPT_FEATURES_REPLY - OF1.2;ofp-print;
-186;ofp-print.at:365;OFPT_FEATURES_REPLY cut off mid-port - OF1.2;ofp-print;
-187;ofp-print.at:394;OFPT_FEATURES_REPLY - OF1.3;ofp-print;
-188;ofp-print.at:406;OFPT_FEATURES_REPLY - OF1.4;ofp-print;
-189;ofp-print.at:418;OFPT_FEATURES_REPLY - OF1.5;ofp-print;
-190;ofp-print.at:430;OFPT_FEATURES_REPLY - with auxiliary_id - OF1.3;ofp-print;
-191;ofp-print.at:442;OFPT_GET_CONFIG_REQUEST;ofp-print;
-192;ofp-print.at:449;OFPT_GET_CONFIG_REPLY, most common form;ofp-print;
-193;ofp-print.at:457;OFPT_GET_CONFIG_REPLY, frags and miss_send_len;ofp-print;
-194;ofp-print.at:464;OFPT_PACKET_IN - OF1.0;ofp-print;
-195;ofp-print.at:478;OFPT_PACKET_IN - OF1.0, with hex output of packet data;ofp-print;
-196;ofp-print.at:496;OFPT_PACKET_IN - OF1.1;ofp-print;
-197;ofp-print.at:511;OFPT_PACKET_IN - OF1.2;ofp-print;
-198;ofp-print.at:525;OFPT_PACKET_IN - OF1.2, with hex output of packet data;ofp-print;
-199;ofp-print.at:542;OFPT_PACKET_IN - OF1.3;ofp-print;
-200;ofp-print.at:557;OFPT_PACKET_IN - OF1.4;ofp-print;
-201;ofp-print.at:572;OFPT_PACKET_IN - OF1.5;ofp-print;
-202;ofp-print.at:587;OFPT_PACKET_IN - OF1.3, with hex output of packet data;ofp-print;
-203;ofp-print.at:605;OFPT_FLOW_REMOVED - OF1.0;ofp-print;
-204;ofp-print.at:619;OFPT_FLOW_REMOVED - OF1.2;ofp-print;
-205;ofp-print.at:630;OFPT_FLOW_REMOVED - OF1.3;ofp-print;
-206;ofp-print.at:641;OFPT_FLOW_REMOVED - OF1.5;ofp-print;
-207;ofp-print.at:657;OFPT_PORT_STATUS - OF1.0;ofp-print;
-208;ofp-print.at:675;OFPT_PORT_STATUS - OF1.1;ofp-print;
-209;ofp-print.at:694;OFPT_PORT_STATUS - OF1.4;ofp-print;
-210;ofp-print.at:714;OFPT_PACKET_OUT - OF1.0;ofp-print;
-211;ofp-print.at:728;OFPT_PACKET_OUT - OF1.0, with packet;ofp-print;
-212;ofp-print.at:743;OFPT_PACKET_OUT - OF1.0, with hex output of packet data;ofp-print;
-213;ofp-print.at:762;OFPT_PACKET_OUT - OF1.1;ofp-print;
-214;ofp-print.at:773;OFPT_PACKET_OUT - OF1.1, with packet;ofp-print;
-215;ofp-print.at:789;OFPT_PACKET_OUT - OF1.5;ofp-print packet-out;
-216;ofp-print.at:840;OFPT_PACKET_OUT - OF1.5, with packet;ofp-print packet-out;
-217;ofp-print.at:858;OFPT_FLOW_MOD - OF1.0 - low verbosity;ofp-print;
-218;ofp-print.at:876;OFPT_FLOW_MOD - OF1.1 - low verbosity;ofp-print;
-219;ofp-print.at:896;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
-220;ofp-print.at:916;OFPT_FLOW_MOD - OF1.0 - high verbosity;ofp-print;
-221;ofp-print.at:934;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
-222;ofp-print.at:953;OFPT_FLOW_MOD - OF1.3 - flags - low verbosity;ofp-print;
-223;ofp-print.at:971;OFPT_FLOW_MOD - OF1.2 - set-field ip_src;ofp-print;
-224;ofp-print.at:986;OFPT_FLOW_MOD - OF1.2 - set-field ip_dst;ofp-print;
-225;ofp-print.at:1001;OFPT_FLOW_MOD - OF1.2 - set-field sctp_src;ofp-print;
-226;ofp-print.at:1016;OFPT_FLOW_MOD - OF1.2 - set-field sctp_dst;ofp-print;
-227;ofp-print.at:1031;OFPT_FLOW_MOD - OF1.2 - experimenter OXM;ofp-print;
-228;ofp-print.at:1045;OFPT_FLOW_MOD - OF1.2 - set-field nd_target, nd_sll;ofp-print;
-229;ofp-print.at:1063;OFPT_FLOW_MOD - OF1.3 - meter;ofp-print;
-230;ofp-print.at:1074;OFPT_FLOW reply - OF1.2 - set-field ip_src;ofp-print;
-231;ofp-print.at:1091;OFPT_FLOW reply - OF1.2 - set-field ip_dst;ofp-print;
-232;ofp-print.at:1108;OFPT_FLOW reply - OF1.2 - set-field sctp_src;ofp-print;
-233;ofp-print.at:1125;OFPT_FLOW reply - OF1.2 - set-field sctp_dst;ofp-print;
-234;ofp-print.at:1142;OFPT_PORT_MOD - OF1.0;ofp-print;
-235;ofp-print.at:1155;OFPT_PORT_MOD - OF1.1;ofp-print;
-236;ofp-print.at:1169;OFPT_PORT_MOD - OF1.2;ofp-print;
-237;ofp-print.at:1183;OFPT_PORT_MOD - OF1.3;ofp-print;
-238;ofp-print.at:1197;OFPT_PORT_MOD - OF1.4;ofp-print;
-239;ofp-print.at:1211;OFPT_TABLE_MOD - OF1.1;ofp-print;
-240;ofp-print.at:1220;OFPT_TABLE_MOD - OF1.2;ofp-print;
-241;ofp-print.at:1229;OFPT_TABLE_MOD - OF1.3;ofp-print;
-242;ofp-print.at:1238;OFPT_TABLE_MOD - OF1.4;ofp-print;
-243;ofp-print.at:1247;OFPST_DESC request;ofp-print ofpt_stats_request;
-244;ofp-print.at:1254;OFPST_DESC reply;ofp-print ofpt_stats_reply;
-245;ofp-print.at:1334;OFPST_FLOW request - OF1.0;ofp-print ofpt_stats_request;
-246;ofp-print.at:1346;OFPST_FLOW request - OF1.2;ofp-print ofpt_stats_request;
-247;ofp-print.at:1358;OFPST_FLOW request - OF1.3;ofp-print ofpt_stats_request;
-248;ofp-print.at:1370;OFPST_FLOW request - OF1.5;ofp-print ofpt_stats_request;
-249;ofp-print.at:1382;OFPST_FLOW reply - OF1.0;ofp-print ofpt_stats_reply;
-250;ofp-print.at:1426;OFPST_FLOW reply - OF1.2;ofp-print ofpt_stats_reply;
-251;ofp-print.at:1461;OFPST_FLOW reply - OF1.5;ofp-print ofpt_stats_reply;
-252;ofp-print.at:1487;OFPST_AGGREGATE request - OF1.0;ofp-print ofpt_stats_request;
-253;ofp-print.at:1499;OFPST_AGGREGATE request - OF1.2;ofp-print ofpt_stats_request;
-254;ofp-print.at:1511;OFPST_AGGREGATE request - OF1.3;ofp-print ofpt_stats_request;
-255;ofp-print.at:1523;OFPST_AGGREGATE request - OF1.5;ofp-print ofpt_stats_request;
-256;ofp-print.at:1537;OFPST_AGGREGATE reply - OF1.0;ofp-print ofpt_stats_reply;
-257;ofp-print.at:1548;OFPST_AGGREGATE reply - OF1.2;ofp-print ofpt_stats_reply;
-258;ofp-print.at:1559;OFPST_AGGREGATE reply - OF1.3;ofp-print ofpt_stats_reply;
-259;ofp-print.at:1570;OFPST_AGGREGATE reply - OF1.5;ofp-print ofpt_stats_reply;
-260;ofp-print.at:1582;OFPST_TABLE request - OF1.0;ofp-print ofpt_stats_request;
-261;ofp-print.at:1589;OFPST_TABLE request - OF1.1;ofp-print ofpt_stats_request;
-262;ofp-print.at:1596;OFPST_TABLE request - OF1.2;ofp-print ofpt_stats_request;
-263;ofp-print.at:1603;OFPST_TABLE request - OF1.3;ofp-print ofpt_stats_request;
-264;ofp-print.at:1610;OFPST_TABLE reply - OF1.0;ofp-print ofpt_stats_reply;
-265;ofp-print.at:1628;OFPST_TABLE reply - OF1.2;ofp-print ofpt_stats_reply;
-266;ofp-print.at:1685;OFPST_TABLE reply - OF1.3;ofp-print ofpt_stats_reply;
-267;ofp-print.at:1702;OFPST_PORT request - 1.0;ofp-print ofpt_stats_request;
-268;ofp-print.at:1712;OFPST_PORT request - 1.1;ofp-print ofpt_stats_request;
-269;ofp-print.at:1722;OFPST_PORT request - 1.2;ofp-print ofpt_stats_request;
-270;ofp-print.at:1732;OFPST_PORT request - 1.3;ofp-print ofpt_stats_request;
-271;ofp-print.at:1742;OFPST_PORT reply - OF1.0;ofp-print ofpt_stats_reply;
-272;ofp-print.at:1785;OFPST_PORT reply - OF1.2;ofp-print ofpt_stats_reply;
-273;ofp-print.at:1820;OFPST_PORT reply - OF1.3;ofp-print ofpt_stats_reply;
-274;ofp-print.at:1859;OFPST_PORT reply - OF1.4;ofp-print ofpt_stats_reply;
-275;ofp-print.at:1879;OFPST_QUEUE request - OF1.0;ofp-print ofpt_stats_request;
-276;ofp-print.at:1889;OFPST_QUEUE request - OF1.1;ofp-print ofpt_stats_request;
-277;ofp-print.at:1899;OFPST_QUEUE request - OF1.2;ofp-print ofpt_stats_request;
-278;ofp-print.at:1909;OFPST_QUEUE request - OF1.3;ofp-print ofpt_stats_request;
-279;ofp-print.at:1919;OFPST_QUEUE reply - OF1.0;ofp-print ofpt_stats_reply;
-280;ofp-print.at:1946;OFPST_QUEUE reply - OF1.1;ofp-print ofpt_stats_reply;
-281;ofp-print.at:1973;OFPST_QUEUE reply - OF1.2;ofp-print ofpt_stats_reply;
-282;ofp-print.at:2000;OFPST_QUEUE reply - OF1.3;ofp-print ofpt_stats_reply;
-283;ofp-print.at:2033;OFPST_QUEUE reply - OF1.4;ofp-print ofpt_stats_reply;
-284;ofp-print.at:2067;NXST_GROUP request - OF1.0;ofp-print ofpt_stats_request;
-285;ofp-print.at:2076;OFPST_GROUP request - OF1.1;ofp-print ofpt_stats_request;
-286;ofp-print.at:2085;NXST_GROUP reply - OF1.0;ofp-print ofpt_stats_reply;
-287;ofp-print.at:2107;OFPST_GROUP reply - OF1.1;ofp-print ofpt_stats_reply;
-288;ofp-print.at:2127;OFPST_GROUP reply - OF1.3;ofp-print ofpt_stats_reply;
-289;ofp-print.at:2149;NXST_GROUP_DESC request - OF1.0;ofp-print ofpt_stats_request;
-290;ofp-print.at:2158;OFPST_GROUP_DESC request - OF1.1;ofp-print ofpt_stats_request;
-291;ofp-print.at:2166;OFPST_GROUP_DESC request - OF1.5;ofp-print ofpt_stats_request;
-292;ofp-print.at:2175;NXST_GROUP_DESC reply - OF1.0;ofp-print ofpt_stats_reply;
-293;ofp-print.at:2200;OFPST_GROUP_DESC reply - OF1.1;ofp-print ofpt_stats_request;
-294;ofp-print.at:2217;OFPST_GROUP_DESC reply - OF1.5;ofp-print ofpt_stats_reply;
-295;ofp-print.at:2242;NXST_GROUP_FEATURES request;ofp-print ofpt_stats_request;
-296;ofp-print.at:2250;OFPST_GROUP_FEATURES request;ofp-print ofpt_stats_request;
-297;ofp-print.at:2258;NXST_GROUP_FEATURES reply;ofp-print ofpt_stats_reply;
-298;ofp-print.at:2285;OFPST_GROUP_FEATURES reply;ofp-print ofpt_stats_reply;
-299;ofp-print.at:2312;OFPST_PORT_DESC request - OF1.0;ofp-print ofpt_stats_request;
-300;ofp-print.at:2319;OFPST_PORT_DESC request - OF1.5;ofp-print ofpt_stats_request;
-301;ofp-print.at:2328;OFPST_PORT_DESC reply - OF1.0;ofp-print ofpt_stats_reply;
-302;ofp-print.at:2347;OFPST_PORT_DESC reply - OF1.4;ofp-print ofpt_stats_reply;
-303;ofp-print.at:2368;OFPT_METER_MOD request - OF1.3;ofp-print;
-304;ofp-print.at:2379;OFPT_METER_MOD request - bad band - OF1.3;ofp-print;
-305;ofp-print.at:2391;OFPT_METER_MOD request - bad command - OF1.3;ofp-print;
-306;ofp-print.at:2401;OFPT_METER_MOD request - bad flags - OF1.3;ofp-print;
-307;ofp-print.at:2413;OFPST_METER request - OF1.3;ofp-print ofpt_stats_request;
-308;ofp-print.at:2420;OFPST_METER_CONFIG request - OF1.3;ofp-print ofpt_stats_request;
-309;ofp-print.at:2427;OFPST_METER_FEATURES request - OF1.3;ofp-print ofpt_stats_request;
-310;ofp-print.at:2434;OFPST_METER_FEATURES reply - OF1.3;ofp-print ofpt_stats_reply;
-311;ofp-print.at:2447;OFPST_METER_CONFIG reply - OF1.3;ofp-print ofpt_stats_reply;
-312;ofp-print.at:2467;OFPST_METER reply - OF1.3;ofp-print ofpt_stats_reply;
-313;ofp-print.at:2491;OFPST_TABLE_FEATURES request - OF1.3;ofp-print ofpt_stats_request;
-314;ofp-print.at:2657;OFPT_BARRIER_REQUEST - OF1.0;ofp-print;
-315;ofp-print.at:2664;OFPT_BARRIER_REQUEST - OF1.1;ofp-print;
-316;ofp-print.at:2671;OFPT_BARRIER_REQUEST - OF1.2;ofp-print;
-317;ofp-print.at:2678;OFPT_BARRIER_REQUEST - OF1.3;ofp-print;
-318;ofp-print.at:2685;OFPT_BARRIER_REPLY - OF1.0;ofp-print;
-319;ofp-print.at:2692;OFPT_BARRIER_REPLY - OF1.1;ofp-print;
-320;ofp-print.at:2699;OFPT_BARRIER_REPLY - OF1.2;ofp-print;
-321;ofp-print.at:2706;OFPT_BARRIER_REPLY - OF1.3;ofp-print;
-322;ofp-print.at:2713;OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.0;ofp-print;
-323;ofp-print.at:2720;OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.2;ofp-print;
-324;ofp-print.at:2728;OFPST_QUEUE_DESC request - OF1.4;ofp-print ofpt_queue_get_config_request;
-325;ofp-print.at:2737;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.0;ofp-print;
-326;ofp-print.at:2752;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.1;ofp-print;
-327;ofp-print.at:2767;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.2;ofp-print;
-328;ofp-print.at:2782;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.3;ofp-print;
-329;ofp-print.at:2798;OFPST_QUEUE_DESC reply - OF1.4;ofp-print ofpt_queue_get_config_reply;
-330;ofp-print.at:2817;OFPT_SET_ASYNC - OF1.3;ofp-print;
-331;ofp-print.at:2846;OFPT_ROLE_REQUEST - OF1.2;ofp-print;
-332;ofp-print.at:2856;OFPT_ROLE_REQUEST - nochange - OF1.2;ofp-print;
-333;ofp-print.at:2866;NXT_ROLE_REQUEST;ofp-print;
-334;ofp-print.at:2876;OFPT_ROLE_REPLY - OF1.2;ofp-print;
-335;ofp-print.at:2886;NXT_ROLE_REPLY;ofp-print;
-336;ofp-print.at:2896;OFP_ROLE_STATUS - master, experimenter - OF1.3;ofp-print;
-337;ofp-print.at:2906;OFP_ROLE_STATUS - master, config - OF1.3;ofp-print;
-338;ofp-print.at:2916;OFP_ROLE_STATUS - master, config,generation - OF1.3;ofp-print;
-339;ofp-print.at:2926;OFP_ROLE_STATUS - master, experimenter - OF1.4;ofp-print;
-340;ofp-print.at:2936;OFP_ROLE_STATUS - master, config - OF1.4;ofp-print;
-341;ofp-print.at:2946;OFP_ROLE_STATUS - master, config,generation - OF1.4;ofp-print;
-342;ofp-print.at:2956;OFP_REQUESTFORWARD - OF1.4;ofp-print;
-343;ofp-print.at:2968;OFP_REQUESTFORWARD - OF1.4;ofp-print;
-344;ofp-print.at:2980;OFP_REQUESTFORWARD - OF1.4;ofp-print;
-345;ofp-print.at:2991;OFP_REQUESTFORWARD - OF1.4;ofp-print;
-346;ofp-print.at:3002;NXT_REQUESTFORWARD - inner NXT_GROUP_MOD;ofp-print;
-347;ofp-print.at:3029;NXT_REQUESTFORWARD - inner OFPT_GROUP_MOD - OF1.1;ofp-print;
-348;ofp-print.at:3056;ONFT_REQUESTFORWARD - inner OFPT_METER_MOD - OF1.3;ofp-print;
-349;ofp-print.at:3078;NXT_SET_PACKET_IN;ofp-print;
-350;ofp-print.at:3088;NXT_PACKET_IN;ofp-print;
-351;ofp-print.at:3109;NXT_PACKET_IN, with hex output of packet data;ofp-print;
-352;ofp-print.at:3134;NX_PACKET_IN2;ofp-print;
-353;ofp-print.at:3157;NXT_SET_ASYNC_CONFIG;ofp-print;
-354;ofp-print.at:3185;OFPT_SET_ASYNC_CONFIG;ofp-print;
-355;ofp-print.at:3212;OFPT_SET_ASYNC_CONFIG - invalid mask - OF1.4;ofp-print;
-356;ofp-print.at:3231;OFPT_SET_ASYNC_CONFIG - unsupported configuration - OF1.4;ofp-print;
-357;ofp-print.at:3250;NXT_SET_CONTROLLER_ID;ofp-print;
-358;ofp-print.at:3260;NXT_FLOW_MONITOR_CANCEL;ofp-print;
-359;ofp-print.at:3270;NXT_FLOW_MONITOR_PAUSED;ofp-print;
-360;ofp-print.at:3279;NXT_FLOW_MONITOR_RESUMED;ofp-print;
-361;ofp-print.at:3288;NXT_SET_FLOW_FORMAT;ofp-print;
-362;ofp-print.at:3299;NXT_FLOW_MOD, low verbosity;ofp-print;
-363;ofp-print.at:3315;NXT_FLOW_MOD, high verbosity;ofp-print;
-364;ofp-print.at:3329;NXT_GROUP_MOD add - OF1.0;ofp-print;
-365;ofp-print.at:3353;OFPT_GROUP_MOD - OF1.1;ofp-print;
-366;ofp-print.at:3369;OFPT_GROUP_MOD add - OF1.5;ofp-print;
-367;ofp-print.at:3390;OFPT_GROUP_MOD insert bucket - OF1.5;ofp-print;
-368;ofp-print.at:3408;NXT_FLOW_REMOVED;ofp-print;
-369;ofp-print.at:3424;NXT_FLOW_MOD_TABLE_ID;ofp-print;
-370;ofp-print.at:3434;NXT_RESUME;ofp-print;
-371;ofp-print.at:3446;NXST_FLOW request;ofp-print ofpt_stats_request;
-372;ofp-print.at:3456;NXST_FLOW reply;ofp-print ofpt_stats_reply;
-373;ofp-print.at:3610;NXST_AGGREGATE request;ofp-print ofpt_stats_request;
-374;ofp-print.at:3620;NXST_AGGREGATE reply;ofp-print ofpt_stats_reply;
-375;ofp-print.at:3631;NXST_FLOW_MONITOR request;ofp-print ofpt_stats_reply;
-376;ofp-print.at:3644;NXST_FLOW_MONITOR reply;ofp-print ofpt_stats_reply;
-377;ofp-print.at:3659;OFPT_BUNDLE_CONTROL - atomic OPEN_REQUEST;ofp-print bundle;
-378;ofp-print.at:3670;OFPT_BUNDLE_CONTROL - ordered OPEN_REQUEST;ofp-print bundle;
-379;ofp-print.at:3681;OFPT_BUNDLE_CONTROL - atomic ordered OPEN_REQUEST;ofp-print bundle;
-380;ofp-print.at:3692;OFPT_BUNDLE_CONTROL - OPEN_REPLY;ofp-print bundle;
-381;ofp-print.at:3703;OFPT_BUNDLE_CONTROL - CLOSE_REQUEST;ofp-print bundle;
-382;ofp-print.at:3714;OFPT_BUNDLE_CONTROL - CLOSE_REPLY;ofp-print bundle;
-383;ofp-print.at:3725;OFPT_BUNDLE_CONTROL - COMMIT_REQUEST;ofp-print bundle;
-384;ofp-print.at:3736;OFPT_BUNDLE_CONTROL - COMMIT_REPLY;ofp-print bundle;
-385;ofp-print.at:3747;OFPT_BUNDLE_CONTROL - DISCARD_REQUEST;ofp-print bundle;
-386;ofp-print.at:3758;OFPT_BUNDLE_CONTROL - DISCARD_REPLY;ofp-print bundle;
-387;ofp-print.at:3769;OFPT_BUNDLE_ADD_MESSAGE - verify xid;ofp-print bundle;
-388;ofp-print.at:3781;OFPT_BUNDLE_ADD_MESSAGE - reject OFPT_HELLO;ofp-print bundle;
-389;ofp-print.at:3795;OFPT_BUNDLE_ADD_MESSAGE - FLOW_MOD;ofp-print bundle;
-390;ofp-print.at:3815;OFPT_BUNDLE_ADD_MESSAGE - PORT_MOD;ofp-print bundle;
-391;ofp-print.at:3832;OFPT_BUNDLE_ADD_MESSAGE - GROUP_MOD;ofp-print bundle;
-392;ofp-print.at:3856;OFPT_BUNDLE_ADD_MESSAGE - PACKET_OUT;ofp-print bundle packet-out;
-393;ofp-print.at:3875;NXST_IPFIX_BRIDGE - request;ofp-print ofpt_stats_request;
-394;ofp-print.at:3885;NXST_IPFIX_BRIDGE - reply;ofp-print ofpt_stats_reply;
-395;ofp-print.at:3908;NXST_IPFIX_FLOW - request;ofp-print ofpt_stats_request;
-396;ofp-print.at:3918;NXST_IPFIX_FLOW - reply;ofp-print ofpt_stats_reply;
-397;ofp-print.at:3954;NXT_CT_FLUSH_ZONE;ofp-print;
-398;ofp-util.at:3;encoding hellos;;
-399;ofp-util.at:54;parsing key-value pairs;;
-400;ofp-errors.at:3;OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.0;ofp-print ofp-errors;
-401;ofp-errors.at:11;OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.1;ofp-print ofp-errors;
-402;ofp-errors.at:19;OFPT_ERROR with type OFPET_BAD_REQUEST - OF1.0;ofp-print ofp-errors;
-403;ofp-errors.at:29;OFPT_ERROR prints type of truncated inner messages;ofp-print ofp-errors;
-404;ofp-errors.at:46;OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.0;ofp-print ofp-errors;
-405;ofp-errors.at:54;OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.1;ofp-print ofp-errors;
-406;ofp-errors.at:64;OFPT_ERROR with type OFPFMFC_OVERLAP - OF1.0;ofp-print ofp-errors;
-407;ofp-errors.at:73;OFPT_ERROR with type OFPBIC_UNSUP_INST - OF1.1;ofp-print ofp-errors;
-408;ofp-errors.at:83;OFPT_ERROR with type OFPBIC_DUP_INST - OF1.4;ofp-print ofp-errors;
-409;ofp-errors.at:97;encoding OFPBIC_* experimenter errors;ofp-print ofp-errors;
-410;ofp-errors.at:117;encoding errors extension that became official;ofp-print ofp-errors;
-411;ofp-errors.at:136;decoding OFPBIC_* experimenter errors;ofp-print ofp-errors;
-412;ofp-errors.at:152;decoding experimenter errors;ofp-print ofp-errors;
-413;ofp-errors.at:184;encoding experimenter errors;ofp-print ofp-errors;
-414;ovs-ofctl.at:3;ovs-ofctl parse-flows choice of protocol;;
-415;ovs-ofctl.at:181;ovs-ofctl parse-flows (OpenFlow 1.0);;
-416;ovs-ofctl.at:248;ovs-ofctl parse-flows (OpenFlow 1.1);;
-417;ovs-ofctl.at:287;ovs-ofctl parse-flows (OpenFlow 1.2);;
-418;ovs-ofctl.at:338;ovs-ofctl parse-flow with invalid mask;;
-419;ovs-ofctl.at:377;ovs-ofctl action inconsistency (OpenFlow 1.1);;
-420;ovs-ofctl.at:386;ovs-ofctl parse-flows (skb_priority);;
-421;ovs-ofctl.at:398;ovs-ofctl parse-flows (NXM);;
-422;ovs-ofctl.at:509;ovs-ofctl -F nxm parse-flows;;
-423;ovs-ofctl.at:588;ovs-ofctl -F nxm -mmm parse-flows;;
-424;ovs-ofctl.at:669;ovs-ofctl parse-nx-match;nx-match;
-425;ovs-ofctl.at:1283;ovs-ofctl parse-ofp10-match;of1.0;
-426;ovs-ofctl.at:1500;ovs-ofctl parse-ofp11-match;of1.1;
-427;ovs-ofctl.at:1826;ovs-ofctl parse-nx-match loose;nx-match;
-428;ovs-ofctl.at:1847;ovs-ofctl parse-oxm (OpenFlow 1.2);oxm;
-429;ovs-ofctl.at:2341;ovs-ofctl parse-oxm (OpenFlow 1.3);oxm;
-430;ovs-ofctl.at:2364;ovs-ofctl parse-oxm (OpenFlow 1.5);oxm;
-431;ovs-ofctl.at:2429;ovs-ofctl parse-oxm loose;oxm;
-432;ovs-ofctl.at:2450;experimenter OXM encoding;;
-433;ovs-ofctl.at:2498;check TCP flags expression in OXM and NXM;;
-434;ovs-ofctl.at:2530;ovs-ofctl check-vlan;vlan;
-435;ovs-ofctl.at:2627;ovs-ofctl -F option and NXM features;;
-436;ovs-ofctl.at:2642;ovs-ofctl -F option with flow_mods;;
-437;ovs-ofctl.at:2654;ovs-ofctl dump-flows honors -F option;;
-438;ovs-ofctl.at:2666;ovs-ofctl dump-flows rejects bad -F option;;
-439;ovs-ofctl.at:2675;ovs-ofctl add-flow reports non-normalized flows;;
-440;ovs-ofctl.at:2689;ovs-ofctl dump-flows with sorting;sort;
-441;ovs-ofctl.at:2792;ovs-ofctl dump-flows --names;port names;
-442;ovs-ofctl.at:2829;ovs-ofctl diff-flows;;
-443;ovs-ofctl.at:2853;ovs-ofctl diff-flows - tunnel metadata;;
-444;ovs-ofctl.at:2889;ovs-ofctl diff-flows - suppress false differences;;
-445;ovs-ofctl.at:2906;ovs-ofctl -F and -O interaction;;
-446;ovs-ofctl.at:2927;ovs-ofctl ofp-parse;;
-447;ovs-ofctl.at:2945;tcp flags - filtering;;
-448;ovs-ofctl.at:3014;ovs-ofctl rule with importance;;
-449;ovs-ofctl.at:3041;ovs-ofctl replace-flows with importance;;
-450;ovs-ofctl.at:3060;ovs-ofctl replace-flows with --bundle;;
-451;ovs-ofctl.at:3188;ovs-ofctl ct-flush-zone;;
-452;ovs-ofctl.at:3201;ovs-ofctl snoop;;
-453;fuzz-regression-list.at:1;fuzz regression - flow_extract_fuzzer-5112775280951296;;
-454;fuzz-regression-list.at:2;fuzz regression - flow_extract_fuzzer-5457710546944000;;
-455;fuzz-regression-list.at:3;fuzz regression - json_parser_fuzzer-4790908707930112;;
-456;fuzz-regression-list.at:4;fuzz regression - ofp_print_fuzzer-4584019764183040;;
-457;fuzz-regression-list.at:5;fuzz regression - ofp_print_fuzzer-4730143510626304;;
-458;fuzz-regression-list.at:6;fuzz regression - ofp_print_fuzzer-4854119633256448;;
-459;fuzz-regression-list.at:7;fuzz regression - ofp_print_fuzzer-5070973479944192;;
-460;fuzz-regression-list.at:8;fuzz regression - ofp_print_fuzzer-5072291707748352;;
-461;fuzz-regression-list.at:9;fuzz regression - ofp_print_fuzzer-5147430386401280;;
-462;fuzz-regression-list.at:10;fuzz regression - ofp_print_fuzzer-5168455220199424;;
-463;fuzz-regression-list.at:11;fuzz regression - ofp_print_fuzzer-5190507327127552;;
-464;fuzz-regression-list.at:12;fuzz regression - ofp_print_fuzzer-5204186701496320;;
-465;fuzz-regression-list.at:13;fuzz regression - ofp_print_fuzzer-5394482341085184;;
-466;fuzz-regression-list.at:14;fuzz regression - ofp_print_fuzzer-5395207246839808;;
-467;fuzz-regression-list.at:15;fuzz regression - ofp_print_fuzzer-5647458888581120;;
-468;fuzz-regression-list.at:16;fuzz regression - ofp_print_fuzzer-5674119268925440;;
-469;fuzz-regression-list.at:17;fuzz regression - ofp_print_fuzzer-5674419757252608;;
-470;fuzz-regression-list.at:18;fuzz regression - ofp_print_fuzzer-5677588436484096;;
-471;fuzz-regression-list.at:19;fuzz regression - ofp_print_fuzzer-5706562554298368;;
-472;fuzz-regression-list.at:20;fuzz regression - ofp_print_fuzzer-5722747668791296;;
-473;fuzz-regression-list.at:21;fuzz regression - ofp_print_fuzzer-6285128790704128;;
-474;fuzz-regression-list.at:22;fuzz regression - ofp_print_fuzzer-6470117922701312;;
-475;fuzz-regression-list.at:23;fuzz regression - ofp_print_fuzzer-6502620041576448;;
-476;odp.at:3;OVS datapath key parsing and formatting - valid forms;;
-477;odp.at:112;OVS datapath wildcarded key parsing and formatting - valid forms;;
-478;odp.at:199;OVS datapath wildcarded key filtering.;;
-479;odp.at:264;OVS datapath actions parsing and formatting - valid forms;;
-480;odp.at:392;OVS datapath actions parsing and formatting - invalid forms;;
-481;odp.at:400;OVS datapath keys parsing and formatting - 33 nested encap ;;
-482;mpls-xlate.at:3;MPLS xlate action;;
-483;mpls-xlate.at:147;MPLS xlate action - patch-port;;
-484;mpls-xlate.at:191;MPLS xlate action - group bucket;;
-485;multipath.at:10;modulo_n multipath link selection;;
-486;multipath.at:78;hash_threshold multipath link selection;;
-487;multipath.at:146;hrw multipath link selection;;
-488;multipath.at:214;iter_hash multipath link selection;;
-489;multipath.at:282;modulo_n multipath symmetric_l3 link selection;;
-490;multipath.at:350;hash_threshold multipath symmetric_l3 link selection;;
-491;multipath.at:418;hrw multipath symmetric_l3 link selection;;
-492;multipath.at:486;iter_hash symmetric_l3 multipath link selection;;
-493;learn.at:3;learning action - parsing and formatting;;
-494;learn.at:28;learning action - parsing and formatting - illegal in_port_oxm;;
-495;learn.at:37;learning action - parsing and formatting - OXM;;
-496;learn.at:50;learning action - examples;;
-497;learn.at:68;learning action - satisfied prerequisites;;
-498;learn.at:83;learning action - invalid prerequisites;;
-499;learn.at:98;learning action - too-long immediate value;;
-500;learn.at:112;learning action - standard VLAN+MAC learning;;
-501;learn.at:178;learning action - learn refreshes hard_age;;
-502;learn.at:244;learning action - TCPv4 port learning;;
-503;learn.at:269;learning action - TCPv6 port learning;;
-504;learn.at:300;learning action - self-modifying flow;;
-505;learn.at:342;learning action - self-modifying flow with idle_timeout;;
-506;learn.at:400;learning action - self-modifying flow with hard_timeout;;
-507;learn.at:496;learning action - fin_timeout feature;;
-508;learn.at:510;learning action - delete_learned feature;;
-509;learn.at:628;learning action - delete_learned/limit with packet;;
-510;learn.at:666;learning action - limit;;
-511;learn.at:705;learning action - limit result_dst;;
-512;learn.at:738;learning action - different limits;;
-513;vconn.at:20;unix vconn - refuse connection;;
-514;vconn.at:20;unix vconn - accept then close;;
-515;vconn.at:20;unix vconn - read hello;;
-516;vconn.at:20;unix vconn - send plain hello;;
-517;vconn.at:20;unix vconn - send long hello;;
-518;vconn.at:20;unix vconn - send echo hello;;
-519;vconn.at:20;unix vconn - send short hello;;
-520;vconn.at:20;unix vconn - send invalid version hello;;
-521;vconn.at:21;tcp vconn - refuse connection;;
-522;vconn.at:21;tcp vconn - accept then close;;
-523;vconn.at:21;tcp vconn - read hello;;
-524;vconn.at:21;tcp vconn - send plain hello;;
-525;vconn.at:21;tcp vconn - send long hello;;
-526;vconn.at:21;tcp vconn - send echo hello;;
-527;vconn.at:21;tcp vconn - send short hello;;
-528;vconn.at:21;tcp vconn - send invalid version hello;;
-529;vconn.at:22;ssl vconn - refuse connection;;
-530;vconn.at:22;ssl vconn - accept then close;;
-531;vconn.at:22;ssl vconn - read hello;;
-532;vconn.at:22;ssl vconn - send plain hello;;
-533;vconn.at:22;ssl vconn - send long hello;;
-534;vconn.at:22;ssl vconn - send echo hello;;
-535;vconn.at:22;ssl vconn - send short hello;;
-536;vconn.at:22;ssl vconn - send invalid version hello;;
-537;file_name.at:13;components of \"/usr/lib\" are \"/usr\", \"lib\";dir_name base_name;
-538;file_name.at:14;components of \"/usr/\" are \"/\", \"usr\";dir_name base_name;
-539;file_name.at:15;components of \"usr\" are \".\", \"usr\";dir_name base_name;
-540;file_name.at:16;components of \"/\" are \"/\", \"/\";dir_name base_name;
-541;file_name.at:17;components of \".\" are \".\", \".\";dir_name base_name;
-542;file_name.at:18;components of \"..\" are \".\", \"..\";dir_name base_name;
-543;file_name.at:19;components of \"//\" are \"//\", \"//\";dir_name base_name;
-544;file_name.at:20;components of \"//foo\" are \"//\", \"foo\";dir_name base_name;
-545;file_name.at:21;components of \"\" are \".\", \".\";dir_name base_name;
-546;file_name.at:24;components of \"dir/file\" are \"dir\", \"file\";dir_name base_name;
-547;file_name.at:25;components of \"dir/file/\" are \"dir\", \"file\";dir_name base_name;
-548;file_name.at:26;components of \"dir/file//\" are \"dir\", \"file\";dir_name base_name;
-549;file_name.at:27;components of \"///foo\" are \"/\", \"foo\";dir_name base_name;
-550;file_name.at:37;follow_symlinks - relative symlinks;;
-551;file_name.at:54;follow_symlinks - absolute symlinks;;
-552;file_name.at:71;follow_symlinks - symlinks to directories;;
-553;file_name.at:84;follow_symlinks - nonexistent targets;;
-554;file_name.at:92;follow_symlinks - regular files;;
-555;file_name.at:97;follow_symlinks - device targets;;
-556;file_name.at:106;follow_symlinks - nonexistent files;;
-557;file_name.at:114;follow_symlinks - symlink loop;;
-558;aes128.at:10;wikipedia test vector 1;aes128;
-559;aes128.at:16;wikipedia test vector 2;aes128;
-560;aes128.at:22;NIST KAT ECBKeySbox128e vector 0;aes128;
-561;aes128.at:28;NIST KAT ECBKeySbox128e vector 1;aes128;
-562;aes128.at:34;NIST KAT ECBKeySbox128e vector 2;aes128;
-563;aes128.at:40;NIST KAT ECBKeySbox128e vector 3;aes128;
-564;aes128.at:46;NIST KAT ECBKeySbox128e vector 4;aes128;
-565;aes128.at:52;NIST KAT ECBKeySbox128e vector 5;aes128;
-566;aes128.at:58;NIST KAT ECBKeySbox128e vector 6;aes128;
-567;aes128.at:64;NIST KAT ECBKeySbox128e vector 7;aes128;
-568;aes128.at:70;NIST KAT ECBKeySbox128e vector 8;aes128;
-569;aes128.at:76;NIST KAT ECBKeySbox128e vector 9;aes128;
-570;aes128.at:82;NIST KAT ECBKeySbox128e vector 10;aes128;
-571;aes128.at:88;NIST KAT ECBKeySbox128e vector 11;aes128;
-572;aes128.at:94;NIST KAT ECBKeySbox128e vector 12;aes128;
-573;aes128.at:100;NIST KAT ECBKeySbox128e vector 13;aes128;
-574;aes128.at:106;NIST KAT ECBKeySbox128e vector 14;aes128;
-575;aes128.at:112;NIST KAT ECBKeySbox128e vector 15;aes128;
-576;aes128.at:118;NIST KAT ECBKeySbox128e vector 16;aes128;
-577;aes128.at:124;NIST KAT ECBKeySbox128e vector 17;aes128;
-578;aes128.at:130;NIST KAT ECBKeySbox128e vector 18;aes128;
-579;aes128.at:136;NIST KAT ECBKeySbox128e vector 19;aes128;
-580;aes128.at:142;NIST KAT ECBKeySbox128e vector 20;aes128;
-581;unixctl-py.at:6;unixctl ovs-vswitchd exit - Python3;python unixctl;
-582;unixctl-py.at:17;unixctl ovs-vswitchd list-commands - Python3;;
-583;unixctl-py.at:30;unixctl ovs-vswitchd arguments - Python3;;
-584;unixctl-py.at:71;unixctl bad target - Python3;;
-585;unixctl-py.at:89;unixctl server - Python3;;
-586;unixctl-py.at:158;unixctl server errors - Python3;;
-587;uuid.at:15;UUID generation, parsing, serialization;uuid;
-588;json.at:55;empty array - C;json positive;
-589;json.at:55;empty array - Python3;json positive python;
-590;json.at:56;single-element array - C;json positive;
-591;json.at:56;single-element array - Python3;json positive python;
-592;json.at:57;2-element array - C;json positive;
-593;json.at:57;2-element array - Python3;json positive python;
-594;json.at:58;many-element array - C;json positive;
-595;json.at:58;many-element array - Python3;json positive python;
-596;json.at:61;missing comma - C;json negative;
-597;json.at:61;missing comma - Python3;json negative python;
-598;json.at:63;trailing comma not allowed - C;json negative;
-599;json.at:63;trailing comma not allowed - Python3;json negative python;
-600;json.at:65;doubled comma not allowed - C;json negative;
-601;json.at:65;doubled comma not allowed - Python3;json negative python;
-602;json.at:70;empty string - C;json positive;
-603;json.at:70;empty string - Python3;json positive python;
-604;json.at:71;1-character strings - C;json positive;
-605;json.at:71;1-character strings - Python3;json positive python;
-606;json.at:74;escape sequences - C;json positive;
-607;json.at:74;escape sequences - Python3;json positive python;
-608;json.at:77;Unicode escape sequences - C;json positive;
-609;json.at:77;Unicode escape sequences - Python3;json positive python;
-610;json.at:80;surrogate pairs - C;json positive;
-611;json.at:83;a string by itself is not valid JSON - C;json negative;
-612;json.at:83;a string by itself is not valid JSON - Python3;json negative python;
-613;json.at:85;end of line in quoted string - C;json negative;
-614;json.at:85;end of line in quoted string - Python3;json negative python;
-615;json.at:89;formfeed in quoted string - C;json negative;
-616;json.at:89;formfeed in quoted string - Python3;json negative python;
-617;json.at:92;bad escape in quoted string - C;json negative;
-618;json.at:92;bad escape in quoted string - Python3;json negative python;
-619;json.at:95;\\u must be followed by 4 hex digits (1) - C;json negative;
-620;json.at:95;\\u must be followed by 4 hex digits (1) - Python3;json negative python;
-621;json.at:98;\\u must be followed by 4 hex digits (2) - C;json negative;
-622;json.at:98;\\u must be followed by 4 hex digits (2) - Python3;json negative python;
-623;json.at:101;isolated leading surrogate not allowed - C;json negative;
-624;json.at:101;isolated leading surrogate not allowed - Python3;json negative python;
-625;json.at:104;surrogatess must paired properly - C;json negative;
-626;json.at:104;surrogatess must paired properly - Python3;json negative python;
-627;json.at:107;null bytes not allowed - C;json negative;
-628;json.at:107;null bytes not allowed - Python3;json negative python;
-629;json.at:111;properly quoted backslash at end of string - C;json positive;
-630;json.at:111;properly quoted backslash at end of string - Python3;json positive python;
-631;json.at:114;stray backslash at end of string - C;json negative;
-632;json.at:114;stray backslash at end of string - Python3;json negative python;
-633;json.at:118;end of input in quoted string - C;json negative;
-634;json.at:127;empty object - C;json positive;
-635;json.at:127;empty object - Python3;json positive python;
-636;json.at:128;simple object - C;json positive;
-637;json.at:128;simple object - Python3;json positive python;
-638;json.at:131;bad value - C;json negative;
-639;json.at:131;bad value - Python3;json negative python;
-640;json.at:133;missing colon - C;json negative;
-641;json.at:133;missing colon - Python3;json negative python;
-642;json.at:135;missing comma - C;json negative;
-643;json.at:135;missing comma - Python3;json negative python;
-644;json.at:137;trailing comma not allowed - C;json negative;
-645;json.at:137;trailing comma not allowed - Python3;json negative python;
-646;json.at:140;doubled comma not allowed - C;json negative;
-647;json.at:140;doubled comma not allowed - Python3;json negative python;
-648;json.at:143;names must be strings - C;json negative;
-649;json.at:143;names must be strings - Python3;json negative python;
-650;json.at:149;null - C;json positive;
-651;json.at:149;null - Python3;json positive python;
-652;json.at:150;false - C;json positive;
-653;json.at:150;false - Python3;json positive python;
-654;json.at:151;true - C;json positive;
-655;json.at:151;true - Python3;json positive python;
-656;json.at:152;a literal by itself is not valid JSON - C;json negative;
-657;json.at:152;a literal by itself is not valid JSON - Python3;json negative python;
-658;json.at:154;nullify is invalid - C;json negative;
-659;json.at:154;nullify is invalid - Python3;json negative python;
-660;json.at:156;nubs is invalid - C;json negative;
-661;json.at:156;nubs is invalid - Python3;json negative python;
-662;json.at:158;xxx is invalid - C;json negative;
-663;json.at:158;xxx is invalid - Python3;json negative python;
-664;json.at:163;integers expressed as reals - C;json positive;
-665;json.at:163;integers expressed as reals - Python3;json positive python;
-666;json.at:173;large integers - C;json positive;
-667;json.at:173;large integers - Python3;json positive python;
-668;json.at:177;large integers expressed as reals - C;json positive;
-669;json.at:177;large integers expressed as reals - Python3;json positive python;
-670;json.at:185;C - large integers that overflow to reals;json positive;
-671;json.at:189;large integers that overflow to reals;json positive python;
-672;json.at:194;negative zero - C;json positive;
-673;json.at:194;negative zero - Python3;json positive python;
-674;json.at:199;reals - C;json positive;
-675;json.at:199;reals - Python3;json positive python;
-676;json.at:203;scientific notation - C;json positive;
-677;json.at:203;scientific notation - Python3;json positive python;
-678;json.at:210;C - +/- DBL_MAX;json positive;
-679;json.at:214;+/- DBL_MAX;json positive python;
-680;json.at:219;negative reals - C;json positive;
-681;json.at:219;negative reals - Python3;json positive python;
-682;json.at:223;negative scientific notation - C;json positive;
-683;json.at:223;negative scientific notation - Python3;json positive python;
-684;json.at:227;1e-9999 underflows to 0 - C;json positive;
-685;json.at:227;1e-9999 underflows to 0 - Python3;json positive python;
-686;json.at:231;a number by itself is not valid JSON - C;json negative;
-687;json.at:231;a number by itself is not valid JSON - Python3;json negative python;
-688;json.at:233;leading zeros not allowed - C;json negative;
-689;json.at:233;leading zeros not allowed - Python3;json negative python;
-690;json.at:237;1e9999 is too big - C;json negative;
-691;json.at:237;1e9999 is too big - Python3;json negative python;
-692;json.at:241;exponent bigger than INT_MAX;json negative;
-693;json.at:245;exponent smaller than INT_MIN;json negative;
-694;json.at:249;accumulated exponent bigger than INT_MAX;json negative;
-695;json.at:253;accumulated exponent smaller than INT_MIN;json negative;
-696;json.at:257;decimal point must be followed by digit - C;json negative;
-697;json.at:257;decimal point must be followed by digit - Python3;json negative python;
-698;json.at:261;exponent must contain at least one digit (1) - C;json negative;
-699;json.at:261;exponent must contain at least one digit (1) - Python3;json negative python;
-700;json.at:265;exponent must contain at least one digit (2) - C;json negative;
-701;json.at:265;exponent must contain at least one digit (2) - Python3;json negative python;
-702;json.at:269;exponent must contain at least one digit (3) - C;json negative;
-703;json.at:269;exponent must contain at least one digit (3) - Python3;json negative python;
-704;json.at:276;RFC 4267 object example - C;json positive;
-705;json.at:276;RFC 4267 object example - Python3;json positive python;
-706;json.at:292;RFC 4267 array example - C;json positive;
-707;json.at:292;RFC 4267 array example - Python3;json positive python;
-708;json.at:319;trailing garbage - C;json negative;
-709;json.at:319;trailing garbage - Python3;json negative python;
-710;json.at:321;formfeeds are not valid white space - C;json negative;
-711;json.at:321;formfeeds are not valid white space - Python3;json negative python;
-712;json.at:323;';' is not a valid token - C;json negative;
-713;json.at:323;';' is not a valid token - Python3;json negative python;
-714;json.at:325;arrays nesting too deep - C;json negative;
-715;json.at:325;arrays nesting too deep - Python3;json negative python;
-716;json.at:329;objects nesting too deep - C;json negative;
-717;json.at:329;objects nesting too deep - Python3;json negative python;
-718;json.at:334;input may not be empty;json negative;
-719;json.at:342;multiple adjacent objects - C;json positive;
-720;json.at:342;multiple adjacent objects - Python3;json positive python;
-721;json.at:347;multiple space-separated objects - C;json positive;
-722;json.at:347;multiple space-separated objects - Python3;json positive python;
-723;json.at:352;multiple objects on separate lines - C;json positive;
-724;json.at:352;multiple objects on separate lines - Python3;json positive python;
-725;json.at:359;multiple objects and arrays - C;json positive;
-726;json.at:359;multiple objects and arrays - Python3;json positive python;
-727;json.at:365;garbage between multiple objects - C;json negative;
-728;json.at:365;garbage between multiple objects - Python3;json negative python;
-729;json.at:369;garbage after multiple objects - C;json negative;
-730;json.at:369;garbage after multiple objects - Python3;json negative python;
-731;jsonrpc.at:3;JSON-RPC request and successful reply;;
-732;jsonrpc.at:12;JSON-RPC request and error reply;;
-733;jsonrpc.at:21;JSON-RPC notification;;
-734;jsonrpc-py.at:3;JSON-RPC request and successful reply - Python3;python jsonrpc;
-735;jsonrpc-py.at:13;JSON-RPC request and error reply - Python3;python jsonrpc;
-736;jsonrpc-py.at:23;JSON-RPC notification - Python3;python jsonrpc;
-737;tunnel.at:3;tunnel - input;;
-738;tunnel.at:65;tunnel - ECN decapsulation;;
-739;tunnel.at:113;tunnel - output;;
-740;tunnel.at:146;tunnel - unencrypted tunnel and not setting skb_mark;;
-741;tunnel.at:164;tunnel - unencrypted tunnel and setting skb_mark to 1;;
-742;tunnel.at:182;tunnel - unencrypted tunnel and setting skb_mark to 2;;
-743;tunnel.at:211;tunnel - ToS and TTL inheritance;;
-744;tunnel.at:250;tunnel - set_tunnel;;
-745;tunnel.at:285;tunnel - key;;
-746;tunnel.at:335;tunnel - key match;;
-747;tunnel.at:385;tunnel - Geneve;;
-748;tunnel.at:397;tunnel - VXLAN;;
-749;tunnel.at:409;tunnel - table version;;
-750;tunnel.at:471;tunnel - LISP;;
-751;tunnel.at:483;tunnel - ERSPAN;;
-752;tunnel.at:526;tunnel - different VXLAN UDP port;;
-753;tunnel.at:555;ofproto-dpif - set_field - tun_src/tun_dst/tun_id;;
-754;tunnel.at:586;tunnel - ERSPAN v1/v2 metadata;;
-755;tunnel.at:706;tunnel - Geneve metadata;;
-756;tunnel.at:854;tunnel - Geneve option present;;
-757;tunnel.at:893;tunnel - concomitant IPv6 and IPv4 tunnels;;
-758;tunnel.at:919;tunnel - concomitant incompatible tunnels on the same port;;
-759;tunnel.at:935;tunnel - concomitant incompatible tunnels on different ports;;
-760;tunnel.at:949;tunnel - Mix Geneve/GRE options;;
-761;tunnel.at:998;tunnel - neighbor entry add and deletion;;
-762;tunnel-push-pop.at:3;tunnel_push_pop - erspan;;
-763;tunnel-push-pop.at:201;tunnel_push_pop - action;;
-764;tunnel-push-pop.at:538;tunnel_push_pop - packet_out;;
-765;tunnel-push-pop.at:576;tunnel_push_pop - underlay bridge match;;
-766;tunnel-push-pop-ipv6.at:3;tunnel_push_pop_ipv6 - ip6gre;;
-767;tunnel-push-pop-ipv6.at:72;tunnel_push_pop_ipv6 - ip6erspan;;
-768;tunnel-push-pop-ipv6.at:191;tunnel_push_pop_ipv6 - action;;
-769;ovs-router.at:3;appctl - route/add with gateway;ovs_router;
-770;ovs-router.at:15;appctl - route/lookup;ovs_router;
-771;ovs-router.at:51;appctl - route/lookup6;ovs_router;
-772;lockfile.at:15;lock and unlock;lockfile;
-773;lockfile.at:17;lock and unlock twice;lockfile;
-774;lockfile.at:19;lock blocks same process;lockfile;
-775;lockfile.at:23;lock blocks same process twice;lockfile;
-776;lockfile.at:28;lock blocks other process;lockfile;
-777;lockfile.at:33;lock twice blocks other process;lockfile;
-778;lockfile.at:39;lock and unlock allows other process;lockfile;
-779;lockfile.at:41;lock multiple;lockfile;
-780;lockfile.at:45;lock symlink;lockfile;
-781;lockfile.at:52;lock symlink to dir;lockfile;
-782;reconnect.at:23;nothing happens if not enabled - C;reconnect;
-783;reconnect.at:23;nothing happens if not enabled - Python3;reconnect;
-784;reconnect.at:34;quick connect, idle disconnect - C;reconnect;
-785;reconnect.at:34;quick connect, idle disconnect - Python3;reconnect;
-786;reconnect.at:90;slow connect, idle disconnect - C;reconnect;
-787;reconnect.at:90;slow connect, idle disconnect - Python3;reconnect;
-788;reconnect.at:160;connect backs off - C;reconnect;
-789;reconnect.at:160;connect backs off - Python3;reconnect;
-790;reconnect.at:359;connections with no data preserve backoff - C;reconnect;
-791;reconnect.at:359;connections with no data preserve backoff - Python3;reconnect;
-792;reconnect.at:523;brief connection preserves backoff - C;reconnect;
-793;reconnect.at:523;brief connection preserves backoff - Python3;reconnect;
-794;reconnect.at:654;brief connection with data preserves backoff - C;reconnect;
-795;reconnect.at:654;brief connection with data preserves backoff - Python3;reconnect;
-796;reconnect.at:815;long connection resets backoff - C;reconnect;
-797;reconnect.at:815;long connection resets backoff - Python3;reconnect;
-798;reconnect.at:976;connection attempt fails quickly - C;reconnect;
-799;reconnect.at:976;connection attempt fails quickly - Python3;reconnect;
-800;reconnect.at:1031;backoff-free tries work - C;reconnect;
-801;reconnect.at:1031;backoff-free tries work - Python3;reconnect;
-802;reconnect.at:1085;max-tries of 1 honored - C;reconnect;
-803;reconnect.at:1085;max-tries of 1 honored - Python3;reconnect;
-804;reconnect.at:1145;max-tries of 0 honored - C;reconnect;
-805;reconnect.at:1145;max-tries of 0 honored - Python3;reconnect;
-806;reconnect.at:1161;passive mode - C;reconnect;
-807;reconnect.at:1161;passive mode - Python3;reconnect;
-808;ovs-vswitchd.at:7;ovs-vswitchd detaches correctly with empty db;;
-809;ovs-vswitchd.at:36;ovs-vswitchd -- stats-update-interval;;
-810;ovs-vswitchd.at:69;ovs-vswitchd -- start additional ovs-vswitchd process;;
-811;ovs-vswitchd.at:94;ovs-vswitchd -- switch over to another ovs-vswitchd process;;
-812;ovs-vswitchd.at:134;ovs-vswitchd -- invalid database path;;
-813;ovs-vswitchd.at:159;ovs-vswitchd -- set service controller;;
-814;ovs-vswitchd.at:176;ovs-vswitchd -- Compatible with OVSDB server - w/o monitor_cond;;
-815;ovs-vswitchd.at:197;ovs-vswitchd - do not create sockets with unsafe names;;
-816;ovs-vswitchd.at:230;ovs-vswitchd - set datapath IDs;;
-817;ofproto.at:3;ofproto - echo request;;
-818;ofproto.at:9;ofproto - handling messages with bad version;monitor;
-819;ofproto.at:33;ofproto - feature request, config request;;
-820;ofproto.at:50;ofproto - set OpenFlow port number;;
-821;ofproto.at:83;ofproto - port stats - (OpenFlow 1.0);;
-822;ofproto.at:94;ofproto - port stats - (OpenFlow 1.2);;
-823;ofproto.at:105;ofproto - port stats - (OpenFlow 1.4);;
-824;ofproto.at:122;ofproto - port-desc stats (OpenFlow 1.0);;
-825;ofproto.at:137;ofproto - port-desc stats (OpenFlow 1.2);;
-826;ofproto.at:150;ofproto - port-desc stats (OpenFlow 1.5);;
-827;ofproto.at:226;ofproto - queue stats - (OpenFlow 1.0);;
-828;ofproto.at:227;ofproto - queue stats - (OpenFlow 1.1);;
-829;ofproto.at:228;ofproto - queue stats - (OpenFlow 1.2);;
-830;ofproto.at:229;ofproto - queue stats - (OpenFlow 1.3);;
-831;ofproto.at:230;ofproto - queue stats - (OpenFlow 1.4);;
-832;ofproto.at:234;ofproto - queue configuration - (OpenFlow 1.0);;
-833;ofproto.at:256;ofproto - queue configuration - (OpenFlow 1.1);;
-834;ofproto.at:271;ofproto - queue configuration - (OpenFlow 1.2);;
-835;ofproto.at:293;ofproto - queue configuration - (OpenFlow 1.4);;
-836;ofproto.at:326;ofproto - del group (OpenFlow 1.0 extension);;
-837;ofproto.at:367;ofproto - del group (OpenFlow 1.1);;
-838;ofproto.at:408;ofproto - add indirect group;;
-839;ofproto.at:421;ofproto - group mod with mod and add_or_mod command;;
-840;ofproto.at:450;ofproto - del group (OpenFlow 1.5);;
-841;ofproto.at:490;ofproto - del group deletes flows;;
-842;ofproto.at:531;ofproto - insert group buckets;;
-843;ofproto.at:667;ofproto - remove group buckets;;
-844;ofproto.at:721;ofproto - bundle del group (OpenFlow 1.3);;
-845;ofproto.at:759;ofproto - bundle add indirect group;;
-846;ofproto.at:774;ofproto - bundle group mod with mod and add_or_mod command;;
-847;ofproto.at:800;ofproto - bundle del group (OpenFlow 1.5);;
-848;ofproto.at:835;ofproto - bundle del group deletes flows;;
-849;ofproto.at:876;ofproto - bundle insert group buckets;;
-850;ofproto.at:973;ofproto - bundle remove group buckets;;
-851;ofproto.at:1030;ofproto - flow mod checks group availability;;
-852;ofproto.at:1047;ofproto - bundle flow mod checks group availability;;
-853;ofproto.at:1067;ofproto - group description;;
-854;ofproto.at:1080;ofproto - group features (OpenFlow 1.0 extension);;
-855;ofproto.at:1106;ofproto - group features (OpenFlow 1.2);;
-856;ofproto.at:1132;ofproto - group stats (OpenFlow 1.0 extension);;
-857;ofproto.at:1156;ofproto - group stats (OpenFlow 1.1);;
-858;ofproto.at:1180;ofproto - group stats (OpenFlow 1.3);;
-859;ofproto.at:1204;ofproto - group stats (OpenFlow 1.5);;
-860;ofproto.at:1227;ofproto - group stats after insert a new bucket (OpenFlow 1.5);;
-861;ofproto.at:1244;ofproto - group add then bridge delete (OpenFlow 1.3);;
-862;ofproto.at:1259;ofproto - mod-port (OpenFlow 1.0);;
-863;ofproto.at:1294;ofproto - mod-port (OpenFlow 1.2);;
-864;ofproto.at:1326;ofproto - mod-port (OpenFlow 1.4);;
-865;ofproto.at:1359;ofproto - basic flow_mod commands (NXM);;
-866;ofproto.at:1381;ofproto - basic flow_mod commands (OpenFlow 1.0);;
-867;ofproto.at:1406;ofproto - add-flow and flags;;
-868;ofproto.at:1439;ofproto - basic flow_mod commands (OpenFlow 1.1);;
-869;ofproto.at:1462;ofproto - flow_mod negative test (OpenFlow 1.1);;
-870;ofproto.at:1476;ofproto - set-field flow_mod commands (NXM);;
-871;ofproto.at:1489;ofproto - basic flow_mod commands (OpenFlow 1.2);;
-872;ofproto.at:1508;ofproto - set-field flow_mod commands (OF1.2);;
-873;ofproto.at:1521;ofproto - dump flows with cookie;;
-874;ofproto.at:1545;ofproto - mod flow with cookie change (OpenFlow 1.0);;
-875;ofproto.at:1561;ofproto - mod flow with cookie change (NXM);;
-876;ofproto.at:1577;ofproto - no mod flow with cookie change (OpenFlow 1.1);;
-877;ofproto.at:1593;ofproto - no mod flow with cookie change (OpenFlow 1.2);;
-878;ofproto.at:1609;ofproto - mod flows based on cookie mask (OpenFlow 1.0);;
-879;ofproto.at:1631;ofproto - mod flows based on cookie mask (OpenFlow 1.1);;
-880;ofproto.at:1653;ofproto - mod flows based on cookie mask (OpenFlow 1.2);;
-881;ofproto.at:1676;ofproto - mod flows based on cookie mask with cookie change;;
-882;ofproto.at:1698;ofproto - mod flow with cookie miss (mask==0) - NXM;;
-883;ofproto.at:1708;ofproto - mod flow with cookie miss (mask==0) - OF1.1;;
-884;ofproto.at:1718;ofproto - mod flow with cookie miss (mask==0) - OF1.2;;
-885;ofproto.at:1727;ofproto - mod flow with cookie miss (mask!=0) - NXM;;
-886;ofproto.at:1736;ofproto - mod flow with cookie miss (mask!=0) - OF1.1;;
-887;ofproto.at:1745;ofproto - mod flow with cookie miss (mask!=0) - OF1.2;;
-888;ofproto.at:1754;ofproto - del flows with cookies;;
-889;ofproto.at:1773;ofproto - del flows based on cookie;;
-890;ofproto.at:1794;ofproto - del flows based on cookie mask;;
-891;ofproto.at:1813;ofproto - del flows based on table id (NXM);;
-892;ofproto.at:1845;ofproto - del flows based on table id (OpenFlow 1.1);;
-893;ofproto.at:1878;ofproto - del flows based on table id (OpenFlow 1.2);;
-894;ofproto.at:1910;ofproto - flow_mod with out_port matching (OpenFlow 1.0);;
-895;ofproto.at:1946;ofproto - flow_mod with out_port matching (OpenFlow 1.1);;
-896;ofproto.at:1982;ofproto - flow_mod with out_group matching (OpenFlow 1.1);;
-897;ofproto.at:2024;ofproto - bundle flow_mod with out group matching (OpenFlow 1.4);;
-898;ofproto.at:2074;ofproto - bundle packet-out (OpenFlow 1.4);;
-899;ofproto.at:2116;ofproto - bundle packet-out, failing bundle commit (OpenFlow 1.4);;
-900;ofproto.at:2157;ofproto - bundle packet-out makes bundle commit to fail(OpenFlow 1.4);;
-901;ofproto.at:2199;ofproto - flow table configuration (OpenFlow 1.0);;
-902;ofproto.at:2242;ofproto - hidden rules not in table stats;;
-903;ofproto.at:2277;ofproto - flow table configuration (OpenFlow 1.2);;
-904;ofproto.at:2342;ofproto - table features (OpenFlow 1.3);;
-905;ofproto.at:2405;ofproto - flow table names;;
-906;ofproto.at:2528;ofproto - table description (OpenFlow 1.4);;
-907;ofproto.at:2558;ofproto - hard limits on flow table size (OpenFlow 1.0);;
-908;ofproto.at:2604;ofproto - hard limits on flow table size (OpenFlow 1.2);;
-909;ofproto.at:2644;ofproto - eviction upon table overflow (OpenFlow 1.0);;
-910;ofproto.at:2703;ofproto - eviction upon table overflow (OpenFlow 1.2);;
-911;ofproto.at:2763;ofproto - eviction using importance upon table overflow (OpenFlow 1.4);;
-912;ofproto.at:2829;ofproto - eviction upon table overflow, with fairness (OpenFlow 1.0);;
-913;ofproto.at:2911;ofproto - eviction upon table overflow, with fairness (OpenFlow 1.2);;
-914;ofproto.at:2993;ofproto - eviction upon table overflow, with modified hard timeout;;
-915;ofproto.at:3037;ofproto - eviction upon table overflow, with modified idle timeout;;
-916;ofproto.at:3081;ofproto - asynchronous message control (OpenFlow 1.0);;
-917;ofproto.at:3183;ofproto - asynchronous message control (OpenFlow 1.2);;
-918;ofproto.at:3290;ofproto - asynchronous message control (OpenFlow 1.3);;
-919;ofproto.at:3409;ofproto - asynchronous message control (OpenFlow 1.4);;
-920;ofproto.at:3641;ofproto - asynchronous message control (OpenFlow 1.5);;
-921;ofproto.at:3719;ofproto - controller role (OpenFlow 1.2);;
-922;ofproto.at:3784;ofproto - controller role (OpenFlow 1.4);;
-923;ofproto.at:3850;ofproto - controller role (OpenFlow 1.3);;
-924;ofproto.at:3915;ofproto - requestforward (OpenFlow 1.4);;
-925;ofproto.at:4007;ofproto - NXT requestforward (OpenFlow 1.0);;
-926;ofproto.at:4105;ofproto - ONF requestforward (OpenFlow 1.3);;
-927;ofproto.at:4206;ofproto - packet-out from controller (OpenFlow 1.0);;
-928;ofproto.at:4242;ofproto - packet-out from controller (OpenFlow 1.2);;
-929;ofproto.at:4275;ofproto - packet-out from controller (OpenFlow 1.1);;
-930;ofproto.at:4305;ofproto - packet-out from controller (OpenFlow 1.5);;
-931;ofproto.at:4335;ofproto - packet-out with metadata and userdata (NXT_PACKET_IN2);;
-932;ofproto.at:4363;ofproto - packet-out with set_field metadata (OpenFlow 1.5);;
-933;ofproto.at:4390;ofproto - packet-out with set_field metadata with packet_type PT_ETH (OpenFlow 1.5);;
-934;ofproto.at:4417;ofproto - packet-out with set_field metadata with packet_type PT_IPV4 on PTAP bridge (OpenFlow 1.5);;
-935;ofproto.at:4445;ofproto - packet-out with metadata (NXM);;
-936;ofproto.at:4473;ofproto - packet-out with metadata (OpenFlow 1.2);;
-937;ofproto.at:4501;ofproto - packet-out with metadata and dual set_field (OpenFlow 1.3);;
-938;ofproto.at:4528;ofproto - packet-out with tunnel metadata (OpenFlow 1.2);;
-939;ofproto.at:4579;ofproto - flow monitoring;monitor;
-940;ofproto.at:4716;ofproto - flow monitoring with !own;monitor;
-941;ofproto.at:4757;ofproto - flow monitoring with out_port;monitor;
-942;ofproto.at:4809;ofproto - flow monitoring pause and resume;monitor;
-943;ofproto.at:4914;ofproto - flow monitoring usable protocols;monitor;
-944;ofproto.at:4935;ofproto - event filtering (OpenFlow 1.3);monitor;
-945;ofproto.at:4975;ofproto - ofport_request;;
-946;ofproto.at:5031;ofproto - bundle open (OpenFlow 1.4);monitor;
-947;ofproto.at:5055;ofproto - bundle double open (OpenFlow 1.4);monitor;
-948;ofproto.at:5087;ofproto - bundle close without open (OpenFlow 1.4);monitor;
-949;ofproto.at:5111;ofproto - bundle double close (OpenFlow 1.4);monitor;
-950;ofproto.at:5150;ofproto - bundle close, different flags (OpenFlow 1.4);monitor;
-951;ofproto.at:5182;ofproto - bundle commit without open (OpenFlow 1.4);monitor;
-952;ofproto.at:5207;ofproto - bundle commit, different flags (OpenFlow 1.4);monitor;
-953;ofproto.at:5239;ofproto - bundle discard without open (OpenFlow 1.4);monitor;
-954;ofproto.at:5265;ofproto - bundle with multiple flow mods (OpenFlow 1.4);;
-955;ofproto.at:5468;ofproto - failing bundle commit (OpenFlow 1.4);;
-956;ofproto.at:5515;ofproto - bundle timeout (OpenFlow 1.4);monitor;
-957;ofproto.at:5577;ofproto - bundle custom timeout (OpenFlow 1.4);monitor;
-958;ofproto.at:5642;ofproto - bundle reset timeout to default (OpenFlow 1.4);monitor;
-959;ofproto.at:5707;ofproto - bundle open (OpenFlow 1.3);monitor;
-960;ofproto.at:5734;ofproto - bundle double open (OpenFlow 1.3);monitor;
-961;ofproto.at:5769;ofproto - bundle close without open (OpenFlow 1.3);monitor;
-962;ofproto.at:5793;ofproto - bundle double close (OpenFlow 1.3);monitor;
-963;ofproto.at:5832;ofproto - bundle close, different flags (OpenFlow 1.3);monitor;
-964;ofproto.at:5864;ofproto - bundle commit without open (OpenFlow 1.3);monitor;
-965;ofproto.at:5889;ofproto - bundle commit, different flags (OpenFlow 1.3);monitor;
-966;ofproto.at:5921;ofproto - bundle discard without open (OpenFlow 1.3);monitor;
-967;ofproto.at:5947;ofproto - bundle with multiple flow mods (OpenFlow 1.3);;
-968;ofproto.at:6143;ofproto - failing bundle add message (OpenFlow 1.3);;
-969;ofproto.at:6190;ofproto - failing bundle commit (OpenFlow 1.3);;
-970;ofproto.at:6216;ofproto - monitor flows with tun_md;;
-971;ofproto.at:6261;ofproto - flow mod with tunnel metadata;ofp-actions;
-972;ofproto.at:6393;ofproto - flush flows, groups, and meters for controller change;flow flows group meter;
-973;dpif-netdev.at:62;dpif-netdev - netdev-dummy/receive;;
-974;dpif-netdev.at:119;dpif-netdev - dummy interface;;
-975;dpif-netdev.at:120;dpif-netdev - dummy-pmd interface;;
-976;dpif-netdev.at:161;dpif-netdev - miss upcall key matches flow_install - dummy;;
-977;dpif-netdev.at:162;dpif-netdev - miss upcall key matches flow_install - dummy-pmd;;
-978;dpif-netdev.at:214;dpif-netdev - datapath flow modification - dummy;;
-979;dpif-netdev.at:215;dpif-netdev - datapath flow modification - dummy-pmd;;
-980;dpif-netdev.at:260;dpif-netdev - miss upcall key matches flow_dump - dummy;;
-981;dpif-netdev.at:261;dpif-netdev - miss upcall key matches flow_dump - dummy-pmd;;
-982;dpif-netdev.at:263;dpif-netdev - meters;;
-983;dpif-netdev.at:429;dpif-netdev - partial hw offload - dummy;;
-984;dpif-netdev.at:430;dpif-netdev - partial hw offload - dummy-pmd;;
-985;dpif-netdev.at:507;dpif-netdev - partial hw offload with packet modifications - dummy;;
-986;dpif-netdev.at:508;dpif-netdev - partial hw offload with packet modifications - dummy-pmd;;
-987;pmd.at:66;PMD - creating a thread/add-port;;
-988;pmd.at:88;PMD - multiqueue support;;
-989;pmd.at:120;PMD - pmd-cpu-mask/distribution of rx queues;;
-990;pmd.at:184;PMD - stats;;
-991;pmd.at:254;PMD - reconfigure n_rxq;;
-992;pmd.at:317;PMD - same flow multiple threads;;
-993;pmd.at:360;PMD - change numa node;;
-994;pmd.at:438;PMD - non pmd device;;
-995;pmd.at:488;PMD - add remove ports;;
-996;pmd.at:532;PMD - rxq affinity;;
-997;pmd.at:585;PMD - rxq affinity - NUMA;;
-998;pmd.at:641;PMD - monitor threads;;
-999;pmd.at:678;PMD - dpctl;;
-1000;dpctl.at:3;dpctl - add-dp del-dp;;
-1001;dpctl.at:19;dpctl - add-if set-if del-if;;
-1002;ofproto-dpif.at:26;ofproto-dpif - revalidator/wait;;
-1003;ofproto-dpif.at:32;ofproto-dpif - active-backup bonding;;
-1004;ofproto-dpif.at:79;ofproto-dpif - balance-slb bonding;;
-1005;ofproto-dpif.at:122;ofproto-dpif - balance-tcp bonding;;
-1006;ofproto-dpif.at:175;ofproto-dpif - balance-tcp bonding, different recirc flow ;;
-1007;ofproto-dpif.at:233;ofproto-dpif - resubmit;;
-1008;ofproto-dpif.at:252;ofproto-dpif - goto table;;
-1009;ofproto-dpif.at:266;ofproto-dpif - write actions;;
-1010;ofproto-dpif.at:283;ofproto-dpif - modify IPv6 Neighbor Solitication (ND);;
-1011;ofproto-dpif.at:302;ofproto-dpif - clear actions;;
-1012;ofproto-dpif.at:318;ofproto-dpif - group chaining;;
-1013;ofproto-dpif.at:331;ofproto-dpif - all group in action list;;
-1014;ofproto-dpif.at:346;ofproto-dpif - indirect group in action list;;
-1015;ofproto-dpif.at:358;ofproto-dpif - group actions have no effect afterwards;;
-1016;ofproto-dpif.at:378;ofproto-dpif - all group in action set;;
-1017;ofproto-dpif.at:393;ofproto-dpif - indirect group in action set;;
-1018;ofproto-dpif.at:405;ofproto-dpif - patch port with action set;;
-1019;ofproto-dpif.at:430;ofproto-dpif - select group;;
-1020;ofproto-dpif.at:465;ofproto-dpif - select group with watch port;;
-1021;ofproto-dpif.at:486;ofproto-dpif - select group with weights;;
-1022;ofproto-dpif.at:560;ofproto-dpif - select group with explicit dp_hash selection method;;
-1023;ofproto-dpif.at:599;ofproto-dpif - select group with legacy hash selection method;;
-1024;ofproto-dpif.at:631;ofproto-dpif - select group with custom hash selection method;;
-1025;ofproto-dpif.at:681;ofproto-dpif - fast failover group;;
-1026;ofproto-dpif.at:693;ofproto-dpif - group stats single bucket;;
-1027;ofproto-dpif.at:714;ofproto-dpif - group stats all buckets;;
-1028;ofproto-dpif.at:735;ofproto-dpif - registers;;
-1029;ofproto-dpif.at:772;ofproto-dpif - extended registers;;
-1030;ofproto-dpif.at:793;ofproto-dpif - extended-extended registers;;
-1031;ofproto-dpif.at:812;ofproto-dpif - load and move order;;
-1032;ofproto-dpif.at:826;ofproto-dpif - copy-field into extended registers;;
-1033;ofproto-dpif.at:846;ofproto-dpif - masked set-field into metadata;;
-1034;ofproto-dpif.at:868;ofproto-dpif - actset_output;;
-1035;ofproto-dpif.at:913;ofproto-dpif - push-pop;;
-1036;ofproto-dpif.at:932;ofproto-dpif - output;;
-1037;ofproto-dpif.at:953;ofproto-dpif - dec_ttl;;
-1038;ofproto-dpif.at:998;ofproto-dpif - dec_ttl without arguments at offset 32 in ofpacts;;
-1039;ofproto-dpif.at:1015;ofproto-dpif - dec_ttl with arguments at offset 32 in ofpacts;;
-1040;ofproto-dpif.at:1032;ofproto-dpif - note at offset 24 in ofpacts;;
-1041;ofproto-dpif.at:1046;ofproto-dpif - note action deep inside ofpacts;;
-1042;ofproto-dpif.at:1052;ofproto-dpif - output, OFPP_NONE ingress port;;
-1043;ofproto-dpif.at:1070;ofproto-dpif - DSCP;;
-1044;ofproto-dpif.at:1097;ofproto-dpif - output/flood flags;;
-1045;ofproto-dpif.at:1155;ofproto-dpif - Default Table Miss - OF1.0 (OFPTC_TABLE_MISS_CONTROLLER);;
-1046;ofproto-dpif.at:1189;ofproto-dpif - Default Table Miss - OF1.3 (OFPTC_TABLE_MISS_DROP);;
-1047;ofproto-dpif.at:1217;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTROLLER;;
-1048;ofproto-dpif.at:1253;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTROLLER;;
-1049;ofproto-dpif.at:1281;ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_CONTINUE;;
-1050;ofproto-dpif.at:1340;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTINUE;;
-1051;ofproto-dpif.at:1404;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTINUE;;
-1052;ofproto-dpif.at:1450;ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_DROP;;
-1053;ofproto-dpif.at:1478;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_DROP;;
-1054;ofproto-dpif.at:1509;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_DROP;;
-1055;ofproto-dpif.at:1540;ofproto-dpif - controller;;
-1056;ofproto-dpif.at:1809;ofproto-dpif - controller with slow-path action;;
-1057;ofproto-dpif.at:1839;ofproto-dpif - controller action without megaflows;;
-1058;ofproto-dpif.at:1910;ofproto-dpif - MPLS handling;;
-1059;ofproto-dpif.at:2960;ofproto-dpif - MPLS handling with goto_table;;
-1060;ofproto-dpif.at:3008;ofproto-dpif - MPLS handling with write_actions;;
-1061;ofproto-dpif.at:3056;ofproto-dpif - table-miss flow (OpenFlow 1.0);;
-1062;ofproto-dpif.at:3096;ofproto-dpif - table-miss flow (OpenFlow 1.3);;
-1063;ofproto-dpif.at:3137;ofproto-dpif - table-miss flow with async config (OpenFlow 1.3);;
-1064;ofproto-dpif.at:3211;ofproto-dpif - table-miss flow (OpenFlow 1.4);;
-1065;ofproto-dpif.at:3253;ofproto-dpif - packet-in reasons (Openflow 1.3);;
-1066;ofproto-dpif.at:3325;ofproto-dpif - packet-in reasons (Openflow 1.4);;
-1067;ofproto-dpif.at:3396;ofproto-dpif - packet-in reasons (Openflow 1.3);;
-1068;ofproto-dpif.at:3435;ofproto-dpif - ARP modification slow-path;;
-1069;ofproto-dpif.at:3464;ofproto-dpif - VLAN handling;;
-1070;ofproto-dpif.at:3616;ofproto-dpif - VLAN depth limit;;
-1071;ofproto-dpif.at:3645;ofproto-dpif - Multi-VLAN actions;;
-1072;ofproto-dpif.at:3702;ofproto-dpif - MPLS handling;;
-1073;ofproto-dpif.at:3817;ofproto-dpif - VLAN+MPLS handling;;
-1074;ofproto-dpif.at:4308;ofproto-dpif - fragment handling - trace;;
-1075;ofproto-dpif.at:4357;ofproto-dpif - fragment handling - upcall;;
-1076;ofproto-dpif.at:4432;ofproto-dpif - fragment handling - actions;;
-1077;ofproto-dpif.at:4537;ofproto-dpif - exit;;
-1078;ofproto-dpif.at:4562;ofproto-dpif - mirroring, select_all;mirror mirrors mirroring;
-1079;ofproto-dpif.at:4593;ofproto-dpif - mirroring, select_src;mirror mirrors mirroring;
-1080;ofproto-dpif.at:4622;ofproto-dpif - mirroring, OFPP_NONE ingress port;mirror mirrors mirroring;
-1081;ofproto-dpif.at:4644;ofproto-dpif - mirroring, select_dst;mirror mirrors mirroring;
-1082;ofproto-dpif.at:4675;ofproto-dpif - mirroring, select_vlan;mirror mirrors mirroring;
-1083;ofproto-dpif.at:4711;ofproto-dpif - mirroring, output_port;mirror mirrors mirroring;
-1084;ofproto-dpif.at:4741;ofproto-dpif - mirroring, output_vlan;mirror mirrors mirroring;
-1085;ofproto-dpif.at:4778;ofproto-dpif - multiple VLAN output mirrors;mirror mirrors mirroring;
-1086;ofproto-dpif.at:4807;ofproto-dpif - mirroring with recirculation;mirror mirrors mirroring;
-1087;ofproto-dpif.at:4833;ofproto-dpif - mirroring, select_all with snaplen;mirror mirrors mirroring;
-1088;ofproto-dpif.at:4863;ofproto-dpif - mirroring, select_all with snaplen and reset snaplen;mirror mirrors mirroring;
-1089;ofproto-dpif.at:4903;ofproto-dpif - mirroring, select_src with snaplen;mirror mirrors mirroring;
-1090;ofproto-dpif.at:4932;ofproto-dpif - mirroring, OFPP_NONE ingress port with snaplen;mirror mirrors mirroring;
-1091;ofproto-dpif.at:4953;ofproto-dpif - mirroring, select_dst with snaplen;mirror mirrors mirroring;
-1092;ofproto-dpif.at:4983;ofproto-dpif - mirroring, select_vlan with snaplen;mirror mirrors mirroring;
-1093;ofproto-dpif.at:5018;ofproto-dpif - mirroring, output_port with snaplen;mirror mirrors mirroring;
-1094;ofproto-dpif.at:5048;ofproto-dpif - mirroring, output_vlan with snaplen;mirror mirrors mirroring;
-1095;ofproto-dpif.at:5076;ofproto-dpif - multiple VLAN output mirrors with snaplen;mirror mirrors mirroring;
-1096;ofproto-dpif.at:5099;ofproto-dpif - resubmit with recirculation;;
-1097;ofproto-dpif.at:5126;ofproto-dpif - resubmit with tun_id;;
-1098;ofproto-dpif.at:5153;ofproto-dpif - recirculation after resubmit;;
-1099;ofproto-dpif.at:5177;ofproto-dpif - packet-out recirculation;;
-1100;ofproto-dpif.at:5205;ofproto-dpif - debug_slow action;;
-1101;ofproto-dpif.at:5332;ofproto-dpif - continuation - pause at end of pipeline;continuations pause resume;
-1102;ofproto-dpif.at:5335;ofproto-dpif - continuation - actions;continuations pause resume;
-1103;ofproto-dpif.at:5343;ofproto-dpif - continuation - resubmit;continuations pause resume;
-1104;ofproto-dpif.at:5351;ofproto-dpif - continuation - action set;continuations pause resume;
-1105;ofproto-dpif.at:5357;ofproto-dpif - continuation - data stack;continuations pause resume;
-1106;ofproto-dpif.at:5375;ofproto-dpif - continuation - mirroring;continuations pause resume;
-1107;ofproto-dpif.at:5386;ofproto-dpif - continuation - patch ports;continuations pause resume;
-1108;ofproto-dpif.at:5398;ofproto-dpif - continuation flow stats;continuations pause resume;
-1109;ofproto-dpif.at:5432;ofproto-dpif - continuation with conntrack;continuations pause resume;
-1110;ofproto-dpif.at:5467;ofproto-dpif - continuation with patch port;continuations pause resume;
-1111;ofproto-dpif.at:5509;ofproto-dpif - continuation after clone;continuations clone pause resume;
-1112;ofproto-dpif.at:5552;ofproto-dpif - ofproto/trace command 1;;
-1113;ofproto-dpif.at:5696;ofproto-dpif - ofproto/trace command 2;;
-1114;ofproto-dpif.at:5805;ofproto-dpif - ofproto/trace from dpctl output;;
-1115;ofproto-dpif.at:5852;ofproto-dpif - ofproto/trace-packet-out;;
-1116;ofproto-dpif.at:5882;ofproto-dpif - MAC learning;;
-1117;ofproto-dpif.at:5971;ofproto-dpif - MAC table overflow;;
-1118;ofproto-dpif.at:6031;ofproto-dpif - MAC table overflow fairness;;
-1119;ofproto-dpif.at:6504;ofproto-dpif - basic truncate action;;
-1120;ofproto-dpif.at:6580;ofproto-dpif - truncate and output to patch port;;
-1121;ofproto-dpif.at:6601;ofproto-dpif - truncate and output to gre tunnel;;
-1122;ofproto-dpif.at:6628;ofproto-dpif - sFlow packet sampling - IPv4 collector;;
-1123;ofproto-dpif.at:6632;ofproto-dpif - sFlow packet sampling - IPv6 collector;;
-1124;ofproto-dpif.at:6638;ofproto-dpif - sFlow packet sampling - LACP structures;;
-1125;ofproto-dpif.at:6695;ofproto-dpif - sFlow packet sampling - tunnel set;;
-1126;ofproto-dpif.at:6764;ofproto-dpif - sFlow packet sampling - tunnel push;;
-1127;ofproto-dpif.at:6866;ofproto-dpif - sFlow packet sampling - MPLS;;
-1128;ofproto-dpif.at:7002;ofproto-dpif - NetFlow flow expiration - IPv4 collector;;
-1129;ofproto-dpif.at:7006;ofproto-dpif - NetFlow flow expiration - IPv6 collector;;
-1130;ofproto-dpif.at:7086;ofproto-dpif - NetFlow active expiration - IPv4 collector;;
-1131;ofproto-dpif.at:7090;ofproto-dpif - NetFlow active expiration - IPv6 collector;;
-1132;ofproto-dpif.at:7098;ofproto-dpif - Bridge IPFIX sanity check;;
-1133;ofproto-dpif.at:7147;ofproto-dpif - Bridge IPFIX statistics check;;
-1134;ofproto-dpif.at:7191;ofproto-dpif - Flow IPFIX sanity check;;
-1135;ofproto-dpif.at:7241;ofproto-dpif - Flow IPFIX sanity check - tunnel set;;
-1136;ofproto-dpif.at:7313;ofproto-dpif - clone action;;
-1137;ofproto-dpif.at:7383;ofproto-dpif - Flow IPFIX statistics check;;
-1138;ofproto-dpif.at:7433;ofproto-dpif - flow stats;;
-1139;ofproto-dpif.at:7454;ofproto-dpif - flow stats reset_counts;;
-1140;ofproto-dpif.at:7627;ofproto-dpif - flow stats reset_counts OpenFlow1.5;;
-1141;ofproto-dpif.at:7713;ofproto-dpif - flow stats, set-n-threads;;
-1142;ofproto-dpif.at:7736;ofproto-dpif - idle_age and hard_age increase over time;;
-1143;ofproto-dpif.at:7826;ofproto-dpif - fin_timeout;;
-1144;ofproto-dpif.at:7860;ofproto-dpif - ovs-appctl dpif/dump-dps;;
-1145;ofproto-dpif.at:7872;ofproto-dpif - ovs-appctl dpif/show;;
-1146;ofproto-dpif.at:7891;ofproto-dpif - ovs-appctl dpif/dump-flows;;
-1147;ofproto-dpif.at:7949;ofproto-dpif - ovs-appctl dpif/get-flow;;
-1148;ofproto-dpif.at:7950;ofproto-dpif - ovs-appctl dpif/get-flow - pmd;;
-1149;ofproto-dpif.at:7952;ofproto-dpif - MPLS actions that result in a userspace action;;
-1150;ofproto-dpif.at:7988;ofproto-dpif - MPLS actions that result in a drop;;
-1151;ofproto-dpif.at:8026;ofproto-dpif - patch ports;;
-1152;ofproto-dpif.at:8101;ofproto-dpif - patch ports - stack;;
-1153;ofproto-dpif.at:8150;ofproto-dpif - port duration;;
-1154;ofproto-dpif.at:8170;ofproto-dpif megaflow - port classification;;
-1155;ofproto-dpif.at:8188;ofproto-dpif megaflow - L2 classification;;
-1156;ofproto-dpif.at:8206;ofproto-dpif megaflow - L3 classification;;
-1157;ofproto-dpif.at:8225;ofproto-dpif megaflow - IPv6 classification;;
-1158;ofproto-dpif.at:8244;ofproto-dpif megaflow - L4 classification;;
-1159;ofproto-dpif.at:8279;ofproto-dpif megaflow - normal;;
-1160;ofproto-dpif.at:8280;ofproto-dpif megaflow - normal - pmd;;
-1161;ofproto-dpif.at:8282;ofproto-dpif megaflow - mpls;;
-1162;ofproto-dpif.at:8328;ofproto-dpif megaflow - netflow - IPv4 collector;;
-1163;ofproto-dpif.at:8332;ofproto-dpif megaflow - netflow - IPv6 collector;;
-1164;ofproto-dpif.at:8360;ofproto-dpif megaflow - normal, active-backup bonding - dummy;;
-1165;ofproto-dpif.at:8361;ofproto-dpif megaflow - normal, active-backup bonding - dummy-pmd;;
-1166;ofproto-dpif.at:8363;ofproto-dpif megaflow - normal, balance-slb bonding;;
-1167;ofproto-dpif.at:8384;ofproto-dpif megaflow - normal, balance-tcp bonding;;
-1168;ofproto-dpif.at:8422;ofproto-dpif megaflow - resubmit port action;;
-1169;ofproto-dpif.at:8441;ofproto-dpif megaflow - resubmit table action;;
-1170;ofproto-dpif.at:8461;ofproto-dpif megaflow - goto_table action;;
-1171;ofproto-dpif.at:8480;ofproto-dpif megaflow - mirroring, select_all;mirror mirrors mirroring;
-1172;ofproto-dpif.at:8504;ofproto-dpif megaflow - mirroring, select_vlan;;
-1173;ofproto-dpif.at:8527;ofproto-dpif megaflow - move action;;
-1174;ofproto-dpif.at:8547;ofproto-dpif megaflow - push action;;
-1175;ofproto-dpif.at:8565;ofproto-dpif megaflow - learning;;
-1176;ofproto-dpif.at:8592;ofproto-dpif megaflow - tunnels;;
-1177;ofproto-dpif.at:8625;ofproto-dpif megaflow - dec_ttl;;
-1178;ofproto-dpif.at:8644;ofproto-dpif megaflow - set dl_dst;;
-1179;ofproto-dpif.at:8665;ofproto-dpif megaflow - set dl_dst with match on dl_src;;
-1180;ofproto-dpif.at:8723;ofproto-dpif megaflow - disabled;;
-1181;ofproto-dpif.at:8724;ofproto-dpif megaflow - disabled - pmd;;
-1182;ofproto-dpif.at:8726;ofproto-dpif - datapath port number change;;
-1183;ofproto-dpif.at:8748;ofproto - bundle with variable bfd/cfm config;;
-1184;ofproto-dpif.at:8826;ofproto-dpif - ofproto-dpif-monitor 1;;
-1185;ofproto-dpif.at:8873;ofproto-dpif - ofproto-dpif-monitor 2;;
-1186;ofproto-dpif.at:8888;ofproto-dpif - forward resubmit;;
-1187;ofproto-dpif.at:8905;ofproto-dpif - backward resubmit;;
-1188;ofproto-dpif.at:8925;ofproto-dpif - infinite resubmit;;
-1189;ofproto-dpif.at:8941;ofproto-dpif - backward resubmit without trace;;
-1190;ofproto-dpif.at:8964;ofproto-dpif - exponential resubmit chain;;
-1191;ofproto-dpif.at:8982;ofproto-dpif - too many output actions;;
-1192;ofproto-dpif.at:9000;ofproto-dpif - stack too deep;;
-1193;ofproto-dpif.at:9020;ofproto-dpif packet-out controller;;
-1194;ofproto-dpif.at:9064;ofproto-dpif packet-out controller (patch port);;
-1195;ofproto-dpif.at:9117;ofproto-dpif packet-out pipeline match field (OpenFlow 1.5);;
-1196;ofproto-dpif.at:9167;ofproto-dpif packet-out goto_table;;
-1197;ofproto-dpif.at:9221;ofproto-dpif packet-out table-miss (continue);;
-1198;ofproto-dpif.at:9271;ofproto-dpif - ICMPv6;;
-1199;ofproto-dpif.at:9291;ofproto-dpif - ICMPv6 type match;;
-1200;ofproto-dpif.at:9321;ofproto-dpif - Neighbor Discovery set-field with checksum update;;
-1201;ofproto-dpif.at:9343;ofproto-dpif - vlan matching;;
-1202;ofproto-dpif.at:9361;ofproto-dpif - in place modification;;
-1203;ofproto-dpif.at:9406;ofproto-dpif - in place modification (vlan);;
-1204;ofproto-dpif.at:9488;ofproto-dpif - trace (unchanged);;
-1205;ofproto-dpif.at:9500;ofproto-dpif - conntrack - controller;;
-1206;ofproto-dpif.at:9626;ofproto-dpif - conntrack - force commit;;
-1207;ofproto-dpif.at:9708;ofproto-dpif - conntrack - ipv6;;
-1208;ofproto-dpif.at:9758;ofproto-dpif - conntrack - output action;;
-1209;ofproto-dpif.at:9817;ofproto-dpif - conntrack - expiration;;
-1210;ofproto-dpif.at:9871;ofproto-dpif - conntrack - untrackable traffic;;
-1211;ofproto-dpif.at:9903;ofproto-dpif - conntrack - zones;;
-1212;ofproto-dpif.at:9968;ofproto-dpif - conntrack - recirc,commit;;
-1213;ofproto-dpif.at:10018;ofproto-dpif - conntrack - ICMP related;;
-1214;ofproto-dpif.at:10068;ofproto-dpif - conntrack - ct_mark;;
-1215;ofproto-dpif.at:10129;ofproto-dpif - conntrack - ct_label;;
-1216;ofproto-dpif.at:10177;ofproto-dpif - conntrack - ct_label datapath flow;;
-1217;ofproto-dpif.at:10225;ofproto-dpif - conntrack - no output;;
-1218;ofproto-dpif.at:10249;ofproto-dpif - conntrack - tcp port reuse;;
-1219;ofproto-dpif.at:10313;ofproto-dpif - conntrack - tcp pick up;;
-1220;ofproto-dpif.at:10398;ofproto-dpif - conntrack - disable tcp sequence checking;;
-1221;ofproto-dpif.at:10539;ofproto-dpif - conntrack - ct_clear;;
-1222;ofproto-dpif.at:10596;ofproto-dpif - conntrack - match masked ct fields;;
-1223;ofproto-dpif.at:10652;ofproto-dpif - conntrack - ofproto/trace;;
-1224;ofproto-dpif.at:10710;ofproto - set mtu;;
-1225;ofproto-dpif.at:10760;ofproto - fragment prerequisites;;
-1226;ofproto-dpif.at:10795;ofproto-dpif - check_pkt_larger action;;
-1227;ofproto-dpif.at:10922;ofproto-dpif - check_pkt_larger with continuation and ct;;
-1228;bridge.at:7;bridge - ports that disappear get added back;;
-1229;bridge.at:44;bridge - multiple bridges share a controller;;
-1230;bridge.at:83;bridge - add port after stopping controller;;
-1231;netdev-type.at:4;bridge - set MAC address of internal port;;
-1232;ovsdb-log.at:3;create empty, reread;ovsdb log;
-1233;ovsdb-log.at:18;write one, reread;ovsdb log;
-1234;ovsdb-log.at:35;check that create fails if file exists;ovsdb log;
-1235;ovsdb-log.at:60;write one, reread;ovsdb log;
-1236;ovsdb-log.at:81;write one, replace, commit;ovsdb log;
-1237;ovsdb-log.at:118;write one, replace, abort;ovsdb log;
-1238;ovsdb-log.at:155;write one, reread - alternative magic;ovsdb log;
-1239;ovsdb-log.at:182;write one, reread, append;ovsdb log;
-1240;ovsdb-log.at:212;write, reread one, overwrite;ovsdb log;
-1241;ovsdb-log.at:238;write, add corrupted data, read;ovsdb log;
-1242;ovsdb-log.at:260;write, add corrupted data, read, overwrite;ovsdb log;
-1243;ovsdb-log.at:292;write, corrupt some data, read, overwrite;ovsdb log;
-1244;ovsdb-log.at:325;write, truncate file, read, overwrite;ovsdb log;
-1245;ovsdb-log.at:358;write bad JSON, read, overwrite;ovsdb log;
-1246;ovsdb-types.at:3;integer - C;ovsdb positive;
-1247;ovsdb-types.at:3;integer - Python3;ovsdb positive python;
-1248;ovsdb-types.at:5;real - C;ovsdb positive;
-1249;ovsdb-types.at:5;real - Python3;ovsdb positive python;
-1250;ovsdb-types.at:7;boolean - C;ovsdb positive;
-1251;ovsdb-types.at:7;boolean - Python3;ovsdb positive python;
-1252;ovsdb-types.at:9;string - C;ovsdb positive;
-1253;ovsdb-types.at:9;string - Python3;ovsdb positive python;
-1254;ovsdb-types.at:11;uuid - C;ovsdb positive;
-1255;ovsdb-types.at:11;uuid - Python3;ovsdb positive python;
-1256;ovsdb-types.at:13;void is not a valid atomic-type - C;ovsdb negative;
-1257;ovsdb-types.at:13;void is not a valid atomic-type - Python3;ovsdb negative;
-1258;ovsdb-types.at:18;integer enum - C;ovsdb positive;
-1259;ovsdb-types.at:18;integer enum - Python3;ovsdb positive python;
-1260;ovsdb-types.at:21;integer >= 5 - C;ovsdb positive;
-1261;ovsdb-types.at:21;integer >= 5 - Python3;ovsdb positive python;
-1262;ovsdb-types.at:24;integer <= 7 - C;ovsdb positive;
-1263;ovsdb-types.at:24;integer <= 7 - Python3;ovsdb positive python;
-1264;ovsdb-types.at:27;integer between -5 and 10 - C;ovsdb positive;
-1265;ovsdb-types.at:27;integer between -5 and 10 - Python3;ovsdb positive python;
-1266;ovsdb-types.at:30;integer max may not be less than min - C;ovsdb negative;
-1267;ovsdb-types.at:30;integer max may not be less than min - Python3;ovsdb negative;
-1268;ovsdb-types.at:34;real enum - C;ovsdb positive;
-1269;ovsdb-types.at:34;real enum - Python3;ovsdb positive python;
-1270;ovsdb-types.at:37;real >= -1.5 - C;ovsdb positive;
-1271;ovsdb-types.at:37;real >= -1.5 - Python3;ovsdb positive python;
-1272;ovsdb-types.at:40;real <= 1e5 - C;ovsdb positive;
-1273;ovsdb-types.at:40;real <= 1e5 - Python3;ovsdb positive python;
-1274;ovsdb-types.at:43;real between -2.5 and 3.75 - C;ovsdb positive;
-1275;ovsdb-types.at:43;real between -2.5 and 3.75 - Python3;ovsdb positive python;
-1276;ovsdb-types.at:46;real max may not be less than min - C;ovsdb negative;
-1277;ovsdb-types.at:46;real max may not be less than min - Python3;ovsdb negative;
-1278;ovsdb-types.at:50;boolean - C;ovsdb positive;
-1279;ovsdb-types.at:50;boolean - Python3;ovsdb positive python;
-1280;ovsdb-types.at:52;boolean enum - C;ovsdb positive;
-1281;ovsdb-types.at:52;boolean enum - Python3;ovsdb positive python;
-1282;ovsdb-types.at:56;string enum - C;ovsdb positive;
-1283;ovsdb-types.at:56;string enum - Python3;ovsdb positive python;
-1284;ovsdb-types.at:59;string minLength - C;ovsdb positive;
-1285;ovsdb-types.at:59;string minLength - Python3;ovsdb positive python;
-1286;ovsdb-types.at:62;string maxLength - C;ovsdb positive;
-1287;ovsdb-types.at:62;string maxLength - Python3;ovsdb positive python;
-1288;ovsdb-types.at:65;string minLength and maxLength - C;ovsdb positive;
-1289;ovsdb-types.at:65;string minLength and maxLength - Python3;ovsdb positive python;
-1290;ovsdb-types.at:68;maxLength must not be less than minLength - C;ovsdb negative;
-1291;ovsdb-types.at:68;maxLength must not be less than minLength - Python3;ovsdb negative;
-1292;ovsdb-types.at:71;maxLength must not be negative - C;ovsdb negative;
-1293;ovsdb-types.at:71;maxLength must not be negative - Python3;ovsdb negative;
-1294;ovsdb-types.at:75;uuid enum - C;ovsdb positive;
-1295;ovsdb-types.at:75;uuid enum - Python3;ovsdb positive python;
-1296;ovsdb-types.at:78;uuid refTable - C;ovsdb positive;
-1297;ovsdb-types.at:78;uuid refTable - Python3;ovsdb positive python;
-1298;ovsdb-types.at:81;uuid refTable must be valid id - C;ovsdb negative;
-1299;ovsdb-types.at:81;uuid refTable must be valid id - Python3;ovsdb negative;
-1300;ovsdb-types.at:85;void is not a valid base-type - C;ovsdb negative;
-1301;ovsdb-types.at:85;void is not a valid base-type - Python3;ovsdb negative;
-1302;ovsdb-types.at:87;\"type\" member must be present - C;ovsdb negative;
-1303;ovsdb-types.at:87;\"type\" member must be present - Python3;ovsdb negative;
-1304;ovsdb-types.at:92;simple integer - C;ovsdb positive;
-1305;ovsdb-types.at:92;simple integer - Python3;ovsdb positive python;
-1306;ovsdb-types.at:94;simple real - C;ovsdb positive;
-1307;ovsdb-types.at:94;simple real - Python3;ovsdb positive python;
-1308;ovsdb-types.at:96;simple boolean - C;ovsdb positive;
-1309;ovsdb-types.at:96;simple boolean - Python3;ovsdb positive python;
-1310;ovsdb-types.at:98;simple string - C;ovsdb positive;
-1311;ovsdb-types.at:98;simple string - Python3;ovsdb positive python;
-1312;ovsdb-types.at:100;simple uuid - C;ovsdb positive;
-1313;ovsdb-types.at:100;simple uuid - Python3;ovsdb positive python;
-1314;ovsdb-types.at:102;integer in object - C;ovsdb positive;
-1315;ovsdb-types.at:102;integer in object - Python3;ovsdb positive python;
-1316;ovsdb-types.at:104;real in object with explicit min and max - C;ovsdb positive;
-1317;ovsdb-types.at:104;real in object with explicit min and max - Python3;ovsdb positive python;
-1318;ovsdb-types.at:107;key type is required - C;ovsdb negative;
-1319;ovsdb-types.at:107;key type is required - Python3;ovsdb negative;
-1320;ovsdb-types.at:109;void is not a valid type - C;ovsdb negative;
-1321;ovsdb-types.at:109;void is not a valid type - Python3;ovsdb negative;
-1322;ovsdb-types.at:114;optional boolean - C;ovsdb positive set;
-1323;ovsdb-types.at:114;optional boolean - Python3;ovsdb positive python set;
-1324;ovsdb-types.at:118;set of 1 to 3 uuids - C;ovsdb positive;
-1325;ovsdb-types.at:118;set of 1 to 3 uuids - Python3;ovsdb positive python;
-1326;ovsdb-types.at:121;set of 0 to 3 strings - C;ovsdb positive;
-1327;ovsdb-types.at:121;set of 0 to 3 strings - Python3;ovsdb positive python;
-1328;ovsdb-types.at:124;set of 0 or more integers - C;ovsdb positive;
-1329;ovsdb-types.at:124;set of 0 or more integers - Python3;ovsdb positive python;
-1330;ovsdb-types.at:127;set of 1 or more reals - C;ovsdb positive;
-1331;ovsdb-types.at:127;set of 1 or more reals - Python3;ovsdb positive python;
-1332;ovsdb-types.at:131;set max cannot be less than min - C;ovsdb negative;
-1333;ovsdb-types.at:131;set max cannot be less than min - Python3;ovsdb negative;
-1334;ovsdb-types.at:134;set max cannot be negative - C;ovsdb negative;
-1335;ovsdb-types.at:134;set max cannot be negative - Python3;ovsdb negative;
-1336;ovsdb-types.at:137;set min cannot be negative - C;ovsdb negative;
-1337;ovsdb-types.at:137;set min cannot be negative - Python3;ovsdb negative;
-1338;ovsdb-types.at:140;set min cannot be greater than one - C;ovsdb negative;
-1339;ovsdb-types.at:140;set min cannot be greater than one - Python3;ovsdb negative;
-1340;ovsdb-types.at:146;map of 1 integer to boolean - C;ovsdb positive;
-1341;ovsdb-types.at:146;map of 1 integer to boolean - Python3;ovsdb positive python;
-1342;ovsdb-types.at:149;map of 1 boolean to integer, explicit min and max - C;ovsdb positive;
-1343;ovsdb-types.at:149;map of 1 boolean to integer, explicit min and max - Python3;ovsdb positive python;
-1344;ovsdb-types.at:152;map of 1 to 5 uuid to real - C;ovsdb positive;
-1345;ovsdb-types.at:152;map of 1 to 5 uuid to real - Python3;ovsdb positive python;
-1346;ovsdb-types.at:155;map of 0 to 10 string to uuid - C;ovsdb positive;
-1347;ovsdb-types.at:155;map of 0 to 10 string to uuid - Python3;ovsdb positive python;
-1348;ovsdb-types.at:158;map of 1 to 20 real to string - C;ovsdb positive;
-1349;ovsdb-types.at:158;map of 1 to 20 real to string - Python3;ovsdb positive python;
-1350;ovsdb-types.at:161;map of 0 or more string to real - C;ovsdb positive;
-1351;ovsdb-types.at:161;map of 0 or more string to real - Python3;ovsdb positive python;
-1352;ovsdb-types.at:165;map key type is required - C;ovsdb negative;
-1353;ovsdb-types.at:165;map key type is required - Python3;ovsdb negative;
-1354;ovsdb-data.at:3;default atoms - C;ovsdb positive;
-1355;ovsdb-data.at:3;default atoms - Python3;ovsdb positive python;
-1356;ovsdb-data.at:11;default data - C;ovsdb positive;
-1357;ovsdb-data.at:11;default data - Python3;ovsdb positive python;
-1358;ovsdb-data.at:76;integer atom from JSON - C;ovsdb positive;
-1359;ovsdb-data.at:76;integer atom from JSON - Python3;ovsdb positive python;
-1360;ovsdb-data.at:89;integer atom from string;ovsdb positive;
-1361;ovsdb-data.at:116;real atom from JSON - C;ovsdb positive;
-1362;ovsdb-data.at:116;real atom from JSON - Python3;ovsdb positive python;
-1363;ovsdb-data.at:133;real atom from string;ovsdb positive;
-1364;ovsdb-data.at:150;boolean atom from JSON - C;ovsdb positive;
-1365;ovsdb-data.at:150;boolean atom from JSON - Python3;ovsdb positive python;
-1366;ovsdb-data.at:155;boolean atom from string;ovsdb positive;
-1367;ovsdb-data.at:160;string atom from JSON - C;ovsdb positive;
-1368;ovsdb-data.at:160;string atom from JSON - Python3;ovsdb positive python;
-1369;ovsdb-data.at:166;string atom from string;ovsdb positive;
-1370;ovsdb-data.at:181;uuid atom from JSON - C;ovsdb positive;
-1371;ovsdb-data.at:181;uuid atom from JSON - Python3;ovsdb positive python;
-1372;ovsdb-data.at:185;uuid atom from string;ovsdb positive;
-1373;ovsdb-data.at:189;integer atom sorting - C;ovsdb positive;
-1374;ovsdb-data.at:189;integer atom sorting - Python3;ovsdb positive python;
-1375;ovsdb-data.at:193;real atom sorting - C;ovsdb positive;
-1376;ovsdb-data.at:193;real atom sorting - Python3;ovsdb positive python;
-1377;ovsdb-data.at:197;boolean atom sorting - C;ovsdb positive;
-1378;ovsdb-data.at:197;boolean atom sorting - Python3;ovsdb positive python;
-1379;ovsdb-data.at:201;string atom sorting - C;ovsdb positive;
-1380;ovsdb-data.at:201;string atom sorting - Python3;ovsdb positive python;
-1381;ovsdb-data.at:205;uuid atom sorting - C;ovsdb positive;
-1382;ovsdb-data.at:205;uuid atom sorting - Python3;ovsdb positive python;
-1383;ovsdb-data.at:242;real not acceptable integer JSON atom - C;ovsdb positive;
-1384;ovsdb-data.at:242;real not acceptable integer JSON atom - Python3;ovsdb positive python;
-1385;ovsdb-data.at:248;no invalid UTF-8 sequences in strings;ovsdb positive;
-1386;ovsdb-data.at:271;real not acceptable integer string atom;ovsdb negative;
-1387;ovsdb-data.at:275;inverted range is not acceptable integer string atom positive and negative;ovsdb negative;
-1388;ovsdb-data.at:279;inverted range is not acceptable integer string atom negative;ovsdb negative;
-1389;ovsdb-data.at:283;inverted range is not acceptable integer string atom positive;ovsdb negative;
-1390;ovsdb-data.at:287;too big range is not acceptable integer string atom positive and negative;ovsdb negative;
-1391;ovsdb-data.at:291;too big range is not acceptable integer string atom negative;ovsdb negative;
-1392;ovsdb-data.at:295;too big range is not acceptable integer string atom positive;ovsdb negative;
-1393;ovsdb-data.at:299;string \"true\" not acceptable boolean JSON atom - C;ovsdb positive;
-1394;ovsdb-data.at:299;string \"true\" not acceptable boolean JSON atom - Python3;ovsdb positive python;
-1395;ovsdb-data.at:303;string \"true\" not acceptable boolean string atom;ovsdb negative;
-1396;ovsdb-data.at:307;integer not acceptable string JSON atom - C;ovsdb positive;
-1397;ovsdb-data.at:307;integer not acceptable string JSON atom - Python3;ovsdb positive python;
-1398;ovsdb-data.at:311;uuid atom must be expressed as JSON array - C;ovsdb positive;
-1399;ovsdb-data.at:311;uuid atom must be expressed as JSON array - Python3;ovsdb positive python;
-1400;ovsdb-data.at:315;named-uuid requires symbol table - C;ovsdb positive;
-1401;ovsdb-data.at:315;named-uuid requires symbol table - Python3;ovsdb positive python;
-1402;ovsdb-data.at:319;empty string atom must be quoted;ovsdb negative;
-1403;ovsdb-data.at:323;quotes must be balanced;ovsdb negative;
-1404;ovsdb-data.at:327;quoted string must not contain unescaped quote;ovsdb negative;
-1405;ovsdb-data.at:331;quoted string must not end with backslash;ovsdb negative;
-1406;ovsdb-data.at:335;uuids must be valid;ovsdb negative;
-1407;ovsdb-data.at:341;integer atom enum - C;ovsdb positive;
-1408;ovsdb-data.at:341;integer atom enum - Python3;ovsdb positive python;
-1409;ovsdb-data.at:364;integer atom enum from string;ovsdb positive;
-1410;ovsdb-data.at:377;integer not in enum set from string;ovsdb negative;
-1411;ovsdb-data.at:381;integer range not in enum set from string;ovsdb negative;
-1412;ovsdb-data.at:385;real atom enum - C;ovsdb positive;
-1413;ovsdb-data.at:385;real atom enum - Python3;ovsdb positive python;
-1414;ovsdb-data.at:402;boolean atom enum - C;ovsdb positive;
-1415;ovsdb-data.at:402;boolean atom enum - Python3;ovsdb positive python;
-1416;ovsdb-data.at:409;string atom enum - C;ovsdb positive;
-1417;ovsdb-data.at:409;string atom enum - Python3;ovsdb positive python;
-1418;ovsdb-data.at:424;uuid atom enum - C;ovsdb positive;
-1419;ovsdb-data.at:424;uuid atom enum - Python3;ovsdb positive python;
-1420;ovsdb-data.at:435;integers >= 5 - C;ovsdb positive;
-1421;ovsdb-data.at:435;integers >= 5 - Python3;ovsdb positive python;
-1422;ovsdb-data.at:448;integers <= -1 - C;ovsdb positive;
-1423;ovsdb-data.at:448;integers <= -1 - Python3;ovsdb positive python;
-1424;ovsdb-data.at:459;integers in range -10 to 10 - C;ovsdb positive;
-1425;ovsdb-data.at:459;integers in range -10 to 10 - Python3;ovsdb positive python;
-1426;ovsdb-data.at:480;reals >= 5 - C;ovsdb positive;
-1427;ovsdb-data.at:480;reals >= 5 - Python3;ovsdb positive python;
-1428;ovsdb-data.at:493;reals <= -1 - C;ovsdb positive;
-1429;ovsdb-data.at:493;reals <= -1 - Python3;ovsdb positive python;
-1430;ovsdb-data.at:504;reals in range -10 to 10 - C;ovsdb positive;
-1431;ovsdb-data.at:504;reals in range -10 to 10 - Python3;ovsdb positive python;
-1432;ovsdb-data.at:525;strings at least 2 characters long - C;ovsdb positive;
-1433;ovsdb-data.at:525;strings at least 2 characters long - Python3;ovsdb positive python;
-1434;ovsdb-data.at:538;strings no more than 2 characters long - C;ovsdb positive;
-1435;ovsdb-data.at:538;strings no more than 2 characters long - Python3;ovsdb positive python;
-1436;ovsdb-data.at:553;integer JSON datum - C;ovsdb positive;
-1437;ovsdb-data.at:553;integer JSON datum - Python3;ovsdb positive python;
-1438;ovsdb-data.at:559;integer string datum;ovsdb positive;
-1439;ovsdb-data.at:566;real JSON datum - C;ovsdb positive;
-1440;ovsdb-data.at:566;real JSON datum - Python3;ovsdb positive python;
-1441;ovsdb-data.at:572;real string datum;ovsdb positive;
-1442;ovsdb-data.at:578;boolean JSON datum - C;ovsdb positive;
-1443;ovsdb-data.at:578;boolean JSON datum - Python3;ovsdb positive python;
-1444;ovsdb-data.at:583;boolean string datum;ovsdb positive;
-1445;ovsdb-data.at:588;string JSON datum - C;ovsdb positive;
-1446;ovsdb-data.at:588;string JSON datum - Python3;ovsdb positive python;
-1447;ovsdb-data.at:594;string string datum;ovsdb positive;
-1448;ovsdb-data.at:603;JSON optional boolean - C;ovsdb positive set;
-1449;ovsdb-data.at:603;JSON optional boolean - Python3;ovsdb positive python set;
-1450;ovsdb-data.at:613;string optional boolean;ovsdb positive set;
-1451;ovsdb-data.at:623;JSON set of 0 or more integers - C;ovsdb positive;
-1452;ovsdb-data.at:623;JSON set of 0 or more integers - Python3;ovsdb positive python;
-1453;ovsdb-data.at:640;string set of 0 or more integers;ovsdb positive;
-1454;ovsdb-data.at:659;JSON set of 1 to 3 uuids - C;ovsdb positive;
-1455;ovsdb-data.at:659;JSON set of 1 to 3 uuids - Python3;ovsdb positive python;
-1456;ovsdb-data.at:670;string set of 1 to 3 uuids;ovsdb positive;
-1457;ovsdb-data.at:679;JSON set of 0 to 3 strings - C;ovsdb positive;
-1458;ovsdb-data.at:679;JSON set of 0 to 3 strings - Python3;ovsdb positive python;
-1459;ovsdb-data.at:692;string set of 0 to 3 strings;ovsdb positive;
-1460;ovsdb-data.at:703;duplicate boolean not allowed in JSON set - C;ovsdb negative;
-1461;ovsdb-data.at:703;duplicate boolean not allowed in JSON set - Python3;ovsdb negative;
-1462;ovsdb-data.at:707;duplicate boolean not allowed in string set;ovsdb negative;
-1463;ovsdb-data.at:711;duplicate integer not allowed in JSON set - C;ovsdb negative;
-1464;ovsdb-data.at:711;duplicate integer not allowed in JSON set - Python3;ovsdb negative;
-1465;ovsdb-data.at:715;duplicate integer not allowed in string set;ovsdb negative;
-1466;ovsdb-data.at:719;duplicate real not allowed in JSON set - C;ovsdb negative;
-1467;ovsdb-data.at:719;duplicate real not allowed in JSON set - Python3;ovsdb negative;
-1468;ovsdb-data.at:723;duplicate real not allowed in string set;ovsdb negative;
-1469;ovsdb-data.at:727;duplicate string not allowed in JSON set - C;ovsdb negative;
-1470;ovsdb-data.at:727;duplicate string not allowed in JSON set - Python3;ovsdb negative;
-1471;ovsdb-data.at:731;duplicate string not allowed in string set;ovsdb negative;
-1472;ovsdb-data.at:735;duplicate uuid not allowed in JSON set - C;ovsdb negative;
-1473;ovsdb-data.at:735;duplicate uuid not allowed in JSON set - Python3;ovsdb negative;
-1474;ovsdb-data.at:742;duplicate uuid not allowed in string set;ovsdb negative;
-1475;ovsdb-data.at:751;JSON map of 1 integer to boolean - C;ovsdb positive;
-1476;ovsdb-data.at:751;JSON map of 1 integer to boolean - Python3;ovsdb positive python;
-1477;ovsdb-data.at:756;string map of 1 integer to boolean;ovsdb positive;
-1478;ovsdb-data.at:761;JSON map of at least 1 integer to boolean - C;ovsdb positive;
-1479;ovsdb-data.at:761;JSON map of at least 1 integer to boolean - Python3;ovsdb positive python;
-1480;ovsdb-data.at:770;string map of at least 1 integer to boolean;ovsdb positive;
-1481;ovsdb-data.at:779;JSON map of 1 boolean to integer - C;ovsdb positive;
-1482;ovsdb-data.at:779;JSON map of 1 boolean to integer - Python3;ovsdb positive python;
-1483;ovsdb-data.at:784;string map of 1 boolean to integer;ovsdb positive;
-1484;ovsdb-data.at:789;JSON map of 1 uuid to real - C;ovsdb positive;
-1485;ovsdb-data.at:789;JSON map of 1 uuid to real - Python3;ovsdb positive python;
-1486;ovsdb-data.at:798;string map of 1 uuid to real;ovsdb positive;
-1487;ovsdb-data.at:807;JSON map of 10 string to string - C;ovsdb positive;
-1488;ovsdb-data.at:807;JSON map of 10 string to string - Python3;ovsdb positive python;
-1489;ovsdb-data.at:821;string map of 10 string to string;ovsdb positive;
-1490;ovsdb-data.at:835;duplicate integer key not allowed in JSON map - C;ovsdb negative;
-1491;ovsdb-data.at:835;duplicate integer key not allowed in JSON map - Python3;ovsdb negative;
-1492;ovsdb-data.at:840;duplicate integer key not allowed in string map;ovsdb negative;
-1493;ovsdb-data.at:845;generate and apply diff -- integer;ovsdb positive;
-1494;ovsdb-data.at:851;generate and apply diff -- boolean;ovsdb positive;
-1495;ovsdb-data.at:857;generate and apply diff -- string;ovsdb positive;
-1496;ovsdb-data.at:864;generate and apply diff -- set;ovsdb positive;
-1497;ovsdb-data.at:885;generate and apply diff -- set -- size error;ovsdb negative;
-1498;ovsdb-data.at:891;generate and apply diff -- map;ovsdb positive;
-1499;ovsdb-data.at:915;generate and apply diff with map -- size error;ovsdb negative;
-1500;ovsdb-column.at:3;ordinary column - C;ovsdb positive;
-1501;ovsdb-column.at:3;ordinary column - Python3;ovsdb positive python;
-1502;ovsdb-column.at:7;immutable column - C;ovsdb positive;
-1503;ovsdb-column.at:7;immutable column - Python3;ovsdb positive python;
-1504;ovsdb-column.at:11;ephemeral column - C;ovsdb positive;
-1505;ovsdb-column.at:11;ephemeral column - Python3;ovsdb positive python;
-1506;ovsdb-table.at:3;non-root table with one column - C;ovsdb positive;
-1507;ovsdb-table.at:3;non-root table with one column - Python3;ovsdb positive python;
-1508;ovsdb-table.at:7;immutable table with one column - C;ovsdb positive;
-1509;ovsdb-table.at:7;immutable table with one column - Python3;ovsdb positive python;
-1510;ovsdb-table.at:13;root table with one column - C;ovsdb positive;
-1511;ovsdb-table.at:13;root table with one column - Python3;ovsdb positive python;
-1512;ovsdb-table.at:19;non-root table with default_is_root=true - C;ovsdb positive;
-1513;ovsdb-table.at:19;non-root table with default_is_root=true - Python3;ovsdb positive python;
-1514;ovsdb-table.at:23;root table with default_is_root=true - C;ovsdb positive;
-1515;ovsdb-table.at:23;root table with default_is_root=true - Python3;ovsdb positive python;
-1516;ovsdb-table.at:29;table with maxRows of 2 - C;ovsdb positive;
-1517;ovsdb-table.at:29;table with maxRows of 2 - Python3;ovsdb positive python;
-1518;ovsdb-table.at:34;table with index - C;ovsdb positive;
-1519;ovsdb-table.at:34;table with index - Python3;ovsdb positive python;
-1520;ovsdb-table.at:40;table with syntax error in index - C;ovsdb negative;
-1521;ovsdb-table.at:40;table with syntax error in index - Python3;ovsdb negative;
-1522;ovsdb-table.at:46;table with empty index - C;ovsdb negative;
-1523;ovsdb-table.at:46;table with empty index - Python3;ovsdb negative;
-1524;ovsdb-table.at:52;table with index of ephemeral column - C;ovsdb negative;
-1525;ovsdb-table.at:52;table with index of ephemeral column - Python3;ovsdb negative;
-1526;ovsdb-table.at:59;column names may not begin with _ - C;ovsdb negative table;
-1527;ovsdb-table.at:59;column names may not begin with _ - Python3;ovsdb negative table;
-1528;ovsdb-table.at:65;table must have at least one column (1) - C;ovsdb negative;
-1529;ovsdb-table.at:65;table must have at least one column (1) - Python3;ovsdb negative;
-1530;ovsdb-table.at:69;table must have at least one column (2) - C;ovsdb negative;
-1531;ovsdb-table.at:69;table must have at least one column (2) - Python3;ovsdb negative;
-1532;ovsdb-table.at:73;table maxRows must be positive - C;ovsdb negative;
-1533;ovsdb-table.at:73;table maxRows must be positive - Python3;ovsdb negative;
-1534;ovsdb-row.at:3;row with one string column;ovsdb positive;
-1535;ovsdb-row.at:19;row with one integer column;ovsdb positive;
-1536;ovsdb-row.at:35;row with one real column;ovsdb positive;
-1537;ovsdb-row.at:51;row with one boolean column;ovsdb positive;
-1538;ovsdb-row.at:64;row with one uuid column;ovsdb positive;
-1539;ovsdb-row.at:77;row with set of 1 to 2 elements;ovsdb positive;
-1540;ovsdb-row.at:84;row with map of 1 to 2 elements;ovsdb positive;
-1541;ovsdb-row.at:91;row with several columns;ovsdb positive;
-1542;ovsdb-row.at:113;row hashing (scalars);ovsdb positive;
-1543;ovsdb-row.at:182;row hashing (sets);ovsdb positive;
-1544;ovsdb-row.at:235;row hashing (maps);ovsdb positive;
-1545;ovsdb-schema.at:3;schema with valid refTables - C;ovsdb positive;
-1546;ovsdb-schema.at:3;schema with valid refTables - Python3;ovsdb positive python;
-1547;ovsdb-schema.at:30;schema with ephemeral strong references - C;ovsdb positive;
-1548;ovsdb-schema.at:30;schema with ephemeral strong references - Python3;ovsdb positive python;
-1549;ovsdb-schema.at:60;schema with immutable weak references - C;ovsdb positive;
-1550;ovsdb-schema.at:60;schema with immutable weak references - Python3;ovsdb positive python;
-1551;ovsdb-schema.at:78;schema without version number - C;ovsdb positive;
-1552;ovsdb-schema.at:78;schema without version number - Python3;ovsdb positive python;
-1553;ovsdb-schema.at:88;schema with invalid refTables - C;ovsdb negative;
-1554;ovsdb-schema.at:88;schema with invalid refTables - Python3;ovsdb negative;
-1555;ovsdb-schema.at:111;schema with invalid version number - C;ovsdb negative;
-1556;ovsdb-schema.at:111;schema with invalid version number - Python3;ovsdb negative;
-1557;ovsdb-condition.at:3;null condition;ovsdb positive;
-1558;ovsdb-condition.at:9;conditions on scalars;ovsdb positive condition;
-1559;ovsdb-condition.at:75;disallowed conditions on scalars;ovsdb negative condition;
-1560;ovsdb-condition.at:213;conditions on optional scalars;ovsdb positive condition;
-1561;ovsdb-condition.at:279;disallowed conditions on optional scalars;ovsdb negative condition;
-1562;ovsdb-condition.at:366;conditions on sets;ovsdb positive condition;
-1563;ovsdb-condition.at:427;condition sorting;ovsdb positive;
-1564;ovsdb-condition.at:441;boolean condition;ovsdb positive;
-1565;ovsdb-condition.at:447;boolean condition;ovsdb positive;
-1566;ovsdb-condition.at:453;evaluating null condition;ovsdb positive;
-1567;ovsdb-condition.at:462;evaluating conditions on integers;ovsdb positive condition;
-1568;ovsdb-condition.at:487;evaluating conditions on reals;ovsdb positive condition;
-1569;ovsdb-condition.at:512;evaluating conditions on booleans;ovsdb positive condition;
-1570;ovsdb-condition.at:536;evaluating conditions on strings;ovsdb positive condition;
-1571;ovsdb-condition.at:561;evaluating conditions on UUIDs;ovsdb positive condition;
-1572;ovsdb-condition.at:587;evaluating conditions on sets;ovsdb positive condition;
-1573;ovsdb-condition.at:669;evaluating conditions on maps (1);ovsdb positive condition;
-1574;ovsdb-condition.at:754;evaluating conditions on maps (2);ovsdb positive condition;
-1575;ovsdb-condition.at:846;evaluating conditions on optional integers;ovsdb positive condition;
-1576;ovsdb-condition.at:881;evaluating conditions on optional strings;ovsdb positive condition;
-1577;ovsdb-condition.at:908;evaluating conditions on optional reals;ovsdb positive condition;
-1578;ovsdb-condition.at:943;evaluating false boolean condition;ovsdb positive;
-1579;ovsdb-condition.at:952;evaluating true boolean condition;ovsdb positive;
-1580;ovsdb-condition.at:961;compare condition;ovsdb positive;
-1581;ovsdb-mutation.at:3;null mutation;ovsdb positive;
-1582;ovsdb-mutation.at:9;mutations on scalars;ovsdb positive mutation;
-1583;ovsdb-mutation.at:37;disallowed mutations on scalars;ovsdb negative mutation;
-1584;ovsdb-mutation.at:102;disallowed mutations on immutable columns;ovsdb negative mutation;
-1585;ovsdb-mutation.at:114;mutations on sets;ovsdb positive mutation;
-1586;ovsdb-mutation.at:166;executing null mutation;ovsdb positive;
-1587;ovsdb-mutation.at:179;executing mutations on integers;ovsdb positive mutation;
-1588;ovsdb-mutation.at:216;integer overflow detection;ovsdb positive mutation;
-1589;ovsdb-mutation.at:297;executing mutations on integers with constraints;ovsdb positive mutation;
-1590;ovsdb-mutation.at:336;executing mutations on reals;ovsdb positive mutation;
-1591;ovsdb-mutation.at:367;real overflow detection;ovsdb positive mutation;
-1592;ovsdb-mutation.at:410;executing mutations on reals with constraints;ovsdb positive mutation;
-1593;ovsdb-mutation.at:443;executing mutations on integer sets;ovsdb positive mutation;
-1594;ovsdb-mutation.at:517;executing mutations on integer sets with constraints;ovsdb positive mutation;
-1595;ovsdb-mutation.at:556;executing mutations on real sets;ovsdb positive mutation;
-1596;ovsdb-mutation.at:629;executing mutations on boolean sets;ovsdb positive mutation;
-1597;ovsdb-mutation.at:679;executing mutations on string sets;ovsdb positive mutation;
-1598;ovsdb-mutation.at:729;executing mutations on uuid sets;ovsdb positive mutation;
-1599;ovsdb-mutation.at:779;executing mutations on integer maps;ovsdb positive mutation;
-1600;ovsdb-query.at:3;queries on scalars;ovsdb positive query;
-1601;ovsdb-query.at:95;queries on sets;ovsdb positive query;
-1602;ovsdb-query.at:176;queries on maps (1);ovsdb positive query;
-1603;ovsdb-query.at:260;queries on maps (2);ovsdb positive query;
-1604;ovsdb-query.at:351;UUID-distinct queries on scalars;ovsdb positive query;
-1605;ovsdb-query.at:444;Boolean-distinct queries on scalars;ovsdb positive query;
-1606;ovsdb-query.at:537;parse colunn set containing bad name;ovsdb negative;
-1607;ovsdb-transaction.at:3;empty table, empty transaction;ovsdb positive;
-1608;ovsdb-transaction.at:17;nonempty table, empty transaction;ovsdb positive;
-1609;ovsdb-transaction.at:41;insert, commit;ovsdb positive transaction;
-1610;ovsdb-transaction.at:70;insert, abort;ovsdb positive transaction;
-1611;ovsdb-transaction.at:98;modify, commit;ovsdb positive transaction;
-1612;ovsdb-transaction.at:127;modify, abort;ovsdb positive transaction;
-1613;ovsdb-transaction.at:156;delete, commit;ovsdb positive transaction;
-1614;ovsdb-transaction.at:181;delete, abort;ovsdb positive transaction;
-1615;ovsdb-transaction.at:207;modify, delete, commit;ovsdb positive transaction;
-1616;ovsdb-transaction.at:234;modify, delete, abort;ovsdb positive transaction;
-1617;ovsdb-transaction.at:262;insert, delete, commit;ovsdb positive transaction;
-1618;ovsdb-transaction.at:291;insert, delete, abort;ovsdb positive transaction;
-1619;ovsdb-transaction.at:322;insert, modify, delete, commit;ovsdb positive transaction;
-1620;ovsdb-transaction.at:353;insert, modify, delete, abort;ovsdb positive transaction;
-1621;ovsdb-transaction.at:385;deletes are aborted cleanly;ovsdb positive transaction;
-1622;ovsdb-execution.at:147;block insert on read only DB;ovsdb execute execution positive;
-1623;ovsdb-execution.at:156;allow select on read only DB;ovsdb execute execution positive;
-1624;ovsdb-execution.at:185;uuid-name must be <id>;ovsdb execute execution positive;
-1625;ovsdb-execution.at:195;named-uuid must be <id>;ovsdb execute execution positive;
-1626;ovsdb-execution.at:204;duplicate uuid-name not allowed;ovsdb execute execution positive;
-1627;ovsdb-execution.at:1164;insert default row, query table;ovsdb execute execution positive;
-1628;ovsdb-execution.at:1164;insert row, query table;ovsdb execute execution positive;
-1629;ovsdb-execution.at:1164;insert row with uuid, query table;ovsdb execute execution positive;
-1630;ovsdb-execution.at:1164;insert rows, query by value;ovsdb execute execution positive;
-1631;ovsdb-execution.at:1164;insert rows, query by named-uuid;ovsdb execute execution positive;
-1632;ovsdb-execution.at:1164;insert rows, update rows by value;ovsdb execute execution positive;
-1633;ovsdb-execution.at:1164;insert rows, mutate rows;ovsdb execute execution positive;
-1634;ovsdb-execution.at:1164;insert rows, delete by named-uuid;ovsdb execute execution positive;
-1635;ovsdb-execution.at:1164;insert rows, delete rows by value;ovsdb execute execution positive;
-1636;ovsdb-execution.at:1164;insert rows, delete by (non-matching) value;ovsdb execute execution positive;
-1637;ovsdb-execution.at:1164;insert rows, delete all;ovsdb execute execution positive;
-1638;ovsdb-execution.at:1164;insert row, query table, commit;ovsdb execute execution positive;
-1639;ovsdb-execution.at:1164;insert row, query table, commit durably;ovsdb execute execution positive;
-1640;ovsdb-execution.at:1164;equality wait with correct rows;ovsdb execute execution positive;
-1641;ovsdb-execution.at:1164;equality wait with extra row;ovsdb execute execution positive;
-1642;ovsdb-execution.at:1164;equality wait with missing row;ovsdb execute execution positive;
-1643;ovsdb-execution.at:1164;inequality wait with correct rows;ovsdb execute execution positive;
-1644;ovsdb-execution.at:1164;inequality wait with extra row;ovsdb execute execution positive;
-1645;ovsdb-execution.at:1164;inequality wait with missing row;ovsdb execute execution positive;
-1646;ovsdb-execution.at:1164;insert and update constraints;ovsdb execute execution positive;
-1647;ovsdb-execution.at:1164;index uniqueness checking;ovsdb execute execution positive;
-1648;ovsdb-execution.at:1164;referential integrity -- simple;ovsdb execute execution positive;
-1649;ovsdb-execution.at:1164;referential integrity -- mutual references;ovsdb execute execution positive;
-1650;ovsdb-execution.at:1164;weak references;ovsdb execute execution positive;
-1651;ovsdb-execution.at:1164;immutable columns;ovsdb execute execution positive;
-1652;ovsdb-execution.at:1164;garbage collection;ovsdb execute execution positive;
-1653;ovsdb-trigger.at:15;trigger fires immediately;ovsdb execute execution trigger positive;
-1654;ovsdb-trigger.at:38;trigger times out;ovsdb execute execution trigger positive;
-1655;ovsdb-trigger.at:61;trigger fires after delay;ovsdb execute execution trigger positive;
-1656;ovsdb-trigger.at:92;delayed trigger modifies database;ovsdb execute execution trigger positive;
-1657;ovsdb-trigger.at:132;one delayed trigger wakes up another;ovsdb execute execution trigger positive;
-1658;ovsdb-tool.at:29;insert default row, query table;ovsdb file positive;
-1659;ovsdb-tool.at:29;insert row, query table;ovsdb file positive;
-1660;ovsdb-tool.at:29;insert row with uuid, query table;ovsdb file positive;
-1661;ovsdb-tool.at:29;insert rows, query by value;ovsdb file positive;
-1662;ovsdb-tool.at:29;insert rows, query by named-uuid;ovsdb file positive;
-1663;ovsdb-tool.at:29;insert rows, update rows by value;ovsdb file positive;
-1664;ovsdb-tool.at:29;insert rows, mutate rows;ovsdb file positive;
-1665;ovsdb-tool.at:29;insert rows, delete by named-uuid;ovsdb file positive;
-1666;ovsdb-tool.at:29;insert rows, delete rows by value;ovsdb file positive;
-1667;ovsdb-tool.at:29;insert rows, delete by (non-matching) value;ovsdb file positive;
-1668;ovsdb-tool.at:29;insert rows, delete all;ovsdb file positive;
-1669;ovsdb-tool.at:29;insert row, query table, commit;ovsdb file positive;
-1670;ovsdb-tool.at:29;insert row, query table, commit durably;ovsdb file positive;
-1671;ovsdb-tool.at:29;equality wait with correct rows;ovsdb file positive;
-1672;ovsdb-tool.at:29;equality wait with extra row;ovsdb file positive;
-1673;ovsdb-tool.at:29;equality wait with missing row;ovsdb file positive;
-1674;ovsdb-tool.at:29;inequality wait with correct rows;ovsdb file positive;
-1675;ovsdb-tool.at:29;inequality wait with extra row;ovsdb file positive;
-1676;ovsdb-tool.at:29;inequality wait with missing row;ovsdb file positive;
-1677;ovsdb-tool.at:29;insert and update constraints;ovsdb file positive;
-1678;ovsdb-tool.at:29;index uniqueness checking;ovsdb file positive;
-1679;ovsdb-tool.at:29;referential integrity -- simple;ovsdb file positive;
-1680;ovsdb-tool.at:29;referential integrity -- mutual references;ovsdb file positive;
-1681;ovsdb-tool.at:29;weak references;ovsdb file positive;
-1682;ovsdb-tool.at:29;immutable columns;ovsdb file positive;
-1683;ovsdb-tool.at:29;garbage collection;ovsdb file positive;
-1684;ovsdb-tool.at:31;transaction comments;ovsdb file positive;
-1685;ovsdb-tool.at:49;ovsdb-tool compact;ovsdb file positive;
-1686;ovsdb-tool.at:172;ovsdb-tool convert -- removing a column;ovsdb file positive;
-1687;ovsdb-tool.at:239;ovsdb-tool convert -- adding a column;ovsdb file positive;
-1688;ovsdb-tool.at:305;ovsdb-tool unsupported cluster operations;ovsdb file negative compact query transact convert;
-1689;ovsdb-tool.at:321;ovsdb-tool schema-version, schema-cksum, schema-name;ovsdb file positive schema-version schema-cksum;
-1690;ovsdb-tool.at:332;ovsdb-tool database inspection commands - standalone;ovsdb file positive db-version db-cksum db-name db-cid db-sid db-local-address;
-1691;ovsdb-tool.at:351;ovsdb-tool database inspection commands - clustered;ovsdb file negative db-version db-cksum db-name db-cid db-sid db-local-address cluster;
-1692;ovsdb-tool.at:369;ovsdb-tool database inspection commands - joining a cluster;ovsdb file positive db-version db-cksum db-name db-cid db-sid db-local-address cluster join joining;
-1693;ovsdb-tool.at:400;ovsdb-tool needs-conversion (no conversion needed);ovsdb file positive;
-1694;ovsdb-tool.at:409;ovsdb-tool needs-conversion (conversion needed);ovsdb file positive;
-1695;ovsdb-tool.at:420;ovsdb-tool create-cluster with initial data;ovsdb file positive;
-1696;ovsdb-tool.at:463;ovsdb-tool convert-to-standalone;ovsdb file positive;
-1697;ovsdb-server.at:41;insert default row, query table;ovsdb server positive unix;
-1698;ovsdb-server.at:41;insert row, query table;ovsdb server positive unix;
-1699;ovsdb-server.at:41;insert row with uuid, query table;ovsdb server positive unix;
-1700;ovsdb-server.at:41;insert rows, query by value;ovsdb server positive unix;
-1701;ovsdb-server.at:41;insert rows, query by named-uuid;ovsdb server positive unix;
-1702;ovsdb-server.at:41;insert rows, update rows by value;ovsdb server positive unix;
-1703;ovsdb-server.at:41;insert rows, mutate rows;ovsdb server positive unix;
-1704;ovsdb-server.at:41;insert rows, delete by named-uuid;ovsdb server positive unix;
-1705;ovsdb-server.at:41;insert rows, delete rows by value;ovsdb server positive unix;
-1706;ovsdb-server.at:41;insert rows, delete by (non-matching) value;ovsdb server positive unix;
-1707;ovsdb-server.at:41;insert rows, delete all;ovsdb server positive unix;
-1708;ovsdb-server.at:41;insert row, query table, commit;ovsdb server positive unix;
-1709;ovsdb-server.at:41;insert row, query table, commit durably;ovsdb server positive unix;
-1710;ovsdb-server.at:41;equality wait with correct rows;ovsdb server positive unix;
-1711;ovsdb-server.at:41;equality wait with extra row;ovsdb server positive unix;
-1712;ovsdb-server.at:41;equality wait with missing row;ovsdb server positive unix;
-1713;ovsdb-server.at:41;inequality wait with correct rows;ovsdb server positive unix;
-1714;ovsdb-server.at:41;inequality wait with extra row;ovsdb server positive unix;
-1715;ovsdb-server.at:41;inequality wait with missing row;ovsdb server positive unix;
-1716;ovsdb-server.at:41;insert and update constraints;ovsdb server positive unix;
-1717;ovsdb-server.at:41;index uniqueness checking;ovsdb server positive unix;
-1718;ovsdb-server.at:41;referential integrity -- simple;ovsdb server positive unix;
-1719;ovsdb-server.at:41;referential integrity -- mutual references;ovsdb server positive unix;
-1720;ovsdb-server.at:41;weak references;ovsdb server positive unix;
-1721;ovsdb-server.at:41;immutable columns;ovsdb server positive unix;
-1722;ovsdb-server.at:41;garbage collection;ovsdb server positive unix;
-1723;ovsdb-server.at:45;truncating corrupted database log;ovsdb server positive unix;
-1724;ovsdb-server.at:92;truncating database log with bad transaction;ovsdb server positive unix;
-1725;ovsdb-server.at:153;database multiplexing implementation;ovsdb server positive;
-1726;ovsdb-server.at:170;ovsdb-server/add-db and remove-db;ovsdb server positive;
-1727;ovsdb-server.at:285;ovsdb-server/add-db with --monitor;ovsdb server positive;
-1728;ovsdb-server.at:320;ovsdb-server/add-db and remove-db with --monitor;ovsdb server positive;
-1729;ovsdb-server.at:353;--remote=db: implementation;ovsdb server positive;
-1730;ovsdb-server.at:417;ovsdb-server/add-remote and remove-remote;ovsdb server positive;
-1731;ovsdb-server.at:470;ovsdb-server/add-remote with --monitor;ovsdb server positive;
-1732;ovsdb-server.at:505;ovsdb-server/add-remote and remove-remote with --monitor;ovsdb server positive;
-1733;ovsdb-server.at:544;SSL db: implementation;ovsdb server positive ssl \$5;
-1734;ovsdb-server.at:835;compacting online - standalone;ovsdb server compact;
-1735;ovsdb-server.at:840;compacting online - cluster;ovsdb server compact;
-1736;ovsdb-server.at:1121;schema conversion online - standalone;ovsdb server convert needs-conversion standalone;
-1737;ovsdb-server.at:1126;schema conversion online - clustered;ovsdb server convert needs-conversion cluster;
-1738;ovsdb-server.at:1131;ovsdb-server combines updates on backlogged connections;;
-1739;ovsdb-server.at:1264;insert default row, query table;ovsdb server positive ssl;
-1740;ovsdb-server.at:1264;insert row, query table;ovsdb server positive ssl;
-1741;ovsdb-server.at:1264;insert row with uuid, query table;ovsdb server positive ssl;
-1742;ovsdb-server.at:1264;insert rows, query by value;ovsdb server positive ssl;
-1743;ovsdb-server.at:1264;insert rows, query by named-uuid;ovsdb server positive ssl;
-1744;ovsdb-server.at:1264;insert rows, update rows by value;ovsdb server positive ssl;
-1745;ovsdb-server.at:1264;insert rows, mutate rows;ovsdb server positive ssl;
-1746;ovsdb-server.at:1264;insert rows, delete by named-uuid;ovsdb server positive ssl;
-1747;ovsdb-server.at:1264;insert rows, delete rows by value;ovsdb server positive ssl;
-1748;ovsdb-server.at:1264;insert rows, delete by (non-matching) value;ovsdb server positive ssl;
-1749;ovsdb-server.at:1264;insert rows, delete all;ovsdb server positive ssl;
-1750;ovsdb-server.at:1264;insert row, query table, commit;ovsdb server positive ssl;
-1751;ovsdb-server.at:1264;insert row, query table, commit durably;ovsdb server positive ssl;
-1752;ovsdb-server.at:1264;equality wait with correct rows;ovsdb server positive ssl;
-1753;ovsdb-server.at:1264;equality wait with extra row;ovsdb server positive ssl;
-1754;ovsdb-server.at:1264;equality wait with missing row;ovsdb server positive ssl;
-1755;ovsdb-server.at:1264;inequality wait with correct rows;ovsdb server positive ssl;
-1756;ovsdb-server.at:1264;inequality wait with extra row;ovsdb server positive ssl;
-1757;ovsdb-server.at:1264;inequality wait with missing row;ovsdb server positive ssl;
-1758;ovsdb-server.at:1264;insert and update constraints;ovsdb server positive ssl;
-1759;ovsdb-server.at:1264;index uniqueness checking;ovsdb server positive ssl;
-1760;ovsdb-server.at:1264;referential integrity -- simple;ovsdb server positive ssl;
-1761;ovsdb-server.at:1264;referential integrity -- mutual references;ovsdb server positive ssl;
-1762;ovsdb-server.at:1264;weak references;ovsdb server positive ssl;
-1763;ovsdb-server.at:1264;immutable columns;ovsdb server positive ssl;
-1764;ovsdb-server.at:1264;garbage collection;ovsdb server positive ssl;
-1765;ovsdb-server.at:1302;insert default row, query table;ovsdb server positive ssl6;
-1766;ovsdb-server.at:1338;insert default row, query table;ovsdb server positive tcp;
-1767;ovsdb-server.at:1338;insert row, query table;ovsdb server positive tcp;
-1768;ovsdb-server.at:1338;insert row with uuid, query table;ovsdb server positive tcp;
-1769;ovsdb-server.at:1338;insert rows, query by value;ovsdb server positive tcp;
-1770;ovsdb-server.at:1338;insert rows, query by named-uuid;ovsdb server positive tcp;
-1771;ovsdb-server.at:1338;insert rows, update rows by value;ovsdb server positive tcp;
-1772;ovsdb-server.at:1338;insert rows, mutate rows;ovsdb server positive tcp;
-1773;ovsdb-server.at:1338;insert rows, delete by named-uuid;ovsdb server positive tcp;
-1774;ovsdb-server.at:1338;insert rows, delete rows by value;ovsdb server positive tcp;
-1775;ovsdb-server.at:1338;insert rows, delete by (non-matching) value;ovsdb server positive tcp;
-1776;ovsdb-server.at:1338;insert rows, delete all;ovsdb server positive tcp;
-1777;ovsdb-server.at:1338;insert row, query table, commit;ovsdb server positive tcp;
-1778;ovsdb-server.at:1338;insert row, query table, commit durably;ovsdb server positive tcp;
-1779;ovsdb-server.at:1338;equality wait with correct rows;ovsdb server positive tcp;
-1780;ovsdb-server.at:1338;equality wait with extra row;ovsdb server positive tcp;
-1781;ovsdb-server.at:1338;equality wait with missing row;ovsdb server positive tcp;
-1782;ovsdb-server.at:1338;inequality wait with correct rows;ovsdb server positive tcp;
-1783;ovsdb-server.at:1338;inequality wait with extra row;ovsdb server positive tcp;
-1784;ovsdb-server.at:1338;inequality wait with missing row;ovsdb server positive tcp;
-1785;ovsdb-server.at:1338;insert and update constraints;ovsdb server positive tcp;
-1786;ovsdb-server.at:1338;index uniqueness checking;ovsdb server positive tcp;
-1787;ovsdb-server.at:1338;referential integrity -- simple;ovsdb server positive tcp;
-1788;ovsdb-server.at:1338;referential integrity -- mutual references;ovsdb server positive tcp;
-1789;ovsdb-server.at:1338;weak references;ovsdb server positive tcp;
-1790;ovsdb-server.at:1338;immutable columns;ovsdb server positive tcp;
-1791;ovsdb-server.at:1338;garbage collection;ovsdb server positive tcp;
-1792;ovsdb-server.at:1375;insert default row, query table;ovsdb server positive tcp6;
-1793;ovsdb-server.at:1411;insert default row, query table;ovsdb server positive transient;
-1794;ovsdb-server.at:1411;insert row, query table;ovsdb server positive transient;
-1795;ovsdb-server.at:1411;insert row with uuid, query table;ovsdb server positive transient;
-1796;ovsdb-server.at:1411;insert rows, query by value;ovsdb server positive transient;
-1797;ovsdb-server.at:1411;insert rows, query by named-uuid;ovsdb server positive transient;
-1798;ovsdb-server.at:1411;insert rows, update rows by value;ovsdb server positive transient;
-1799;ovsdb-server.at:1411;insert rows, mutate rows;ovsdb server positive transient;
-1800;ovsdb-server.at:1411;insert rows, delete by named-uuid;ovsdb server positive transient;
-1801;ovsdb-server.at:1411;insert rows, delete rows by value;ovsdb server positive transient;
-1802;ovsdb-server.at:1411;insert rows, delete by (non-matching) value;ovsdb server positive transient;
-1803;ovsdb-server.at:1411;insert rows, delete all;ovsdb server positive transient;
-1804;ovsdb-server.at:1411;insert row, query table, commit;ovsdb server positive transient;
-1805;ovsdb-server.at:1411;insert row, query table, commit durably;ovsdb server positive transient;
-1806;ovsdb-server.at:1411;equality wait with correct rows;ovsdb server positive transient;
-1807;ovsdb-server.at:1411;equality wait with extra row;ovsdb server positive transient;
-1808;ovsdb-server.at:1411;equality wait with missing row;ovsdb server positive transient;
-1809;ovsdb-server.at:1411;inequality wait with correct rows;ovsdb server positive transient;
-1810;ovsdb-server.at:1411;inequality wait with extra row;ovsdb server positive transient;
-1811;ovsdb-server.at:1411;inequality wait with missing row;ovsdb server positive transient;
-1812;ovsdb-server.at:1411;insert and update constraints;ovsdb server positive transient;
-1813;ovsdb-server.at:1411;index uniqueness checking;ovsdb server positive transient;
-1814;ovsdb-server.at:1411;referential integrity -- simple;ovsdb server positive transient;
-1815;ovsdb-server.at:1411;referential integrity -- mutual references;ovsdb server positive transient;
-1816;ovsdb-server.at:1411;weak references;ovsdb server positive transient;
-1817;ovsdb-server.at:1411;immutable columns;ovsdb server positive transient;
-1818;ovsdb-server.at:1411;garbage collection;ovsdb server positive transient;
-1819;ovsdb-server.at:1451;insert default row, query table;ovsdb server tcp replication;
-1820;ovsdb-server.at:1451;insert row, query table;ovsdb server tcp replication;
-1821;ovsdb-server.at:1451;insert row with uuid, query table;ovsdb server tcp replication;
-1822;ovsdb-server.at:1451;insert rows, query by value;ovsdb server tcp replication;
-1823;ovsdb-server.at:1451;insert rows, query by named-uuid;ovsdb server tcp replication;
-1824;ovsdb-server.at:1451;insert rows, update rows by value;ovsdb server tcp replication;
-1825;ovsdb-server.at:1451;insert rows, mutate rows;ovsdb server tcp replication;
-1826;ovsdb-server.at:1451;insert rows, delete by named-uuid;ovsdb server tcp replication;
-1827;ovsdb-server.at:1451;insert rows, delete rows by value;ovsdb server tcp replication;
-1828;ovsdb-server.at:1451;insert rows, delete by (non-matching) value;ovsdb server tcp replication;
-1829;ovsdb-server.at:1451;insert rows, delete all;ovsdb server tcp replication;
-1830;ovsdb-server.at:1451;insert row, query table, commit;ovsdb server tcp replication;
-1831;ovsdb-server.at:1451;insert row, query table, commit durably;ovsdb server tcp replication;
-1832;ovsdb-server.at:1451;equality wait with correct rows;ovsdb server tcp replication;
-1833;ovsdb-server.at:1451;equality wait with extra row;ovsdb server tcp replication;
-1834;ovsdb-server.at:1451;equality wait with missing row;ovsdb server tcp replication;
-1835;ovsdb-server.at:1451;inequality wait with correct rows;ovsdb server tcp replication;
-1836;ovsdb-server.at:1451;inequality wait with extra row;ovsdb server tcp replication;
-1837;ovsdb-server.at:1451;inequality wait with missing row;ovsdb server tcp replication;
-1838;ovsdb-server.at:1451;insert and update constraints;ovsdb server tcp replication;
-1839;ovsdb-server.at:1451;index uniqueness checking;ovsdb server tcp replication;
-1840;ovsdb-server.at:1451;referential integrity -- simple;ovsdb server tcp replication;
-1841;ovsdb-server.at:1451;referential integrity -- mutual references;ovsdb server tcp replication;
-1842;ovsdb-server.at:1451;weak references;ovsdb server tcp replication;
-1843;ovsdb-server.at:1451;immutable columns;ovsdb server tcp replication;
-1844;ovsdb-server.at:1451;garbage collection;ovsdb server tcp replication;
-1845;ovsdb-server.at:1505;insert monitored table, insert excluded table;ovsdb server tcp replication table-exclusion;
-1846;ovsdb-server.at:1505;insert monitored table, update excluded table;ovsdb server tcp replication table-exclusion;
-1847;ovsdb-server.at:1505;update monitored table, insert excluded table;ovsdb server tcp replication table-exclusion;
-1848;ovsdb-server.at:1505;update monitored table, update excluded table;ovsdb server tcp replication table-exclusion;
-1849;ovsdb-server.at:1505;delete monitored table, insert excluded table;ovsdb server tcp replication table-exclusion;
-1850;ovsdb-server.at:1505;delete monitored table, update excluded table;ovsdb server tcp replication table-exclusion;
-1851;ovsdb-server.at:1510;ovsdb-server/get-active-ovsdb-server;ovsdb server replication get-active;
-1852;ovsdb-server.at:1523;ovsdb-server/set-active-ovsdb-server;ovsdb server replication set-active;
-1853;ovsdb-server.at:1537;ovsdb-server/get-sync-exclude-tables;ovsdb server replication get-exclude-tables;
-1854;ovsdb-server.at:1550;ovsdb-server/set-sync-exclude-tables;ovsdb server replication set-exclude-tables;
-1855;ovsdb-server.at:1600;ovsdb-server/connect-active-server;ovsdb server replication connect-active-server;
-1856;ovsdb-server.at:1639;ovsdb-server/disconnect-active-server;ovsdb server replication disconnect-active-server;
-1857;ovsdb-server.at:1725;ovsdb-server/active-backup-role-switching;ovsdb server replication active-backup-switching;
-1858;ovsdb-server.at:1809;ovsdb-server prevent self replicating;ovsdb server replication;
-1859;ovsdb-server.at:1840;ovsdb-server/read-only db:ptcp connection;ovsdb server read-only;
-1860;ovsdb-server.at:1907;ovsdb-server replication with schema mismatch;ovsdb server replication;
-1861;ovsdb-client.at:3;ovsdb-client get-schema-version and get-schema-cksum;ovsdb client positive;
-1862;ovsdb-client.at:15;ovsdb-client backup and restore;ovsdb client positive;
-1863;ovsdb-client.at:122;ovsdb-client query;ovsdb client positive;
-1864;ovsdb-monitor.at:111;monitor insert into empty table;ovsdb server monitor positive;
-1865;ovsdb-monitor.at:123;monitor insert into populated table;ovsdb server monitor positive;
-1866;ovsdb-monitor.at:141;monitor delete;ovsdb server monitor positive;
-1867;ovsdb-monitor.at:159;monitor row update;ovsdb server monitor positive;
-1868;ovsdb-monitor.at:179;monitor no-op row updates;ovsdb server monitor positive;
-1869;ovsdb-monitor.at:202;monitor insert-and-update transaction;ovsdb server monitor positive;
-1870;ovsdb-monitor.at:225;monitor insert-update-and-delete transaction;ovsdb server monitor positive;
-1871;ovsdb-monitor.at:254;monitor weak reference change;ovsdb server monitor positive;
-1872;ovsdb-monitor.at:289;monitor insert-update-and-delete transaction;ovsdb server monitor positive;
-1873;ovsdb-monitor.at:340;monitor all operations;ovsdb server monitor positive;
-1874;ovsdb-monitor.at:360;monitor initial only;ovsdb server monitor positive;
-1875;ovsdb-monitor.at:367;monitor insert only;ovsdb server monitor positive;
-1876;ovsdb-monitor.at:374;monitor delete only;ovsdb server monitor positive;
-1877;ovsdb-monitor.at:382;monitor modify only;ovsdb server monitor positive;
-1878;ovsdb-monitor.at:392;monitor-cond empty condition;ovsdb server monitor monitor-cond positive;
-1879;ovsdb-monitor.at:423;monitor-cond multiple conditions;ovsdb server monitor monitor-cond positive;
-1880;ovsdb-monitor.at:451;monitor-cond delete from populated table;ovsdb server monitor monitor-cond positive;
-1881;ovsdb-monitor.at:476;monitor-cond insert due to modify;ovsdb server monitor monitor-cond positive;
-1882;ovsdb-monitor.at:500;monitor-cond delete due to modify;ovsdb server monitor monitor-cond positive;
-1883;ovsdb-monitor.at:524;monitor-cond condition non-monitored columns;ovsdb server monitor monitor-cond positive;
-1884;ovsdb-monitor.at:553;monitor-cond-change;ovsdb server monitor monitor-cond positive [[[\"name\",\"==\",\"one\"],[\"name\",\"==\",\"two\"]]], [[[\"name\",\"==\",\"one\"]]], [[false]], [[true]];
-1885;ovsdb-monitor.at:594;monitor-cond-change with many sessions pending;ovsdb server monitor monitor-cond negative;
-1886;ovsdb-monitor.at:665;monitor-cond-since not found;ovsdb server monitor monitor-cond-since positive;
-1887;ovsdb-monitor.at:719;monitor-cond-since db restart;ovsdb server monitor monitor-cond-since positive;
-1888;ovsdb-monitor.at:783;monitor-cond-since found but no new rows;ovsdb server monitor monitor-cond-since positive;
-1889;ovsdb-monitor.at:824;monitor-cond-since empty db;ovsdb server monitor monitor-cond-since positive;
-1890;ovsdb-monitor.at:847;monitor-cond-since condition change;ovsdb server monitor monitor-cond-since positive;
-1891;ovsdb-monitor.at:908;monitor-cond-since non-cluster;ovsdb server monitor monitor-cond-since positive;
-1892;ovsdb-monitor.at:961;monitor-cond-since non-cluster non-zero last_id;ovsdb server monitor monitor-cond-since negative;
-1893;ovsdb-idl.at:280;simple passive idl, initially empty, select empty - Python3 - ptcp;ovsdb server idl positive python with tcp socket;
-1894;ovsdb-idl.at:288;simple idl, initially empty, no ops - C;ovsdb server idl positive;
-1895;ovsdb-idl.at:288;simple idl, initially empty, no ops - C - tcp;ovsdb server idl positive tcp socket;
-1896;ovsdb-idl.at:288;simple idl, initially empty, no ops - C - tcp6;ovsdb server idl positive tcp6 socket;
-1897;ovsdb-idl.at:288;simple idl, initially empty, no ops - Python3;ovsdb server idl positive python;
-1898;ovsdb-idl.at:288;simple idl, initially empty, no ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1899;ovsdb-idl.at:288;simple idl, initially empty, no ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1900;ovsdb-idl.at:288;simple idl, initially empty, no ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1901;ovsdb-idl.at:288;simple idl, initially empty, no ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1902;ovsdb-idl.at:288;simple idl, initially empty, no ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1903;ovsdb-idl.at:288;simple idl, initially empty, no ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1904;ovsdb-idl.at:295;simple idl, initially empty, various ops - C;ovsdb server idl positive;
-1905;ovsdb-idl.at:295;simple idl, initially empty, various ops - C - tcp;ovsdb server idl positive tcp socket;
-1906;ovsdb-idl.at:295;simple idl, initially empty, various ops - C - tcp6;ovsdb server idl positive tcp6 socket;
-1907;ovsdb-idl.at:295;simple idl, initially empty, various ops - Python3;ovsdb server idl positive python;
-1908;ovsdb-idl.at:295;simple idl, initially empty, various ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1909;ovsdb-idl.at:295;simple idl, initially empty, various ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1910;ovsdb-idl.at:295;simple idl, initially empty, various ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1911;ovsdb-idl.at:295;simple idl, initially empty, various ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1912;ovsdb-idl.at:295;simple idl, initially empty, various ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1913;ovsdb-idl.at:295;simple idl, initially empty, various ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1914;ovsdb-idl.at:373;simple idl, initially populated - C;ovsdb server idl positive;
-1915;ovsdb-idl.at:373;simple idl, initially populated - C - tcp;ovsdb server idl positive tcp socket;
-1916;ovsdb-idl.at:373;simple idl, initially populated - C - tcp6;ovsdb server idl positive tcp6 socket;
-1917;ovsdb-idl.at:373;simple idl, initially populated - Python3;ovsdb server idl positive python;
-1918;ovsdb-idl.at:373;simple idl, initially populated - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1919;ovsdb-idl.at:373;simple idl, initially populated - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1920;ovsdb-idl.at:373;simple idl, initially populated - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1921;ovsdb-idl.at:373;simple idl, initially populated - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1922;ovsdb-idl.at:373;simple idl, initially populated - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1923;ovsdb-idl.at:373;simple idl, initially populated - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1924;ovsdb-idl.at:404;simple idl, writing via IDL - C;ovsdb server idl positive;
-1925;ovsdb-idl.at:404;simple idl, writing via IDL - C - tcp;ovsdb server idl positive tcp socket;
-1926;ovsdb-idl.at:404;simple idl, writing via IDL - C - tcp6;ovsdb server idl positive tcp6 socket;
-1927;ovsdb-idl.at:404;simple idl, writing via IDL - Python3;ovsdb server idl positive python;
-1928;ovsdb-idl.at:404;simple idl, writing via IDL - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1929;ovsdb-idl.at:404;simple idl, writing via IDL - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1930;ovsdb-idl.at:404;simple idl, writing via IDL - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1931;ovsdb-idl.at:404;simple idl, writing via IDL - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1932;ovsdb-idl.at:404;simple idl, writing via IDL - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1933;ovsdb-idl.at:404;simple idl, writing via IDL - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1934;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - C;ovsdb server idl positive;
-1935;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - C - tcp;ovsdb server idl positive tcp socket;
-1936;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - C - tcp6;ovsdb server idl positive tcp6 socket;
-1937;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - Python3;ovsdb server idl positive python;
-1938;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1939;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1940;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1941;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1942;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1943;ovsdb-idl.at:435;simple idl, writing via IDL with unicode - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1944;ovsdb-idl.at:462;simple idl, writing large data via IDL with unicode - Python3;ovsdb server idl positive python;
-1945;ovsdb-idl.at:474;simple idl, handling verification failure - C;ovsdb server idl positive;
-1946;ovsdb-idl.at:474;simple idl, handling verification failure - C - tcp;ovsdb server idl positive tcp socket;
-1947;ovsdb-idl.at:474;simple idl, handling verification failure - C - tcp6;ovsdb server idl positive tcp6 socket;
-1948;ovsdb-idl.at:474;simple idl, handling verification failure - Python3;ovsdb server idl positive python;
-1949;ovsdb-idl.at:474;simple idl, handling verification failure - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1950;ovsdb-idl.at:474;simple idl, handling verification failure - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1951;ovsdb-idl.at:474;simple idl, handling verification failure - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1952;ovsdb-idl.at:474;simple idl, handling verification failure - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1953;ovsdb-idl.at:474;simple idl, handling verification failure - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1954;ovsdb-idl.at:474;simple idl, handling verification failure - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1955;ovsdb-idl.at:505;simple idl, increment operation - C;ovsdb server idl positive;
-1956;ovsdb-idl.at:505;simple idl, increment operation - C - tcp;ovsdb server idl positive tcp socket;
-1957;ovsdb-idl.at:505;simple idl, increment operation - C - tcp6;ovsdb server idl positive tcp6 socket;
-1958;ovsdb-idl.at:505;simple idl, increment operation - Python3;ovsdb server idl positive python;
-1959;ovsdb-idl.at:505;simple idl, increment operation - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1960;ovsdb-idl.at:505;simple idl, increment operation - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1961;ovsdb-idl.at:505;simple idl, increment operation - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1962;ovsdb-idl.at:505;simple idl, increment operation - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1963;ovsdb-idl.at:505;simple idl, increment operation - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1964;ovsdb-idl.at:505;simple idl, increment operation - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1965;ovsdb-idl.at:517;simple idl, aborting - C;ovsdb server idl positive;
-1966;ovsdb-idl.at:517;simple idl, aborting - C - tcp;ovsdb server idl positive tcp socket;
-1967;ovsdb-idl.at:517;simple idl, aborting - C - tcp6;ovsdb server idl positive tcp6 socket;
-1968;ovsdb-idl.at:517;simple idl, aborting - Python3;ovsdb server idl positive python;
-1969;ovsdb-idl.at:517;simple idl, aborting - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1970;ovsdb-idl.at:517;simple idl, aborting - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1971;ovsdb-idl.at:517;simple idl, aborting - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1972;ovsdb-idl.at:517;simple idl, aborting - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1973;ovsdb-idl.at:517;simple idl, aborting - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1974;ovsdb-idl.at:517;simple idl, aborting - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1975;ovsdb-idl.at:531;simple idl, destroy without commit or abort - C;ovsdb server idl positive;
-1976;ovsdb-idl.at:531;simple idl, destroy without commit or abort - C - tcp;ovsdb server idl positive tcp socket;
-1977;ovsdb-idl.at:531;simple idl, destroy without commit or abort - C - tcp6;ovsdb server idl positive tcp6 socket;
-1978;ovsdb-idl.at:531;simple idl, destroy without commit or abort - Python3;ovsdb server idl positive python;
-1979;ovsdb-idl.at:531;simple idl, destroy without commit or abort - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1980;ovsdb-idl.at:531;simple idl, destroy without commit or abort - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1981;ovsdb-idl.at:531;simple idl, destroy without commit or abort - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1982;ovsdb-idl.at:531;simple idl, destroy without commit or abort - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1983;ovsdb-idl.at:531;simple idl, destroy without commit or abort - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1984;ovsdb-idl.at:531;simple idl, destroy without commit or abort - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1985;ovsdb-idl.at:545;simple idl, conditional, false condition - C;ovsdb server idl positive;
-1986;ovsdb-idl.at:545;simple idl, conditional, false condition - C - tcp;ovsdb server idl positive tcp socket;
-1987;ovsdb-idl.at:545;simple idl, conditional, false condition - C - tcp6;ovsdb server idl positive tcp6 socket;
-1988;ovsdb-idl.at:545;simple idl, conditional, false condition - Python3;ovsdb server idl positive python;
-1989;ovsdb-idl.at:545;simple idl, conditional, false condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
-1990;ovsdb-idl.at:545;simple idl, conditional, false condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-1991;ovsdb-idl.at:545;simple idl, conditional, false condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-1992;ovsdb-idl.at:545;simple idl, conditional, false condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1993;ovsdb-idl.at:545;simple idl, conditional, false condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-1994;ovsdb-idl.at:545;simple idl, conditional, false condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-1995;ovsdb-idl.at:561;simple idl, conditional, true condition - C;ovsdb server idl positive;
-1996;ovsdb-idl.at:561;simple idl, conditional, true condition - C - tcp;ovsdb server idl positive tcp socket;
-1997;ovsdb-idl.at:561;simple idl, conditional, true condition - C - tcp6;ovsdb server idl positive tcp6 socket;
-1998;ovsdb-idl.at:561;simple idl, conditional, true condition - Python3;ovsdb server idl positive python;
-1999;ovsdb-idl.at:561;simple idl, conditional, true condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2000;ovsdb-idl.at:561;simple idl, conditional, true condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2001;ovsdb-idl.at:561;simple idl, conditional, true condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2002;ovsdb-idl.at:561;simple idl, conditional, true condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2003;ovsdb-idl.at:561;simple idl, conditional, true condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2004;ovsdb-idl.at:561;simple idl, conditional, true condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2005;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - C;ovsdb server idl positive;
-2006;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - C - tcp;ovsdb server idl positive tcp socket;
-2007;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - C - tcp6;ovsdb server idl positive tcp6 socket;
-2008;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - Python3;ovsdb server idl positive python;
-2009;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2010;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2011;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2012;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2013;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2014;ovsdb-idl.at:577;simple idl, conditional, multiple clauses in condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2015;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - C;ovsdb server idl positive;
-2016;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - C - tcp;ovsdb server idl positive tcp socket;
-2017;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - C - tcp6;ovsdb server idl positive tcp6 socket;
-2018;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - Python3;ovsdb server idl positive python;
-2019;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2020;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2021;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2022;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2023;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2024;ovsdb-idl.at:599;simple idl, conditional, modify as insert due to condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2025;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - C;ovsdb server idl positive;
-2026;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - C - tcp;ovsdb server idl positive tcp socket;
-2027;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - C - tcp6;ovsdb server idl positive tcp6 socket;
-2028;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - Python3;ovsdb server idl positive python;
-2029;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2030;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2031;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2032;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2033;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2034;ovsdb-idl.at:615;simple idl, conditional, modify as delete due to condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2035;ovsdb-idl.at:642;simple idl, conditional, multiple tables - C;ovsdb server idl positive;
-2036;ovsdb-idl.at:642;simple idl, conditional, multiple tables - C - tcp;ovsdb server idl positive tcp socket;
-2037;ovsdb-idl.at:642;simple idl, conditional, multiple tables - C - tcp6;ovsdb server idl positive tcp6 socket;
-2038;ovsdb-idl.at:642;simple idl, conditional, multiple tables - Python3;ovsdb server idl positive python;
-2039;ovsdb-idl.at:642;simple idl, conditional, multiple tables - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2040;ovsdb-idl.at:642;simple idl, conditional, multiple tables - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2041;ovsdb-idl.at:642;simple idl, conditional, multiple tables - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2042;ovsdb-idl.at:642;simple idl, conditional, multiple tables - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2043;ovsdb-idl.at:642;simple idl, conditional, multiple tables - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2044;ovsdb-idl.at:642;simple idl, conditional, multiple tables - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2045;ovsdb-idl.at:681;self-linking idl, consistent ops - C;ovsdb server idl positive;
-2046;ovsdb-idl.at:681;self-linking idl, consistent ops - C - tcp;ovsdb server idl positive tcp socket;
-2047;ovsdb-idl.at:681;self-linking idl, consistent ops - C - tcp6;ovsdb server idl positive tcp6 socket;
-2048;ovsdb-idl.at:681;self-linking idl, consistent ops - Python3;ovsdb server idl positive python;
-2049;ovsdb-idl.at:681;self-linking idl, consistent ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2050;ovsdb-idl.at:681;self-linking idl, consistent ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2051;ovsdb-idl.at:681;self-linking idl, consistent ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2052;ovsdb-idl.at:681;self-linking idl, consistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2053;ovsdb-idl.at:681;self-linking idl, consistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2054;ovsdb-idl.at:681;self-linking idl, consistent ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2055;ovsdb-idl.at:725;self-linking idl, inconsistent ops - C;ovsdb server idl positive;
-2056;ovsdb-idl.at:725;self-linking idl, inconsistent ops - C - tcp;ovsdb server idl positive tcp socket;
-2057;ovsdb-idl.at:725;self-linking idl, inconsistent ops - C - tcp6;ovsdb server idl positive tcp6 socket;
-2058;ovsdb-idl.at:725;self-linking idl, inconsistent ops - Python3;ovsdb server idl positive python;
-2059;ovsdb-idl.at:725;self-linking idl, inconsistent ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2060;ovsdb-idl.at:725;self-linking idl, inconsistent ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2061;ovsdb-idl.at:725;self-linking idl, inconsistent ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2062;ovsdb-idl.at:725;self-linking idl, inconsistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2063;ovsdb-idl.at:725;self-linking idl, inconsistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2064;ovsdb-idl.at:725;self-linking idl, inconsistent ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2065;ovsdb-idl.at:773;self-linking idl, sets - C;ovsdb server idl positive;
-2066;ovsdb-idl.at:773;self-linking idl, sets - C - tcp;ovsdb server idl positive tcp socket;
-2067;ovsdb-idl.at:773;self-linking idl, sets - C - tcp6;ovsdb server idl positive tcp6 socket;
-2068;ovsdb-idl.at:773;self-linking idl, sets - Python3;ovsdb server idl positive python;
-2069;ovsdb-idl.at:773;self-linking idl, sets - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2070;ovsdb-idl.at:773;self-linking idl, sets - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2071;ovsdb-idl.at:773;self-linking idl, sets - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2072;ovsdb-idl.at:773;self-linking idl, sets - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2073;ovsdb-idl.at:773;self-linking idl, sets - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2074;ovsdb-idl.at:773;self-linking idl, sets - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2075;ovsdb-idl.at:823;external-linking idl, consistent ops - C;ovsdb server idl positive;
-2076;ovsdb-idl.at:823;external-linking idl, consistent ops - C - tcp;ovsdb server idl positive tcp socket;
-2077;ovsdb-idl.at:823;external-linking idl, consistent ops - C - tcp6;ovsdb server idl positive tcp6 socket;
-2078;ovsdb-idl.at:823;external-linking idl, consistent ops - Python3;ovsdb server idl positive python;
-2079;ovsdb-idl.at:823;external-linking idl, consistent ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2080;ovsdb-idl.at:823;external-linking idl, consistent ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2081;ovsdb-idl.at:823;external-linking idl, consistent ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2082;ovsdb-idl.at:823;external-linking idl, consistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2083;ovsdb-idl.at:823;external-linking idl, consistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2084;ovsdb-idl.at:823;external-linking idl, consistent ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2085;ovsdb-idl.at:841;singleton idl, constraints - C;ovsdb server idl positive;
-2086;ovsdb-idl.at:841;singleton idl, constraints - C - tcp;ovsdb server idl positive tcp socket;
-2087;ovsdb-idl.at:841;singleton idl, constraints - C - tcp6;ovsdb server idl positive tcp6 socket;
-2088;ovsdb-idl.at:841;singleton idl, constraints - Python3;ovsdb server idl positive python;
-2089;ovsdb-idl.at:841;singleton idl, constraints - Python3 - register_columns;ovsdb server idl positive python register_columns;
-2090;ovsdb-idl.at:841;singleton idl, constraints - Python3 - tcp;ovsdb server idl positive python with tcp socket;
-2091;ovsdb-idl.at:841;singleton idl, constraints - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
-2092;ovsdb-idl.at:841;singleton idl, constraints - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2093;ovsdb-idl.at:841;singleton idl, constraints - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
-2094;ovsdb-idl.at:841;singleton idl, constraints - Python3 - SSL;ovsdb server idl positive python with ssl socket;
-2095;ovsdb-idl.at:867;external-linking idl, insert ops - Python3;ovsdb server idl positive python;
-2096;ovsdb-idl.at:877;getattr idl, insert ops - Python3;ovsdb server idl positive python;
-2097;ovsdb-idl.at:886;row-from-json idl, whats this - Python3;ovsdb server idl positive python;
-2098;ovsdb-idl.at:903;idl handling of missing tables and columns - C;ovsdb server idl positive;
-2099;ovsdb-idl.at:992;simple idl, initially populated - Python3 - fetch;ovsdb server idl positive python increment fetch;
-2100;ovsdb-idl.at:1036;simple idl disable monitor-cond - Python3;ovsdb server idl python monitor;
-2101;ovsdb-idl.at:1129;track, simple idl, initially populated - C;ovsdb server idl tracking positive;
-2102;ovsdb-idl.at:1161;track, simple idl, initially empty, various ops - C;ovsdb server idl tracking positive;
-2103;ovsdb-idl.at:1255;map, simple2 idl-partial-update-map-column, initially populated - C;ovsdb server idl partial update map column positive;
-2104;ovsdb-idl.at:1273;partial-map idl - Python3;ovsdb server idl positive python;
-2105;ovsdb-idl.at:1304;set, simple3 idl-partial-update-set-column, initially populated - C;ovsdb server idl partial update set column positive;
-2106;ovsdb-idl.at:1324;partial-set idl - Python3;ovsdb server idl positive python;
-2107;ovsdb-idl.at:1355;simple idl verify notify - Python3;ovsdb server idl positive python notify;
-2108;ovsdb-idl.at:1355;simple idl verify notify - Python3 - SSL;ovsdb server idl positive python with ssl socket notify;
-2109;ovsdb-idl.at:1482;Compound_index, single column test  - C;ovsdb server idl compound_index_single_column compound_index positive 001: s=list000 i=1 b=true r=101.000000 i=10 r=110.000000 i=2 b=false r=102.000000 s=list001 r=120.000000 r=122.000000 i=4 r=130.000000 s=list005 i=5 s=list020 i=19 r=219.000000 i=20 r=220.000000 003:;
-2110;ovsdb-idl.at:1629;Compound_index, double column test  - C;ovsdb server idl compound_index_double_column compound_index positive 001: s=list000 i=1 b=true r=101.000000 i=10 r=110.000000 i=2 b=false r=102.000000 s=list001 r=120.000000 r=122.000000 i=4 r=130.000000 s=list005 i=5 s=list020 i=19 r=219.000000 i=20 r=220.000000 002: 003: 004:;
-2111;ovsdb-idl.at:1753;set, simple3 idl-compound-index-with-ref, initially populated - C;ovsdb server idl compound_index compound_index_with_ref positive;
-2112;ovsdb-idl.at:1780;Check Stream open block - C - tcp;check stream open block tcp;
-2113;ovsdb-idl.at:1781;Check Stream open block - C - tcp6;check stream open block tcp6;
-2114;ovsdb-idl.at:1815;Check Python IDL connects to leader - Python3 (leader only);ovsdb server idl python leader_only with tcp socket;
-2115;ovsdb-idl.at:1816;Check Python IDL reconnects to leader - Python3 (leader only);ovsdb server idl python leader_only with tcp socket;
-2116;ovsdb-idl.at:1840;simple idl, monitor_cond_since, cluster disconnect - C - tcp;ovsdb server idl positive tcp socket 000: change conditions 001: empty 002: 003: i=2 r=1 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> 004: 005: reconnect 006: 007: {\"error\":null,\"result\":[{\"count\":1}]} 008: i=1 r=2 uuid=<2> 009: done;
-2117;ovsdb-lock.at:21;ovsdb lock -- lock;ovsdb lock positive;
-2118;ovsdb-lock.at:37;ovsdb lock -- unlock;ovsdb lock positive;
-2119;ovsdb-lock.at:57;ovsdb lock -- steal;ovsdb lock positive;
-2120;ovsdb-rbac.at:3;ovsdb-server/rbac 2;ovsdb server rbac;
-2121;ovs-vsctl.at:131;ovs-vsctl connection retry;;
-2122;ovs-vsctl.at:175;add-br a;ovs-vsctl;
-2123;ovs-vsctl.at:185;add-br a, add-br a;ovs-vsctl;
-2124;ovs-vsctl.at:198;add-br a, add-br b;ovs-vsctl;
-2125;ovs-vsctl.at:213;add-br a, add-br b, del-br a;ovs-vsctl;
-2126;ovs-vsctl.at:223;add-br a, del-br a, add-br a;ovs-vsctl;
-2127;ovs-vsctl.at:243;add-br a, add-port a a1, add-port a a2;ovs-vsctl;
-2128;ovs-vsctl.at:257;add-br a, add-port a a1, add-port a a1;ovs-vsctl;
-2129;ovs-vsctl.at:272;add-br a b, add-port a a1, add-port b b1, del-br a;ovs-vsctl;
-2130;ovs-vsctl.at:294;add-br a, add-bond a bond0 a1 a2 a3;ovs-vsctl;
-2131;ovs-vsctl.at:316;add-bond-iface and del-bond-iface;ovs-vsctl;
-2132;ovs-vsctl.at:376;add-br a b, add-port a a1, add-port b b1, del-port a a1;ovs-vsctl;
-2133;ovs-vsctl.at:403;add-br a, add-bond a bond0 a1 a2 a3, del-port bond0;ovs-vsctl;
-2134;ovs-vsctl.at:420;external IDs;ovs-vsctl;
-2135;ovs-vsctl.at:476;controllers;controller ovs-vsctl;
-2136;ovs-vsctl.at:508;fail-mode;fail-mode ovs-vsctl;
-2137;ovs-vsctl.at:538;emer-reset;emer-reset ovs-vsctl;
-2138;ovs-vsctl.at:773;simple fake bridge (VLAN 9);ovs-vsctl fake-bridge;
-2139;ovs-vsctl.at:773;list bridges -- real and fake (VLAN 9);ovs-vsctl fake-bridge;
-2140;ovs-vsctl.at:773;simple fake bridge + del-br fake bridge (VLAN 9);ovs-vsctl fake-bridge;
-2141;ovs-vsctl.at:773;simple fake bridge + del-br real bridge (VLAN 9);ovs-vsctl fake-bridge;
-2142;ovs-vsctl.at:773;simple fake bridge + external IDs (VLAN 9);ovs-vsctl fake-bridge;
-2143;ovs-vsctl.at:773;simple fake bridge + del-port from parent (VLAN 9);ovs-vsctl fake-bridge del-port;
-2144;ovs-vsctl.at:774;simple fake bridge (VLAN 0);ovs-vsctl fake-bridge;
-2145;ovs-vsctl.at:774;list bridges -- real and fake (VLAN 0);ovs-vsctl fake-bridge;
-2146;ovs-vsctl.at:774;simple fake bridge + del-br fake bridge (VLAN 0);ovs-vsctl fake-bridge;
-2147;ovs-vsctl.at:774;simple fake bridge + del-br real bridge (VLAN 0);ovs-vsctl fake-bridge;
-2148;ovs-vsctl.at:774;simple fake bridge + external IDs (VLAN 0);ovs-vsctl fake-bridge;
-2149;ovs-vsctl.at:774;simple fake bridge + del-port from parent (VLAN 0);ovs-vsctl fake-bridge del-port;
-2150;ovs-vsctl.at:785;fake bridge on bond;ovs-vsctl fake-bridge;
-2151;ovs-vsctl.at:797;fake bridge on bond + del-br fake bridge;ovs-vsctl fake-bridge;
-2152;ovs-vsctl.at:809;fake bridge on bond + del-br real bridge;ovs-vsctl fake-bridge;
-2153;ovs-vsctl.at:821;managers;manager ovs-vsctl;
-2154;ovs-vsctl.at:851;database commands -- positive checks;ovs-vsctl;
-2155;ovs-vsctl.at:983;database commands -- negative checks;ovs-vsctl;
-2156;ovs-vsctl.at:1132;database commands -- conditions;ovs-vsctl;
-2157;ovs-vsctl.at:1266;database commands -- wait-until immediately true;ovs-vsctl;
-2158;ovs-vsctl.at:1280;database commands -- wait-until must wait;ovs-vsctl;
-2159;ovs-vsctl.at:1313;--id option on create, get commands;ovs-vsctl;
-2160;ovs-vsctl.at:1360;unreferenced record warnings;ovs-vsctl;
-2161;ovs-vsctl.at:1394;created row UUID is wrong in same execution;ovs-vsctl;
-2162;ovs-vsctl.at:1431;--all option on destroy command;ovs-vsctl;
-2163;ovs-vsctl.at:1480;add-port -- reserved names 1;;
-2164;ovs-vsctl.at:1512;add-port -- reserved names 2;;
-2165;ovs-vsctl.at:1550;naming in db commands;ovs-vsctl;
-2166;ovs-vsctl.at:1569;bootstrap ca cert;ovs-vsctl ssl;
-2167;ovs-vsctl.at:1596;peer ca cert;ovs-vsctl ssl;
-2168;ovs-vsctl.at:1623;TLS server name indication (SNI);ovsdb server positive ssl tls sni;
-2169;ovs-xapi-sync.at:3;ovs-xapi-sync;;
-2170;interface-reconfigure.at:695;non-VLAN, non-bond;interface-reconfigure;
-2171;interface-reconfigure.at:771;VLAN, non-bond;interface-reconfigure;
-2172;interface-reconfigure.at:845;Bond, non-VLAN;interface-reconfigure;
-2173;interface-reconfigure.at:933;VLAN on bond;interface-reconfigure;
-2174;interface-reconfigure.at:1032;Re-create port with different types;interface-reconfigure;
-2175;stp.at:3;STP example from IEEE 802.1D-1998;stp;
-2176;stp.at:27;STP example from IEEE 802.1D-2004 figures 17.4 and 17.5;stp;
-2177;stp.at:70;STP example from IEEE 802.1D-2004 figure 17.6;stp;
-2178;stp.at:96;STP example from IEEE 802.1D-2004 figure 17.7;stp;
-2179;stp.at:125;STP.io.1.1: Link Failure;stp;
-2180;stp.at:164;STP.io.1.2: Repeated Network;stp;
-2181;stp.at:188;STP.io.1.4: Network Initialization;stp;
-2182;stp.at:214;STP.io.1.5: Topology Change;stp;
-2183;stp.at:267;STP.op.1.1 and STP.op.1.2;stp;
-2184;stp.at:281;STP.op.1.4: All Ports Initialized to Designated Ports;stp;
-2185;stp.at:302;STP.op.3.1: Root Bridge Selection: Root ID Values;stp;
-2186;stp.at:322;STP.op.3.3: Root Bridge Selection: Bridge ID Values;stp;
-2187;stp.at:345;STP.op.3.3: Root Bridge Selection: Bridge ID Values;stp;
-2188;stp.at:390;STP - dummy interface;;
-2189;stp.at:467;STP - flush the fdb and mdb when topology changed;;
-2190;stp.at:597;STP - check link-state when stp is running;;
-2191;rstp.at:3;RSTP Single bridge;rstp;
-2192;rstp.at:13;RSTP Link failure;rstp;
-2193;rstp.at:32;RSTP Double link Failure;rstp;
-2194;rstp.at:74;RSTP example from IEEE 802.1D-2004 figures 17.4 and 17.5;rstp;
-2195;rstp.at:111;RSTP example from IEEE 802.1D-2004 figure 17.6;rstp;
-2196;rstp.at:131;RSTP example from IEEE 802.1D-2004 figure 17.7;rstp;
-2197;rstp.at:156;RSTP - dummy interface;;
-2198;vlog.at:3;vlog - Python3;;
-2199;vlog.at:110;vlog - vlog/reopen - C;;
-2200;vlog.at:144;vlog - vlog/reopen - Python3;;
-2201;vlog.at:171;vlog - vlog/reopen without log file - C;;
-2202;vlog.at:183;vlog - vlog/reopen without log file - Python3;;
-2203;vlog.at:195;vlog - vlog/reopen can't reopen log file - C;;
-2204;vlog.at:231;vlog - vlog/reopen can't reopen log file - Python3;;
-2205;vlog.at:258;vlog - vlog/close - C;;
-2206;vlog.at:298;vlog - vlog/close - Python3;;
-2207;vlog.at:332;vlog - vlog/set and vlog/list - C;;
-2208;vlog.at:378;vlog - vlog/set and vlog/list - Python3;;
-2209;vlog.at:428;vlog - RFC5424 facility;;
-2210;vlog.at:465;vlog - RFC5424 facility - Python3;;
-2211;vtep-ctl.at:168;add-ps a;vtep-ctl;
-2212;vtep-ctl.at:176;add-ps a, add-ps a;vtep-ctl;
-2213;vtep-ctl.at:186;add-ps a, add-ps b;vtep-ctl;
-2214;vtep-ctl.at:195;add-ps a, add-ps b, del-ps a;vtep-ctl;
-2215;vtep-ctl.at:204;add-ps a, del-ps a, add-ps a;vtep-ctl;
-2216;vtep-ctl.at:218;add-ps a, add-port a a1, add-port a a2;vtep-ctl;
-2217;vtep-ctl.at:231;add-ps a, add-port a a1, add-port a a1;vtep-ctl;
-2218;vtep-ctl.at:243;add-ps a b, add-port a a1, add-port b b1, del-ps a;vtep-ctl;
-2219;vtep-ctl.at:264;add-ps a b, add-port a a1, add-port b b1, del-port a a1;vtep-ctl;
-2220;vtep-ctl.at:281;add-ps a b, add-port a p1, add-port b p1, del-port a p1;vtep-ctl;
-2221;vtep-ctl.at:304;add-ls a;vtep-ctl;
-2222;vtep-ctl.at:312;add-ls a, add-ls a;vtep-ctl;
-2223;vtep-ctl.at:322;add-ls a, add-ls b;vtep-ctl;
-2224;vtep-ctl.at:331;add-ls a, add-ls b, del-ls a;vtep-ctl;
-2225;vtep-ctl.at:340;add-ls a, del-ls a, add-ls a;vtep-ctl;
-2226;vtep-ctl.at:354;add-ls a, get-replication-mode a;vtep-ctl;
-2227;vtep-ctl.at:365;add-ls a, set-replication-mode a source_node;vtep-ctl;
-2228;vtep-ctl.at:376;add-ls a, set-replication-mode a service_node;vtep-ctl;
-2229;vtep-ctl.at:391;add-lr a;vtep-ctl;
-2230;vtep-ctl.at:399;add-lr a, add-lr a;vtep-ctl;
-2231;vtep-ctl.at:409;add-lr a, add-lr b;vtep-ctl;
-2232;vtep-ctl.at:418;add-lr a, add-lr b, del-lr a;vtep-ctl;
-2233;vtep-ctl.at:427;add-lr a, del-lr a, add-lr a;vtep-ctl;
-2234;vtep-ctl.at:444;bind-ls ps1 pp1 300 ls1;vtep-ctl;
-2235;vtep-ctl.at:462;bind-ls ps1 pp1 300 ls1, bind-ls ps1 pp1 400 ls2;vtep-ctl;
-2236;vtep-ctl.at:484;bind-ls ps1 pp1 300, bind-ls ps2 pp2 300 ls2;vtep-ctl;
-2237;vtep-ctl.at:515;add-ucast-local ls1;vtep-ctl;
-2238;vtep-ctl.at:542;add-ucast-local ls1, overwrite;vtep-ctl;
-2239;vtep-ctl.at:562;add-ucast-local ls1, del-ucast-local ls1;vtep-ctl;
-2240;vtep-ctl.at:593;add-ucast-remote ls1;vtep-ctl;
-2241;vtep-ctl.at:620;add-ucast-remote ls1, overwrite;vtep-ctl;
-2242;vtep-ctl.at:640;add-ucast-remote ls1, del-ucast-remote ls1;vtep-ctl;
-2243;vtep-ctl.at:671;add-ucast-local ls1, add-ucast-remote ls1;vtep-ctl;
-2244;vtep-ctl.at:702;add-mcast-local ls1;vtep-ctl;
-2245;vtep-ctl.at:731;add-mcast-local ls1, del-mcast-local ls1;vtep-ctl;
-2246;vtep-ctl.at:768;add-mcast-remote ls1;vtep-ctl;
-2247;vtep-ctl.at:797;add-mcast-remote ls1, del-mcast-remote ls1;vtep-ctl;
-2248;vtep-ctl.at:834;add-mcast-local ls1, add-mcast-remote ls1;vtep-ctl;
-2249;vtep-ctl.at:869;add local and remote macs, clear-local-macs;vtep-ctl;
-2250;vtep-ctl.at:926;add local and remote macs, clear-remote-macs;vtep-ctl;
-2251;vtep-ctl.at:986;managers;manager vtep-ctl;
-2252;vtep-ctl.at:1013;show command;vtep-ctl show;
-2253;auto-attach.at:3;auto-attach - packets;auto-attach;
-2254;mcast-snooping.at:3;mcast - check multicasts to trunk ports are not duplicated;;
-2255;mcast-snooping.at:108;mcast - delete the port mdb when vlan configuration changed;;
-2256;mcast-snooping.at:165;mcast - delete the port mdb when port destroyed;;
-2257;packet-type-aware.at:3;ptap - legal flow entries in ptap bridge;;
-2258;packet-type-aware.at:34;ptap - triangle bridge setup with L2 and L3 GRE tunnels;;
-2259;packet-type-aware.at:515;ptap - check decap() prerequisits;;
-2260;packet-type-aware.at:544;ptap - check encap/decap VLAN tagged Ethernet frame;;
-2261;packet-type-aware.at:619;ptap - L3 over patch port;;
-2262;packet-type-aware.at:920;ptap - recirculate after packet_type change;;
-2263;nsh.at:7;nsh - matching;;
-2264;nsh.at:53;nsh - md1 encap over a veth link;;
-2265;nsh.at:187;nsh - md2 encap over a veth link;;
-2266;nsh.at:282;nsh - double encap over veth link using groups;;
-2267;nsh.at:462;nsh - triangle PTAP bridge setup with NSH over vxlan-gpe;;
-2268;drop-stats.at:3;drop-stats - cli tests;;
-2269;drop-stats.at:43;drop-stats - pipeline and recurssion drops;;
-2270;drop-stats.at:102;drop-stats - too many resubmit;;
-2271;drop-stats.at:129;drop-stats - stack too deep;;
-2272;drop-stats.at:155;drop-stats - too many mpls labels;;
+132;classifier.at:309;flow classifier - packet with extra padding;;
+133;check-structs.at:10;check struct tail padding;check-structs;
+134;check-structs.at:20;check struct internal alignment;check-structs;
+135;check-structs.at:31;check struct declared size;check-structs;
+136;check-structs.at:43;check wrong struct's declared size;check-structs;
+137;daemon.at:48;daemon;;
+138;daemon.at:78;daemon --monitor;;
+139;daemon.at:121;daemon --detach;;
+140;daemon.at:146;daemon --detach --monitor;;
+141;daemon.at:185;daemon --detach startup errors;;
+142;daemon.at:193;daemon --detach --monitor startup errors;;
+143;daemon.at:202;daemon --service;windows-service;
+144;daemon-py.at:3;daemon - Python3;python daemon;
+145;daemon-py.at:26;daemon --monitor - Python3;;
+146;daemon-py.at:60;daemon --monitor restart exit code - Python3;;
+147;daemon-py.at:94;daemon --detach - Python3;;
+148;daemon-py.at:116;daemon --detach --monitor - Python3;;
+149;daemon-py.at:155;daemon --detach startup errors - Python3;;
+150;daemon-py.at:162;daemon --detach --monitor startup errors - Python3;;
+151;daemon-py.at:170;daemon --detach closes standard fds - Python3;;
+152;daemon-py.at:189;daemon --detach --monitor closes standard fds - Python3;;
+153;ofp-actions.at:3;OpenFlow 1.0 action translation;ofp-actions of1.0;
+154;ofp-actions.at:331;OpenFlow 1.0 \"instruction\" translations;ofp-actions of1.0 instruction;
+155;ofp-actions.at:361;OpenFlow 1.1 action translation;ofp-actions of1.1;
+156;ofp-actions.at:504;OpenFlow 1.1 instruction translation;of1.1 instruction ofp-actions;
+157;ofp-actions.at:715;OpenFlow 1.2 action translation;ofp-actions of1.2;
+158;ofp-actions.at:741;OpenFlow 1.3 action translation;ofp-actions of1.3;
+159;ofp-actions.at:794;OpenFlow 1.5 action translation;ofp-actions of1.5;
+160;ofp-actions.at:821;ofp-actions - inconsistent MPLS actions;;
+161;ofp-actions.at:833;reg_load <-> set_field translation corner case;ofp-actions;
+162;ofp-actions.at:848;enqueue action for OF1.1+;ofp-actions;
+163;ofp-actions.at:865;mod_nw_ttl action for OF1.0;ofp-actions;
+164;ofp-actions.at:882;mod_nw_ecn action translation;ofp-actions;
+165;ofp-actions.at:927;action parsing errors;;
+166;ofp-print.at:3;empty;ofp-print;
+167;ofp-print.at:9;too short;ofp-print;
+168;ofp-print.at:17;wrong OpenFlow version;ofp-print;
+169;ofp-print.at:27;truncated message;ofp-print;
+170;ofp-print.at:35;message only uses part of buffer;ofp-print;
+171;ofp-print.at:44;OFPT_HELLO - ordinary;ofp-print;
+172;ofp-print.at:52;OFPT_HELLO with extra data;ofp-print;
+173;ofp-print.at:64;OFPT_HELLO with version bitmap;ofp-print;
+174;ofp-print.at:73;OFPT_HELLO with version bitmap and extra data;ofp-print;
+175;ofp-print.at:87;OFPT_HELLO with higher than supported version;ofp-print;
+176;ofp-print.at:106;OFPT_HELLO with contradictory version bitmaps;ofp-print;
+177;ofp-print.at:148;OFPT_ECHO_REQUEST, empty payload;ofp-print;
+178;ofp-print.at:155;OFPT_ECHO_REQUEST, 5-byte payload;ofp-print;
+179;ofp-print.at:163;OFPT_ECHO_REPLY, empty payload;ofp-print;
+180;ofp-print.at:170;OFPT_ECHO_REPLY, 5-byte payload;ofp-print;
+181;ofp-print.at:178;OFPT_FEATURES_REQUEST;ofp-print;
+182;ofp-print.at:185;OFPT_FEATURES_REPLY - OF1.0;ofp-print;
+183;ofp-print.at:235;OFPT_FEATURES_REPLY cut off mid-port - OF1.0;ofp-print;
+184;ofp-print.at:274;OFPT_FEATURES_REPLY - OF1.1;ofp-print;
+185;ofp-print.at:305;OFPT_FEATURES_REPLY cut off mid-port - OF1.1;ofp-print;
+186;ofp-print.at:334;OFPT_FEATURES_REPLY - OF1.2;ofp-print;
+187;ofp-print.at:365;OFPT_FEATURES_REPLY cut off mid-port - OF1.2;ofp-print;
+188;ofp-print.at:394;OFPT_FEATURES_REPLY - OF1.3;ofp-print;
+189;ofp-print.at:406;OFPT_FEATURES_REPLY - OF1.4;ofp-print;
+190;ofp-print.at:418;OFPT_FEATURES_REPLY - OF1.5;ofp-print;
+191;ofp-print.at:430;OFPT_FEATURES_REPLY - with auxiliary_id - OF1.3;ofp-print;
+192;ofp-print.at:442;OFPT_GET_CONFIG_REQUEST;ofp-print;
+193;ofp-print.at:449;OFPT_GET_CONFIG_REPLY, most common form;ofp-print;
+194;ofp-print.at:457;OFPT_GET_CONFIG_REPLY, frags and miss_send_len;ofp-print;
+195;ofp-print.at:464;OFPT_PACKET_IN - OF1.0;ofp-print;
+196;ofp-print.at:478;OFPT_PACKET_IN - OF1.0, with hex output of packet data;ofp-print;
+197;ofp-print.at:496;OFPT_PACKET_IN - OF1.1;ofp-print;
+198;ofp-print.at:511;OFPT_PACKET_IN - OF1.2;ofp-print;
+199;ofp-print.at:525;OFPT_PACKET_IN - OF1.2, with hex output of packet data;ofp-print;
+200;ofp-print.at:542;OFPT_PACKET_IN - OF1.3;ofp-print;
+201;ofp-print.at:557;OFPT_PACKET_IN - OF1.4;ofp-print;
+202;ofp-print.at:572;OFPT_PACKET_IN - OF1.5;ofp-print;
+203;ofp-print.at:587;OFPT_PACKET_IN - OF1.3, with hex output of packet data;ofp-print;
+204;ofp-print.at:605;OFPT_FLOW_REMOVED - OF1.0;ofp-print;
+205;ofp-print.at:619;OFPT_FLOW_REMOVED - OF1.2;ofp-print;
+206;ofp-print.at:630;OFPT_FLOW_REMOVED - OF1.3;ofp-print;
+207;ofp-print.at:641;OFPT_FLOW_REMOVED - OF1.5;ofp-print;
+208;ofp-print.at:657;OFPT_PORT_STATUS - OF1.0;ofp-print;
+209;ofp-print.at:675;OFPT_PORT_STATUS - OF1.1;ofp-print;
+210;ofp-print.at:694;OFPT_PORT_STATUS - OF1.4;ofp-print;
+211;ofp-print.at:714;OFPT_PACKET_OUT - OF1.0;ofp-print;
+212;ofp-print.at:728;OFPT_PACKET_OUT - OF1.0, with packet;ofp-print;
+213;ofp-print.at:743;OFPT_PACKET_OUT - OF1.0, with hex output of packet data;ofp-print;
+214;ofp-print.at:762;OFPT_PACKET_OUT - OF1.1;ofp-print;
+215;ofp-print.at:773;OFPT_PACKET_OUT - OF1.1, with packet;ofp-print;
+216;ofp-print.at:789;OFPT_PACKET_OUT - OF1.5;ofp-print packet-out;
+217;ofp-print.at:840;OFPT_PACKET_OUT - OF1.5, with packet;ofp-print packet-out;
+218;ofp-print.at:858;OFPT_FLOW_MOD - OF1.0 - low verbosity;ofp-print;
+219;ofp-print.at:876;OFPT_FLOW_MOD - OF1.1 - low verbosity;ofp-print;
+220;ofp-print.at:896;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
+221;ofp-print.at:916;OFPT_FLOW_MOD - OF1.0 - high verbosity;ofp-print;
+222;ofp-print.at:934;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
+223;ofp-print.at:953;OFPT_FLOW_MOD - OF1.3 - flags - low verbosity;ofp-print;
+224;ofp-print.at:971;OFPT_FLOW_MOD - OF1.2 - set-field ip_src;ofp-print;
+225;ofp-print.at:986;OFPT_FLOW_MOD - OF1.2 - set-field ip_dst;ofp-print;
+226;ofp-print.at:1001;OFPT_FLOW_MOD - OF1.2 - set-field sctp_src;ofp-print;
+227;ofp-print.at:1016;OFPT_FLOW_MOD - OF1.2 - set-field sctp_dst;ofp-print;
+228;ofp-print.at:1031;OFPT_FLOW_MOD - OF1.2 - experimenter OXM;ofp-print;
+229;ofp-print.at:1045;OFPT_FLOW_MOD - OF1.2 - set-field nd_target, nd_sll;ofp-print;
+230;ofp-print.at:1063;OFPT_FLOW_MOD - OF1.3 - meter;ofp-print;
+231;ofp-print.at:1074;OFPT_FLOW reply - OF1.2 - set-field ip_src;ofp-print;
+232;ofp-print.at:1091;OFPT_FLOW reply - OF1.2 - set-field ip_dst;ofp-print;
+233;ofp-print.at:1108;OFPT_FLOW reply - OF1.2 - set-field sctp_src;ofp-print;
+234;ofp-print.at:1125;OFPT_FLOW reply - OF1.2 - set-field sctp_dst;ofp-print;
+235;ofp-print.at:1142;OFPT_PORT_MOD - OF1.0;ofp-print;
+236;ofp-print.at:1155;OFPT_PORT_MOD - OF1.1;ofp-print;
+237;ofp-print.at:1169;OFPT_PORT_MOD - OF1.2;ofp-print;
+238;ofp-print.at:1183;OFPT_PORT_MOD - OF1.3;ofp-print;
+239;ofp-print.at:1197;OFPT_PORT_MOD - OF1.4;ofp-print;
+240;ofp-print.at:1211;OFPT_TABLE_MOD - OF1.1;ofp-print;
+241;ofp-print.at:1220;OFPT_TABLE_MOD - OF1.2;ofp-print;
+242;ofp-print.at:1229;OFPT_TABLE_MOD - OF1.3;ofp-print;
+243;ofp-print.at:1238;OFPT_TABLE_MOD - OF1.4;ofp-print;
+244;ofp-print.at:1247;OFPST_DESC request;ofp-print ofpt_stats_request;
+245;ofp-print.at:1254;OFPST_DESC reply;ofp-print ofpt_stats_reply;
+246;ofp-print.at:1334;OFPST_FLOW request - OF1.0;ofp-print ofpt_stats_request;
+247;ofp-print.at:1346;OFPST_FLOW request - OF1.2;ofp-print ofpt_stats_request;
+248;ofp-print.at:1358;OFPST_FLOW request - OF1.3;ofp-print ofpt_stats_request;
+249;ofp-print.at:1370;OFPST_FLOW request - OF1.5;ofp-print ofpt_stats_request;
+250;ofp-print.at:1382;OFPST_FLOW reply - OF1.0;ofp-print ofpt_stats_reply;
+251;ofp-print.at:1426;OFPST_FLOW reply - OF1.2;ofp-print ofpt_stats_reply;
+252;ofp-print.at:1461;OFPST_FLOW reply - OF1.5;ofp-print ofpt_stats_reply;
+253;ofp-print.at:1487;OFPST_AGGREGATE request - OF1.0;ofp-print ofpt_stats_request;
+254;ofp-print.at:1499;OFPST_AGGREGATE request - OF1.2;ofp-print ofpt_stats_request;
+255;ofp-print.at:1511;OFPST_AGGREGATE request - OF1.3;ofp-print ofpt_stats_request;
+256;ofp-print.at:1523;OFPST_AGGREGATE request - OF1.5;ofp-print ofpt_stats_request;
+257;ofp-print.at:1537;OFPST_AGGREGATE reply - OF1.0;ofp-print ofpt_stats_reply;
+258;ofp-print.at:1548;OFPST_AGGREGATE reply - OF1.2;ofp-print ofpt_stats_reply;
+259;ofp-print.at:1559;OFPST_AGGREGATE reply - OF1.3;ofp-print ofpt_stats_reply;
+260;ofp-print.at:1570;OFPST_AGGREGATE reply - OF1.5;ofp-print ofpt_stats_reply;
+261;ofp-print.at:1582;OFPST_TABLE request - OF1.0;ofp-print ofpt_stats_request;
+262;ofp-print.at:1589;OFPST_TABLE request - OF1.1;ofp-print ofpt_stats_request;
+263;ofp-print.at:1596;OFPST_TABLE request - OF1.2;ofp-print ofpt_stats_request;
+264;ofp-print.at:1603;OFPST_TABLE request - OF1.3;ofp-print ofpt_stats_request;
+265;ofp-print.at:1610;OFPST_TABLE reply - OF1.0;ofp-print ofpt_stats_reply;
+266;ofp-print.at:1628;OFPST_TABLE reply - OF1.2;ofp-print ofpt_stats_reply;
+267;ofp-print.at:1685;OFPST_TABLE reply - OF1.3;ofp-print ofpt_stats_reply;
+268;ofp-print.at:1702;OFPST_PORT request - 1.0;ofp-print ofpt_stats_request;
+269;ofp-print.at:1712;OFPST_PORT request - 1.1;ofp-print ofpt_stats_request;
+270;ofp-print.at:1722;OFPST_PORT request - 1.2;ofp-print ofpt_stats_request;
+271;ofp-print.at:1732;OFPST_PORT request - 1.3;ofp-print ofpt_stats_request;
+272;ofp-print.at:1742;OFPST_PORT reply - OF1.0;ofp-print ofpt_stats_reply;
+273;ofp-print.at:1785;OFPST_PORT reply - OF1.2;ofp-print ofpt_stats_reply;
+274;ofp-print.at:1820;OFPST_PORT reply - OF1.3;ofp-print ofpt_stats_reply;
+275;ofp-print.at:1859;OFPST_PORT reply - OF1.4;ofp-print ofpt_stats_reply;
+276;ofp-print.at:1879;OFPST_QUEUE request - OF1.0;ofp-print ofpt_stats_request;
+277;ofp-print.at:1889;OFPST_QUEUE request - OF1.1;ofp-print ofpt_stats_request;
+278;ofp-print.at:1899;OFPST_QUEUE request - OF1.2;ofp-print ofpt_stats_request;
+279;ofp-print.at:1909;OFPST_QUEUE request - OF1.3;ofp-print ofpt_stats_request;
+280;ofp-print.at:1919;OFPST_QUEUE reply - OF1.0;ofp-print ofpt_stats_reply;
+281;ofp-print.at:1946;OFPST_QUEUE reply - OF1.1;ofp-print ofpt_stats_reply;
+282;ofp-print.at:1973;OFPST_QUEUE reply - OF1.2;ofp-print ofpt_stats_reply;
+283;ofp-print.at:2000;OFPST_QUEUE reply - OF1.3;ofp-print ofpt_stats_reply;
+284;ofp-print.at:2033;OFPST_QUEUE reply - OF1.4;ofp-print ofpt_stats_reply;
+285;ofp-print.at:2067;NXST_GROUP request - OF1.0;ofp-print ofpt_stats_request;
+286;ofp-print.at:2076;OFPST_GROUP request - OF1.1;ofp-print ofpt_stats_request;
+287;ofp-print.at:2085;NXST_GROUP reply - OF1.0;ofp-print ofpt_stats_reply;
+288;ofp-print.at:2107;OFPST_GROUP reply - OF1.1;ofp-print ofpt_stats_reply;
+289;ofp-print.at:2127;OFPST_GROUP reply - OF1.3;ofp-print ofpt_stats_reply;
+290;ofp-print.at:2149;NXST_GROUP_DESC request - OF1.0;ofp-print ofpt_stats_request;
+291;ofp-print.at:2158;OFPST_GROUP_DESC request - OF1.1;ofp-print ofpt_stats_request;
+292;ofp-print.at:2166;OFPST_GROUP_DESC request - OF1.5;ofp-print ofpt_stats_request;
+293;ofp-print.at:2175;NXST_GROUP_DESC reply - OF1.0;ofp-print ofpt_stats_reply;
+294;ofp-print.at:2200;OFPST_GROUP_DESC reply - OF1.1;ofp-print ofpt_stats_request;
+295;ofp-print.at:2217;OFPST_GROUP_DESC reply - OF1.5;ofp-print ofpt_stats_reply;
+296;ofp-print.at:2242;NXST_GROUP_FEATURES request;ofp-print ofpt_stats_request;
+297;ofp-print.at:2250;OFPST_GROUP_FEATURES request;ofp-print ofpt_stats_request;
+298;ofp-print.at:2258;NXST_GROUP_FEATURES reply;ofp-print ofpt_stats_reply;
+299;ofp-print.at:2285;OFPST_GROUP_FEATURES reply;ofp-print ofpt_stats_reply;
+300;ofp-print.at:2312;OFPST_PORT_DESC request - OF1.0;ofp-print ofpt_stats_request;
+301;ofp-print.at:2319;OFPST_PORT_DESC request - OF1.5;ofp-print ofpt_stats_request;
+302;ofp-print.at:2328;OFPST_PORT_DESC reply - OF1.0;ofp-print ofpt_stats_reply;
+303;ofp-print.at:2347;OFPST_PORT_DESC reply - OF1.4;ofp-print ofpt_stats_reply;
+304;ofp-print.at:2368;OFPT_METER_MOD request - OF1.3;ofp-print;
+305;ofp-print.at:2379;OFPT_METER_MOD request - bad band - OF1.3;ofp-print;
+306;ofp-print.at:2391;OFPT_METER_MOD request - bad command - OF1.3;ofp-print;
+307;ofp-print.at:2401;OFPT_METER_MOD request - bad flags - OF1.3;ofp-print;
+308;ofp-print.at:2413;OFPST_METER request - OF1.3;ofp-print ofpt_stats_request;
+309;ofp-print.at:2420;OFPST_METER_CONFIG request - OF1.3;ofp-print ofpt_stats_request;
+310;ofp-print.at:2427;OFPST_METER_FEATURES request - OF1.3;ofp-print ofpt_stats_request;
+311;ofp-print.at:2434;OFPST_METER_FEATURES reply - OF1.3;ofp-print ofpt_stats_reply;
+312;ofp-print.at:2447;OFPST_METER_CONFIG reply - OF1.3;ofp-print ofpt_stats_reply;
+313;ofp-print.at:2467;OFPST_METER reply - OF1.3;ofp-print ofpt_stats_reply;
+314;ofp-print.at:2491;OFPST_TABLE_FEATURES request - OF1.3;ofp-print ofpt_stats_request;
+315;ofp-print.at:2657;OFPT_BARRIER_REQUEST - OF1.0;ofp-print;
+316;ofp-print.at:2664;OFPT_BARRIER_REQUEST - OF1.1;ofp-print;
+317;ofp-print.at:2671;OFPT_BARRIER_REQUEST - OF1.2;ofp-print;
+318;ofp-print.at:2678;OFPT_BARRIER_REQUEST - OF1.3;ofp-print;
+319;ofp-print.at:2685;OFPT_BARRIER_REPLY - OF1.0;ofp-print;
+320;ofp-print.at:2692;OFPT_BARRIER_REPLY - OF1.1;ofp-print;
+321;ofp-print.at:2699;OFPT_BARRIER_REPLY - OF1.2;ofp-print;
+322;ofp-print.at:2706;OFPT_BARRIER_REPLY - OF1.3;ofp-print;
+323;ofp-print.at:2713;OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.0;ofp-print;
+324;ofp-print.at:2720;OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.2;ofp-print;
+325;ofp-print.at:2728;OFPST_QUEUE_DESC request - OF1.4;ofp-print ofpt_queue_get_config_request;
+326;ofp-print.at:2737;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.0;ofp-print;
+327;ofp-print.at:2752;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.1;ofp-print;
+328;ofp-print.at:2767;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.2;ofp-print;
+329;ofp-print.at:2782;OFPT_QUEUE_GET_CONFIG_REPLY - OF1.3;ofp-print;
+330;ofp-print.at:2798;OFPST_QUEUE_DESC reply - OF1.4;ofp-print ofpt_queue_get_config_reply;
+331;ofp-print.at:2817;OFPT_SET_ASYNC - OF1.3;ofp-print;
+332;ofp-print.at:2846;OFPT_ROLE_REQUEST - OF1.2;ofp-print;
+333;ofp-print.at:2856;OFPT_ROLE_REQUEST - nochange - OF1.2;ofp-print;
+334;ofp-print.at:2866;NXT_ROLE_REQUEST;ofp-print;
+335;ofp-print.at:2876;OFPT_ROLE_REPLY - OF1.2;ofp-print;
+336;ofp-print.at:2886;NXT_ROLE_REPLY;ofp-print;
+337;ofp-print.at:2896;OFP_ROLE_STATUS - master, experimenter - OF1.3;ofp-print;
+338;ofp-print.at:2906;OFP_ROLE_STATUS - master, config - OF1.3;ofp-print;
+339;ofp-print.at:2916;OFP_ROLE_STATUS - master, config,generation - OF1.3;ofp-print;
+340;ofp-print.at:2926;OFP_ROLE_STATUS - master, experimenter - OF1.4;ofp-print;
+341;ofp-print.at:2936;OFP_ROLE_STATUS - master, config - OF1.4;ofp-print;
+342;ofp-print.at:2946;OFP_ROLE_STATUS - master, config,generation - OF1.4;ofp-print;
+343;ofp-print.at:2956;OFP_REQUESTFORWARD - OF1.4;ofp-print;
+344;ofp-print.at:2968;OFP_REQUESTFORWARD - OF1.4;ofp-print;
+345;ofp-print.at:2980;OFP_REQUESTFORWARD - OF1.4;ofp-print;
+346;ofp-print.at:2991;OFP_REQUESTFORWARD - OF1.4;ofp-print;
+347;ofp-print.at:3002;NXT_REQUESTFORWARD - inner NXT_GROUP_MOD;ofp-print;
+348;ofp-print.at:3029;NXT_REQUESTFORWARD - inner OFPT_GROUP_MOD - OF1.1;ofp-print;
+349;ofp-print.at:3056;ONFT_REQUESTFORWARD - inner OFPT_METER_MOD - OF1.3;ofp-print;
+350;ofp-print.at:3078;NXT_SET_PACKET_IN;ofp-print;
+351;ofp-print.at:3088;NXT_PACKET_IN;ofp-print;
+352;ofp-print.at:3109;NXT_PACKET_IN, with hex output of packet data;ofp-print;
+353;ofp-print.at:3134;NX_PACKET_IN2;ofp-print;
+354;ofp-print.at:3157;NXT_SET_ASYNC_CONFIG;ofp-print;
+355;ofp-print.at:3185;OFPT_SET_ASYNC_CONFIG;ofp-print;
+356;ofp-print.at:3212;OFPT_SET_ASYNC_CONFIG - invalid mask - OF1.4;ofp-print;
+357;ofp-print.at:3231;OFPT_SET_ASYNC_CONFIG - unsupported configuration - OF1.4;ofp-print;
+358;ofp-print.at:3250;NXT_SET_CONTROLLER_ID;ofp-print;
+359;ofp-print.at:3260;NXT_FLOW_MONITOR_CANCEL;ofp-print;
+360;ofp-print.at:3270;NXT_FLOW_MONITOR_PAUSED;ofp-print;
+361;ofp-print.at:3279;NXT_FLOW_MONITOR_RESUMED;ofp-print;
+362;ofp-print.at:3288;NXT_SET_FLOW_FORMAT;ofp-print;
+363;ofp-print.at:3299;NXT_FLOW_MOD, low verbosity;ofp-print;
+364;ofp-print.at:3315;NXT_FLOW_MOD, high verbosity;ofp-print;
+365;ofp-print.at:3329;NXT_GROUP_MOD add - OF1.0;ofp-print;
+366;ofp-print.at:3353;OFPT_GROUP_MOD - OF1.1;ofp-print;
+367;ofp-print.at:3369;OFPT_GROUP_MOD add - OF1.5;ofp-print;
+368;ofp-print.at:3390;OFPT_GROUP_MOD insert bucket - OF1.5;ofp-print;
+369;ofp-print.at:3408;NXT_FLOW_REMOVED;ofp-print;
+370;ofp-print.at:3424;NXT_FLOW_MOD_TABLE_ID;ofp-print;
+371;ofp-print.at:3434;NXT_RESUME;ofp-print;
+372;ofp-print.at:3446;NXST_FLOW request;ofp-print ofpt_stats_request;
+373;ofp-print.at:3456;NXST_FLOW reply;ofp-print ofpt_stats_reply;
+374;ofp-print.at:3610;NXST_AGGREGATE request;ofp-print ofpt_stats_request;
+375;ofp-print.at:3620;NXST_AGGREGATE reply;ofp-print ofpt_stats_reply;
+376;ofp-print.at:3631;NXST_FLOW_MONITOR request;ofp-print ofpt_stats_reply;
+377;ofp-print.at:3644;NXST_FLOW_MONITOR reply;ofp-print ofpt_stats_reply;
+378;ofp-print.at:3659;OFPT_BUNDLE_CONTROL - atomic OPEN_REQUEST;ofp-print bundle;
+379;ofp-print.at:3670;OFPT_BUNDLE_CONTROL - ordered OPEN_REQUEST;ofp-print bundle;
+380;ofp-print.at:3681;OFPT_BUNDLE_CONTROL - atomic ordered OPEN_REQUEST;ofp-print bundle;
+381;ofp-print.at:3692;OFPT_BUNDLE_CONTROL - OPEN_REPLY;ofp-print bundle;
+382;ofp-print.at:3703;OFPT_BUNDLE_CONTROL - CLOSE_REQUEST;ofp-print bundle;
+383;ofp-print.at:3714;OFPT_BUNDLE_CONTROL - CLOSE_REPLY;ofp-print bundle;
+384;ofp-print.at:3725;OFPT_BUNDLE_CONTROL - COMMIT_REQUEST;ofp-print bundle;
+385;ofp-print.at:3736;OFPT_BUNDLE_CONTROL - COMMIT_REPLY;ofp-print bundle;
+386;ofp-print.at:3747;OFPT_BUNDLE_CONTROL - DISCARD_REQUEST;ofp-print bundle;
+387;ofp-print.at:3758;OFPT_BUNDLE_CONTROL - DISCARD_REPLY;ofp-print bundle;
+388;ofp-print.at:3769;OFPT_BUNDLE_ADD_MESSAGE - verify xid;ofp-print bundle;
+389;ofp-print.at:3781;OFPT_BUNDLE_ADD_MESSAGE - reject OFPT_HELLO;ofp-print bundle;
+390;ofp-print.at:3795;OFPT_BUNDLE_ADD_MESSAGE - FLOW_MOD;ofp-print bundle;
+391;ofp-print.at:3815;OFPT_BUNDLE_ADD_MESSAGE - PORT_MOD;ofp-print bundle;
+392;ofp-print.at:3832;OFPT_BUNDLE_ADD_MESSAGE - GROUP_MOD;ofp-print bundle;
+393;ofp-print.at:3856;OFPT_BUNDLE_ADD_MESSAGE - PACKET_OUT;ofp-print bundle packet-out;
+394;ofp-print.at:3875;NXST_IPFIX_BRIDGE - request;ofp-print ofpt_stats_request;
+395;ofp-print.at:3885;NXST_IPFIX_BRIDGE - reply;ofp-print ofpt_stats_reply;
+396;ofp-print.at:3908;NXST_IPFIX_FLOW - request;ofp-print ofpt_stats_request;
+397;ofp-print.at:3918;NXST_IPFIX_FLOW - reply;ofp-print ofpt_stats_reply;
+398;ofp-print.at:3954;NXT_CT_FLUSH_ZONE;ofp-print;
+399;ofp-util.at:3;encoding hellos;;
+400;ofp-util.at:54;parsing key-value pairs;;
+401;ofp-errors.at:3;OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.0;ofp-print ofp-errors;
+402;ofp-errors.at:11;OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.1;ofp-print ofp-errors;
+403;ofp-errors.at:19;OFPT_ERROR with type OFPET_BAD_REQUEST - OF1.0;ofp-print ofp-errors;
+404;ofp-errors.at:29;OFPT_ERROR prints type of truncated inner messages;ofp-print ofp-errors;
+405;ofp-errors.at:46;OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.0;ofp-print ofp-errors;
+406;ofp-errors.at:54;OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.1;ofp-print ofp-errors;
+407;ofp-errors.at:64;OFPT_ERROR with type OFPFMFC_OVERLAP - OF1.0;ofp-print ofp-errors;
+408;ofp-errors.at:73;OFPT_ERROR with type OFPBIC_UNSUP_INST - OF1.1;ofp-print ofp-errors;
+409;ofp-errors.at:83;OFPT_ERROR with type OFPBIC_DUP_INST - OF1.4;ofp-print ofp-errors;
+410;ofp-errors.at:97;encoding OFPBIC_* experimenter errors;ofp-print ofp-errors;
+411;ofp-errors.at:117;encoding errors extension that became official;ofp-print ofp-errors;
+412;ofp-errors.at:136;decoding OFPBIC_* experimenter errors;ofp-print ofp-errors;
+413;ofp-errors.at:152;decoding experimenter errors;ofp-print ofp-errors;
+414;ofp-errors.at:184;encoding experimenter errors;ofp-print ofp-errors;
+415;ovs-ofctl.at:3;ovs-ofctl parse-flows choice of protocol;;
+416;ovs-ofctl.at:182;ovs-ofctl parse-flows (OpenFlow 1.0);;
+417;ovs-ofctl.at:249;ovs-ofctl parse-flows (OpenFlow 1.1);;
+418;ovs-ofctl.at:288;ovs-ofctl parse-flows (OpenFlow 1.2);;
+419;ovs-ofctl.at:339;ovs-ofctl parse-flow with invalid mask;;
+420;ovs-ofctl.at:378;ovs-ofctl action inconsistency (OpenFlow 1.1);;
+421;ovs-ofctl.at:387;ovs-ofctl parse-flows (skb_priority);;
+422;ovs-ofctl.at:399;ovs-ofctl parse-flows (NXM);;
+423;ovs-ofctl.at:512;ovs-ofctl -F nxm parse-flows;;
+424;ovs-ofctl.at:591;ovs-ofctl -F nxm -mmm parse-flows;;
+425;ovs-ofctl.at:672;ovs-ofctl parse-nx-match;nx-match;
+426;ovs-ofctl.at:1286;ovs-ofctl parse-ofp10-match;of1.0;
+427;ovs-ofctl.at:1503;ovs-ofctl parse-ofp11-match;of1.1;
+428;ovs-ofctl.at:1829;ovs-ofctl parse-nx-match loose;nx-match;
+429;ovs-ofctl.at:1850;ovs-ofctl parse-oxm (OpenFlow 1.2);oxm;
+430;ovs-ofctl.at:2344;ovs-ofctl parse-oxm (OpenFlow 1.3);oxm;
+431;ovs-ofctl.at:2367;ovs-ofctl parse-oxm (OpenFlow 1.5);oxm;
+432;ovs-ofctl.at:2432;ovs-ofctl parse-oxm loose;oxm;
+433;ovs-ofctl.at:2453;experimenter OXM encoding;;
+434;ovs-ofctl.at:2501;check TCP flags expression in OXM and NXM;;
+435;ovs-ofctl.at:2533;ovs-ofctl check-vlan;vlan;
+436;ovs-ofctl.at:2630;ovs-ofctl -F option and NXM features;;
+437;ovs-ofctl.at:2645;ovs-ofctl -F option with flow_mods;;
+438;ovs-ofctl.at:2657;ovs-ofctl dump-flows honors -F option;;
+439;ovs-ofctl.at:2669;ovs-ofctl dump-flows rejects bad -F option;;
+440;ovs-ofctl.at:2678;ovs-ofctl add-flow reports non-normalized flows;;
+441;ovs-ofctl.at:2692;ovs-ofctl dump-flows with sorting;sort;
+442;ovs-ofctl.at:2795;ovs-ofctl dump-flows --names;port names;
+443;ovs-ofctl.at:2832;ovs-ofctl diff-flows;;
+444;ovs-ofctl.at:2856;ovs-ofctl diff-flows - tunnel metadata;;
+445;ovs-ofctl.at:2892;ovs-ofctl diff-flows - suppress false differences;;
+446;ovs-ofctl.at:2909;ovs-ofctl -F and -O interaction;;
+447;ovs-ofctl.at:2930;ovs-ofctl ofp-parse;;
+448;ovs-ofctl.at:2948;tcp flags - filtering;;
+449;ovs-ofctl.at:3017;ovs-ofctl rule with importance;;
+450;ovs-ofctl.at:3044;ovs-ofctl replace-flows with importance;;
+451;ovs-ofctl.at:3063;ovs-ofctl replace-flows with --bundle;;
+452;ovs-ofctl.at:3191;ovs-ofctl ct-flush-zone;;
+453;ovs-ofctl.at:3204;ovs-ofctl snoop;;
+454;fuzz-regression-list.at:1;fuzz regression - flow_extract_fuzzer-5112775280951296;;
+455;fuzz-regression-list.at:2;fuzz regression - flow_extract_fuzzer-5457710546944000;;
+456;fuzz-regression-list.at:3;fuzz regression - json_parser_fuzzer-4790908707930112;;
+457;fuzz-regression-list.at:4;fuzz regression - ofp_print_fuzzer-4584019764183040;;
+458;fuzz-regression-list.at:5;fuzz regression - ofp_print_fuzzer-4730143510626304;;
+459;fuzz-regression-list.at:6;fuzz regression - ofp_print_fuzzer-4854119633256448;;
+460;fuzz-regression-list.at:7;fuzz regression - ofp_print_fuzzer-5070973479944192;;
+461;fuzz-regression-list.at:8;fuzz regression - ofp_print_fuzzer-5072291707748352;;
+462;fuzz-regression-list.at:9;fuzz regression - ofp_print_fuzzer-5147430386401280;;
+463;fuzz-regression-list.at:10;fuzz regression - ofp_print_fuzzer-5168455220199424;;
+464;fuzz-regression-list.at:11;fuzz regression - ofp_print_fuzzer-5190507327127552;;
+465;fuzz-regression-list.at:12;fuzz regression - ofp_print_fuzzer-5204186701496320;;
+466;fuzz-regression-list.at:13;fuzz regression - ofp_print_fuzzer-5394482341085184;;
+467;fuzz-regression-list.at:14;fuzz regression - ofp_print_fuzzer-5395207246839808;;
+468;fuzz-regression-list.at:15;fuzz regression - ofp_print_fuzzer-5647458888581120;;
+469;fuzz-regression-list.at:16;fuzz regression - ofp_print_fuzzer-5674119268925440;;
+470;fuzz-regression-list.at:17;fuzz regression - ofp_print_fuzzer-5674419757252608;;
+471;fuzz-regression-list.at:18;fuzz regression - ofp_print_fuzzer-5677588436484096;;
+472;fuzz-regression-list.at:19;fuzz regression - ofp_print_fuzzer-5706562554298368;;
+473;fuzz-regression-list.at:20;fuzz regression - ofp_print_fuzzer-5722747668791296;;
+474;fuzz-regression-list.at:21;fuzz regression - ofp_print_fuzzer-6285128790704128;;
+475;fuzz-regression-list.at:22;fuzz regression - ofp_print_fuzzer-6470117922701312;;
+476;fuzz-regression-list.at:23;fuzz regression - ofp_print_fuzzer-6502620041576448;;
+477;odp.at:3;OVS datapath key parsing and formatting - valid forms;;
+478;odp.at:112;OVS datapath wildcarded key parsing and formatting - valid forms;;
+479;odp.at:199;OVS datapath wildcarded key filtering.;;
+480;odp.at:264;OVS datapath actions parsing and formatting - valid forms;;
+481;odp.at:392;OVS datapath actions parsing and formatting - invalid forms;;
+482;odp.at:400;OVS datapath actions parsing and formatting - userdata overflow;;
+483;odp.at:437;OVS datapath keys parsing and formatting - 33 nested encap ;;
+484;mpls-xlate.at:3;MPLS xlate action;;
+485;mpls-xlate.at:147;MPLS xlate action - patch-port;;
+486;mpls-xlate.at:191;MPLS xlate action - group bucket;;
+487;multipath.at:10;modulo_n multipath link selection;;
+488;multipath.at:78;hash_threshold multipath link selection;;
+489;multipath.at:146;hrw multipath link selection;;
+490;multipath.at:214;iter_hash multipath link selection;;
+491;multipath.at:282;modulo_n multipath symmetric_l3 link selection;;
+492;multipath.at:350;hash_threshold multipath symmetric_l3 link selection;;
+493;multipath.at:418;hrw multipath symmetric_l3 link selection;;
+494;multipath.at:486;iter_hash symmetric_l3 multipath link selection;;
+495;learn.at:3;learning action - parsing and formatting;;
+496;learn.at:28;learning action - parsing and formatting - illegal in_port_oxm;;
+497;learn.at:37;learning action - parsing and formatting - OXM;;
+498;learn.at:50;learning action - examples;;
+499;learn.at:68;learning action - satisfied prerequisites;;
+500;learn.at:83;learning action - invalid prerequisites;;
+501;learn.at:98;learning action - too-long immediate value;;
+502;learn.at:112;learning action - standard VLAN+MAC learning;;
+503;learn.at:178;learning action - learn refreshes hard_age;;
+504;learn.at:244;learning action - TCPv4 port learning;;
+505;learn.at:269;learning action - TCPv6 port learning;;
+506;learn.at:300;learning action - self-modifying flow;;
+507;learn.at:342;learning action - self-modifying flow with idle_timeout;;
+508;learn.at:400;learning action - self-modifying flow with hard_timeout;;
+509;learn.at:496;learning action - fin_timeout feature;;
+510;learn.at:510;learning action - delete_learned feature;;
+511;learn.at:628;learning action - delete_learned/limit with packet;;
+512;learn.at:666;learning action - limit;;
+513;learn.at:705;learning action - limit result_dst;;
+514;learn.at:738;learning action - different limits;;
+515;vconn.at:20;unix vconn - refuse connection;;
+516;vconn.at:20;unix vconn - accept then close;;
+517;vconn.at:20;unix vconn - read hello;;
+518;vconn.at:20;unix vconn - send plain hello;;
+519;vconn.at:20;unix vconn - send long hello;;
+520;vconn.at:20;unix vconn - send echo hello;;
+521;vconn.at:20;unix vconn - send short hello;;
+522;vconn.at:20;unix vconn - send invalid version hello;;
+523;vconn.at:21;tcp vconn - refuse connection;;
+524;vconn.at:21;tcp vconn - accept then close;;
+525;vconn.at:21;tcp vconn - read hello;;
+526;vconn.at:21;tcp vconn - send plain hello;;
+527;vconn.at:21;tcp vconn - send long hello;;
+528;vconn.at:21;tcp vconn - send echo hello;;
+529;vconn.at:21;tcp vconn - send short hello;;
+530;vconn.at:21;tcp vconn - send invalid version hello;;
+531;vconn.at:22;ssl vconn - refuse connection;;
+532;vconn.at:22;ssl vconn - accept then close;;
+533;vconn.at:22;ssl vconn - read hello;;
+534;vconn.at:22;ssl vconn - send plain hello;;
+535;vconn.at:22;ssl vconn - send long hello;;
+536;vconn.at:22;ssl vconn - send echo hello;;
+537;vconn.at:22;ssl vconn - send short hello;;
+538;vconn.at:22;ssl vconn - send invalid version hello;;
+539;file_name.at:13;components of \"/usr/lib\" are \"/usr\", \"lib\";dir_name base_name;
+540;file_name.at:14;components of \"/usr/\" are \"/\", \"usr\";dir_name base_name;
+541;file_name.at:15;components of \"usr\" are \".\", \"usr\";dir_name base_name;
+542;file_name.at:16;components of \"/\" are \"/\", \"/\";dir_name base_name;
+543;file_name.at:17;components of \".\" are \".\", \".\";dir_name base_name;
+544;file_name.at:18;components of \"..\" are \".\", \"..\";dir_name base_name;
+545;file_name.at:19;components of \"//\" are \"//\", \"//\";dir_name base_name;
+546;file_name.at:20;components of \"//foo\" are \"//\", \"foo\";dir_name base_name;
+547;file_name.at:21;components of \"\" are \".\", \".\";dir_name base_name;
+548;file_name.at:24;components of \"dir/file\" are \"dir\", \"file\";dir_name base_name;
+549;file_name.at:25;components of \"dir/file/\" are \"dir\", \"file\";dir_name base_name;
+550;file_name.at:26;components of \"dir/file//\" are \"dir\", \"file\";dir_name base_name;
+551;file_name.at:27;components of \"///foo\" are \"/\", \"foo\";dir_name base_name;
+552;file_name.at:37;follow_symlinks - relative symlinks;;
+553;file_name.at:54;follow_symlinks - absolute symlinks;;
+554;file_name.at:71;follow_symlinks - symlinks to directories;;
+555;file_name.at:84;follow_symlinks - nonexistent targets;;
+556;file_name.at:92;follow_symlinks - regular files;;
+557;file_name.at:97;follow_symlinks - device targets;;
+558;file_name.at:106;follow_symlinks - nonexistent files;;
+559;file_name.at:114;follow_symlinks - symlink loop;;
+560;aes128.at:10;wikipedia test vector 1;aes128;
+561;aes128.at:16;wikipedia test vector 2;aes128;
+562;aes128.at:22;NIST KAT ECBKeySbox128e vector 0;aes128;
+563;aes128.at:28;NIST KAT ECBKeySbox128e vector 1;aes128;
+564;aes128.at:34;NIST KAT ECBKeySbox128e vector 2;aes128;
+565;aes128.at:40;NIST KAT ECBKeySbox128e vector 3;aes128;
+566;aes128.at:46;NIST KAT ECBKeySbox128e vector 4;aes128;
+567;aes128.at:52;NIST KAT ECBKeySbox128e vector 5;aes128;
+568;aes128.at:58;NIST KAT ECBKeySbox128e vector 6;aes128;
+569;aes128.at:64;NIST KAT ECBKeySbox128e vector 7;aes128;
+570;aes128.at:70;NIST KAT ECBKeySbox128e vector 8;aes128;
+571;aes128.at:76;NIST KAT ECBKeySbox128e vector 9;aes128;
+572;aes128.at:82;NIST KAT ECBKeySbox128e vector 10;aes128;
+573;aes128.at:88;NIST KAT ECBKeySbox128e vector 11;aes128;
+574;aes128.at:94;NIST KAT ECBKeySbox128e vector 12;aes128;
+575;aes128.at:100;NIST KAT ECBKeySbox128e vector 13;aes128;
+576;aes128.at:106;NIST KAT ECBKeySbox128e vector 14;aes128;
+577;aes128.at:112;NIST KAT ECBKeySbox128e vector 15;aes128;
+578;aes128.at:118;NIST KAT ECBKeySbox128e vector 16;aes128;
+579;aes128.at:124;NIST KAT ECBKeySbox128e vector 17;aes128;
+580;aes128.at:130;NIST KAT ECBKeySbox128e vector 18;aes128;
+581;aes128.at:136;NIST KAT ECBKeySbox128e vector 19;aes128;
+582;aes128.at:142;NIST KAT ECBKeySbox128e vector 20;aes128;
+583;unixctl-py.at:6;unixctl ovs-vswitchd exit - Python3;python unixctl;
+584;unixctl-py.at:17;unixctl ovs-vswitchd list-commands - Python3;;
+585;unixctl-py.at:30;unixctl ovs-vswitchd arguments - Python3;;
+586;unixctl-py.at:71;unixctl bad target - Python3;;
+587;unixctl-py.at:89;unixctl server - Python3;;
+588;unixctl-py.at:158;unixctl server errors - Python3;;
+589;uuid.at:15;UUID generation, parsing, serialization;uuid;
+590;json.at:55;empty array - C;json positive;
+591;json.at:55;empty array - Python3;json positive python;
+592;json.at:56;single-element array - C;json positive;
+593;json.at:56;single-element array - Python3;json positive python;
+594;json.at:57;2-element array - C;json positive;
+595;json.at:57;2-element array - Python3;json positive python;
+596;json.at:58;many-element array - C;json positive;
+597;json.at:58;many-element array - Python3;json positive python;
+598;json.at:61;missing comma - C;json negative;
+599;json.at:61;missing comma - Python3;json negative python;
+600;json.at:63;trailing comma not allowed - C;json negative;
+601;json.at:63;trailing comma not allowed - Python3;json negative python;
+602;json.at:65;doubled comma not allowed - C;json negative;
+603;json.at:65;doubled comma not allowed - Python3;json negative python;
+604;json.at:70;empty string - C;json positive;
+605;json.at:70;empty string - Python3;json positive python;
+606;json.at:71;1-character strings - C;json positive;
+607;json.at:71;1-character strings - Python3;json positive python;
+608;json.at:74;escape sequences - C;json positive;
+609;json.at:74;escape sequences - Python3;json positive python;
+610;json.at:77;Unicode escape sequences - C;json positive;
+611;json.at:77;Unicode escape sequences - Python3;json positive python;
+612;json.at:80;surrogate pairs - C;json positive;
+613;json.at:83;a string by itself is not valid JSON - C;json negative;
+614;json.at:83;a string by itself is not valid JSON - Python3;json negative python;
+615;json.at:85;end of line in quoted string - C;json negative;
+616;json.at:85;end of line in quoted string - Python3;json negative python;
+617;json.at:89;formfeed in quoted string - C;json negative;
+618;json.at:89;formfeed in quoted string - Python3;json negative python;
+619;json.at:92;bad escape in quoted string - C;json negative;
+620;json.at:92;bad escape in quoted string - Python3;json negative python;
+621;json.at:95;\\u must be followed by 4 hex digits (1) - C;json negative;
+622;json.at:95;\\u must be followed by 4 hex digits (1) - Python3;json negative python;
+623;json.at:98;\\u must be followed by 4 hex digits (2) - C;json negative;
+624;json.at:98;\\u must be followed by 4 hex digits (2) - Python3;json negative python;
+625;json.at:101;isolated leading surrogate not allowed - C;json negative;
+626;json.at:101;isolated leading surrogate not allowed - Python3;json negative python;
+627;json.at:104;surrogatess must paired properly - C;json negative;
+628;json.at:104;surrogatess must paired properly - Python3;json negative python;
+629;json.at:107;null bytes not allowed - C;json negative;
+630;json.at:107;null bytes not allowed - Python3;json negative python;
+631;json.at:111;properly quoted backslash at end of string - C;json positive;
+632;json.at:111;properly quoted backslash at end of string - Python3;json positive python;
+633;json.at:114;stray backslash at end of string - C;json negative;
+634;json.at:114;stray backslash at end of string - Python3;json negative python;
+635;json.at:118;end of input in quoted string - C;json negative;
+636;json.at:127;empty object - C;json positive;
+637;json.at:127;empty object - Python3;json positive python;
+638;json.at:128;simple object - C;json positive;
+639;json.at:128;simple object - Python3;json positive python;
+640;json.at:131;bad value - C;json negative;
+641;json.at:131;bad value - Python3;json negative python;
+642;json.at:133;missing colon - C;json negative;
+643;json.at:133;missing colon - Python3;json negative python;
+644;json.at:135;missing comma - C;json negative;
+645;json.at:135;missing comma - Python3;json negative python;
+646;json.at:137;trailing comma not allowed - C;json negative;
+647;json.at:137;trailing comma not allowed - Python3;json negative python;
+648;json.at:140;doubled comma not allowed - C;json negative;
+649;json.at:140;doubled comma not allowed - Python3;json negative python;
+650;json.at:143;names must be strings - C;json negative;
+651;json.at:143;names must be strings - Python3;json negative python;
+652;json.at:149;null - C;json positive;
+653;json.at:149;null - Python3;json positive python;
+654;json.at:150;false - C;json positive;
+655;json.at:150;false - Python3;json positive python;
+656;json.at:151;true - C;json positive;
+657;json.at:151;true - Python3;json positive python;
+658;json.at:152;a literal by itself is not valid JSON - C;json negative;
+659;json.at:152;a literal by itself is not valid JSON - Python3;json negative python;
+660;json.at:154;nullify is invalid - C;json negative;
+661;json.at:154;nullify is invalid - Python3;json negative python;
+662;json.at:156;nubs is invalid - C;json negative;
+663;json.at:156;nubs is invalid - Python3;json negative python;
+664;json.at:158;xxx is invalid - C;json negative;
+665;json.at:158;xxx is invalid - Python3;json negative python;
+666;json.at:163;integers expressed as reals - C;json positive;
+667;json.at:163;integers expressed as reals - Python3;json positive python;
+668;json.at:173;large integers - C;json positive;
+669;json.at:173;large integers - Python3;json positive python;
+670;json.at:177;large integers expressed as reals - C;json positive;
+671;json.at:177;large integers expressed as reals - Python3;json positive python;
+672;json.at:185;C - large integers that overflow to reals;json positive;
+673;json.at:189;large integers that overflow to reals;json positive python;
+674;json.at:194;negative zero - C;json positive;
+675;json.at:194;negative zero - Python3;json positive python;
+676;json.at:199;reals - C;json positive;
+677;json.at:199;reals - Python3;json positive python;
+678;json.at:203;scientific notation - C;json positive;
+679;json.at:203;scientific notation - Python3;json positive python;
+680;json.at:210;C - +/- DBL_MAX;json positive;
+681;json.at:214;+/- DBL_MAX;json positive python;
+682;json.at:219;negative reals - C;json positive;
+683;json.at:219;negative reals - Python3;json positive python;
+684;json.at:223;negative scientific notation - C;json positive;
+685;json.at:223;negative scientific notation - Python3;json positive python;
+686;json.at:227;1e-9999 underflows to 0 - C;json positive;
+687;json.at:227;1e-9999 underflows to 0 - Python3;json positive python;
+688;json.at:231;a number by itself is not valid JSON - C;json negative;
+689;json.at:231;a number by itself is not valid JSON - Python3;json negative python;
+690;json.at:233;leading zeros not allowed - C;json negative;
+691;json.at:233;leading zeros not allowed - Python3;json negative python;
+692;json.at:237;1e9999 is too big - C;json negative;
+693;json.at:237;1e9999 is too big - Python3;json negative python;
+694;json.at:241;exponent bigger than INT_MAX;json negative;
+695;json.at:245;exponent smaller than INT_MIN;json negative;
+696;json.at:249;accumulated exponent bigger than INT_MAX;json negative;
+697;json.at:253;accumulated exponent smaller than INT_MIN;json negative;
+698;json.at:257;decimal point must be followed by digit - C;json negative;
+699;json.at:257;decimal point must be followed by digit - Python3;json negative python;
+700;json.at:261;exponent must contain at least one digit (1) - C;json negative;
+701;json.at:261;exponent must contain at least one digit (1) - Python3;json negative python;
+702;json.at:265;exponent must contain at least one digit (2) - C;json negative;
+703;json.at:265;exponent must contain at least one digit (2) - Python3;json negative python;
+704;json.at:269;exponent must contain at least one digit (3) - C;json negative;
+705;json.at:269;exponent must contain at least one digit (3) - Python3;json negative python;
+706;json.at:276;RFC 4267 object example - C;json positive;
+707;json.at:276;RFC 4267 object example - Python3;json positive python;
+708;json.at:292;RFC 4267 array example - C;json positive;
+709;json.at:292;RFC 4267 array example - Python3;json positive python;
+710;json.at:319;trailing garbage - C;json negative;
+711;json.at:319;trailing garbage - Python3;json negative python;
+712;json.at:321;formfeeds are not valid white space - C;json negative;
+713;json.at:321;formfeeds are not valid white space - Python3;json negative python;
+714;json.at:323;';' is not a valid token - C;json negative;
+715;json.at:323;';' is not a valid token - Python3;json negative python;
+716;json.at:325;arrays nesting too deep - C;json negative;
+717;json.at:325;arrays nesting too deep - Python3;json negative python;
+718;json.at:329;objects nesting too deep - C;json negative;
+719;json.at:329;objects nesting too deep - Python3;json negative python;
+720;json.at:334;input may not be empty;json negative;
+721;json.at:342;multiple adjacent objects - C;json positive;
+722;json.at:342;multiple adjacent objects - Python3;json positive python;
+723;json.at:347;multiple space-separated objects - C;json positive;
+724;json.at:347;multiple space-separated objects - Python3;json positive python;
+725;json.at:352;multiple objects on separate lines - C;json positive;
+726;json.at:352;multiple objects on separate lines - Python3;json positive python;
+727;json.at:359;multiple objects and arrays - C;json positive;
+728;json.at:359;multiple objects and arrays - Python3;json positive python;
+729;json.at:365;garbage between multiple objects - C;json negative;
+730;json.at:365;garbage between multiple objects - Python3;json negative python;
+731;json.at:369;garbage after multiple objects - C;json negative;
+732;json.at:369;garbage after multiple objects - Python3;json negative python;
+733;jsonrpc.at:3;JSON-RPC request and successful reply;;
+734;jsonrpc.at:12;JSON-RPC request and error reply;;
+735;jsonrpc.at:21;JSON-RPC notification;;
+736;jsonrpc-py.at:3;JSON-RPC request and successful reply - Python3;python jsonrpc;
+737;jsonrpc-py.at:13;JSON-RPC request and error reply - Python3;python jsonrpc;
+738;jsonrpc-py.at:23;JSON-RPC notification - Python3;python jsonrpc;
+739;tunnel.at:3;tunnel - input;;
+740;tunnel.at:65;tunnel - ECN decapsulation;;
+741;tunnel.at:113;tunnel - too long nested attributes;;
+742;tunnel.at:142;tunnel - output;;
+743;tunnel.at:175;tunnel - unencrypted tunnel and not setting skb_mark;;
+744;tunnel.at:193;tunnel - unencrypted tunnel and setting skb_mark to 1;;
+745;tunnel.at:211;tunnel - unencrypted tunnel and setting skb_mark to 2;;
+746;tunnel.at:240;tunnel - ToS and TTL inheritance;;
+747;tunnel.at:279;tunnel - set_tunnel;;
+748;tunnel.at:314;tunnel - key;;
+749;tunnel.at:364;tunnel - key match;;
+750;tunnel.at:414;tunnel - Geneve;;
+751;tunnel.at:426;tunnel - VXLAN;;
+752;tunnel.at:438;tunnel - table version;;
+753;tunnel.at:500;tunnel - LISP;;
+754;tunnel.at:512;tunnel - ERSPAN;;
+755;tunnel.at:555;tunnel - different VXLAN UDP port;;
+756;tunnel.at:584;ofproto-dpif - set_field - tun_src/tun_dst/tun_id;;
+757;tunnel.at:615;tunnel - ERSPAN v1/v2 metadata;;
+758;tunnel.at:735;tunnel - Geneve metadata;;
+759;tunnel.at:883;tunnel - Geneve option present;;
+760;tunnel.at:922;tunnel - concomitant IPv6 and IPv4 tunnels;;
+761;tunnel.at:948;tunnel - concomitant incompatible tunnels on the same port;;
+762;tunnel.at:964;tunnel - concomitant incompatible tunnels on different ports;;
+763;tunnel.at:978;tunnel - Mix Geneve/GRE options;;
+764;tunnel.at:1027;tunnel - neighbor entry add and deletion;;
+765;tunnel-push-pop.at:3;tunnel_push_pop - erspan;;
+766;tunnel-push-pop.at:201;tunnel_push_pop - action;;
+767;tunnel-push-pop.at:538;tunnel_push_pop - packet_out;;
+768;tunnel-push-pop.at:576;tunnel_push_pop - underlay bridge match;;
+769;tunnel-push-pop-ipv6.at:3;tunnel_push_pop_ipv6 - ip6gre;;
+770;tunnel-push-pop-ipv6.at:72;tunnel_push_pop_ipv6 - ip6erspan;;
+771;tunnel-push-pop-ipv6.at:191;tunnel_push_pop_ipv6 - action;;
+772;ovs-router.at:3;appctl - route/add with gateway;ovs_router;
+773;ovs-router.at:15;appctl - route/lookup;ovs_router;
+774;ovs-router.at:51;appctl - route/lookup6;ovs_router;
+775;lockfile.at:15;lock and unlock;lockfile;
+776;lockfile.at:17;lock and unlock twice;lockfile;
+777;lockfile.at:19;lock blocks same process;lockfile;
+778;lockfile.at:23;lock blocks same process twice;lockfile;
+779;lockfile.at:28;lock blocks other process;lockfile;
+780;lockfile.at:33;lock twice blocks other process;lockfile;
+781;lockfile.at:39;lock and unlock allows other process;lockfile;
+782;lockfile.at:41;lock multiple;lockfile;
+783;lockfile.at:45;lock symlink;lockfile;
+784;lockfile.at:52;lock symlink to dir;lockfile;
+785;reconnect.at:23;nothing happens if not enabled - C;reconnect;
+786;reconnect.at:23;nothing happens if not enabled - Python3;reconnect;
+787;reconnect.at:34;quick connect, idle disconnect - C;reconnect;
+788;reconnect.at:34;quick connect, idle disconnect - Python3;reconnect;
+789;reconnect.at:90;slow connect, idle disconnect - C;reconnect;
+790;reconnect.at:90;slow connect, idle disconnect - Python3;reconnect;
+791;reconnect.at:160;connect backs off - C;reconnect;
+792;reconnect.at:160;connect backs off - Python3;reconnect;
+793;reconnect.at:359;connections with no data preserve backoff - C;reconnect;
+794;reconnect.at:359;connections with no data preserve backoff - Python3;reconnect;
+795;reconnect.at:523;brief connection preserves backoff - C;reconnect;
+796;reconnect.at:523;brief connection preserves backoff - Python3;reconnect;
+797;reconnect.at:654;brief connection with data preserves backoff - C;reconnect;
+798;reconnect.at:654;brief connection with data preserves backoff - Python3;reconnect;
+799;reconnect.at:815;long connection resets backoff - C;reconnect;
+800;reconnect.at:815;long connection resets backoff - Python3;reconnect;
+801;reconnect.at:976;connection attempt fails quickly - C;reconnect;
+802;reconnect.at:976;connection attempt fails quickly - Python3;reconnect;
+803;reconnect.at:1031;backoff-free tries work - C;reconnect;
+804;reconnect.at:1031;backoff-free tries work - Python3;reconnect;
+805;reconnect.at:1085;max-tries of 1 honored - C;reconnect;
+806;reconnect.at:1085;max-tries of 1 honored - Python3;reconnect;
+807;reconnect.at:1145;max-tries of 0 honored - C;reconnect;
+808;reconnect.at:1145;max-tries of 0 honored - Python3;reconnect;
+809;reconnect.at:1161;passive mode - C;reconnect;
+810;reconnect.at:1161;passive mode - Python3;reconnect;
+811;ovs-vswitchd.at:7;ovs-vswitchd detaches correctly with empty db;;
+812;ovs-vswitchd.at:36;ovs-vswitchd -- stats-update-interval;;
+813;ovs-vswitchd.at:69;ovs-vswitchd -- start additional ovs-vswitchd process;;
+814;ovs-vswitchd.at:94;ovs-vswitchd -- switch over to another ovs-vswitchd process;;
+815;ovs-vswitchd.at:134;ovs-vswitchd -- invalid database path;;
+816;ovs-vswitchd.at:159;ovs-vswitchd -- set service controller;;
+817;ovs-vswitchd.at:176;ovs-vswitchd -- Compatible with OVSDB server - w/o monitor_cond;;
+818;ovs-vswitchd.at:197;ovs-vswitchd - do not create sockets with unsafe names;;
+819;ovs-vswitchd.at:230;ovs-vswitchd - set datapath IDs;;
+820;ofproto.at:3;ofproto - echo request;;
+821;ofproto.at:9;ofproto - handling messages with bad version;monitor;
+822;ofproto.at:33;ofproto - feature request, config request;;
+823;ofproto.at:50;ofproto - set OpenFlow port number;;
+824;ofproto.at:83;ofproto - port stats - (OpenFlow 1.0);;
+825;ofproto.at:94;ofproto - port stats - (OpenFlow 1.2);;
+826;ofproto.at:105;ofproto - port stats - (OpenFlow 1.4);;
+827;ofproto.at:122;ofproto - port-desc stats (OpenFlow 1.0);;
+828;ofproto.at:137;ofproto - port-desc stats (OpenFlow 1.2);;
+829;ofproto.at:150;ofproto - port-desc stats (OpenFlow 1.5);;
+830;ofproto.at:226;ofproto - queue stats - (OpenFlow 1.0);;
+831;ofproto.at:227;ofproto - queue stats - (OpenFlow 1.1);;
+832;ofproto.at:228;ofproto - queue stats - (OpenFlow 1.2);;
+833;ofproto.at:229;ofproto - queue stats - (OpenFlow 1.3);;
+834;ofproto.at:230;ofproto - queue stats - (OpenFlow 1.4);;
+835;ofproto.at:234;ofproto - queue configuration - (OpenFlow 1.0);;
+836;ofproto.at:256;ofproto - queue configuration - (OpenFlow 1.1);;
+837;ofproto.at:271;ofproto - queue configuration - (OpenFlow 1.2);;
+838;ofproto.at:293;ofproto - queue configuration - (OpenFlow 1.4);;
+839;ofproto.at:326;ofproto - del group (OpenFlow 1.0 extension);;
+840;ofproto.at:367;ofproto - del group (OpenFlow 1.1);;
+841;ofproto.at:408;ofproto - add indirect group;;
+842;ofproto.at:421;ofproto - group mod with mod and add_or_mod command;;
+843;ofproto.at:450;ofproto - del group (OpenFlow 1.5);;
+844;ofproto.at:490;ofproto - del group deletes flows;;
+845;ofproto.at:531;ofproto - insert group buckets;;
+846;ofproto.at:667;ofproto - remove group buckets;;
+847;ofproto.at:721;ofproto - bundle del group (OpenFlow 1.3);;
+848;ofproto.at:759;ofproto - bundle add indirect group;;
+849;ofproto.at:774;ofproto - bundle group mod with mod and add_or_mod command;;
+850;ofproto.at:800;ofproto - bundle del group (OpenFlow 1.5);;
+851;ofproto.at:835;ofproto - bundle del group deletes flows;;
+852;ofproto.at:876;ofproto - bundle insert group buckets;;
+853;ofproto.at:973;ofproto - bundle remove group buckets;;
+854;ofproto.at:1030;ofproto - flow mod checks group availability;;
+855;ofproto.at:1047;ofproto - bundle flow mod checks group availability;;
+856;ofproto.at:1067;ofproto - group description;;
+857;ofproto.at:1080;ofproto - group features (OpenFlow 1.0 extension);;
+858;ofproto.at:1106;ofproto - group features (OpenFlow 1.2);;
+859;ofproto.at:1132;ofproto - group stats (OpenFlow 1.0 extension);;
+860;ofproto.at:1156;ofproto - group stats (OpenFlow 1.1);;
+861;ofproto.at:1180;ofproto - group stats (OpenFlow 1.3);;
+862;ofproto.at:1204;ofproto - group stats (OpenFlow 1.5);;
+863;ofproto.at:1227;ofproto - group stats after insert a new bucket (OpenFlow 1.5);;
+864;ofproto.at:1244;ofproto - group add then bridge delete (OpenFlow 1.3);;
+865;ofproto.at:1259;ofproto - mod-port (OpenFlow 1.0);;
+866;ofproto.at:1294;ofproto - mod-port (OpenFlow 1.2);;
+867;ofproto.at:1326;ofproto - mod-port (OpenFlow 1.4);;
+868;ofproto.at:1359;ofproto - basic flow_mod commands (NXM);;
+869;ofproto.at:1381;ofproto - basic flow_mod commands (OpenFlow 1.0);;
+870;ofproto.at:1406;ofproto - add-flow and flags;;
+871;ofproto.at:1439;ofproto - basic flow_mod commands (OpenFlow 1.1);;
+872;ofproto.at:1462;ofproto - flow_mod negative test (OpenFlow 1.1);;
+873;ofproto.at:1476;ofproto - set-field flow_mod commands (NXM);;
+874;ofproto.at:1489;ofproto - basic flow_mod commands (OpenFlow 1.2);;
+875;ofproto.at:1508;ofproto - set-field flow_mod commands (OF1.2);;
+876;ofproto.at:1521;ofproto - dump flows with cookie;;
+877;ofproto.at:1545;ofproto - mod flow with cookie change (OpenFlow 1.0);;
+878;ofproto.at:1561;ofproto - mod flow with cookie change (NXM);;
+879;ofproto.at:1577;ofproto - no mod flow with cookie change (OpenFlow 1.1);;
+880;ofproto.at:1593;ofproto - no mod flow with cookie change (OpenFlow 1.2);;
+881;ofproto.at:1609;ofproto - mod flows based on cookie mask (OpenFlow 1.0);;
+882;ofproto.at:1631;ofproto - mod flows based on cookie mask (OpenFlow 1.1);;
+883;ofproto.at:1653;ofproto - mod flows based on cookie mask (OpenFlow 1.2);;
+884;ofproto.at:1676;ofproto - mod flows based on cookie mask with cookie change;;
+885;ofproto.at:1698;ofproto - mod flow with cookie miss (mask==0) - NXM;;
+886;ofproto.at:1708;ofproto - mod flow with cookie miss (mask==0) - OF1.1;;
+887;ofproto.at:1718;ofproto - mod flow with cookie miss (mask==0) - OF1.2;;
+888;ofproto.at:1727;ofproto - mod flow with cookie miss (mask!=0) - NXM;;
+889;ofproto.at:1736;ofproto - mod flow with cookie miss (mask!=0) - OF1.1;;
+890;ofproto.at:1745;ofproto - mod flow with cookie miss (mask!=0) - OF1.2;;
+891;ofproto.at:1754;ofproto - del flows with cookies;;
+892;ofproto.at:1773;ofproto - del flows based on cookie;;
+893;ofproto.at:1794;ofproto - del flows based on cookie mask;;
+894;ofproto.at:1813;ofproto - del flows based on table id (NXM);;
+895;ofproto.at:1845;ofproto - del flows based on table id (OpenFlow 1.1);;
+896;ofproto.at:1878;ofproto - del flows based on table id (OpenFlow 1.2);;
+897;ofproto.at:1910;ofproto - flow_mod with out_port matching (OpenFlow 1.0);;
+898;ofproto.at:1946;ofproto - flow_mod with out_port matching (OpenFlow 1.1);;
+899;ofproto.at:1982;ofproto - flow_mod with out_group matching (OpenFlow 1.1);;
+900;ofproto.at:2024;ofproto - bundle flow_mod with out group matching (OpenFlow 1.4);;
+901;ofproto.at:2074;ofproto - bundle packet-out (OpenFlow 1.4);;
+902;ofproto.at:2116;ofproto - bundle packet-out, failing bundle commit (OpenFlow 1.4);;
+903;ofproto.at:2157;ofproto - bundle packet-out makes bundle commit to fail(OpenFlow 1.4);;
+904;ofproto.at:2199;ofproto - flow table configuration (OpenFlow 1.0);;
+905;ofproto.at:2242;ofproto - hidden rules not in table stats;;
+906;ofproto.at:2277;ofproto - flow table configuration (OpenFlow 1.2);;
+907;ofproto.at:2342;ofproto - table features (OpenFlow 1.3);;
+908;ofproto.at:2405;ofproto - flow table names;;
+909;ofproto.at:2528;ofproto - table description (OpenFlow 1.4);;
+910;ofproto.at:2558;ofproto - hard limits on flow table size (OpenFlow 1.0);;
+911;ofproto.at:2604;ofproto - hard limits on flow table size (OpenFlow 1.2);;
+912;ofproto.at:2644;ofproto - eviction upon table overflow (OpenFlow 1.0);;
+913;ofproto.at:2703;ofproto - eviction upon table overflow (OpenFlow 1.2);;
+914;ofproto.at:2763;ofproto - eviction using importance upon table overflow (OpenFlow 1.4);;
+915;ofproto.at:2829;ofproto - eviction upon table overflow, with fairness (OpenFlow 1.0);;
+916;ofproto.at:2911;ofproto - eviction upon table overflow, with fairness (OpenFlow 1.2);;
+917;ofproto.at:2993;ofproto - eviction upon table overflow, with modified hard timeout;;
+918;ofproto.at:3037;ofproto - eviction upon table overflow, with modified idle timeout;;
+919;ofproto.at:3081;ofproto - asynchronous message control (OpenFlow 1.0);;
+920;ofproto.at:3183;ofproto - asynchronous message control (OpenFlow 1.2);;
+921;ofproto.at:3290;ofproto - asynchronous message control (OpenFlow 1.3);;
+922;ofproto.at:3409;ofproto - asynchronous message control (OpenFlow 1.4);;
+923;ofproto.at:3641;ofproto - asynchronous message control (OpenFlow 1.5);;
+924;ofproto.at:3719;ofproto - controller role (OpenFlow 1.2);;
+925;ofproto.at:3784;ofproto - controller role (OpenFlow 1.4);;
+926;ofproto.at:3850;ofproto - controller role (OpenFlow 1.3);;
+927;ofproto.at:3915;ofproto - requestforward (OpenFlow 1.4);;
+928;ofproto.at:4007;ofproto - NXT requestforward (OpenFlow 1.0);;
+929;ofproto.at:4105;ofproto - ONF requestforward (OpenFlow 1.3);;
+930;ofproto.at:4206;ofproto - packet-out from controller (OpenFlow 1.0);;
+931;ofproto.at:4242;ofproto - packet-out from controller (OpenFlow 1.2);;
+932;ofproto.at:4275;ofproto - packet-out from controller (OpenFlow 1.1);;
+933;ofproto.at:4305;ofproto - packet-out from controller (OpenFlow 1.5);;
+934;ofproto.at:4335;ofproto - packet-out with metadata and userdata (NXT_PACKET_IN2);;
+935;ofproto.at:4363;ofproto - packet-out with set_field metadata (OpenFlow 1.5);;
+936;ofproto.at:4390;ofproto - packet-out with set_field metadata with packet_type PT_ETH (OpenFlow 1.5);;
+937;ofproto.at:4417;ofproto - packet-out with set_field metadata with packet_type PT_IPV4 on PTAP bridge (OpenFlow 1.5);;
+938;ofproto.at:4445;ofproto - packet-out with metadata (NXM);;
+939;ofproto.at:4473;ofproto - packet-out with metadata (OpenFlow 1.2);;
+940;ofproto.at:4501;ofproto - packet-out with metadata and dual set_field (OpenFlow 1.3);;
+941;ofproto.at:4528;ofproto - packet-out with tunnel metadata (OpenFlow 1.2);;
+942;ofproto.at:4579;ofproto - flow monitoring;monitor;
+943;ofproto.at:4716;ofproto - flow monitoring with !own;monitor;
+944;ofproto.at:4757;ofproto - flow monitoring with out_port;monitor;
+945;ofproto.at:4809;ofproto - flow monitoring pause and resume;monitor;
+946;ofproto.at:4914;ofproto - flow monitoring usable protocols;monitor;
+947;ofproto.at:4935;ofproto - event filtering (OpenFlow 1.3);monitor;
+948;ofproto.at:4975;ofproto - ofport_request;;
+949;ofproto.at:5031;ofproto - bundle open (OpenFlow 1.4);monitor;
+950;ofproto.at:5055;ofproto - bundle double open (OpenFlow 1.4);monitor;
+951;ofproto.at:5087;ofproto - bundle close without open (OpenFlow 1.4);monitor;
+952;ofproto.at:5111;ofproto - bundle double close (OpenFlow 1.4);monitor;
+953;ofproto.at:5150;ofproto - bundle close, different flags (OpenFlow 1.4);monitor;
+954;ofproto.at:5182;ofproto - bundle commit without open (OpenFlow 1.4);monitor;
+955;ofproto.at:5207;ofproto - bundle commit, different flags (OpenFlow 1.4);monitor;
+956;ofproto.at:5239;ofproto - bundle discard without open (OpenFlow 1.4);monitor;
+957;ofproto.at:5265;ofproto - bundle with multiple flow mods (OpenFlow 1.4);;
+958;ofproto.at:5468;ofproto - failing bundle commit (OpenFlow 1.4);;
+959;ofproto.at:5515;ofproto - bundle timeout (OpenFlow 1.4);monitor;
+960;ofproto.at:5577;ofproto - bundle custom timeout (OpenFlow 1.4);monitor;
+961;ofproto.at:5642;ofproto - bundle reset timeout to default (OpenFlow 1.4);monitor;
+962;ofproto.at:5707;ofproto - bundle open (OpenFlow 1.3);monitor;
+963;ofproto.at:5734;ofproto - bundle double open (OpenFlow 1.3);monitor;
+964;ofproto.at:5769;ofproto - bundle close without open (OpenFlow 1.3);monitor;
+965;ofproto.at:5793;ofproto - bundle double close (OpenFlow 1.3);monitor;
+966;ofproto.at:5832;ofproto - bundle close, different flags (OpenFlow 1.3);monitor;
+967;ofproto.at:5864;ofproto - bundle commit without open (OpenFlow 1.3);monitor;
+968;ofproto.at:5889;ofproto - bundle commit, different flags (OpenFlow 1.3);monitor;
+969;ofproto.at:5921;ofproto - bundle discard without open (OpenFlow 1.3);monitor;
+970;ofproto.at:5947;ofproto - bundle with multiple flow mods (OpenFlow 1.3);;
+971;ofproto.at:6143;ofproto - failing bundle add message (OpenFlow 1.3);;
+972;ofproto.at:6190;ofproto - failing bundle commit (OpenFlow 1.3);;
+973;ofproto.at:6216;ofproto - monitor flows with tun_md;;
+974;ofproto.at:6261;ofproto - flow mod with tunnel metadata;ofp-actions;
+975;ofproto.at:6393;ofproto - flush flows, groups, and meters for controller change;flow flows group meter;
+976;dpif-netdev.at:62;dpif-netdev - netdev-dummy/receive;;
+977;dpif-netdev.at:119;dpif-netdev - dummy interface;;
+978;dpif-netdev.at:120;dpif-netdev - dummy-pmd interface;;
+979;dpif-netdev.at:161;dpif-netdev - miss upcall key matches flow_install - dummy;;
+980;dpif-netdev.at:162;dpif-netdev - miss upcall key matches flow_install - dummy-pmd;;
+981;dpif-netdev.at:214;dpif-netdev - datapath flow modification - dummy;;
+982;dpif-netdev.at:215;dpif-netdev - datapath flow modification - dummy-pmd;;
+983;dpif-netdev.at:260;dpif-netdev - miss upcall key matches flow_dump - dummy;;
+984;dpif-netdev.at:261;dpif-netdev - miss upcall key matches flow_dump - dummy-pmd;;
+985;dpif-netdev.at:263;dpif-netdev - meters;;
+986;dpif-netdev.at:429;dpif-netdev - partial hw offload - dummy;;
+987;dpif-netdev.at:430;dpif-netdev - partial hw offload - dummy-pmd;;
+988;dpif-netdev.at:507;dpif-netdev - partial hw offload with packet modifications - dummy;;
+989;dpif-netdev.at:508;dpif-netdev - partial hw offload with packet modifications - dummy-pmd;;
+990;pmd.at:66;PMD - creating a thread/add-port;;
+991;pmd.at:88;PMD - multiqueue support;;
+992;pmd.at:120;PMD - pmd-cpu-mask/distribution of rx queues;;
+993;pmd.at:184;PMD - stats;;
+994;pmd.at:254;PMD - reconfigure n_rxq;;
+995;pmd.at:317;PMD - same flow multiple threads;;
+996;pmd.at:360;PMD - change numa node;;
+997;pmd.at:438;PMD - non pmd device;;
+998;pmd.at:488;PMD - add remove ports;;
+999;pmd.at:532;PMD - rxq affinity;;
+1000;pmd.at:585;PMD - rxq affinity - NUMA;;
+1001;pmd.at:641;PMD - monitor threads;;
+1002;pmd.at:678;PMD - dpctl;;
+1003;dpctl.at:3;dpctl - add-dp del-dp;;
+1004;dpctl.at:19;dpctl - add-if set-if del-if;;
+1005;ofproto-dpif.at:26;ofproto-dpif - revalidator/wait;;
+1006;ofproto-dpif.at:32;ofproto-dpif - active-backup bonding;;
+1007;ofproto-dpif.at:79;ofproto-dpif - balance-slb bonding;;
+1008;ofproto-dpif.at:122;ofproto-dpif - balance-tcp bonding;;
+1009;ofproto-dpif.at:175;ofproto-dpif - balance-tcp bonding, different recirc flow ;;
+1010;ofproto-dpif.at:233;ofproto-dpif - resubmit;;
+1011;ofproto-dpif.at:252;ofproto-dpif - goto table;;
+1012;ofproto-dpif.at:266;ofproto-dpif - write actions;;
+1013;ofproto-dpif.at:283;ofproto-dpif - modify IPv6 Neighbor Solitication (ND);;
+1014;ofproto-dpif.at:302;ofproto-dpif - clear actions;;
+1015;ofproto-dpif.at:318;ofproto-dpif - group chaining;;
+1016;ofproto-dpif.at:331;ofproto-dpif - all group in action list;;
+1017;ofproto-dpif.at:346;ofproto-dpif - indirect group in action list;;
+1018;ofproto-dpif.at:358;ofproto-dpif - group actions have no effect afterwards;;
+1019;ofproto-dpif.at:378;ofproto-dpif - all group in action set;;
+1020;ofproto-dpif.at:393;ofproto-dpif - indirect group in action set;;
+1021;ofproto-dpif.at:405;ofproto-dpif - patch port with action set;;
+1022;ofproto-dpif.at:430;ofproto-dpif - select group;;
+1023;ofproto-dpif.at:465;ofproto-dpif - select group with watch port;;
+1024;ofproto-dpif.at:486;ofproto-dpif - select group with weights;;
+1025;ofproto-dpif.at:560;ofproto-dpif - select group with explicit dp_hash selection method;;
+1026;ofproto-dpif.at:599;ofproto-dpif - select group with legacy hash selection method;;
+1027;ofproto-dpif.at:631;ofproto-dpif - select group with custom hash selection method;;
+1028;ofproto-dpif.at:681;ofproto-dpif - fast failover group;;
+1029;ofproto-dpif.at:693;ofproto-dpif - group stats single bucket;;
+1030;ofproto-dpif.at:714;ofproto-dpif - group stats all buckets;;
+1031;ofproto-dpif.at:735;ofproto-dpif - registers;;
+1032;ofproto-dpif.at:772;ofproto-dpif - extended registers;;
+1033;ofproto-dpif.at:793;ofproto-dpif - extended-extended registers;;
+1034;ofproto-dpif.at:812;ofproto-dpif - load and move order;;
+1035;ofproto-dpif.at:826;ofproto-dpif - copy-field into extended registers;;
+1036;ofproto-dpif.at:846;ofproto-dpif - masked set-field into metadata;;
+1037;ofproto-dpif.at:868;ofproto-dpif - actset_output;;
+1038;ofproto-dpif.at:913;ofproto-dpif - push-pop;;
+1039;ofproto-dpif.at:932;ofproto-dpif - output;;
+1040;ofproto-dpif.at:953;ofproto-dpif - dec_ttl;;
+1041;ofproto-dpif.at:998;ofproto-dpif - dec_ttl without arguments at offset 32 in ofpacts;;
+1042;ofproto-dpif.at:1015;ofproto-dpif - dec_ttl with arguments at offset 32 in ofpacts;;
+1043;ofproto-dpif.at:1032;ofproto-dpif - note at offset 24 in ofpacts;;
+1044;ofproto-dpif.at:1046;ofproto-dpif - note action deep inside ofpacts;;
+1045;ofproto-dpif.at:1052;ofproto-dpif - output, OFPP_NONE ingress port;;
+1046;ofproto-dpif.at:1070;ofproto-dpif - DSCP;;
+1047;ofproto-dpif.at:1097;ofproto-dpif - output/flood flags;;
+1048;ofproto-dpif.at:1155;ofproto-dpif - Default Table Miss - OF1.0 (OFPTC_TABLE_MISS_CONTROLLER);;
+1049;ofproto-dpif.at:1189;ofproto-dpif - Default Table Miss - OF1.3 (OFPTC_TABLE_MISS_DROP);;
+1050;ofproto-dpif.at:1217;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTROLLER;;
+1051;ofproto-dpif.at:1253;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTROLLER;;
+1052;ofproto-dpif.at:1281;ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_CONTINUE;;
+1053;ofproto-dpif.at:1340;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTINUE;;
+1054;ofproto-dpif.at:1404;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTINUE;;
+1055;ofproto-dpif.at:1450;ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_DROP;;
+1056;ofproto-dpif.at:1478;ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_DROP;;
+1057;ofproto-dpif.at:1509;ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_DROP;;
+1058;ofproto-dpif.at:1540;ofproto-dpif - controller;;
+1059;ofproto-dpif.at:1809;ofproto-dpif - controller with slow-path action;;
+1060;ofproto-dpif.at:1839;ofproto-dpif - controller action without megaflows;;
+1061;ofproto-dpif.at:1910;ofproto-dpif - MPLS handling;;
+1062;ofproto-dpif.at:2960;ofproto-dpif - MPLS handling with goto_table;;
+1063;ofproto-dpif.at:3008;ofproto-dpif - MPLS handling with write_actions;;
+1064;ofproto-dpif.at:3056;ofproto-dpif - table-miss flow (OpenFlow 1.0);;
+1065;ofproto-dpif.at:3096;ofproto-dpif - table-miss flow (OpenFlow 1.3);;
+1066;ofproto-dpif.at:3137;ofproto-dpif - table-miss flow with async config (OpenFlow 1.3);;
+1067;ofproto-dpif.at:3211;ofproto-dpif - table-miss flow (OpenFlow 1.4);;
+1068;ofproto-dpif.at:3253;ofproto-dpif - packet-in reasons (Openflow 1.3);;
+1069;ofproto-dpif.at:3325;ofproto-dpif - packet-in reasons (Openflow 1.4);;
+1070;ofproto-dpif.at:3396;ofproto-dpif - packet-in reasons (Openflow 1.3);;
+1071;ofproto-dpif.at:3435;ofproto-dpif - ARP modification slow-path;;
+1072;ofproto-dpif.at:3464;ofproto-dpif - VLAN handling;;
+1073;ofproto-dpif.at:3616;ofproto-dpif - VLAN depth limit;;
+1074;ofproto-dpif.at:3645;ofproto-dpif - Multi-VLAN actions;;
+1075;ofproto-dpif.at:3702;ofproto-dpif - MPLS handling;;
+1076;ofproto-dpif.at:3817;ofproto-dpif - VLAN+MPLS handling;;
+1077;ofproto-dpif.at:4308;ofproto-dpif - fragment handling - trace;;
+1078;ofproto-dpif.at:4357;ofproto-dpif - fragment handling - upcall;;
+1079;ofproto-dpif.at:4432;ofproto-dpif - fragment handling - actions;;
+1080;ofproto-dpif.at:4537;ofproto-dpif - exit;;
+1081;ofproto-dpif.at:4562;ofproto-dpif - mirroring, select_all;mirror mirrors mirroring;
+1082;ofproto-dpif.at:4593;ofproto-dpif - mirroring, select_src;mirror mirrors mirroring;
+1083;ofproto-dpif.at:4622;ofproto-dpif - mirroring, OFPP_NONE ingress port;mirror mirrors mirroring;
+1084;ofproto-dpif.at:4644;ofproto-dpif - mirroring, select_dst;mirror mirrors mirroring;
+1085;ofproto-dpif.at:4675;ofproto-dpif - mirroring, select_vlan;mirror mirrors mirroring;
+1086;ofproto-dpif.at:4711;ofproto-dpif - mirroring, output_port;mirror mirrors mirroring;
+1087;ofproto-dpif.at:4741;ofproto-dpif - mirroring, output_vlan;mirror mirrors mirroring;
+1088;ofproto-dpif.at:4778;ofproto-dpif - multiple VLAN output mirrors;mirror mirrors mirroring;
+1089;ofproto-dpif.at:4807;ofproto-dpif - mirroring with recirculation;mirror mirrors mirroring;
+1090;ofproto-dpif.at:4833;ofproto-dpif - mirroring, select_all with snaplen;mirror mirrors mirroring;
+1091;ofproto-dpif.at:4863;ofproto-dpif - mirroring, select_all with snaplen and reset snaplen;mirror mirrors mirroring;
+1092;ofproto-dpif.at:4903;ofproto-dpif - mirroring, select_src with snaplen;mirror mirrors mirroring;
+1093;ofproto-dpif.at:4932;ofproto-dpif - mirroring, OFPP_NONE ingress port with snaplen;mirror mirrors mirroring;
+1094;ofproto-dpif.at:4953;ofproto-dpif - mirroring, select_dst with snaplen;mirror mirrors mirroring;
+1095;ofproto-dpif.at:4983;ofproto-dpif - mirroring, select_vlan with snaplen;mirror mirrors mirroring;
+1096;ofproto-dpif.at:5018;ofproto-dpif - mirroring, output_port with snaplen;mirror mirrors mirroring;
+1097;ofproto-dpif.at:5048;ofproto-dpif - mirroring, output_vlan with snaplen;mirror mirrors mirroring;
+1098;ofproto-dpif.at:5076;ofproto-dpif - multiple VLAN output mirrors with snaplen;mirror mirrors mirroring;
+1099;ofproto-dpif.at:5099;ofproto-dpif - resubmit with recirculation;;
+1100;ofproto-dpif.at:5126;ofproto-dpif - resubmit with tun_id;;
+1101;ofproto-dpif.at:5153;ofproto-dpif - recirculation after resubmit;;
+1102;ofproto-dpif.at:5177;ofproto-dpif - packet-out recirculation;;
+1103;ofproto-dpif.at:5205;ofproto-dpif - debug_slow action;;
+1104;ofproto-dpif.at:5332;ofproto-dpif - continuation - pause at end of pipeline;continuations pause resume;
+1105;ofproto-dpif.at:5335;ofproto-dpif - continuation - actions;continuations pause resume;
+1106;ofproto-dpif.at:5343;ofproto-dpif - continuation - resubmit;continuations pause resume;
+1107;ofproto-dpif.at:5351;ofproto-dpif - continuation - action set;continuations pause resume;
+1108;ofproto-dpif.at:5357;ofproto-dpif - continuation - data stack;continuations pause resume;
+1109;ofproto-dpif.at:5375;ofproto-dpif - continuation - mirroring;continuations pause resume;
+1110;ofproto-dpif.at:5386;ofproto-dpif - continuation - patch ports;continuations pause resume;
+1111;ofproto-dpif.at:5398;ofproto-dpif - continuation flow stats;continuations pause resume;
+1112;ofproto-dpif.at:5432;ofproto-dpif - continuation with conntrack;continuations pause resume;
+1113;ofproto-dpif.at:5467;ofproto-dpif - continuation with patch port;continuations pause resume;
+1114;ofproto-dpif.at:5509;ofproto-dpif - continuation after clone;continuations clone pause resume;
+1115;ofproto-dpif.at:5552;ofproto-dpif - ofproto/trace command 1;;
+1116;ofproto-dpif.at:5696;ofproto-dpif - ofproto/trace command 2;;
+1117;ofproto-dpif.at:5805;ofproto-dpif - ofproto/trace from dpctl output;;
+1118;ofproto-dpif.at:5852;ofproto-dpif - ofproto/trace-packet-out;;
+1119;ofproto-dpif.at:5882;ofproto-dpif - MAC learning;;
+1120;ofproto-dpif.at:5971;ofproto-dpif - MAC table overflow;;
+1121;ofproto-dpif.at:6031;ofproto-dpif - MAC table overflow fairness;;
+1122;ofproto-dpif.at:6504;ofproto-dpif - basic truncate action;;
+1123;ofproto-dpif.at:6580;ofproto-dpif - truncate and output to patch port;;
+1124;ofproto-dpif.at:6601;ofproto-dpif - truncate and output to gre tunnel;;
+1125;ofproto-dpif.at:6628;ofproto-dpif - sFlow packet sampling - IPv4 collector;;
+1126;ofproto-dpif.at:6632;ofproto-dpif - sFlow packet sampling - IPv6 collector;;
+1127;ofproto-dpif.at:6638;ofproto-dpif - sFlow packet sampling - LACP structures;;
+1128;ofproto-dpif.at:6695;ofproto-dpif - sFlow packet sampling - tunnel set;;
+1129;ofproto-dpif.at:6764;ofproto-dpif - sFlow packet sampling - tunnel push;;
+1130;ofproto-dpif.at:6866;ofproto-dpif - sFlow packet sampling - MPLS;;
+1131;ofproto-dpif.at:7002;ofproto-dpif - NetFlow flow expiration - IPv4 collector;;
+1132;ofproto-dpif.at:7006;ofproto-dpif - NetFlow flow expiration - IPv6 collector;;
+1133;ofproto-dpif.at:7086;ofproto-dpif - NetFlow active expiration - IPv4 collector;;
+1134;ofproto-dpif.at:7090;ofproto-dpif - NetFlow active expiration - IPv6 collector;;
+1135;ofproto-dpif.at:7098;ofproto-dpif - Bridge IPFIX sanity check;;
+1136;ofproto-dpif.at:7147;ofproto-dpif - Bridge IPFIX statistics check;;
+1137;ofproto-dpif.at:7191;ofproto-dpif - Flow IPFIX sanity check;;
+1138;ofproto-dpif.at:7241;ofproto-dpif - Flow IPFIX sanity check - tunnel set;;
+1139;ofproto-dpif.at:7313;ofproto-dpif - clone action;;
+1140;ofproto-dpif.at:7383;ofproto-dpif - Flow IPFIX statistics check;;
+1141;ofproto-dpif.at:7433;ofproto-dpif - flow stats;;
+1142;ofproto-dpif.at:7454;ofproto-dpif - flow stats reset_counts;;
+1143;ofproto-dpif.at:7627;ofproto-dpif - flow stats reset_counts OpenFlow1.5;;
+1144;ofproto-dpif.at:7713;ofproto-dpif - flow stats, set-n-threads;;
+1145;ofproto-dpif.at:7736;ofproto-dpif - idle_age and hard_age increase over time;;
+1146;ofproto-dpif.at:7826;ofproto-dpif - fin_timeout;;
+1147;ofproto-dpif.at:7860;ofproto-dpif - ovs-appctl dpif/dump-dps;;
+1148;ofproto-dpif.at:7872;ofproto-dpif - ovs-appctl dpif/show;;
+1149;ofproto-dpif.at:7891;ofproto-dpif - ovs-appctl dpif/dump-flows;;
+1150;ofproto-dpif.at:7949;ofproto-dpif - ovs-appctl dpif/get-flow;;
+1151;ofproto-dpif.at:7950;ofproto-dpif - ovs-appctl dpif/get-flow - pmd;;
+1152;ofproto-dpif.at:7952;ofproto-dpif - MPLS actions that result in a userspace action;;
+1153;ofproto-dpif.at:7988;ofproto-dpif - MPLS actions that result in a drop;;
+1154;ofproto-dpif.at:8026;ofproto-dpif - patch ports;;
+1155;ofproto-dpif.at:8101;ofproto-dpif - patch ports - stack;;
+1156;ofproto-dpif.at:8150;ofproto-dpif - port duration;;
+1157;ofproto-dpif.at:8170;ofproto-dpif megaflow - port classification;;
+1158;ofproto-dpif.at:8188;ofproto-dpif megaflow - L2 classification;;
+1159;ofproto-dpif.at:8206;ofproto-dpif megaflow - L3 classification;;
+1160;ofproto-dpif.at:8225;ofproto-dpif megaflow - IPv6 classification;;
+1161;ofproto-dpif.at:8244;ofproto-dpif megaflow - L4 classification;;
+1162;ofproto-dpif.at:8279;ofproto-dpif megaflow - normal;;
+1163;ofproto-dpif.at:8280;ofproto-dpif megaflow - normal - pmd;;
+1164;ofproto-dpif.at:8282;ofproto-dpif megaflow - mpls;;
+1165;ofproto-dpif.at:8328;ofproto-dpif megaflow - netflow - IPv4 collector;;
+1166;ofproto-dpif.at:8332;ofproto-dpif megaflow - netflow - IPv6 collector;;
+1167;ofproto-dpif.at:8360;ofproto-dpif megaflow - normal, active-backup bonding - dummy;;
+1168;ofproto-dpif.at:8361;ofproto-dpif megaflow - normal, active-backup bonding - dummy-pmd;;
+1169;ofproto-dpif.at:8363;ofproto-dpif megaflow - normal, balance-slb bonding;;
+1170;ofproto-dpif.at:8384;ofproto-dpif megaflow - normal, balance-tcp bonding;;
+1171;ofproto-dpif.at:8422;ofproto-dpif megaflow - resubmit port action;;
+1172;ofproto-dpif.at:8441;ofproto-dpif megaflow - resubmit table action;;
+1173;ofproto-dpif.at:8461;ofproto-dpif megaflow - goto_table action;;
+1174;ofproto-dpif.at:8480;ofproto-dpif megaflow - mirroring, select_all;mirror mirrors mirroring;
+1175;ofproto-dpif.at:8504;ofproto-dpif megaflow - mirroring, select_vlan;;
+1176;ofproto-dpif.at:8527;ofproto-dpif megaflow - move action;;
+1177;ofproto-dpif.at:8547;ofproto-dpif megaflow - push action;;
+1178;ofproto-dpif.at:8565;ofproto-dpif megaflow - learning;;
+1179;ofproto-dpif.at:8592;ofproto-dpif megaflow - tunnels;;
+1180;ofproto-dpif.at:8625;ofproto-dpif megaflow - dec_ttl;;
+1181;ofproto-dpif.at:8644;ofproto-dpif megaflow - set dl_dst;;
+1182;ofproto-dpif.at:8665;ofproto-dpif megaflow - set dl_dst with match on dl_src;;
+1183;ofproto-dpif.at:8723;ofproto-dpif megaflow - disabled;;
+1184;ofproto-dpif.at:8724;ofproto-dpif megaflow - disabled - pmd;;
+1185;ofproto-dpif.at:8726;ofproto-dpif - datapath port number change;;
+1186;ofproto-dpif.at:8748;ofproto - bundle with variable bfd/cfm config;;
+1187;ofproto-dpif.at:8826;ofproto-dpif - ofproto-dpif-monitor 1;;
+1188;ofproto-dpif.at:8873;ofproto-dpif - ofproto-dpif-monitor 2;;
+1189;ofproto-dpif.at:8888;ofproto-dpif - forward resubmit;;
+1190;ofproto-dpif.at:8905;ofproto-dpif - backward resubmit;;
+1191;ofproto-dpif.at:8925;ofproto-dpif - infinite resubmit;;
+1192;ofproto-dpif.at:8941;ofproto-dpif - backward resubmit without trace;;
+1193;ofproto-dpif.at:8964;ofproto-dpif - exponential resubmit chain;;
+1194;ofproto-dpif.at:8982;ofproto-dpif - too many output actions;;
+1195;ofproto-dpif.at:9000;ofproto-dpif - stack too deep;;
+1196;ofproto-dpif.at:9020;ofproto-dpif packet-out controller;;
+1197;ofproto-dpif.at:9064;ofproto-dpif packet-out controller (patch port);;
+1198;ofproto-dpif.at:9117;ofproto-dpif packet-out pipeline match field (OpenFlow 1.5);;
+1199;ofproto-dpif.at:9167;ofproto-dpif packet-out goto_table;;
+1200;ofproto-dpif.at:9221;ofproto-dpif packet-out table-miss (continue);;
+1201;ofproto-dpif.at:9271;ofproto-dpif - ICMPv6;;
+1202;ofproto-dpif.at:9291;ofproto-dpif - ICMPv6 type match;;
+1203;ofproto-dpif.at:9321;ofproto-dpif - Neighbor Discovery set-field with checksum update;;
+1204;ofproto-dpif.at:9343;ofproto-dpif - vlan matching;;
+1205;ofproto-dpif.at:9361;ofproto-dpif - in place modification;;
+1206;ofproto-dpif.at:9406;ofproto-dpif - in place modification (vlan);;
+1207;ofproto-dpif.at:9488;ofproto-dpif - trace (unchanged);;
+1208;ofproto-dpif.at:9500;ofproto-dpif - conntrack - controller;;
+1209;ofproto-dpif.at:9626;ofproto-dpif - conntrack - force commit;;
+1210;ofproto-dpif.at:9708;ofproto-dpif - conntrack - ipv6;;
+1211;ofproto-dpif.at:9758;ofproto-dpif - conntrack - output action;;
+1212;ofproto-dpif.at:9817;ofproto-dpif - conntrack - expiration;;
+1213;ofproto-dpif.at:9871;ofproto-dpif - conntrack - untrackable traffic;;
+1214;ofproto-dpif.at:9903;ofproto-dpif - conntrack - zones;;
+1215;ofproto-dpif.at:9968;ofproto-dpif - conntrack - recirc,commit;;
+1216;ofproto-dpif.at:10018;ofproto-dpif - conntrack - ICMP related;;
+1217;ofproto-dpif.at:10068;ofproto-dpif - conntrack - ct_mark;;
+1218;ofproto-dpif.at:10129;ofproto-dpif - conntrack - ct_label;;
+1219;ofproto-dpif.at:10177;ofproto-dpif - conntrack - ct_label datapath flow;;
+1220;ofproto-dpif.at:10225;ofproto-dpif - conntrack - no output;;
+1221;ofproto-dpif.at:10249;ofproto-dpif - conntrack - tcp port reuse;;
+1222;ofproto-dpif.at:10313;ofproto-dpif - conntrack - tcp pick up;;
+1223;ofproto-dpif.at:10398;ofproto-dpif - conntrack - disable tcp sequence checking;;
+1224;ofproto-dpif.at:10539;ofproto-dpif - conntrack - ct_clear;;
+1225;ofproto-dpif.at:10596;ofproto-dpif - conntrack - match masked ct fields;;
+1226;ofproto-dpif.at:10652;ofproto-dpif - conntrack - ofproto/trace;;
+1227;ofproto-dpif.at:10710;ofproto - set mtu;;
+1228;ofproto-dpif.at:10760;ofproto - fragment prerequisites;;
+1229;ofproto-dpif.at:10795;ofproto-dpif - check_pkt_larger action;;
+1230;ofproto-dpif.at:10922;ofproto-dpif - check_pkt_larger with continuation and ct;;
+1231;bridge.at:7;bridge - ports that disappear get added back;;
+1232;bridge.at:44;bridge - multiple bridges share a controller;;
+1233;bridge.at:83;bridge - add port after stopping controller;;
+1234;bridge.at:107;bridge - change ofproto versions;;
+1235;netdev-type.at:4;bridge - set MAC address of internal port;;
+1236;ovsdb-log.at:3;create empty, reread;ovsdb log;
+1237;ovsdb-log.at:18;write one, reread;ovsdb log;
+1238;ovsdb-log.at:35;check that create fails if file exists;ovsdb log;
+1239;ovsdb-log.at:60;write one, reread;ovsdb log;
+1240;ovsdb-log.at:81;write one, replace, commit;ovsdb log;
+1241;ovsdb-log.at:118;write one, replace, abort;ovsdb log;
+1242;ovsdb-log.at:155;write one, reread - alternative magic;ovsdb log;
+1243;ovsdb-log.at:182;write one, reread, append;ovsdb log;
+1244;ovsdb-log.at:212;write, reread one, overwrite;ovsdb log;
+1245;ovsdb-log.at:238;write, add corrupted data, read;ovsdb log;
+1246;ovsdb-log.at:260;write, add corrupted data, read, overwrite;ovsdb log;
+1247;ovsdb-log.at:292;write, corrupt some data, read, overwrite;ovsdb log;
+1248;ovsdb-log.at:325;write, truncate file, read, overwrite;ovsdb log;
+1249;ovsdb-log.at:358;write bad JSON, read, overwrite;ovsdb log;
+1250;ovsdb-types.at:3;integer - C;ovsdb positive;
+1251;ovsdb-types.at:3;integer - Python3;ovsdb positive python;
+1252;ovsdb-types.at:5;real - C;ovsdb positive;
+1253;ovsdb-types.at:5;real - Python3;ovsdb positive python;
+1254;ovsdb-types.at:7;boolean - C;ovsdb positive;
+1255;ovsdb-types.at:7;boolean - Python3;ovsdb positive python;
+1256;ovsdb-types.at:9;string - C;ovsdb positive;
+1257;ovsdb-types.at:9;string - Python3;ovsdb positive python;
+1258;ovsdb-types.at:11;uuid - C;ovsdb positive;
+1259;ovsdb-types.at:11;uuid - Python3;ovsdb positive python;
+1260;ovsdb-types.at:13;void is not a valid atomic-type - C;ovsdb negative;
+1261;ovsdb-types.at:13;void is not a valid atomic-type - Python3;ovsdb negative;
+1262;ovsdb-types.at:18;integer enum - C;ovsdb positive;
+1263;ovsdb-types.at:18;integer enum - Python3;ovsdb positive python;
+1264;ovsdb-types.at:21;integer >= 5 - C;ovsdb positive;
+1265;ovsdb-types.at:21;integer >= 5 - Python3;ovsdb positive python;
+1266;ovsdb-types.at:24;integer <= 7 - C;ovsdb positive;
+1267;ovsdb-types.at:24;integer <= 7 - Python3;ovsdb positive python;
+1268;ovsdb-types.at:27;integer between -5 and 10 - C;ovsdb positive;
+1269;ovsdb-types.at:27;integer between -5 and 10 - Python3;ovsdb positive python;
+1270;ovsdb-types.at:30;integer max may not be less than min - C;ovsdb negative;
+1271;ovsdb-types.at:30;integer max may not be less than min - Python3;ovsdb negative;
+1272;ovsdb-types.at:34;real enum - C;ovsdb positive;
+1273;ovsdb-types.at:34;real enum - Python3;ovsdb positive python;
+1274;ovsdb-types.at:37;real >= -1.5 - C;ovsdb positive;
+1275;ovsdb-types.at:37;real >= -1.5 - Python3;ovsdb positive python;
+1276;ovsdb-types.at:40;real <= 1e5 - C;ovsdb positive;
+1277;ovsdb-types.at:40;real <= 1e5 - Python3;ovsdb positive python;
+1278;ovsdb-types.at:43;real between -2.5 and 3.75 - C;ovsdb positive;
+1279;ovsdb-types.at:43;real between -2.5 and 3.75 - Python3;ovsdb positive python;
+1280;ovsdb-types.at:46;real max may not be less than min - C;ovsdb negative;
+1281;ovsdb-types.at:46;real max may not be less than min - Python3;ovsdb negative;
+1282;ovsdb-types.at:50;boolean - C;ovsdb positive;
+1283;ovsdb-types.at:50;boolean - Python3;ovsdb positive python;
+1284;ovsdb-types.at:52;boolean enum - C;ovsdb positive;
+1285;ovsdb-types.at:52;boolean enum - Python3;ovsdb positive python;
+1286;ovsdb-types.at:56;string enum - C;ovsdb positive;
+1287;ovsdb-types.at:56;string enum - Python3;ovsdb positive python;
+1288;ovsdb-types.at:59;string minLength - C;ovsdb positive;
+1289;ovsdb-types.at:59;string minLength - Python3;ovsdb positive python;
+1290;ovsdb-types.at:62;string maxLength - C;ovsdb positive;
+1291;ovsdb-types.at:62;string maxLength - Python3;ovsdb positive python;
+1292;ovsdb-types.at:65;string minLength and maxLength - C;ovsdb positive;
+1293;ovsdb-types.at:65;string minLength and maxLength - Python3;ovsdb positive python;
+1294;ovsdb-types.at:68;maxLength must not be less than minLength - C;ovsdb negative;
+1295;ovsdb-types.at:68;maxLength must not be less than minLength - Python3;ovsdb negative;
+1296;ovsdb-types.at:71;maxLength must not be negative - C;ovsdb negative;
+1297;ovsdb-types.at:71;maxLength must not be negative - Python3;ovsdb negative;
+1298;ovsdb-types.at:75;uuid enum - C;ovsdb positive;
+1299;ovsdb-types.at:75;uuid enum - Python3;ovsdb positive python;
+1300;ovsdb-types.at:78;uuid refTable - C;ovsdb positive;
+1301;ovsdb-types.at:78;uuid refTable - Python3;ovsdb positive python;
+1302;ovsdb-types.at:81;uuid refTable must be valid id - C;ovsdb negative;
+1303;ovsdb-types.at:81;uuid refTable must be valid id - Python3;ovsdb negative;
+1304;ovsdb-types.at:85;void is not a valid base-type - C;ovsdb negative;
+1305;ovsdb-types.at:85;void is not a valid base-type - Python3;ovsdb negative;
+1306;ovsdb-types.at:87;\"type\" member must be present - C;ovsdb negative;
+1307;ovsdb-types.at:87;\"type\" member must be present - Python3;ovsdb negative;
+1308;ovsdb-types.at:92;simple integer - C;ovsdb positive;
+1309;ovsdb-types.at:92;simple integer - Python3;ovsdb positive python;
+1310;ovsdb-types.at:94;simple real - C;ovsdb positive;
+1311;ovsdb-types.at:94;simple real - Python3;ovsdb positive python;
+1312;ovsdb-types.at:96;simple boolean - C;ovsdb positive;
+1313;ovsdb-types.at:96;simple boolean - Python3;ovsdb positive python;
+1314;ovsdb-types.at:98;simple string - C;ovsdb positive;
+1315;ovsdb-types.at:98;simple string - Python3;ovsdb positive python;
+1316;ovsdb-types.at:100;simple uuid - C;ovsdb positive;
+1317;ovsdb-types.at:100;simple uuid - Python3;ovsdb positive python;
+1318;ovsdb-types.at:102;integer in object - C;ovsdb positive;
+1319;ovsdb-types.at:102;integer in object - Python3;ovsdb positive python;
+1320;ovsdb-types.at:104;real in object with explicit min and max - C;ovsdb positive;
+1321;ovsdb-types.at:104;real in object with explicit min and max - Python3;ovsdb positive python;
+1322;ovsdb-types.at:107;key type is required - C;ovsdb negative;
+1323;ovsdb-types.at:107;key type is required - Python3;ovsdb negative;
+1324;ovsdb-types.at:109;void is not a valid type - C;ovsdb negative;
+1325;ovsdb-types.at:109;void is not a valid type - Python3;ovsdb negative;
+1326;ovsdb-types.at:114;optional boolean - C;ovsdb positive set;
+1327;ovsdb-types.at:114;optional boolean - Python3;ovsdb positive python set;
+1328;ovsdb-types.at:118;set of 1 to 3 uuids - C;ovsdb positive;
+1329;ovsdb-types.at:118;set of 1 to 3 uuids - Python3;ovsdb positive python;
+1330;ovsdb-types.at:121;set of 0 to 3 strings - C;ovsdb positive;
+1331;ovsdb-types.at:121;set of 0 to 3 strings - Python3;ovsdb positive python;
+1332;ovsdb-types.at:124;set of 0 or more integers - C;ovsdb positive;
+1333;ovsdb-types.at:124;set of 0 or more integers - Python3;ovsdb positive python;
+1334;ovsdb-types.at:127;set of 1 or more reals - C;ovsdb positive;
+1335;ovsdb-types.at:127;set of 1 or more reals - Python3;ovsdb positive python;
+1336;ovsdb-types.at:131;set max cannot be less than min - C;ovsdb negative;
+1337;ovsdb-types.at:131;set max cannot be less than min - Python3;ovsdb negative;
+1338;ovsdb-types.at:134;set max cannot be negative - C;ovsdb negative;
+1339;ovsdb-types.at:134;set max cannot be negative - Python3;ovsdb negative;
+1340;ovsdb-types.at:137;set min cannot be negative - C;ovsdb negative;
+1341;ovsdb-types.at:137;set min cannot be negative - Python3;ovsdb negative;
+1342;ovsdb-types.at:140;set min cannot be greater than one - C;ovsdb negative;
+1343;ovsdb-types.at:140;set min cannot be greater than one - Python3;ovsdb negative;
+1344;ovsdb-types.at:146;map of 1 integer to boolean - C;ovsdb positive;
+1345;ovsdb-types.at:146;map of 1 integer to boolean - Python3;ovsdb positive python;
+1346;ovsdb-types.at:149;map of 1 boolean to integer, explicit min and max - C;ovsdb positive;
+1347;ovsdb-types.at:149;map of 1 boolean to integer, explicit min and max - Python3;ovsdb positive python;
+1348;ovsdb-types.at:152;map of 1 to 5 uuid to real - C;ovsdb positive;
+1349;ovsdb-types.at:152;map of 1 to 5 uuid to real - Python3;ovsdb positive python;
+1350;ovsdb-types.at:155;map of 0 to 10 string to uuid - C;ovsdb positive;
+1351;ovsdb-types.at:155;map of 0 to 10 string to uuid - Python3;ovsdb positive python;
+1352;ovsdb-types.at:158;map of 1 to 20 real to string - C;ovsdb positive;
+1353;ovsdb-types.at:158;map of 1 to 20 real to string - Python3;ovsdb positive python;
+1354;ovsdb-types.at:161;map of 0 or more string to real - C;ovsdb positive;
+1355;ovsdb-types.at:161;map of 0 or more string to real - Python3;ovsdb positive python;
+1356;ovsdb-types.at:165;map key type is required - C;ovsdb negative;
+1357;ovsdb-types.at:165;map key type is required - Python3;ovsdb negative;
+1358;ovsdb-data.at:3;default atoms - C;ovsdb positive;
+1359;ovsdb-data.at:3;default atoms - Python3;ovsdb positive python;
+1360;ovsdb-data.at:11;default data - C;ovsdb positive;
+1361;ovsdb-data.at:11;default data - Python3;ovsdb positive python;
+1362;ovsdb-data.at:76;integer atom from JSON - C;ovsdb positive;
+1363;ovsdb-data.at:76;integer atom from JSON - Python3;ovsdb positive python;
+1364;ovsdb-data.at:89;integer atom from string;ovsdb positive;
+1365;ovsdb-data.at:116;real atom from JSON - C;ovsdb positive;
+1366;ovsdb-data.at:116;real atom from JSON - Python3;ovsdb positive python;
+1367;ovsdb-data.at:133;real atom from string;ovsdb positive;
+1368;ovsdb-data.at:150;boolean atom from JSON - C;ovsdb positive;
+1369;ovsdb-data.at:150;boolean atom from JSON - Python3;ovsdb positive python;
+1370;ovsdb-data.at:155;boolean atom from string;ovsdb positive;
+1371;ovsdb-data.at:160;string atom from JSON - C;ovsdb positive;
+1372;ovsdb-data.at:160;string atom from JSON - Python3;ovsdb positive python;
+1373;ovsdb-data.at:166;string atom from string;ovsdb positive;
+1374;ovsdb-data.at:181;uuid atom from JSON - C;ovsdb positive;
+1375;ovsdb-data.at:181;uuid atom from JSON - Python3;ovsdb positive python;
+1376;ovsdb-data.at:185;uuid atom from string;ovsdb positive;
+1377;ovsdb-data.at:189;integer atom sorting - C;ovsdb positive;
+1378;ovsdb-data.at:189;integer atom sorting - Python3;ovsdb positive python;
+1379;ovsdb-data.at:193;real atom sorting - C;ovsdb positive;
+1380;ovsdb-data.at:193;real atom sorting - Python3;ovsdb positive python;
+1381;ovsdb-data.at:197;boolean atom sorting - C;ovsdb positive;
+1382;ovsdb-data.at:197;boolean atom sorting - Python3;ovsdb positive python;
+1383;ovsdb-data.at:201;string atom sorting - C;ovsdb positive;
+1384;ovsdb-data.at:201;string atom sorting - Python3;ovsdb positive python;
+1385;ovsdb-data.at:205;uuid atom sorting - C;ovsdb positive;
+1386;ovsdb-data.at:205;uuid atom sorting - Python3;ovsdb positive python;
+1387;ovsdb-data.at:242;real not acceptable integer JSON atom - C;ovsdb positive;
+1388;ovsdb-data.at:242;real not acceptable integer JSON atom - Python3;ovsdb positive python;
+1389;ovsdb-data.at:248;no invalid UTF-8 sequences in strings;ovsdb positive;
+1390;ovsdb-data.at:271;real not acceptable integer string atom;ovsdb negative;
+1391;ovsdb-data.at:275;inverted range is not acceptable integer string atom positive and negative;ovsdb negative;
+1392;ovsdb-data.at:279;inverted range is not acceptable integer string atom negative;ovsdb negative;
+1393;ovsdb-data.at:283;inverted range is not acceptable integer string atom positive;ovsdb negative;
+1394;ovsdb-data.at:287;too big range is not acceptable integer string atom positive and negative;ovsdb negative;
+1395;ovsdb-data.at:291;too big range is not acceptable integer string atom negative;ovsdb negative;
+1396;ovsdb-data.at:295;too big range is not acceptable integer string atom positive;ovsdb negative;
+1397;ovsdb-data.at:299;string \"true\" not acceptable boolean JSON atom - C;ovsdb positive;
+1398;ovsdb-data.at:299;string \"true\" not acceptable boolean JSON atom - Python3;ovsdb positive python;
+1399;ovsdb-data.at:303;string \"true\" not acceptable boolean string atom;ovsdb negative;
+1400;ovsdb-data.at:307;integer not acceptable string JSON atom - C;ovsdb positive;
+1401;ovsdb-data.at:307;integer not acceptable string JSON atom - Python3;ovsdb positive python;
+1402;ovsdb-data.at:311;uuid atom must be expressed as JSON array - C;ovsdb positive;
+1403;ovsdb-data.at:311;uuid atom must be expressed as JSON array - Python3;ovsdb positive python;
+1404;ovsdb-data.at:315;named-uuid requires symbol table - C;ovsdb positive;
+1405;ovsdb-data.at:315;named-uuid requires symbol table - Python3;ovsdb positive python;
+1406;ovsdb-data.at:319;empty string atom must be quoted;ovsdb negative;
+1407;ovsdb-data.at:323;quotes must be balanced;ovsdb negative;
+1408;ovsdb-data.at:327;quoted string must not contain unescaped quote;ovsdb negative;
+1409;ovsdb-data.at:331;quoted string must not end with backslash;ovsdb negative;
+1410;ovsdb-data.at:335;uuids must be valid;ovsdb negative;
+1411;ovsdb-data.at:341;integer atom enum - C;ovsdb positive;
+1412;ovsdb-data.at:341;integer atom enum - Python3;ovsdb positive python;
+1413;ovsdb-data.at:364;integer atom enum from string;ovsdb positive;
+1414;ovsdb-data.at:377;integer not in enum set from string;ovsdb negative;
+1415;ovsdb-data.at:381;integer range not in enum set from string;ovsdb negative;
+1416;ovsdb-data.at:385;real atom enum - C;ovsdb positive;
+1417;ovsdb-data.at:385;real atom enum - Python3;ovsdb positive python;
+1418;ovsdb-data.at:402;boolean atom enum - C;ovsdb positive;
+1419;ovsdb-data.at:402;boolean atom enum - Python3;ovsdb positive python;
+1420;ovsdb-data.at:409;string atom enum - C;ovsdb positive;
+1421;ovsdb-data.at:409;string atom enum - Python3;ovsdb positive python;
+1422;ovsdb-data.at:424;uuid atom enum - C;ovsdb positive;
+1423;ovsdb-data.at:424;uuid atom enum - Python3;ovsdb positive python;
+1424;ovsdb-data.at:435;integers >= 5 - C;ovsdb positive;
+1425;ovsdb-data.at:435;integers >= 5 - Python3;ovsdb positive python;
+1426;ovsdb-data.at:448;integers <= -1 - C;ovsdb positive;
+1427;ovsdb-data.at:448;integers <= -1 - Python3;ovsdb positive python;
+1428;ovsdb-data.at:459;integers in range -10 to 10 - C;ovsdb positive;
+1429;ovsdb-data.at:459;integers in range -10 to 10 - Python3;ovsdb positive python;
+1430;ovsdb-data.at:480;reals >= 5 - C;ovsdb positive;
+1431;ovsdb-data.at:480;reals >= 5 - Python3;ovsdb positive python;
+1432;ovsdb-data.at:493;reals <= -1 - C;ovsdb positive;
+1433;ovsdb-data.at:493;reals <= -1 - Python3;ovsdb positive python;
+1434;ovsdb-data.at:504;reals in range -10 to 10 - C;ovsdb positive;
+1435;ovsdb-data.at:504;reals in range -10 to 10 - Python3;ovsdb positive python;
+1436;ovsdb-data.at:525;strings at least 2 characters long - C;ovsdb positive;
+1437;ovsdb-data.at:525;strings at least 2 characters long - Python3;ovsdb positive python;
+1438;ovsdb-data.at:538;strings no more than 2 characters long - C;ovsdb positive;
+1439;ovsdb-data.at:538;strings no more than 2 characters long - Python3;ovsdb positive python;
+1440;ovsdb-data.at:553;integer JSON datum - C;ovsdb positive;
+1441;ovsdb-data.at:553;integer JSON datum - Python3;ovsdb positive python;
+1442;ovsdb-data.at:559;integer string datum;ovsdb positive;
+1443;ovsdb-data.at:566;real JSON datum - C;ovsdb positive;
+1444;ovsdb-data.at:566;real JSON datum - Python3;ovsdb positive python;
+1445;ovsdb-data.at:572;real string datum;ovsdb positive;
+1446;ovsdb-data.at:578;boolean JSON datum - C;ovsdb positive;
+1447;ovsdb-data.at:578;boolean JSON datum - Python3;ovsdb positive python;
+1448;ovsdb-data.at:583;boolean string datum;ovsdb positive;
+1449;ovsdb-data.at:588;string JSON datum - C;ovsdb positive;
+1450;ovsdb-data.at:588;string JSON datum - Python3;ovsdb positive python;
+1451;ovsdb-data.at:594;string string datum;ovsdb positive;
+1452;ovsdb-data.at:603;JSON optional boolean - C;ovsdb positive set;
+1453;ovsdb-data.at:603;JSON optional boolean - Python3;ovsdb positive python set;
+1454;ovsdb-data.at:613;string optional boolean;ovsdb positive set;
+1455;ovsdb-data.at:623;JSON set of 0 or more integers - C;ovsdb positive;
+1456;ovsdb-data.at:623;JSON set of 0 or more integers - Python3;ovsdb positive python;
+1457;ovsdb-data.at:640;string set of 0 or more integers;ovsdb positive;
+1458;ovsdb-data.at:659;JSON set of 1 to 3 uuids - C;ovsdb positive;
+1459;ovsdb-data.at:659;JSON set of 1 to 3 uuids - Python3;ovsdb positive python;
+1460;ovsdb-data.at:670;string set of 1 to 3 uuids;ovsdb positive;
+1461;ovsdb-data.at:679;JSON set of 0 to 3 strings - C;ovsdb positive;
+1462;ovsdb-data.at:679;JSON set of 0 to 3 strings - Python3;ovsdb positive python;
+1463;ovsdb-data.at:692;string set of 0 to 3 strings;ovsdb positive;
+1464;ovsdb-data.at:703;duplicate boolean not allowed in JSON set - C;ovsdb negative;
+1465;ovsdb-data.at:703;duplicate boolean not allowed in JSON set - Python3;ovsdb negative;
+1466;ovsdb-data.at:707;duplicate boolean not allowed in string set;ovsdb negative;
+1467;ovsdb-data.at:711;duplicate integer not allowed in JSON set - C;ovsdb negative;
+1468;ovsdb-data.at:711;duplicate integer not allowed in JSON set - Python3;ovsdb negative;
+1469;ovsdb-data.at:715;duplicate integer not allowed in string set;ovsdb negative;
+1470;ovsdb-data.at:719;duplicate real not allowed in JSON set - C;ovsdb negative;
+1471;ovsdb-data.at:719;duplicate real not allowed in JSON set - Python3;ovsdb negative;
+1472;ovsdb-data.at:723;duplicate real not allowed in string set;ovsdb negative;
+1473;ovsdb-data.at:727;duplicate string not allowed in JSON set - C;ovsdb negative;
+1474;ovsdb-data.at:727;duplicate string not allowed in JSON set - Python3;ovsdb negative;
+1475;ovsdb-data.at:731;duplicate string not allowed in string set;ovsdb negative;
+1476;ovsdb-data.at:735;duplicate uuid not allowed in JSON set - C;ovsdb negative;
+1477;ovsdb-data.at:735;duplicate uuid not allowed in JSON set - Python3;ovsdb negative;
+1478;ovsdb-data.at:742;duplicate uuid not allowed in string set;ovsdb negative;
+1479;ovsdb-data.at:751;JSON map of 1 integer to boolean - C;ovsdb positive;
+1480;ovsdb-data.at:751;JSON map of 1 integer to boolean - Python3;ovsdb positive python;
+1481;ovsdb-data.at:756;string map of 1 integer to boolean;ovsdb positive;
+1482;ovsdb-data.at:761;JSON map of at least 1 integer to boolean - C;ovsdb positive;
+1483;ovsdb-data.at:761;JSON map of at least 1 integer to boolean - Python3;ovsdb positive python;
+1484;ovsdb-data.at:770;string map of at least 1 integer to boolean;ovsdb positive;
+1485;ovsdb-data.at:779;JSON map of 1 boolean to integer - C;ovsdb positive;
+1486;ovsdb-data.at:779;JSON map of 1 boolean to integer - Python3;ovsdb positive python;
+1487;ovsdb-data.at:784;string map of 1 boolean to integer;ovsdb positive;
+1488;ovsdb-data.at:789;JSON map of 1 uuid to real - C;ovsdb positive;
+1489;ovsdb-data.at:789;JSON map of 1 uuid to real - Python3;ovsdb positive python;
+1490;ovsdb-data.at:798;string map of 1 uuid to real;ovsdb positive;
+1491;ovsdb-data.at:807;JSON map of 10 string to string - C;ovsdb positive;
+1492;ovsdb-data.at:807;JSON map of 10 string to string - Python3;ovsdb positive python;
+1493;ovsdb-data.at:821;string map of 10 string to string;ovsdb positive;
+1494;ovsdb-data.at:835;duplicate integer key not allowed in JSON map - C;ovsdb negative;
+1495;ovsdb-data.at:835;duplicate integer key not allowed in JSON map - Python3;ovsdb negative;
+1496;ovsdb-data.at:840;duplicate integer key not allowed in string map;ovsdb negative;
+1497;ovsdb-data.at:845;generate and apply diff -- integer;ovsdb positive;
+1498;ovsdb-data.at:851;generate and apply diff -- boolean;ovsdb positive;
+1499;ovsdb-data.at:857;generate and apply diff -- string;ovsdb positive;
+1500;ovsdb-data.at:864;generate and apply diff -- set;ovsdb positive;
+1501;ovsdb-data.at:885;generate and apply diff -- set -- size error;ovsdb negative;
+1502;ovsdb-data.at:891;generate and apply diff -- map;ovsdb positive;
+1503;ovsdb-data.at:915;generate and apply diff with map -- size error;ovsdb negative;
+1504;ovsdb-column.at:3;ordinary column - C;ovsdb positive;
+1505;ovsdb-column.at:3;ordinary column - Python3;ovsdb positive python;
+1506;ovsdb-column.at:7;immutable column - C;ovsdb positive;
+1507;ovsdb-column.at:7;immutable column - Python3;ovsdb positive python;
+1508;ovsdb-column.at:11;ephemeral column - C;ovsdb positive;
+1509;ovsdb-column.at:11;ephemeral column - Python3;ovsdb positive python;
+1510;ovsdb-table.at:3;non-root table with one column - C;ovsdb positive;
+1511;ovsdb-table.at:3;non-root table with one column - Python3;ovsdb positive python;
+1512;ovsdb-table.at:7;immutable table with one column - C;ovsdb positive;
+1513;ovsdb-table.at:7;immutable table with one column - Python3;ovsdb positive python;
+1514;ovsdb-table.at:13;root table with one column - C;ovsdb positive;
+1515;ovsdb-table.at:13;root table with one column - Python3;ovsdb positive python;
+1516;ovsdb-table.at:19;non-root table with default_is_root=true - C;ovsdb positive;
+1517;ovsdb-table.at:19;non-root table with default_is_root=true - Python3;ovsdb positive python;
+1518;ovsdb-table.at:23;root table with default_is_root=true - C;ovsdb positive;
+1519;ovsdb-table.at:23;root table with default_is_root=true - Python3;ovsdb positive python;
+1520;ovsdb-table.at:29;table with maxRows of 2 - C;ovsdb positive;
+1521;ovsdb-table.at:29;table with maxRows of 2 - Python3;ovsdb positive python;
+1522;ovsdb-table.at:34;table with index - C;ovsdb positive;
+1523;ovsdb-table.at:34;table with index - Python3;ovsdb positive python;
+1524;ovsdb-table.at:40;table with syntax error in index - C;ovsdb negative;
+1525;ovsdb-table.at:40;table with syntax error in index - Python3;ovsdb negative;
+1526;ovsdb-table.at:46;table with empty index - C;ovsdb negative;
+1527;ovsdb-table.at:46;table with empty index - Python3;ovsdb negative;
+1528;ovsdb-table.at:52;table with index of ephemeral column - C;ovsdb negative;
+1529;ovsdb-table.at:52;table with index of ephemeral column - Python3;ovsdb negative;
+1530;ovsdb-table.at:59;column names may not begin with _ - C;ovsdb negative table;
+1531;ovsdb-table.at:59;column names may not begin with _ - Python3;ovsdb negative table;
+1532;ovsdb-table.at:65;table must have at least one column (1) - C;ovsdb negative;
+1533;ovsdb-table.at:65;table must have at least one column (1) - Python3;ovsdb negative;
+1534;ovsdb-table.at:69;table must have at least one column (2) - C;ovsdb negative;
+1535;ovsdb-table.at:69;table must have at least one column (2) - Python3;ovsdb negative;
+1536;ovsdb-table.at:73;table maxRows must be positive - C;ovsdb negative;
+1537;ovsdb-table.at:73;table maxRows must be positive - Python3;ovsdb negative;
+1538;ovsdb-row.at:3;row with one string column;ovsdb positive;
+1539;ovsdb-row.at:19;row with one integer column;ovsdb positive;
+1540;ovsdb-row.at:35;row with one real column;ovsdb positive;
+1541;ovsdb-row.at:51;row with one boolean column;ovsdb positive;
+1542;ovsdb-row.at:64;row with one uuid column;ovsdb positive;
+1543;ovsdb-row.at:77;row with set of 1 to 2 elements;ovsdb positive;
+1544;ovsdb-row.at:84;row with map of 1 to 2 elements;ovsdb positive;
+1545;ovsdb-row.at:91;row with several columns;ovsdb positive;
+1546;ovsdb-row.at:113;row hashing (scalars);ovsdb positive;
+1547;ovsdb-row.at:182;row hashing (sets);ovsdb positive;
+1548;ovsdb-row.at:235;row hashing (maps);ovsdb positive;
+1549;ovsdb-schema.at:3;schema with valid refTables - C;ovsdb positive;
+1550;ovsdb-schema.at:3;schema with valid refTables - Python3;ovsdb positive python;
+1551;ovsdb-schema.at:30;schema with ephemeral strong references - C;ovsdb positive;
+1552;ovsdb-schema.at:30;schema with ephemeral strong references - Python3;ovsdb positive python;
+1553;ovsdb-schema.at:60;schema with immutable weak references - C;ovsdb positive;
+1554;ovsdb-schema.at:60;schema with immutable weak references - Python3;ovsdb positive python;
+1555;ovsdb-schema.at:78;schema without version number - C;ovsdb positive;
+1556;ovsdb-schema.at:78;schema without version number - Python3;ovsdb positive python;
+1557;ovsdb-schema.at:88;schema with invalid refTables - C;ovsdb negative;
+1558;ovsdb-schema.at:88;schema with invalid refTables - Python3;ovsdb negative;
+1559;ovsdb-schema.at:111;schema with invalid version number - C;ovsdb negative;
+1560;ovsdb-schema.at:111;schema with invalid version number - Python3;ovsdb negative;
+1561;ovsdb-condition.at:3;null condition;ovsdb positive;
+1562;ovsdb-condition.at:9;conditions on scalars;ovsdb positive condition;
+1563;ovsdb-condition.at:75;disallowed conditions on scalars;ovsdb negative condition;
+1564;ovsdb-condition.at:213;conditions on optional scalars;ovsdb positive condition;
+1565;ovsdb-condition.at:279;disallowed conditions on optional scalars;ovsdb negative condition;
+1566;ovsdb-condition.at:366;conditions on sets;ovsdb positive condition;
+1567;ovsdb-condition.at:427;condition sorting;ovsdb positive;
+1568;ovsdb-condition.at:441;boolean condition;ovsdb positive;
+1569;ovsdb-condition.at:447;boolean condition;ovsdb positive;
+1570;ovsdb-condition.at:453;evaluating null condition;ovsdb positive;
+1571;ovsdb-condition.at:462;evaluating conditions on integers;ovsdb positive condition;
+1572;ovsdb-condition.at:487;evaluating conditions on reals;ovsdb positive condition;
+1573;ovsdb-condition.at:512;evaluating conditions on booleans;ovsdb positive condition;
+1574;ovsdb-condition.at:536;evaluating conditions on strings;ovsdb positive condition;
+1575;ovsdb-condition.at:561;evaluating conditions on UUIDs;ovsdb positive condition;
+1576;ovsdb-condition.at:587;evaluating conditions on sets;ovsdb positive condition;
+1577;ovsdb-condition.at:669;evaluating conditions on maps (1);ovsdb positive condition;
+1578;ovsdb-condition.at:754;evaluating conditions on maps (2);ovsdb positive condition;
+1579;ovsdb-condition.at:846;evaluating conditions on optional integers;ovsdb positive condition;
+1580;ovsdb-condition.at:881;evaluating conditions on optional strings;ovsdb positive condition;
+1581;ovsdb-condition.at:908;evaluating conditions on optional reals;ovsdb positive condition;
+1582;ovsdb-condition.at:943;evaluating false boolean condition;ovsdb positive;
+1583;ovsdb-condition.at:952;evaluating true boolean condition;ovsdb positive;
+1584;ovsdb-condition.at:961;compare condition;ovsdb positive;
+1585;ovsdb-mutation.at:3;null mutation;ovsdb positive;
+1586;ovsdb-mutation.at:9;mutations on scalars;ovsdb positive mutation;
+1587;ovsdb-mutation.at:37;disallowed mutations on scalars;ovsdb negative mutation;
+1588;ovsdb-mutation.at:102;disallowed mutations on immutable columns;ovsdb negative mutation;
+1589;ovsdb-mutation.at:114;mutations on sets;ovsdb positive mutation;
+1590;ovsdb-mutation.at:166;executing null mutation;ovsdb positive;
+1591;ovsdb-mutation.at:179;executing mutations on integers;ovsdb positive mutation;
+1592;ovsdb-mutation.at:216;integer overflow detection;ovsdb positive mutation;
+1593;ovsdb-mutation.at:297;executing mutations on integers with constraints;ovsdb positive mutation;
+1594;ovsdb-mutation.at:336;executing mutations on reals;ovsdb positive mutation;
+1595;ovsdb-mutation.at:367;real overflow detection;ovsdb positive mutation;
+1596;ovsdb-mutation.at:410;executing mutations on reals with constraints;ovsdb positive mutation;
+1597;ovsdb-mutation.at:443;executing mutations on integer sets;ovsdb positive mutation;
+1598;ovsdb-mutation.at:517;executing mutations on integer sets with constraints;ovsdb positive mutation;
+1599;ovsdb-mutation.at:556;executing mutations on real sets;ovsdb positive mutation;
+1600;ovsdb-mutation.at:629;executing mutations on boolean sets;ovsdb positive mutation;
+1601;ovsdb-mutation.at:679;executing mutations on string sets;ovsdb positive mutation;
+1602;ovsdb-mutation.at:729;executing mutations on uuid sets;ovsdb positive mutation;
+1603;ovsdb-mutation.at:779;executing mutations on integer maps;ovsdb positive mutation;
+1604;ovsdb-query.at:3;queries on scalars;ovsdb positive query;
+1605;ovsdb-query.at:95;queries on sets;ovsdb positive query;
+1606;ovsdb-query.at:176;queries on maps (1);ovsdb positive query;
+1607;ovsdb-query.at:260;queries on maps (2);ovsdb positive query;
+1608;ovsdb-query.at:351;UUID-distinct queries on scalars;ovsdb positive query;
+1609;ovsdb-query.at:444;Boolean-distinct queries on scalars;ovsdb positive query;
+1610;ovsdb-query.at:537;parse colunn set containing bad name;ovsdb negative;
+1611;ovsdb-transaction.at:3;empty table, empty transaction;ovsdb positive;
+1612;ovsdb-transaction.at:17;nonempty table, empty transaction;ovsdb positive;
+1613;ovsdb-transaction.at:41;insert, commit;ovsdb positive transaction;
+1614;ovsdb-transaction.at:70;insert, abort;ovsdb positive transaction;
+1615;ovsdb-transaction.at:98;modify, commit;ovsdb positive transaction;
+1616;ovsdb-transaction.at:127;modify, abort;ovsdb positive transaction;
+1617;ovsdb-transaction.at:156;delete, commit;ovsdb positive transaction;
+1618;ovsdb-transaction.at:181;delete, abort;ovsdb positive transaction;
+1619;ovsdb-transaction.at:207;modify, delete, commit;ovsdb positive transaction;
+1620;ovsdb-transaction.at:234;modify, delete, abort;ovsdb positive transaction;
+1621;ovsdb-transaction.at:262;insert, delete, commit;ovsdb positive transaction;
+1622;ovsdb-transaction.at:291;insert, delete, abort;ovsdb positive transaction;
+1623;ovsdb-transaction.at:322;insert, modify, delete, commit;ovsdb positive transaction;
+1624;ovsdb-transaction.at:353;insert, modify, delete, abort;ovsdb positive transaction;
+1625;ovsdb-transaction.at:385;deletes are aborted cleanly;ovsdb positive transaction;
+1626;ovsdb-execution.at:147;block insert on read only DB;ovsdb execute execution positive;
+1627;ovsdb-execution.at:156;allow select on read only DB;ovsdb execute execution positive;
+1628;ovsdb-execution.at:185;uuid-name must be <id>;ovsdb execute execution positive;
+1629;ovsdb-execution.at:195;named-uuid must be <id>;ovsdb execute execution positive;
+1630;ovsdb-execution.at:204;duplicate uuid-name not allowed;ovsdb execute execution positive;
+1631;ovsdb-execution.at:1164;insert default row, query table;ovsdb execute execution positive;
+1632;ovsdb-execution.at:1164;insert row, query table;ovsdb execute execution positive;
+1633;ovsdb-execution.at:1164;insert row with uuid, query table;ovsdb execute execution positive;
+1634;ovsdb-execution.at:1164;insert rows, query by value;ovsdb execute execution positive;
+1635;ovsdb-execution.at:1164;insert rows, query by named-uuid;ovsdb execute execution positive;
+1636;ovsdb-execution.at:1164;insert rows, update rows by value;ovsdb execute execution positive;
+1637;ovsdb-execution.at:1164;insert rows, mutate rows;ovsdb execute execution positive;
+1638;ovsdb-execution.at:1164;insert rows, delete by named-uuid;ovsdb execute execution positive;
+1639;ovsdb-execution.at:1164;insert rows, delete rows by value;ovsdb execute execution positive;
+1640;ovsdb-execution.at:1164;insert rows, delete by (non-matching) value;ovsdb execute execution positive;
+1641;ovsdb-execution.at:1164;insert rows, delete all;ovsdb execute execution positive;
+1642;ovsdb-execution.at:1164;insert row, query table, commit;ovsdb execute execution positive;
+1643;ovsdb-execution.at:1164;insert row, query table, commit durably;ovsdb execute execution positive;
+1644;ovsdb-execution.at:1164;equality wait with correct rows;ovsdb execute execution positive;
+1645;ovsdb-execution.at:1164;equality wait with extra row;ovsdb execute execution positive;
+1646;ovsdb-execution.at:1164;equality wait with missing row;ovsdb execute execution positive;
+1647;ovsdb-execution.at:1164;inequality wait with correct rows;ovsdb execute execution positive;
+1648;ovsdb-execution.at:1164;inequality wait with extra row;ovsdb execute execution positive;
+1649;ovsdb-execution.at:1164;inequality wait with missing row;ovsdb execute execution positive;
+1650;ovsdb-execution.at:1164;insert and update constraints;ovsdb execute execution positive;
+1651;ovsdb-execution.at:1164;index uniqueness checking;ovsdb execute execution positive;
+1652;ovsdb-execution.at:1164;referential integrity -- simple;ovsdb execute execution positive;
+1653;ovsdb-execution.at:1164;referential integrity -- mutual references;ovsdb execute execution positive;
+1654;ovsdb-execution.at:1164;weak references;ovsdb execute execution positive;
+1655;ovsdb-execution.at:1164;immutable columns;ovsdb execute execution positive;
+1656;ovsdb-execution.at:1164;garbage collection;ovsdb execute execution positive;
+1657;ovsdb-trigger.at:15;trigger fires immediately;ovsdb execute execution trigger positive;
+1658;ovsdb-trigger.at:38;trigger times out;ovsdb execute execution trigger positive;
+1659;ovsdb-trigger.at:61;trigger fires after delay;ovsdb execute execution trigger positive;
+1660;ovsdb-trigger.at:92;delayed trigger modifies database;ovsdb execute execution trigger positive;
+1661;ovsdb-trigger.at:132;one delayed trigger wakes up another;ovsdb execute execution trigger positive;
+1662;ovsdb-tool.at:29;insert default row, query table;ovsdb file positive;
+1663;ovsdb-tool.at:29;insert row, query table;ovsdb file positive;
+1664;ovsdb-tool.at:29;insert row with uuid, query table;ovsdb file positive;
+1665;ovsdb-tool.at:29;insert rows, query by value;ovsdb file positive;
+1666;ovsdb-tool.at:29;insert rows, query by named-uuid;ovsdb file positive;
+1667;ovsdb-tool.at:29;insert rows, update rows by value;ovsdb file positive;
+1668;ovsdb-tool.at:29;insert rows, mutate rows;ovsdb file positive;
+1669;ovsdb-tool.at:29;insert rows, delete by named-uuid;ovsdb file positive;
+1670;ovsdb-tool.at:29;insert rows, delete rows by value;ovsdb file positive;
+1671;ovsdb-tool.at:29;insert rows, delete by (non-matching) value;ovsdb file positive;
+1672;ovsdb-tool.at:29;insert rows, delete all;ovsdb file positive;
+1673;ovsdb-tool.at:29;insert row, query table, commit;ovsdb file positive;
+1674;ovsdb-tool.at:29;insert row, query table, commit durably;ovsdb file positive;
+1675;ovsdb-tool.at:29;equality wait with correct rows;ovsdb file positive;
+1676;ovsdb-tool.at:29;equality wait with extra row;ovsdb file positive;
+1677;ovsdb-tool.at:29;equality wait with missing row;ovsdb file positive;
+1678;ovsdb-tool.at:29;inequality wait with correct rows;ovsdb file positive;
+1679;ovsdb-tool.at:29;inequality wait with extra row;ovsdb file positive;
+1680;ovsdb-tool.at:29;inequality wait with missing row;ovsdb file positive;
+1681;ovsdb-tool.at:29;insert and update constraints;ovsdb file positive;
+1682;ovsdb-tool.at:29;index uniqueness checking;ovsdb file positive;
+1683;ovsdb-tool.at:29;referential integrity -- simple;ovsdb file positive;
+1684;ovsdb-tool.at:29;referential integrity -- mutual references;ovsdb file positive;
+1685;ovsdb-tool.at:29;weak references;ovsdb file positive;
+1686;ovsdb-tool.at:29;immutable columns;ovsdb file positive;
+1687;ovsdb-tool.at:29;garbage collection;ovsdb file positive;
+1688;ovsdb-tool.at:31;transaction comments;ovsdb file positive;
+1689;ovsdb-tool.at:49;ovsdb-tool compact;ovsdb file positive;
+1690;ovsdb-tool.at:172;ovsdb-tool convert -- removing a column;ovsdb file positive;
+1691;ovsdb-tool.at:239;ovsdb-tool convert -- adding a column;ovsdb file positive;
+1692;ovsdb-tool.at:305;ovsdb-tool unsupported cluster operations;ovsdb file negative compact query transact convert;
+1693;ovsdb-tool.at:321;ovsdb-tool schema-version, schema-cksum, schema-name;ovsdb file positive schema-version schema-cksum;
+1694;ovsdb-tool.at:332;ovsdb-tool database inspection commands - standalone;ovsdb file positive db-version db-cksum db-name db-cid db-sid db-local-address;
+1695;ovsdb-tool.at:351;ovsdb-tool database inspection commands - clustered;ovsdb file negative db-version db-cksum db-name db-cid db-sid db-local-address cluster;
+1696;ovsdb-tool.at:369;ovsdb-tool database inspection commands - joining a cluster;ovsdb file positive db-version db-cksum db-name db-cid db-sid db-local-address cluster join joining;
+1697;ovsdb-tool.at:400;ovsdb-tool needs-conversion (no conversion needed);ovsdb file positive;
+1698;ovsdb-tool.at:409;ovsdb-tool needs-conversion (conversion needed);ovsdb file positive;
+1699;ovsdb-tool.at:420;ovsdb-tool create-cluster with initial data;ovsdb file positive;
+1700;ovsdb-tool.at:463;ovsdb-tool convert-to-standalone;ovsdb file positive;
+1701;ovsdb-server.at:41;insert default row, query table;ovsdb server positive unix;
+1702;ovsdb-server.at:41;insert row, query table;ovsdb server positive unix;
+1703;ovsdb-server.at:41;insert row with uuid, query table;ovsdb server positive unix;
+1704;ovsdb-server.at:41;insert rows, query by value;ovsdb server positive unix;
+1705;ovsdb-server.at:41;insert rows, query by named-uuid;ovsdb server positive unix;
+1706;ovsdb-server.at:41;insert rows, update rows by value;ovsdb server positive unix;
+1707;ovsdb-server.at:41;insert rows, mutate rows;ovsdb server positive unix;
+1708;ovsdb-server.at:41;insert rows, delete by named-uuid;ovsdb server positive unix;
+1709;ovsdb-server.at:41;insert rows, delete rows by value;ovsdb server positive unix;
+1710;ovsdb-server.at:41;insert rows, delete by (non-matching) value;ovsdb server positive unix;
+1711;ovsdb-server.at:41;insert rows, delete all;ovsdb server positive unix;
+1712;ovsdb-server.at:41;insert row, query table, commit;ovsdb server positive unix;
+1713;ovsdb-server.at:41;insert row, query table, commit durably;ovsdb server positive unix;
+1714;ovsdb-server.at:41;equality wait with correct rows;ovsdb server positive unix;
+1715;ovsdb-server.at:41;equality wait with extra row;ovsdb server positive unix;
+1716;ovsdb-server.at:41;equality wait with missing row;ovsdb server positive unix;
+1717;ovsdb-server.at:41;inequality wait with correct rows;ovsdb server positive unix;
+1718;ovsdb-server.at:41;inequality wait with extra row;ovsdb server positive unix;
+1719;ovsdb-server.at:41;inequality wait with missing row;ovsdb server positive unix;
+1720;ovsdb-server.at:41;insert and update constraints;ovsdb server positive unix;
+1721;ovsdb-server.at:41;index uniqueness checking;ovsdb server positive unix;
+1722;ovsdb-server.at:41;referential integrity -- simple;ovsdb server positive unix;
+1723;ovsdb-server.at:41;referential integrity -- mutual references;ovsdb server positive unix;
+1724;ovsdb-server.at:41;weak references;ovsdb server positive unix;
+1725;ovsdb-server.at:41;immutable columns;ovsdb server positive unix;
+1726;ovsdb-server.at:41;garbage collection;ovsdb server positive unix;
+1727;ovsdb-server.at:45;truncating corrupted database log;ovsdb server positive unix;
+1728;ovsdb-server.at:92;truncating database log with bad transaction;ovsdb server positive unix;
+1729;ovsdb-server.at:153;database multiplexing implementation;ovsdb server positive;
+1730;ovsdb-server.at:170;ovsdb-server/add-db and remove-db;ovsdb server positive;
+1731;ovsdb-server.at:285;ovsdb-server/add-db with --monitor;ovsdb server positive;
+1732;ovsdb-server.at:320;ovsdb-server/add-db and remove-db with --monitor;ovsdb server positive;
+1733;ovsdb-server.at:353;--remote=db: implementation;ovsdb server positive;
+1734;ovsdb-server.at:417;ovsdb-server/add-remote and remove-remote;ovsdb server positive;
+1735;ovsdb-server.at:470;ovsdb-server/add-remote with --monitor;ovsdb server positive;
+1736;ovsdb-server.at:505;ovsdb-server/add-remote and remove-remote with --monitor;ovsdb server positive;
+1737;ovsdb-server.at:544;SSL db: implementation;ovsdb server positive ssl \$5;
+1738;ovsdb-server.at:835;compacting online - standalone;ovsdb server compact;
+1739;ovsdb-server.at:840;compacting online - cluster;ovsdb server compact;
+1740;ovsdb-server.at:1121;schema conversion online - standalone;ovsdb server convert needs-conversion standalone;
+1741;ovsdb-server.at:1126;schema conversion online - clustered;ovsdb server convert needs-conversion cluster;
+1742;ovsdb-server.at:1131;ovsdb-server combines updates on backlogged connections;;
+1743;ovsdb-server.at:1264;insert default row, query table;ovsdb server positive ssl;
+1744;ovsdb-server.at:1264;insert row, query table;ovsdb server positive ssl;
+1745;ovsdb-server.at:1264;insert row with uuid, query table;ovsdb server positive ssl;
+1746;ovsdb-server.at:1264;insert rows, query by value;ovsdb server positive ssl;
+1747;ovsdb-server.at:1264;insert rows, query by named-uuid;ovsdb server positive ssl;
+1748;ovsdb-server.at:1264;insert rows, update rows by value;ovsdb server positive ssl;
+1749;ovsdb-server.at:1264;insert rows, mutate rows;ovsdb server positive ssl;
+1750;ovsdb-server.at:1264;insert rows, delete by named-uuid;ovsdb server positive ssl;
+1751;ovsdb-server.at:1264;insert rows, delete rows by value;ovsdb server positive ssl;
+1752;ovsdb-server.at:1264;insert rows, delete by (non-matching) value;ovsdb server positive ssl;
+1753;ovsdb-server.at:1264;insert rows, delete all;ovsdb server positive ssl;
+1754;ovsdb-server.at:1264;insert row, query table, commit;ovsdb server positive ssl;
+1755;ovsdb-server.at:1264;insert row, query table, commit durably;ovsdb server positive ssl;
+1756;ovsdb-server.at:1264;equality wait with correct rows;ovsdb server positive ssl;
+1757;ovsdb-server.at:1264;equality wait with extra row;ovsdb server positive ssl;
+1758;ovsdb-server.at:1264;equality wait with missing row;ovsdb server positive ssl;
+1759;ovsdb-server.at:1264;inequality wait with correct rows;ovsdb server positive ssl;
+1760;ovsdb-server.at:1264;inequality wait with extra row;ovsdb server positive ssl;
+1761;ovsdb-server.at:1264;inequality wait with missing row;ovsdb server positive ssl;
+1762;ovsdb-server.at:1264;insert and update constraints;ovsdb server positive ssl;
+1763;ovsdb-server.at:1264;index uniqueness checking;ovsdb server positive ssl;
+1764;ovsdb-server.at:1264;referential integrity -- simple;ovsdb server positive ssl;
+1765;ovsdb-server.at:1264;referential integrity -- mutual references;ovsdb server positive ssl;
+1766;ovsdb-server.at:1264;weak references;ovsdb server positive ssl;
+1767;ovsdb-server.at:1264;immutable columns;ovsdb server positive ssl;
+1768;ovsdb-server.at:1264;garbage collection;ovsdb server positive ssl;
+1769;ovsdb-server.at:1302;insert default row, query table;ovsdb server positive ssl6;
+1770;ovsdb-server.at:1338;insert default row, query table;ovsdb server positive tcp;
+1771;ovsdb-server.at:1338;insert row, query table;ovsdb server positive tcp;
+1772;ovsdb-server.at:1338;insert row with uuid, query table;ovsdb server positive tcp;
+1773;ovsdb-server.at:1338;insert rows, query by value;ovsdb server positive tcp;
+1774;ovsdb-server.at:1338;insert rows, query by named-uuid;ovsdb server positive tcp;
+1775;ovsdb-server.at:1338;insert rows, update rows by value;ovsdb server positive tcp;
+1776;ovsdb-server.at:1338;insert rows, mutate rows;ovsdb server positive tcp;
+1777;ovsdb-server.at:1338;insert rows, delete by named-uuid;ovsdb server positive tcp;
+1778;ovsdb-server.at:1338;insert rows, delete rows by value;ovsdb server positive tcp;
+1779;ovsdb-server.at:1338;insert rows, delete by (non-matching) value;ovsdb server positive tcp;
+1780;ovsdb-server.at:1338;insert rows, delete all;ovsdb server positive tcp;
+1781;ovsdb-server.at:1338;insert row, query table, commit;ovsdb server positive tcp;
+1782;ovsdb-server.at:1338;insert row, query table, commit durably;ovsdb server positive tcp;
+1783;ovsdb-server.at:1338;equality wait with correct rows;ovsdb server positive tcp;
+1784;ovsdb-server.at:1338;equality wait with extra row;ovsdb server positive tcp;
+1785;ovsdb-server.at:1338;equality wait with missing row;ovsdb server positive tcp;
+1786;ovsdb-server.at:1338;inequality wait with correct rows;ovsdb server positive tcp;
+1787;ovsdb-server.at:1338;inequality wait with extra row;ovsdb server positive tcp;
+1788;ovsdb-server.at:1338;inequality wait with missing row;ovsdb server positive tcp;
+1789;ovsdb-server.at:1338;insert and update constraints;ovsdb server positive tcp;
+1790;ovsdb-server.at:1338;index uniqueness checking;ovsdb server positive tcp;
+1791;ovsdb-server.at:1338;referential integrity -- simple;ovsdb server positive tcp;
+1792;ovsdb-server.at:1338;referential integrity -- mutual references;ovsdb server positive tcp;
+1793;ovsdb-server.at:1338;weak references;ovsdb server positive tcp;
+1794;ovsdb-server.at:1338;immutable columns;ovsdb server positive tcp;
+1795;ovsdb-server.at:1338;garbage collection;ovsdb server positive tcp;
+1796;ovsdb-server.at:1375;insert default row, query table;ovsdb server positive tcp6;
+1797;ovsdb-server.at:1411;insert default row, query table;ovsdb server positive transient;
+1798;ovsdb-server.at:1411;insert row, query table;ovsdb server positive transient;
+1799;ovsdb-server.at:1411;insert row with uuid, query table;ovsdb server positive transient;
+1800;ovsdb-server.at:1411;insert rows, query by value;ovsdb server positive transient;
+1801;ovsdb-server.at:1411;insert rows, query by named-uuid;ovsdb server positive transient;
+1802;ovsdb-server.at:1411;insert rows, update rows by value;ovsdb server positive transient;
+1803;ovsdb-server.at:1411;insert rows, mutate rows;ovsdb server positive transient;
+1804;ovsdb-server.at:1411;insert rows, delete by named-uuid;ovsdb server positive transient;
+1805;ovsdb-server.at:1411;insert rows, delete rows by value;ovsdb server positive transient;
+1806;ovsdb-server.at:1411;insert rows, delete by (non-matching) value;ovsdb server positive transient;
+1807;ovsdb-server.at:1411;insert rows, delete all;ovsdb server positive transient;
+1808;ovsdb-server.at:1411;insert row, query table, commit;ovsdb server positive transient;
+1809;ovsdb-server.at:1411;insert row, query table, commit durably;ovsdb server positive transient;
+1810;ovsdb-server.at:1411;equality wait with correct rows;ovsdb server positive transient;
+1811;ovsdb-server.at:1411;equality wait with extra row;ovsdb server positive transient;
+1812;ovsdb-server.at:1411;equality wait with missing row;ovsdb server positive transient;
+1813;ovsdb-server.at:1411;inequality wait with correct rows;ovsdb server positive transient;
+1814;ovsdb-server.at:1411;inequality wait with extra row;ovsdb server positive transient;
+1815;ovsdb-server.at:1411;inequality wait with missing row;ovsdb server positive transient;
+1816;ovsdb-server.at:1411;insert and update constraints;ovsdb server positive transient;
+1817;ovsdb-server.at:1411;index uniqueness checking;ovsdb server positive transient;
+1818;ovsdb-server.at:1411;referential integrity -- simple;ovsdb server positive transient;
+1819;ovsdb-server.at:1411;referential integrity -- mutual references;ovsdb server positive transient;
+1820;ovsdb-server.at:1411;weak references;ovsdb server positive transient;
+1821;ovsdb-server.at:1411;immutable columns;ovsdb server positive transient;
+1822;ovsdb-server.at:1411;garbage collection;ovsdb server positive transient;
+1823;ovsdb-server.at:1451;insert default row, query table;ovsdb server tcp replication;
+1824;ovsdb-server.at:1451;insert row, query table;ovsdb server tcp replication;
+1825;ovsdb-server.at:1451;insert row with uuid, query table;ovsdb server tcp replication;
+1826;ovsdb-server.at:1451;insert rows, query by value;ovsdb server tcp replication;
+1827;ovsdb-server.at:1451;insert rows, query by named-uuid;ovsdb server tcp replication;
+1828;ovsdb-server.at:1451;insert rows, update rows by value;ovsdb server tcp replication;
+1829;ovsdb-server.at:1451;insert rows, mutate rows;ovsdb server tcp replication;
+1830;ovsdb-server.at:1451;insert rows, delete by named-uuid;ovsdb server tcp replication;
+1831;ovsdb-server.at:1451;insert rows, delete rows by value;ovsdb server tcp replication;
+1832;ovsdb-server.at:1451;insert rows, delete by (non-matching) value;ovsdb server tcp replication;
+1833;ovsdb-server.at:1451;insert rows, delete all;ovsdb server tcp replication;
+1834;ovsdb-server.at:1451;insert row, query table, commit;ovsdb server tcp replication;
+1835;ovsdb-server.at:1451;insert row, query table, commit durably;ovsdb server tcp replication;
+1836;ovsdb-server.at:1451;equality wait with correct rows;ovsdb server tcp replication;
+1837;ovsdb-server.at:1451;equality wait with extra row;ovsdb server tcp replication;
+1838;ovsdb-server.at:1451;equality wait with missing row;ovsdb server tcp replication;
+1839;ovsdb-server.at:1451;inequality wait with correct rows;ovsdb server tcp replication;
+1840;ovsdb-server.at:1451;inequality wait with extra row;ovsdb server tcp replication;
+1841;ovsdb-server.at:1451;inequality wait with missing row;ovsdb server tcp replication;
+1842;ovsdb-server.at:1451;insert and update constraints;ovsdb server tcp replication;
+1843;ovsdb-server.at:1451;index uniqueness checking;ovsdb server tcp replication;
+1844;ovsdb-server.at:1451;referential integrity -- simple;ovsdb server tcp replication;
+1845;ovsdb-server.at:1451;referential integrity -- mutual references;ovsdb server tcp replication;
+1846;ovsdb-server.at:1451;weak references;ovsdb server tcp replication;
+1847;ovsdb-server.at:1451;immutable columns;ovsdb server tcp replication;
+1848;ovsdb-server.at:1451;garbage collection;ovsdb server tcp replication;
+1849;ovsdb-server.at:1505;insert monitored table, insert excluded table;ovsdb server tcp replication table-exclusion;
+1850;ovsdb-server.at:1505;insert monitored table, update excluded table;ovsdb server tcp replication table-exclusion;
+1851;ovsdb-server.at:1505;update monitored table, insert excluded table;ovsdb server tcp replication table-exclusion;
+1852;ovsdb-server.at:1505;update monitored table, update excluded table;ovsdb server tcp replication table-exclusion;
+1853;ovsdb-server.at:1505;delete monitored table, insert excluded table;ovsdb server tcp replication table-exclusion;
+1854;ovsdb-server.at:1505;delete monitored table, update excluded table;ovsdb server tcp replication table-exclusion;
+1855;ovsdb-server.at:1510;ovsdb-server/get-active-ovsdb-server;ovsdb server replication get-active;
+1856;ovsdb-server.at:1523;ovsdb-server/set-active-ovsdb-server;ovsdb server replication set-active;
+1857;ovsdb-server.at:1537;ovsdb-server/get-sync-exclude-tables;ovsdb server replication get-exclude-tables;
+1858;ovsdb-server.at:1550;ovsdb-server/set-sync-exclude-tables;ovsdb server replication set-exclude-tables;
+1859;ovsdb-server.at:1600;ovsdb-server/connect-active-server;ovsdb server replication connect-active-server;
+1860;ovsdb-server.at:1639;ovsdb-server/disconnect-active-server;ovsdb server replication disconnect-active-server;
+1861;ovsdb-server.at:1725;ovsdb-server/active-backup-role-switching;ovsdb server replication active-backup-switching;
+1862;ovsdb-server.at:1809;ovsdb-server prevent self replicating;ovsdb server replication;
+1863;ovsdb-server.at:1840;ovsdb-server/read-only db:ptcp connection;ovsdb server read-only;
+1864;ovsdb-server.at:1907;ovsdb-server replication with schema mismatch;ovsdb server replication;
+1865;ovsdb-client.at:3;ovsdb-client get-schema-version and get-schema-cksum;ovsdb client positive;
+1866;ovsdb-client.at:15;ovsdb-client backup and restore;ovsdb client positive;
+1867;ovsdb-client.at:122;ovsdb-client query;ovsdb client positive;
+1868;ovsdb-monitor.at:111;monitor insert into empty table;ovsdb server monitor positive;
+1869;ovsdb-monitor.at:123;monitor insert into populated table;ovsdb server monitor positive;
+1870;ovsdb-monitor.at:141;monitor delete;ovsdb server monitor positive;
+1871;ovsdb-monitor.at:159;monitor row update;ovsdb server monitor positive;
+1872;ovsdb-monitor.at:179;monitor no-op row updates;ovsdb server monitor positive;
+1873;ovsdb-monitor.at:202;monitor insert-and-update transaction;ovsdb server monitor positive;
+1874;ovsdb-monitor.at:225;monitor insert-update-and-delete transaction;ovsdb server monitor positive;
+1875;ovsdb-monitor.at:254;monitor weak reference change;ovsdb server monitor positive;
+1876;ovsdb-monitor.at:289;monitor insert-update-and-delete transaction;ovsdb server monitor positive;
+1877;ovsdb-monitor.at:340;monitor all operations;ovsdb server monitor positive;
+1878;ovsdb-monitor.at:360;monitor initial only;ovsdb server monitor positive;
+1879;ovsdb-monitor.at:367;monitor insert only;ovsdb server monitor positive;
+1880;ovsdb-monitor.at:374;monitor delete only;ovsdb server monitor positive;
+1881;ovsdb-monitor.at:382;monitor modify only;ovsdb server monitor positive;
+1882;ovsdb-monitor.at:392;monitor-cond empty condition;ovsdb server monitor monitor-cond positive;
+1883;ovsdb-monitor.at:423;monitor-cond multiple conditions;ovsdb server monitor monitor-cond positive;
+1884;ovsdb-monitor.at:451;monitor-cond delete from populated table;ovsdb server monitor monitor-cond positive;
+1885;ovsdb-monitor.at:476;monitor-cond insert due to modify;ovsdb server monitor monitor-cond positive;
+1886;ovsdb-monitor.at:500;monitor-cond delete due to modify;ovsdb server monitor monitor-cond positive;
+1887;ovsdb-monitor.at:524;monitor-cond condition non-monitored columns;ovsdb server monitor monitor-cond positive;
+1888;ovsdb-monitor.at:553;monitor-cond-change;ovsdb server monitor monitor-cond positive [[[\"name\",\"==\",\"one\"],[\"name\",\"==\",\"two\"]]], [[[\"name\",\"==\",\"one\"]]], [[false]], [[true]];
+1889;ovsdb-monitor.at:594;monitor-cond-change with many sessions pending;ovsdb server monitor monitor-cond negative;
+1890;ovsdb-monitor.at:665;monitor-cond-since not found;ovsdb server monitor monitor-cond-since positive;
+1891;ovsdb-monitor.at:719;monitor-cond-since db restart;ovsdb server monitor monitor-cond-since positive;
+1892;ovsdb-monitor.at:783;monitor-cond-since found but no new rows;ovsdb server monitor monitor-cond-since positive;
+1893;ovsdb-monitor.at:824;monitor-cond-since empty db;ovsdb server monitor monitor-cond-since positive;
+1894;ovsdb-monitor.at:847;monitor-cond-since condition change;ovsdb server monitor monitor-cond-since positive;
+1895;ovsdb-monitor.at:908;monitor-cond-since non-cluster;ovsdb server monitor monitor-cond-since positive;
+1896;ovsdb-monitor.at:961;monitor-cond-since non-cluster non-zero last_id;ovsdb server monitor monitor-cond-since negative;
+1897;ovsdb-idl.at:290;simple passive idl, initially empty, select empty - Python3 - ptcp;ovsdb server idl positive python with tcp socket;
+1898;ovsdb-idl.at:298;simple idl, initially empty, no ops - C;ovsdb server idl positive;
+1899;ovsdb-idl.at:298;simple idl, initially empty, no ops - C - tcp;ovsdb server idl positive tcp socket;
+1900;ovsdb-idl.at:298;simple idl, initially empty, no ops - C - tcp6;ovsdb server idl positive tcp6 socket;
+1901;ovsdb-idl.at:298;simple idl, initially empty, no ops - Python3;ovsdb server idl positive python;
+1902;ovsdb-idl.at:298;simple idl, initially empty, no ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1903;ovsdb-idl.at:298;simple idl, initially empty, no ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1904;ovsdb-idl.at:298;simple idl, initially empty, no ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1905;ovsdb-idl.at:298;simple idl, initially empty, no ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1906;ovsdb-idl.at:298;simple idl, initially empty, no ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1907;ovsdb-idl.at:298;simple idl, initially empty, no ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1908;ovsdb-idl.at:305;simple idl, initially empty, various ops - C;ovsdb server idl positive;
+1909;ovsdb-idl.at:305;simple idl, initially empty, various ops - C - tcp;ovsdb server idl positive tcp socket;
+1910;ovsdb-idl.at:305;simple idl, initially empty, various ops - C - tcp6;ovsdb server idl positive tcp6 socket;
+1911;ovsdb-idl.at:305;simple idl, initially empty, various ops - Python3;ovsdb server idl positive python;
+1912;ovsdb-idl.at:305;simple idl, initially empty, various ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1913;ovsdb-idl.at:305;simple idl, initially empty, various ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1914;ovsdb-idl.at:305;simple idl, initially empty, various ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1915;ovsdb-idl.at:305;simple idl, initially empty, various ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1916;ovsdb-idl.at:305;simple idl, initially empty, various ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1917;ovsdb-idl.at:305;simple idl, initially empty, various ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1918;ovsdb-idl.at:383;simple idl, initially populated - C;ovsdb server idl positive;
+1919;ovsdb-idl.at:383;simple idl, initially populated - C - tcp;ovsdb server idl positive tcp socket;
+1920;ovsdb-idl.at:383;simple idl, initially populated - C - tcp6;ovsdb server idl positive tcp6 socket;
+1921;ovsdb-idl.at:383;simple idl, initially populated - Python3;ovsdb server idl positive python;
+1922;ovsdb-idl.at:383;simple idl, initially populated - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1923;ovsdb-idl.at:383;simple idl, initially populated - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1924;ovsdb-idl.at:383;simple idl, initially populated - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1925;ovsdb-idl.at:383;simple idl, initially populated - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1926;ovsdb-idl.at:383;simple idl, initially populated - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1927;ovsdb-idl.at:383;simple idl, initially populated - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1928;ovsdb-idl.at:414;simple idl, writing via IDL - C;ovsdb server idl positive;
+1929;ovsdb-idl.at:414;simple idl, writing via IDL - C - tcp;ovsdb server idl positive tcp socket;
+1930;ovsdb-idl.at:414;simple idl, writing via IDL - C - tcp6;ovsdb server idl positive tcp6 socket;
+1931;ovsdb-idl.at:414;simple idl, writing via IDL - Python3;ovsdb server idl positive python;
+1932;ovsdb-idl.at:414;simple idl, writing via IDL - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1933;ovsdb-idl.at:414;simple idl, writing via IDL - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1934;ovsdb-idl.at:414;simple idl, writing via IDL - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1935;ovsdb-idl.at:414;simple idl, writing via IDL - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1936;ovsdb-idl.at:414;simple idl, writing via IDL - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1937;ovsdb-idl.at:414;simple idl, writing via IDL - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1938;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - C;ovsdb server idl positive;
+1939;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - C - tcp;ovsdb server idl positive tcp socket;
+1940;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - C - tcp6;ovsdb server idl positive tcp6 socket;
+1941;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - Python3;ovsdb server idl positive python;
+1942;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1943;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1944;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1945;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1946;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1947;ovsdb-idl.at:445;simple idl, writing via IDL with unicode - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1948;ovsdb-idl.at:472;simple idl, writing large data via IDL with unicode - Python3;ovsdb server idl positive python;
+1949;ovsdb-idl.at:484;simple idl, handling verification failure - C;ovsdb server idl positive;
+1950;ovsdb-idl.at:484;simple idl, handling verification failure - C - tcp;ovsdb server idl positive tcp socket;
+1951;ovsdb-idl.at:484;simple idl, handling verification failure - C - tcp6;ovsdb server idl positive tcp6 socket;
+1952;ovsdb-idl.at:484;simple idl, handling verification failure - Python3;ovsdb server idl positive python;
+1953;ovsdb-idl.at:484;simple idl, handling verification failure - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1954;ovsdb-idl.at:484;simple idl, handling verification failure - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1955;ovsdb-idl.at:484;simple idl, handling verification failure - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1956;ovsdb-idl.at:484;simple idl, handling verification failure - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1957;ovsdb-idl.at:484;simple idl, handling verification failure - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1958;ovsdb-idl.at:484;simple idl, handling verification failure - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1959;ovsdb-idl.at:515;simple idl, increment operation - C;ovsdb server idl positive;
+1960;ovsdb-idl.at:515;simple idl, increment operation - C - tcp;ovsdb server idl positive tcp socket;
+1961;ovsdb-idl.at:515;simple idl, increment operation - C - tcp6;ovsdb server idl positive tcp6 socket;
+1962;ovsdb-idl.at:515;simple idl, increment operation - Python3;ovsdb server idl positive python;
+1963;ovsdb-idl.at:515;simple idl, increment operation - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1964;ovsdb-idl.at:515;simple idl, increment operation - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1965;ovsdb-idl.at:515;simple idl, increment operation - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1966;ovsdb-idl.at:515;simple idl, increment operation - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1967;ovsdb-idl.at:515;simple idl, increment operation - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1968;ovsdb-idl.at:515;simple idl, increment operation - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1969;ovsdb-idl.at:527;simple idl, aborting - C;ovsdb server idl positive;
+1970;ovsdb-idl.at:527;simple idl, aborting - C - tcp;ovsdb server idl positive tcp socket;
+1971;ovsdb-idl.at:527;simple idl, aborting - C - tcp6;ovsdb server idl positive tcp6 socket;
+1972;ovsdb-idl.at:527;simple idl, aborting - Python3;ovsdb server idl positive python;
+1973;ovsdb-idl.at:527;simple idl, aborting - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1974;ovsdb-idl.at:527;simple idl, aborting - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1975;ovsdb-idl.at:527;simple idl, aborting - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1976;ovsdb-idl.at:527;simple idl, aborting - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1977;ovsdb-idl.at:527;simple idl, aborting - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1978;ovsdb-idl.at:527;simple idl, aborting - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1979;ovsdb-idl.at:541;simple idl, destroy without commit or abort - C;ovsdb server idl positive;
+1980;ovsdb-idl.at:541;simple idl, destroy without commit or abort - C - tcp;ovsdb server idl positive tcp socket;
+1981;ovsdb-idl.at:541;simple idl, destroy without commit or abort - C - tcp6;ovsdb server idl positive tcp6 socket;
+1982;ovsdb-idl.at:541;simple idl, destroy without commit or abort - Python3;ovsdb server idl positive python;
+1983;ovsdb-idl.at:541;simple idl, destroy without commit or abort - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1984;ovsdb-idl.at:541;simple idl, destroy without commit or abort - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1985;ovsdb-idl.at:541;simple idl, destroy without commit or abort - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1986;ovsdb-idl.at:541;simple idl, destroy without commit or abort - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1987;ovsdb-idl.at:541;simple idl, destroy without commit or abort - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1988;ovsdb-idl.at:541;simple idl, destroy without commit or abort - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1989;ovsdb-idl.at:555;simple idl, conditional, false condition - C;ovsdb server idl positive;
+1990;ovsdb-idl.at:555;simple idl, conditional, false condition - C - tcp;ovsdb server idl positive tcp socket;
+1991;ovsdb-idl.at:555;simple idl, conditional, false condition - C - tcp6;ovsdb server idl positive tcp6 socket;
+1992;ovsdb-idl.at:555;simple idl, conditional, false condition - Python3;ovsdb server idl positive python;
+1993;ovsdb-idl.at:555;simple idl, conditional, false condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
+1994;ovsdb-idl.at:555;simple idl, conditional, false condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+1995;ovsdb-idl.at:555;simple idl, conditional, false condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+1996;ovsdb-idl.at:555;simple idl, conditional, false condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1997;ovsdb-idl.at:555;simple idl, conditional, false condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+1998;ovsdb-idl.at:555;simple idl, conditional, false condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+1999;ovsdb-idl.at:571;simple idl, conditional, true condition - C;ovsdb server idl positive;
+2000;ovsdb-idl.at:571;simple idl, conditional, true condition - C - tcp;ovsdb server idl positive tcp socket;
+2001;ovsdb-idl.at:571;simple idl, conditional, true condition - C - tcp6;ovsdb server idl positive tcp6 socket;
+2002;ovsdb-idl.at:571;simple idl, conditional, true condition - Python3;ovsdb server idl positive python;
+2003;ovsdb-idl.at:571;simple idl, conditional, true condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2004;ovsdb-idl.at:571;simple idl, conditional, true condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2005;ovsdb-idl.at:571;simple idl, conditional, true condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2006;ovsdb-idl.at:571;simple idl, conditional, true condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2007;ovsdb-idl.at:571;simple idl, conditional, true condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2008;ovsdb-idl.at:571;simple idl, conditional, true condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2009;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - C;ovsdb server idl positive;
+2010;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - C - tcp;ovsdb server idl positive tcp socket;
+2011;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - C - tcp6;ovsdb server idl positive tcp6 socket;
+2012;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - Python3;ovsdb server idl positive python;
+2013;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2014;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2015;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2016;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2017;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2018;ovsdb-idl.at:587;simple idl, conditional, multiple clauses in condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2019;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - C;ovsdb server idl positive;
+2020;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - C - tcp;ovsdb server idl positive tcp socket;
+2021;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - C - tcp6;ovsdb server idl positive tcp6 socket;
+2022;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - Python3;ovsdb server idl positive python;
+2023;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2024;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2025;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2026;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2027;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2028;ovsdb-idl.at:609;simple idl, conditional, modify as insert due to condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2029;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - C;ovsdb server idl positive;
+2030;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - C - tcp;ovsdb server idl positive tcp socket;
+2031;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - C - tcp6;ovsdb server idl positive tcp6 socket;
+2032;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - Python3;ovsdb server idl positive python;
+2033;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2034;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2035;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2036;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2037;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2038;ovsdb-idl.at:625;simple idl, conditional, modify as delete due to condition - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2039;ovsdb-idl.at:652;simple idl, conditional, multiple tables - C;ovsdb server idl positive;
+2040;ovsdb-idl.at:652;simple idl, conditional, multiple tables - C - tcp;ovsdb server idl positive tcp socket;
+2041;ovsdb-idl.at:652;simple idl, conditional, multiple tables - C - tcp6;ovsdb server idl positive tcp6 socket;
+2042;ovsdb-idl.at:652;simple idl, conditional, multiple tables - Python3;ovsdb server idl positive python;
+2043;ovsdb-idl.at:652;simple idl, conditional, multiple tables - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2044;ovsdb-idl.at:652;simple idl, conditional, multiple tables - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2045;ovsdb-idl.at:652;simple idl, conditional, multiple tables - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2046;ovsdb-idl.at:652;simple idl, conditional, multiple tables - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2047;ovsdb-idl.at:652;simple idl, conditional, multiple tables - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2048;ovsdb-idl.at:652;simple idl, conditional, multiple tables - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2049;ovsdb-idl.at:691;self-linking idl, consistent ops - C;ovsdb server idl positive;
+2050;ovsdb-idl.at:691;self-linking idl, consistent ops - C - tcp;ovsdb server idl positive tcp socket;
+2051;ovsdb-idl.at:691;self-linking idl, consistent ops - C - tcp6;ovsdb server idl positive tcp6 socket;
+2052;ovsdb-idl.at:691;self-linking idl, consistent ops - Python3;ovsdb server idl positive python;
+2053;ovsdb-idl.at:691;self-linking idl, consistent ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2054;ovsdb-idl.at:691;self-linking idl, consistent ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2055;ovsdb-idl.at:691;self-linking idl, consistent ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2056;ovsdb-idl.at:691;self-linking idl, consistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2057;ovsdb-idl.at:691;self-linking idl, consistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2058;ovsdb-idl.at:691;self-linking idl, consistent ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2059;ovsdb-idl.at:735;self-linking idl, inconsistent ops - C;ovsdb server idl positive;
+2060;ovsdb-idl.at:735;self-linking idl, inconsistent ops - C - tcp;ovsdb server idl positive tcp socket;
+2061;ovsdb-idl.at:735;self-linking idl, inconsistent ops - C - tcp6;ovsdb server idl positive tcp6 socket;
+2062;ovsdb-idl.at:735;self-linking idl, inconsistent ops - Python3;ovsdb server idl positive python;
+2063;ovsdb-idl.at:735;self-linking idl, inconsistent ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2064;ovsdb-idl.at:735;self-linking idl, inconsistent ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2065;ovsdb-idl.at:735;self-linking idl, inconsistent ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2066;ovsdb-idl.at:735;self-linking idl, inconsistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2067;ovsdb-idl.at:735;self-linking idl, inconsistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2068;ovsdb-idl.at:735;self-linking idl, inconsistent ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2069;ovsdb-idl.at:783;self-linking idl, sets - C;ovsdb server idl positive;
+2070;ovsdb-idl.at:783;self-linking idl, sets - C - tcp;ovsdb server idl positive tcp socket;
+2071;ovsdb-idl.at:783;self-linking idl, sets - C - tcp6;ovsdb server idl positive tcp6 socket;
+2072;ovsdb-idl.at:783;self-linking idl, sets - Python3;ovsdb server idl positive python;
+2073;ovsdb-idl.at:783;self-linking idl, sets - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2074;ovsdb-idl.at:783;self-linking idl, sets - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2075;ovsdb-idl.at:783;self-linking idl, sets - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2076;ovsdb-idl.at:783;self-linking idl, sets - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2077;ovsdb-idl.at:783;self-linking idl, sets - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2078;ovsdb-idl.at:783;self-linking idl, sets - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2079;ovsdb-idl.at:833;external-linking idl, consistent ops - C;ovsdb server idl positive;
+2080;ovsdb-idl.at:833;external-linking idl, consistent ops - C - tcp;ovsdb server idl positive tcp socket;
+2081;ovsdb-idl.at:833;external-linking idl, consistent ops - C - tcp6;ovsdb server idl positive tcp6 socket;
+2082;ovsdb-idl.at:833;external-linking idl, consistent ops - Python3;ovsdb server idl positive python;
+2083;ovsdb-idl.at:833;external-linking idl, consistent ops - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2084;ovsdb-idl.at:833;external-linking idl, consistent ops - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2085;ovsdb-idl.at:833;external-linking idl, consistent ops - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2086;ovsdb-idl.at:833;external-linking idl, consistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2087;ovsdb-idl.at:833;external-linking idl, consistent ops - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2088;ovsdb-idl.at:833;external-linking idl, consistent ops - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2089;ovsdb-idl.at:851;singleton idl, constraints - C;ovsdb server idl positive;
+2090;ovsdb-idl.at:851;singleton idl, constraints - C - tcp;ovsdb server idl positive tcp socket;
+2091;ovsdb-idl.at:851;singleton idl, constraints - C - tcp6;ovsdb server idl positive tcp6 socket;
+2092;ovsdb-idl.at:851;singleton idl, constraints - Python3;ovsdb server idl positive python;
+2093;ovsdb-idl.at:851;singleton idl, constraints - Python3 - register_columns;ovsdb server idl positive python register_columns;
+2094;ovsdb-idl.at:851;singleton idl, constraints - Python3 - tcp;ovsdb server idl positive python with tcp socket;
+2095;ovsdb-idl.at:851;singleton idl, constraints - Python3 (multiple remotes) - tcp;ovsdb server idl positive python with tcp socket;
+2096;ovsdb-idl.at:851;singleton idl, constraints - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2097;ovsdb-idl.at:851;singleton idl, constraints - Python3 - tcp6;ovsdb server idl positive python with tcp6 socket;
+2098;ovsdb-idl.at:851;singleton idl, constraints - Python3 - SSL;ovsdb server idl positive python with ssl socket;
+2099;ovsdb-idl.at:877;external-linking idl, insert ops - Python3;ovsdb server idl positive python;
+2100;ovsdb-idl.at:887;getattr idl, insert ops - Python3;ovsdb server idl positive python;
+2101;ovsdb-idl.at:896;row-from-json idl, whats this - Python3;ovsdb server idl positive python;
+2102;ovsdb-idl.at:913;idl handling of missing tables and columns - C;ovsdb server idl positive;
+2103;ovsdb-idl.at:1005;simple idl, initially populated - Python3 - fetch;ovsdb server idl positive python increment fetch;
+2104;ovsdb-idl.at:1049;simple idl disable monitor-cond - Python3;ovsdb server idl python monitor;
+2105;ovsdb-idl.at:1142;track, simple idl, initially populated - C;ovsdb server idl tracking positive;
+2106;ovsdb-idl.at:1178;track, simple idl, initially populated, orphan weak references - C;ovsdb server idl tracking positive;
+2107;ovsdb-idl.at:1231;track, simple idl, initially populated, orphan rows, conditional - C;ovsdb server idl tracking positive;
+2108;ovsdb-idl.at:1280;track, simple idl, initially empty, various ops - C;ovsdb server idl tracking positive;
+2109;ovsdb-idl.at:1377;map, simple2 idl-partial-update-map-column, initially populated - C;ovsdb server idl partial update map column positive;
+2110;ovsdb-idl.at:1395;partial-map idl - Python3;ovsdb server idl positive python;
+2111;ovsdb-idl.at:1413;partial-map update set refmap idl - Python3;ovsdb server idl positive python;
+2112;ovsdb-idl.at:1438;set, simple3 idl-partial-update-set-column, initially populated - C;ovsdb server idl partial update set column positive;
+2113;ovsdb-idl.at:1458;partial-set idl - Python3;ovsdb server idl positive python;
+2114;ovsdb-idl.at:1489;simple idl verify notify - Python3;ovsdb server idl positive python notify;
+2115;ovsdb-idl.at:1489;simple idl verify notify - Python3 - SSL;ovsdb server idl positive python with ssl socket notify;
+2116;ovsdb-idl.at:1616;Compound_index, single column test  - C;ovsdb server idl compound_index_single_column compound_index positive 001: s=list000 i=1 b=true r=101.000000 i=10 r=110.000000 i=2 b=false r=102.000000 s=list001 r=120.000000 r=122.000000 i=4 r=130.000000 s=list005 i=5 s=list020 i=19 r=219.000000 i=20 r=220.000000 003:;
+2117;ovsdb-idl.at:1763;Compound_index, double column test  - C;ovsdb server idl compound_index_double_column compound_index positive 001: s=list000 i=1 b=true r=101.000000 i=10 r=110.000000 i=2 b=false r=102.000000 s=list001 r=120.000000 r=122.000000 i=4 r=130.000000 s=list005 i=5 s=list020 i=19 r=219.000000 i=20 r=220.000000 002: 003: 004:;
+2118;ovsdb-idl.at:1887;set, simple3 idl-compound-index-with-ref, initially populated - C;ovsdb server idl compound_index compound_index_with_ref positive;
+2119;ovsdb-idl.at:1914;Check stream open block - C - tcp;ovsdb server stream open_block tcp;
+2120;ovsdb-idl.at:1915;Check stream open block - C - tcp6;ovsdb server stream open_block tcp6;
+2121;ovsdb-idl.at:1916;Check stream open block - Python3 - tcp;ovsdb server stream open_block tcp;
+2122;ovsdb-idl.at:1918;Check stream open block - Python3 - tcp6;ovsdb server stream open_block tcp6;
+2123;ovsdb-idl.at:1941;Check Python IDL connects to leader - Python3 (leader only);ovsdb server idl python leader_only with tcp socket;
+2124;ovsdb-idl.at:1942;Check Python IDL reconnects to leader - Python3 (leader only);ovsdb server idl python leader_only with tcp socket;
+2125;ovsdb-idl.at:1966;simple idl, monitor_cond_since, cluster disconnect - C - tcp;ovsdb server idl positive tcp socket 000: change conditions 001: empty 002: 003: i=2 r=1 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1> 004: 005: reconnect 006: 007: {\"error\":null,\"result\":[{\"count\":1}]} 008: i=1 r=2 uuid=<2> 009: done;
+2126;ovsdb-lock.at:21;ovsdb lock -- lock;ovsdb lock positive;
+2127;ovsdb-lock.at:37;ovsdb lock -- unlock;ovsdb lock positive;
+2128;ovsdb-lock.at:57;ovsdb lock -- steal;ovsdb lock positive;
+2129;ovsdb-rbac.at:3;ovsdb-server/rbac 2;ovsdb server rbac;
+2130;ovs-vsctl.at:131;ovs-vsctl connection retry;;
+2131;ovs-vsctl.at:175;add-br a;ovs-vsctl;
+2132;ovs-vsctl.at:185;add-br a, add-br a;ovs-vsctl;
+2133;ovs-vsctl.at:198;add-br a, add-br b;ovs-vsctl;
+2134;ovs-vsctl.at:213;add-br a, add-br b, del-br a;ovs-vsctl;
+2135;ovs-vsctl.at:223;add-br a, del-br a, add-br a;ovs-vsctl;
+2136;ovs-vsctl.at:243;add-br a, add-port a a1, add-port a a2;ovs-vsctl;
+2137;ovs-vsctl.at:257;add-br a, add-port a a1, add-port a a1;ovs-vsctl;
+2138;ovs-vsctl.at:272;add-br a b, add-port a a1, add-port b b1, del-br a;ovs-vsctl;
+2139;ovs-vsctl.at:294;add-br a, add-bond a bond0 a1 a2 a3;ovs-vsctl;
+2140;ovs-vsctl.at:316;add-bond-iface and del-bond-iface;ovs-vsctl;
+2141;ovs-vsctl.at:376;add-br a b, add-port a a1, add-port b b1, del-port a a1;ovs-vsctl;
+2142;ovs-vsctl.at:403;add-br a, add-bond a bond0 a1 a2 a3, del-port bond0;ovs-vsctl;
+2143;ovs-vsctl.at:420;external IDs;ovs-vsctl;
+2144;ovs-vsctl.at:476;controllers;controller ovs-vsctl;
+2145;ovs-vsctl.at:508;fail-mode;fail-mode ovs-vsctl;
+2146;ovs-vsctl.at:538;emer-reset;emer-reset ovs-vsctl;
+2147;ovs-vsctl.at:773;simple fake bridge (VLAN 9);ovs-vsctl fake-bridge;
+2148;ovs-vsctl.at:773;list bridges -- real and fake (VLAN 9);ovs-vsctl fake-bridge;
+2149;ovs-vsctl.at:773;simple fake bridge + del-br fake bridge (VLAN 9);ovs-vsctl fake-bridge;
+2150;ovs-vsctl.at:773;simple fake bridge + del-br real bridge (VLAN 9);ovs-vsctl fake-bridge;
+2151;ovs-vsctl.at:773;simple fake bridge + external IDs (VLAN 9);ovs-vsctl fake-bridge;
+2152;ovs-vsctl.at:773;simple fake bridge + del-port from parent (VLAN 9);ovs-vsctl fake-bridge del-port;
+2153;ovs-vsctl.at:774;simple fake bridge (VLAN 0);ovs-vsctl fake-bridge;
+2154;ovs-vsctl.at:774;list bridges -- real and fake (VLAN 0);ovs-vsctl fake-bridge;
+2155;ovs-vsctl.at:774;simple fake bridge + del-br fake bridge (VLAN 0);ovs-vsctl fake-bridge;
+2156;ovs-vsctl.at:774;simple fake bridge + del-br real bridge (VLAN 0);ovs-vsctl fake-bridge;
+2157;ovs-vsctl.at:774;simple fake bridge + external IDs (VLAN 0);ovs-vsctl fake-bridge;
+2158;ovs-vsctl.at:774;simple fake bridge + del-port from parent (VLAN 0);ovs-vsctl fake-bridge del-port;
+2159;ovs-vsctl.at:785;fake bridge on bond;ovs-vsctl fake-bridge;
+2160;ovs-vsctl.at:797;fake bridge on bond + del-br fake bridge;ovs-vsctl fake-bridge;
+2161;ovs-vsctl.at:809;fake bridge on bond + del-br real bridge;ovs-vsctl fake-bridge;
+2162;ovs-vsctl.at:821;managers;manager ovs-vsctl;
+2163;ovs-vsctl.at:851;database commands -- positive checks;ovs-vsctl;
+2164;ovs-vsctl.at:983;database commands -- negative checks;ovs-vsctl;
+2165;ovs-vsctl.at:1132;database commands -- conditions;ovs-vsctl;
+2166;ovs-vsctl.at:1266;database commands -- wait-until immediately true;ovs-vsctl;
+2167;ovs-vsctl.at:1280;database commands -- wait-until must wait;ovs-vsctl;
+2168;ovs-vsctl.at:1313;--id option on create, get commands;ovs-vsctl;
+2169;ovs-vsctl.at:1360;unreferenced record warnings;ovs-vsctl;
+2170;ovs-vsctl.at:1394;created row UUID is wrong in same execution;ovs-vsctl;
+2171;ovs-vsctl.at:1431;--all option on destroy command;ovs-vsctl;
+2172;ovs-vsctl.at:1480;add-port -- reserved names 1;;
+2173;ovs-vsctl.at:1512;add-port -- reserved names 2;;
+2174;ovs-vsctl.at:1550;naming in db commands;ovs-vsctl;
+2175;ovs-vsctl.at:1569;bootstrap ca cert;ovs-vsctl ssl;
+2176;ovs-vsctl.at:1596;peer ca cert;ovs-vsctl ssl;
+2177;ovs-vsctl.at:1623;TLS server name indication (SNI);ovsdb server positive ssl tls sni;
+2178;ovs-xapi-sync.at:3;ovs-xapi-sync;;
+2179;interface-reconfigure.at:695;non-VLAN, non-bond;interface-reconfigure;
+2180;interface-reconfigure.at:771;VLAN, non-bond;interface-reconfigure;
+2181;interface-reconfigure.at:845;Bond, non-VLAN;interface-reconfigure;
+2182;interface-reconfigure.at:933;VLAN on bond;interface-reconfigure;
+2183;interface-reconfigure.at:1032;Re-create port with different types;interface-reconfigure;
+2184;stp.at:3;STP example from IEEE 802.1D-1998;stp;
+2185;stp.at:27;STP example from IEEE 802.1D-2004 figures 17.4 and 17.5;stp;
+2186;stp.at:70;STP example from IEEE 802.1D-2004 figure 17.6;stp;
+2187;stp.at:96;STP example from IEEE 802.1D-2004 figure 17.7;stp;
+2188;stp.at:125;STP.io.1.1: Link Failure;stp;
+2189;stp.at:164;STP.io.1.2: Repeated Network;stp;
+2190;stp.at:188;STP.io.1.4: Network Initialization;stp;
+2191;stp.at:214;STP.io.1.5: Topology Change;stp;
+2192;stp.at:267;STP.op.1.1 and STP.op.1.2;stp;
+2193;stp.at:281;STP.op.1.4: All Ports Initialized to Designated Ports;stp;
+2194;stp.at:302;STP.op.3.1: Root Bridge Selection: Root ID Values;stp;
+2195;stp.at:322;STP.op.3.3: Root Bridge Selection: Bridge ID Values;stp;
+2196;stp.at:345;STP.op.3.3: Root Bridge Selection: Bridge ID Values;stp;
+2197;stp.at:390;STP - dummy interface;;
+2198;stp.at:467;STP - flush the fdb and mdb when topology changed;;
+2199;stp.at:597;STP - check link-state when stp is running;;
+2200;rstp.at:3;RSTP Single bridge;rstp;
+2201;rstp.at:13;RSTP Link failure;rstp;
+2202;rstp.at:32;RSTP Double link Failure;rstp;
+2203;rstp.at:74;RSTP example from IEEE 802.1D-2004 figures 17.4 and 17.5;rstp;
+2204;rstp.at:111;RSTP example from IEEE 802.1D-2004 figure 17.6;rstp;
+2205;rstp.at:131;RSTP example from IEEE 802.1D-2004 figure 17.7;rstp;
+2206;rstp.at:156;RSTP - dummy interface;;
+2207;vlog.at:3;vlog - Python3;;
+2208;vlog.at:110;vlog - vlog/reopen - C;;
+2209;vlog.at:144;vlog - vlog/reopen - Python3;;
+2210;vlog.at:171;vlog - vlog/reopen without log file - C;;
+2211;vlog.at:183;vlog - vlog/reopen without log file - Python3;;
+2212;vlog.at:195;vlog - vlog/reopen can't reopen log file - C;;
+2213;vlog.at:231;vlog - vlog/reopen can't reopen log file - Python3;;
+2214;vlog.at:258;vlog - vlog/close - C;;
+2215;vlog.at:298;vlog - vlog/close - Python3;;
+2216;vlog.at:332;vlog - vlog/set and vlog/list - C;;
+2217;vlog.at:378;vlog - vlog/set and vlog/list - Python3;;
+2218;vlog.at:428;vlog - RFC5424 facility;;
+2219;vlog.at:465;vlog - RFC5424 facility - Python3;;
+2220;vtep-ctl.at:168;add-ps a;vtep-ctl;
+2221;vtep-ctl.at:176;add-ps a, add-ps a;vtep-ctl;
+2222;vtep-ctl.at:186;add-ps a, add-ps b;vtep-ctl;
+2223;vtep-ctl.at:195;add-ps a, add-ps b, del-ps a;vtep-ctl;
+2224;vtep-ctl.at:204;add-ps a, del-ps a, add-ps a;vtep-ctl;
+2225;vtep-ctl.at:218;add-ps a, add-port a a1, add-port a a2;vtep-ctl;
+2226;vtep-ctl.at:231;add-ps a, add-port a a1, add-port a a1;vtep-ctl;
+2227;vtep-ctl.at:243;add-ps a b, add-port a a1, add-port b b1, del-ps a;vtep-ctl;
+2228;vtep-ctl.at:264;add-ps a b, add-port a a1, add-port b b1, del-port a a1;vtep-ctl;
+2229;vtep-ctl.at:281;add-ps a b, add-port a p1, add-port b p1, del-port a p1;vtep-ctl;
+2230;vtep-ctl.at:304;add-ls a;vtep-ctl;
+2231;vtep-ctl.at:312;add-ls a, add-ls a;vtep-ctl;
+2232;vtep-ctl.at:322;add-ls a, add-ls b;vtep-ctl;
+2233;vtep-ctl.at:331;add-ls a, add-ls b, del-ls a;vtep-ctl;
+2234;vtep-ctl.at:340;add-ls a, del-ls a, add-ls a;vtep-ctl;
+2235;vtep-ctl.at:354;add-ls a, get-replication-mode a;vtep-ctl;
+2236;vtep-ctl.at:365;add-ls a, set-replication-mode a source_node;vtep-ctl;
+2237;vtep-ctl.at:376;add-ls a, set-replication-mode a service_node;vtep-ctl;
+2238;vtep-ctl.at:391;add-lr a;vtep-ctl;
+2239;vtep-ctl.at:399;add-lr a, add-lr a;vtep-ctl;
+2240;vtep-ctl.at:409;add-lr a, add-lr b;vtep-ctl;
+2241;vtep-ctl.at:418;add-lr a, add-lr b, del-lr a;vtep-ctl;
+2242;vtep-ctl.at:427;add-lr a, del-lr a, add-lr a;vtep-ctl;
+2243;vtep-ctl.at:444;bind-ls ps1 pp1 300 ls1;vtep-ctl;
+2244;vtep-ctl.at:462;bind-ls ps1 pp1 300 ls1, bind-ls ps1 pp1 400 ls2;vtep-ctl;
+2245;vtep-ctl.at:484;bind-ls ps1 pp1 300, bind-ls ps2 pp2 300 ls2;vtep-ctl;
+2246;vtep-ctl.at:515;add-ucast-local ls1;vtep-ctl;
+2247;vtep-ctl.at:542;add-ucast-local ls1, overwrite;vtep-ctl;
+2248;vtep-ctl.at:562;add-ucast-local ls1, del-ucast-local ls1;vtep-ctl;
+2249;vtep-ctl.at:593;add-ucast-remote ls1;vtep-ctl;
+2250;vtep-ctl.at:620;add-ucast-remote ls1, overwrite;vtep-ctl;
+2251;vtep-ctl.at:640;add-ucast-remote ls1, del-ucast-remote ls1;vtep-ctl;
+2252;vtep-ctl.at:671;add-ucast-local ls1, add-ucast-remote ls1;vtep-ctl;
+2253;vtep-ctl.at:702;add-mcast-local ls1;vtep-ctl;
+2254;vtep-ctl.at:731;add-mcast-local ls1, del-mcast-local ls1;vtep-ctl;
+2255;vtep-ctl.at:768;add-mcast-remote ls1;vtep-ctl;
+2256;vtep-ctl.at:797;add-mcast-remote ls1, del-mcast-remote ls1;vtep-ctl;
+2257;vtep-ctl.at:834;add-mcast-local ls1, add-mcast-remote ls1;vtep-ctl;
+2258;vtep-ctl.at:869;add local and remote macs, clear-local-macs;vtep-ctl;
+2259;vtep-ctl.at:926;add local and remote macs, clear-remote-macs;vtep-ctl;
+2260;vtep-ctl.at:986;managers;manager vtep-ctl;
+2261;vtep-ctl.at:1013;show command;vtep-ctl show;
+2262;auto-attach.at:3;auto-attach - packets;auto-attach;
+2263;mcast-snooping.at:3;mcast - check multicasts to trunk ports are not duplicated;;
+2264;mcast-snooping.at:108;mcast - delete the port mdb when vlan configuration changed;;
+2265;mcast-snooping.at:165;mcast - delete the port mdb when port destroyed;;
+2266;packet-type-aware.at:3;ptap - legal flow entries in ptap bridge;;
+2267;packet-type-aware.at:34;ptap - triangle bridge setup with L2 and L3 GRE tunnels;;
+2268;packet-type-aware.at:515;ptap - check decap() prerequisits;;
+2269;packet-type-aware.at:544;ptap - check encap/decap VLAN tagged Ethernet frame;;
+2270;packet-type-aware.at:619;ptap - L3 over patch port;;
+2271;packet-type-aware.at:920;ptap - recirculate after packet_type change;;
+2272;nsh.at:7;nsh - matching;;
+2273;nsh.at:53;nsh - md1 encap over a veth link;;
+2274;nsh.at:187;nsh - md2 encap over a veth link;;
+2275;nsh.at:282;nsh - double encap over veth link using groups;;
+2276;nsh.at:462;nsh - triangle PTAP bridge setup with NSH over vxlan-gpe;;
+2277;drop-stats.at:3;drop-stats - cli tests;;
+2278;drop-stats.at:43;drop-stats - pipeline and recurssion drops;;
+2279;drop-stats.at:102;drop-stats - too many resubmit;;
+2280;drop-stats.at:129;drop-stats - stack too deep;;
+2281;drop-stats.at:155;drop-stats - too many mpls labels;;
 "
 # List of the all the test groups.
 at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -2890,7 +2899,7 @@
   for at_grp
   do
     eval at_value=\$$at_grp
-    if test $at_value -lt 1 || test $at_value -gt 2272; then
+    if test $at_value -lt 1 || test $at_value -gt 2281; then
       $as_echo "invalid test group: $at_value" >&2
       exit 1
     fi
@@ -3188,7 +3197,7 @@
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-openvswitch 2.13.1 test suite test groups:
+openvswitch 2.13.3 test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -3229,7 +3238,7 @@
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (openvswitch 2.13.1)" &&
+  $as_echo "$as_me (openvswitch 2.13.3)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3303,340 +3312,340 @@
 # Category starts at test group 128.
 at_banner_text_14="conjunctive match"
 # Banner 15. check-structs.at:1
-# Category starts at test group 132.
+# Category starts at test group 133.
 at_banner_text_15="struct alignment checker unit tests"
 # Banner 16. daemon.at:1
-# Category starts at test group 136.
+# Category starts at test group 137.
 at_banner_text_16="daemon unit tests - C"
 # Banner 17. daemon-py.at:1
-# Category starts at test group 143.
+# Category starts at test group 144.
 at_banner_text_17="daemon unit tests - Python3"
 # Banner 18. ofp-actions.at:1
-# Category starts at test group 152.
+# Category starts at test group 153.
 at_banner_text_18="OpenFlow actions"
 # Banner 19. ofp-print.at:1
-# Category starts at test group 165.
+# Category starts at test group 166.
 at_banner_text_19="ofp-print"
 # Banner 20. ofp-util.at:1
-# Category starts at test group 398.
+# Category starts at test group 399.
 at_banner_text_20="OpenFlow utilities"
 # Banner 21. ofp-errors.at:1
-# Category starts at test group 400.
+# Category starts at test group 401.
 at_banner_text_21="ofp-errors tests"
 # Banner 22. ovs-ofctl.at:1
-# Category starts at test group 414.
+# Category starts at test group 415.
 at_banner_text_22="ovs-ofctl"
 # Banner 23. fuzz-regression.at:1
-# Category starts at test group 453.
+# Category starts at test group 454.
 at_banner_text_23="fuzz regression"
 # Banner 24. odp.at:1
-# Category starts at test group 476.
+# Category starts at test group 477.
 at_banner_text_24="datapath parsing and formatting"
 # Banner 25. mpls-xlate.at:1
-# Category starts at test group 482.
+# Category starts at test group 484.
 at_banner_text_25="mpls-xlate"
 # Banner 26. multipath.at:1
-# Category starts at test group 485.
+# Category starts at test group 487.
 at_banner_text_26="multipath link selection"
 # Banner 27. learn.at:1
-# Category starts at test group 493.
+# Category starts at test group 495.
 at_banner_text_27="learning action"
 # Banner 28. vconn.at:20
-# Category starts at test group 513.
+# Category starts at test group 515.
 at_banner_text_28="vconn library -- unix class"
 # Banner 29. vconn.at:21
-# Category starts at test group 521.
+# Category starts at test group 523.
 at_banner_text_29="vconn library -- tcp class"
 # Banner 30. vconn.at:22
-# Category starts at test group 529.
+# Category starts at test group 531.
 at_banner_text_30="vconn library -- ssl class"
 # Banner 31. file_name.at:1
-# Category starts at test group 537.
+# Category starts at test group 539.
 at_banner_text_31="test dir_name and base_name functions"
 # Banner 32. file_name.at:29
-# Category starts at test group 550.
+# Category starts at test group 552.
 at_banner_text_32="test follow_symlinks function"
 # Banner 33. aes128.at:1
-# Category starts at test group 558.
+# Category starts at test group 560.
 at_banner_text_33="AES-128 unit tests"
 # Banner 34. unixctl-py.at:1
-# Category starts at test group 581.
+# Category starts at test group 583.
 at_banner_text_34="unixctl"
 # Banner 35. uuid.at:1
-# Category starts at test group 587.
+# Category starts at test group 589.
 at_banner_text_35="UUID unit tests"
 # Banner 36. json.at:53
-# Category starts at test group 588.
+# Category starts at test group 590.
 at_banner_text_36="JSON -- arrays"
 # Banner 37. json.at:68
-# Category starts at test group 602.
+# Category starts at test group 604.
 at_banner_text_37="JSON -- strings"
 # Banner 38. json.at:125
-# Category starts at test group 634.
+# Category starts at test group 636.
 at_banner_text_38="JSON -- objects"
 # Banner 39. json.at:147
-# Category starts at test group 650.
+# Category starts at test group 652.
 at_banner_text_39="JSON -- literal names"
 # Banner 40. json.at:161
-# Category starts at test group 664.
+# Category starts at test group 666.
 at_banner_text_40="JSON -- numbers"
 # Banner 41. json.at:274
-# Category starts at test group 704.
+# Category starts at test group 706.
 at_banner_text_41="JSON -- RFC 4627 examples"
 # Banner 42. json.at:317
-# Category starts at test group 708.
+# Category starts at test group 710.
 at_banner_text_42="JSON -- pathological cases"
 # Banner 43. json.at:340
-# Category starts at test group 719.
+# Category starts at test group 721.
 at_banner_text_43="JSON -- multiple inputs"
 # Banner 44. jsonrpc.at:1
-# Category starts at test group 731.
+# Category starts at test group 733.
 at_banner_text_44="JSON-RPC - C"
 # Banner 45. jsonrpc-py.at:1
-# Category starts at test group 734.
+# Category starts at test group 736.
 at_banner_text_45="JSON-RPC - Python3"
 # Banner 46. tunnel.at:1
-# Category starts at test group 737.
+# Category starts at test group 739.
 at_banner_text_46="tunnel"
 # Banner 47. tunnel-push-pop.at:1
-# Category starts at test group 762.
+# Category starts at test group 765.
 at_banner_text_47="tunnel_push_pop"
 # Banner 48. tunnel-push-pop-ipv6.at:1
-# Category starts at test group 766.
+# Category starts at test group 769.
 at_banner_text_48="tunnel_push_pop_ipv6"
 # Banner 49. ovs-router.at:1
-# Category starts at test group 769.
+# Category starts at test group 772.
 at_banner_text_49="ovs-router"
 # Banner 50. lockfile.at:1
-# Category starts at test group 772.
+# Category starts at test group 775.
 at_banner_text_50="lockfile unit tests"
 # Banner 51. reconnect.at:1
-# Category starts at test group 782.
+# Category starts at test group 785.
 at_banner_text_51="reconnect library"
 # Banner 52. ovs-vswitchd.at:1
-# Category starts at test group 808.
+# Category starts at test group 811.
 at_banner_text_52="ovs-vswitchd"
 # Banner 53. ofproto.at:1
-# Category starts at test group 817.
+# Category starts at test group 820.
 at_banner_text_53="ofproto"
 # Banner 54. dpif-netdev.at:1
-# Category starts at test group 973.
+# Category starts at test group 976.
 at_banner_text_54="dpif-netdev"
 # Banner 55. pmd.at:1
-# Category starts at test group 987.
+# Category starts at test group 990.
 at_banner_text_55="PMD"
 # Banner 56. dpctl.at:1
-# Category starts at test group 1000.
+# Category starts at test group 1003.
 at_banner_text_56="dpctl"
 # Banner 57. ofproto-dpif.at:1
-# Category starts at test group 1002.
+# Category starts at test group 1005.
 at_banner_text_57="ofproto-dpif"
 # Banner 58. ofproto-dpif.at:8168
-# Category starts at test group 1154.
+# Category starts at test group 1157.
 at_banner_text_58="ofproto-dpif -- megaflows"
 # Banner 59. ofproto-dpif.at:8884
-# Category starts at test group 1186.
+# Category starts at test group 1189.
 at_banner_text_59="ofproto-dpif - flow translation resource limits"
 # Banner 60. bridge.at:1
-# Category starts at test group 1228.
+# Category starts at test group 1231.
 at_banner_text_60="bridge"
 # Banner 61. netdev-type.at:1
-# Category starts at test group 1231.
+# Category starts at test group 1235.
 at_banner_text_61="netdev-type"
 # Banner 62. ovsdb-log.at:1
-# Category starts at test group 1232.
+# Category starts at test group 1236.
 at_banner_text_62="OVSDB -- logging"
 # Banner 63. ovsdb-types.at:1
-# Category starts at test group 1246.
+# Category starts at test group 1250.
 at_banner_text_63="OVSDB -- atomic types"
 # Banner 64. ovsdb-types.at:16
-# Category starts at test group 1258.
+# Category starts at test group 1262.
 at_banner_text_64="OVSDB -- base types"
 # Banner 65. ovsdb-types.at:90
-# Category starts at test group 1304.
+# Category starts at test group 1308.
 at_banner_text_65="OVSDB -- simple types"
 # Banner 66. ovsdb-types.at:112
-# Category starts at test group 1322.
+# Category starts at test group 1326.
 at_banner_text_66="OVSDB -- set types"
 # Banner 67. ovsdb-types.at:144
-# Category starts at test group 1340.
+# Category starts at test group 1344.
 at_banner_text_67="OVSDB -- map types"
 # Banner 68. ovsdb-data.at:1
-# Category starts at test group 1354.
+# Category starts at test group 1358.
 at_banner_text_68="OVSDB -- default values"
 # Banner 69. ovsdb-data.at:74
-# Category starts at test group 1358.
+# Category starts at test group 1362.
 at_banner_text_69="OVSDB -- atoms without constraints"
 # Banner 70. ovsdb-data.at:339
-# Category starts at test group 1407.
+# Category starts at test group 1411.
 at_banner_text_70="OVSDB -- atoms with enum constraints"
 # Banner 71. ovsdb-data.at:433
-# Category starts at test group 1420.
+# Category starts at test group 1424.
 at_banner_text_71="OVSDB -- atoms with other constraints"
 # Banner 72. ovsdb-data.at:551
-# Category starts at test group 1436.
+# Category starts at test group 1440.
 at_banner_text_72="OVSDB -- simple data"
 # Banner 73. ovsdb-data.at:601
-# Category starts at test group 1448.
+# Category starts at test group 1452.
 at_banner_text_73="OVSDB -- set data"
 # Banner 74. ovsdb-data.at:749
-# Category starts at test group 1475.
+# Category starts at test group 1479.
 at_banner_text_74="OVSDB -- map data"
 # Banner 75. ovsdb-column.at:1
-# Category starts at test group 1500.
+# Category starts at test group 1504.
 at_banner_text_75="OVSDB -- columns"
 # Banner 76. ovsdb-table.at:1
-# Category starts at test group 1506.
+# Category starts at test group 1510.
 at_banner_text_76="OVSDB -- tables"
 # Banner 77. ovsdb-row.at:1
-# Category starts at test group 1534.
+# Category starts at test group 1538.
 at_banner_text_77="OVSDB -- rows"
 # Banner 78. ovsdb-schema.at:1
-# Category starts at test group 1545.
+# Category starts at test group 1549.
 at_banner_text_78="OVSDB -- schemas"
 # Banner 79. ovsdb-condition.at:1
-# Category starts at test group 1557.
+# Category starts at test group 1561.
 at_banner_text_79="OVSDB -- conditions"
 # Banner 80. ovsdb-mutation.at:1
-# Category starts at test group 1581.
+# Category starts at test group 1585.
 at_banner_text_80="OVSDB -- mutations"
 # Banner 81. ovsdb-query.at:1
-# Category starts at test group 1600.
+# Category starts at test group 1604.
 at_banner_text_81="OVSDB -- queries"
 # Banner 82. ovsdb-transaction.at:1
-# Category starts at test group 1607.
+# Category starts at test group 1611.
 at_banner_text_82="OVSDB -- transactions"
 # Banner 83. ovsdb-execution.at:1
-# Category starts at test group 1622.
+# Category starts at test group 1626.
 at_banner_text_83="OVSDB -- execution"
 # Banner 84. ovsdb-trigger.at:1
-# Category starts at test group 1653.
+# Category starts at test group 1657.
 at_banner_text_84="OVSDB -- triggers"
 # Banner 85. ovsdb-tool.at:1
-# Category starts at test group 1658.
+# Category starts at test group 1662.
 at_banner_text_85="OVSDB -- ovsdb-tool"
 # Banner 86. ovsdb-replication.at:1
-# Category starts at test group 1697.
+# Category starts at test group 1701.
 at_banner_text_86="OVSDB -- replication"
 # Banner 87. ovsdb-server.at:1
-# Category starts at test group 1697.
+# Category starts at test group 1701.
 at_banner_text_87="OVSDB -- ovsdb-server transactions (Unix sockets)"
 # Banner 88. ovsdb-server.at:43
-# Category starts at test group 1723.
+# Category starts at test group 1727.
 at_banner_text_88="ovsdb-server miscellaneous features"
 # Banner 89. ovsdb-server.at:1229
-# Category starts at test group 1739.
+# Category starts at test group 1743.
 at_banner_text_89="OVSDB -- ovsdb-server transactions (SSL IPv4 sockets)"
 # Banner 90. ovsdb-server.at:1266
-# Category starts at test group 1765.
+# Category starts at test group 1769.
 at_banner_text_90="OVSDB -- ovsdb-server transactions (SSL IPv6 sockets)"
 # Banner 91. ovsdb-server.at:1304
-# Category starts at test group 1766.
+# Category starts at test group 1770.
 at_banner_text_91="OVSDB -- ovsdb-server transactions (TCP IPv4 sockets)"
 # Banner 92. ovsdb-server.at:1340
-# Category starts at test group 1792.
+# Category starts at test group 1796.
 at_banner_text_92="OVSDB -- ovsdb-server transactions (TCP IPv6 sockets)"
 # Banner 93. ovsdb-server.at:1377
-# Category starts at test group 1793.
+# Category starts at test group 1797.
 at_banner_text_93="OVSDB -- transactions on transient ovsdb-server"
 # Banner 94. ovsdb-server.at:1413
-# Category starts at test group 1819.
+# Category starts at test group 1823.
 at_banner_text_94="OVSDB -- ovsdb-server replication"
 # Banner 95. ovsdb-server.at:1453
-# Category starts at test group 1845.
+# Category starts at test group 1849.
 at_banner_text_95="OVSDB -- ovsdb-server replication table-exclusion"
 # Banner 96. ovsdb-server.at:1507
-# Category starts at test group 1851.
+# Category starts at test group 1855.
 at_banner_text_96="OVSDB -- ovsdb-server replication runtime management commands"
 # Banner 97. ovsdb-client.at:1
-# Category starts at test group 1861.
+# Category starts at test group 1865.
 at_banner_text_97="OVSDB -- ovsdb-client commands"
 # Banner 98. ovsdb-monitor.at:1
-# Category starts at test group 1864.
+# Category starts at test group 1868.
 at_banner_text_98="OVSDB -- ovsdb-server monitors"
 # Banner 99. ovsdb-monitor.at:318
-# Category starts at test group 1873.
+# Category starts at test group 1877.
 at_banner_text_99="ovsdb -- ovsdb-monitor monitor only some operations"
 # Banner 100. ovsdb-monitor.at:390
-# Category starts at test group 1878.
+# Category starts at test group 1882.
 at_banner_text_100="ovsdb -- ovsdb-monitor-cond conditional monitor only some operations"
 # Banner 101. ovsdb-idl.at:1
-# Category starts at test group 1893.
+# Category starts at test group 1897.
 at_banner_text_101="OVSDB -- interface description language (IDL)"
 # Banner 102. ovsdb-lock.at:1
-# Category starts at test group 2117.
+# Category starts at test group 2126.
 at_banner_text_102="OVSDB -- lock"
 # Banner 103. ovsdb-rbac.at:1
-# Category starts at test group 2120.
+# Category starts at test group 2129.
 at_banner_text_103="OVSDB -- ovsdb-server rbac"
 # Banner 104. ovs-vsctl.at:129
-# Category starts at test group 2121.
+# Category starts at test group 2130.
 at_banner_text_104="ovs-vsctl unit tests"
 # Banner 105. ovs-vsctl.at:173
-# Category starts at test group 2122.
+# Category starts at test group 2131.
 at_banner_text_105="ovs-vsctl unit tests -- real bridges"
 # Banner 106. ovs-vsctl.at:773
-# Category starts at test group 2138.
+# Category starts at test group 2147.
 at_banner_text_106="ovs-vsctl unit tests -- fake bridges (VLAN 9)"
 # Banner 107. ovs-vsctl.at:774
-# Category starts at test group 2144.
+# Category starts at test group 2153.
 at_banner_text_107="ovs-vsctl unit tests -- fake bridges (VLAN 0)"
 # Banner 108. ovs-vsctl.at:819
-# Category starts at test group 2153.
+# Category starts at test group 2162.
 at_banner_text_108="ovs-vsctl unit tests -- manager commands"
 # Banner 109. ovs-vsctl.at:849
-# Category starts at test group 2154.
+# Category starts at test group 2163.
 at_banner_text_109="ovs-vsctl unit tests -- database commands"
 # Banner 110. ovs-vsctl.at:1478
-# Category starts at test group 2163.
+# Category starts at test group 2172.
 at_banner_text_110="ovs-vsctl add-port -- reserved port names"
 # Banner 111. ovs-xapi-sync.at:1
-# Category starts at test group 2169.
+# Category starts at test group 2178.
 at_banner_text_111="ovs-xapi-sync"
 # Banner 112. interface-reconfigure.at:693
-# Category starts at test group 2170.
+# Category starts at test group 2179.
 at_banner_text_112="interface-reconfigure"
 # Banner 113. stp.at:1
-# Category starts at test group 2175.
+# Category starts at test group 2184.
 at_banner_text_113="Spanning Tree Protocol unit tests"
 # Banner 114. rstp.at:1
-# Category starts at test group 2191.
+# Category starts at test group 2200.
 at_banner_text_114="Rapid Spanning Tree Protocol unit tests"
 # Banner 115. vlog.at:1
-# Category starts at test group 2198.
+# Category starts at test group 2207.
 at_banner_text_115="vlog"
 # Banner 116. vtep-ctl.at:166
-# Category starts at test group 2211.
+# Category starts at test group 2220.
 at_banner_text_116="vtep-ctl unit tests -- physical switch tests"
 # Banner 117. vtep-ctl.at:302
-# Category starts at test group 2221.
+# Category starts at test group 2230.
 at_banner_text_117="vtep-ctl unit tests -- logical switch tests"
 # Banner 118. vtep-ctl.at:389
-# Category starts at test group 2229.
+# Category starts at test group 2238.
 at_banner_text_118="vtep-ctl unit tests -- logical router tests"
 # Banner 119. vtep-ctl.at:442
-# Category starts at test group 2234.
+# Category starts at test group 2243.
 at_banner_text_119="vtep-ctl unit tests -- logical binding tests"
 # Banner 120. vtep-ctl.at:513
-# Category starts at test group 2237.
+# Category starts at test group 2246.
 at_banner_text_120="vtep-ctl unit tests -- MAC binding tests"
 # Banner 121. vtep-ctl.at:984
-# Category starts at test group 2251.
+# Category starts at test group 2260.
 at_banner_text_121="vtep-ctl unit tests -- manager commands"
 # Banner 122. auto-attach.at:1
-# Category starts at test group 2253.
+# Category starts at test group 2262.
 at_banner_text_122="auto-attach unit tests"
 # Banner 123. mcast-snooping.at:1
-# Category starts at test group 2254.
+# Category starts at test group 2263.
 at_banner_text_123="mcast snooping"
 # Banner 124. packet-type-aware.at:1
-# Category starts at test group 2257.
+# Category starts at test group 2266.
 at_banner_text_124="packet-type-aware pipeline"
 # Banner 125. nsh.at:1
-# Category starts at test group 2263.
+# Category starts at test group 2272.
 at_banner_text_125="network service header (NSH)"
 # Banner 126. drop-stats.at:1
-# Category starts at test group 2268.
+# Category starts at test group 2277.
 at_banner_text_126="drop-stats"
 
 # Take any -C into account.
@@ -3798,11 +3807,11 @@
 
 # Banners and logs.
 $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
 {
   $as_echo "## ------------------------------ ##
-## openvswitch 2.13.1 test suite. ##
+## openvswitch 2.13.3 test suite. ##
 ## ------------------------------ ##"
   echo
 
@@ -7515,25 +7524,6 @@
     on_exit 'kill `cat ovsdb-server.pid`'
 }
 
-# ovsdb_cluster_start_idltest [REMOTE] [SCHEMA]
-#
-# Creates a database using SCHEMA (default: idltest.ovsschema) and
-# starts a database cluster listening on punix:socket and REMOTE (if
-# specified).
-ovsdb_cluster_start_idltest () {
-   local n=$1
-   ovsdb-tool create-cluster s1.db $abs_srcdir/idltest.ovsschema unix:s1.raft || return $?
-   cid=`ovsdb-tool db-cid s1.db`
-   schema_name=`ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema`
-   for i in `seq 2 $n`; do
-     ovsdb-tool join-cluster s$i.db $schema_name unix:s$i.raft unix:s1.raft || return $?
-   done
-   for i in `seq $n`; do
-     ovsdb-server -vraft -vconsole:warn --detach --no-chdir --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i --remote=punix:s$i.ovsdb ${2:+--remote=$2} s$i.db || return $?
-   done
-   on_exit 'kill `cat s*.pid`'
-}
-
 # ovsdb_cluster_leader [REMOTES] [DATABASE]
 #
 # Returns the leader of the DATABASE cluster.
@@ -8825,7 +8815,7 @@
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <bugs@openvswitch.org>
-   Subject: [openvswitch 2.13.1] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [openvswitch 2.13.3] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -33248,18 +33238,19 @@
 
 ovs_init
 
+
 { set +x
-$as_echo "$at_srcdir/library.at:56: ovstest test-sha1"
-at_fn_check_prepare_trace "library.at:56"
+$as_echo "$at_srcdir/library.at:57: ovstest test-sha1"
+at_fn_check_prepare_trace "library.at:57"
 ( $at_check_trace; ovstest test-sha1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo ".........
+echo >>"$at_stdout"; $as_echo "..........
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:56"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:57"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33270,7 +33261,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_57
 #AT_START_58
-at_fn_group_banner 58 'library.at:60' \
+at_fn_group_banner 58 'library.at:61' \
   "test skiplist" "                                  " 7
 at_xfail=no
 (
@@ -33281,8 +33272,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/library.at:62: ovstest test-skiplist"
-at_fn_check_prepare_trace "library.at:62"
+$as_echo "$at_srcdir/library.at:63: ovstest test-skiplist"
+at_fn_check_prepare_trace "library.at:63"
 ( $at_check_trace; ovstest test-skiplist
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -33296,7 +33287,7 @@
 
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:62"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:63"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33307,7 +33298,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_58
 #AT_START_59
-at_fn_group_banner 59 'library.at:71' \
+at_fn_group_banner 59 'library.at:72' \
   "type properties" "                                " 7
 at_xfail=no
 (
@@ -33317,15 +33308,15 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:72: test-type-props"
-at_fn_check_prepare_trace "library.at:72"
+$as_echo "$at_srcdir/library.at:73: test-type-props"
+at_fn_check_prepare_trace "library.at:73"
 ( $at_check_trace; test-type-props
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:72"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:73"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33336,7 +33327,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_59
 #AT_START_60
-at_fn_group_banner 60 'library.at:75' \
+at_fn_group_banner 60 'library.at:76' \
   "strtok_r bug fix" "                               " 7
 at_xfail=no
 (
@@ -33346,8 +33337,8 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:76: test-strtok_r"
-at_fn_check_prepare_trace "library.at:76"
+$as_echo "$at_srcdir/library.at:77: test-strtok_r"
+at_fn_check_prepare_trace "library.at:77"
 ( $at_check_trace; test-strtok_r
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -33356,7 +33347,7 @@
 echo >>"$at_stdout"; $as_echo "NULL NULL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:76"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:77"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33367,7 +33358,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_60
 #AT_START_61
-at_fn_group_banner 61 'library.at:80' \
+at_fn_group_banner 61 'library.at:81' \
   "byte order conversion" "                          " 7
 at_xfail=no
 (
@@ -33378,15 +33369,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/library.at:82: ovstest test-byte-order"
-at_fn_check_prepare_trace "library.at:82"
+$as_echo "$at_srcdir/library.at:83: ovstest test-byte-order"
+at_fn_check_prepare_trace "library.at:83"
 ( $at_check_trace; ovstest test-byte-order
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:82"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:83"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33397,7 +33388,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_61
 #AT_START_62
-at_fn_group_banner 62 'library.at:85' \
+at_fn_group_banner 62 'library.at:86' \
   "random number generator" "                        " 7
 at_xfail=no
 (
@@ -33407,8 +33398,8 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:86: ovstest test-random"
-at_fn_check_prepare_trace "library.at:86"
+$as_echo "$at_srcdir/library.at:87: ovstest test-random"
+at_fn_check_prepare_trace "library.at:87"
 ( $at_check_trace; ovstest test-random
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -33463,7 +33454,7 @@
 (expected values are 625)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:86"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:87"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33474,7 +33465,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_62
 #AT_START_63
-at_fn_group_banner 63 'library.at:137' \
+at_fn_group_banner 63 'library.at:138' \
   "ctz() function" "                                 " 7
 at_xfail=no
 (
@@ -33485,15 +33476,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util ctz"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util ctz"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util ctz
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33504,7 +33495,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_63
 #AT_START_64
-at_fn_group_banner 64 'library.at:137' \
+at_fn_group_banner 64 'library.at:138' \
   "clz() function" "                                 " 7
 at_xfail=no
 (
@@ -33515,15 +33506,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util clz"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util clz"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util clz
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33534,7 +33525,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_64
 #AT_START_65
-at_fn_group_banner 65 'library.at:137' \
+at_fn_group_banner 65 'library.at:138' \
   "round_up_pow2() function" "                       " 7
 at_xfail=no
 (
@@ -33545,15 +33536,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util round_up_pow2"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util round_up_pow2"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util round_up_pow2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33564,7 +33555,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_65
 #AT_START_66
-at_fn_group_banner 66 'library.at:137' \
+at_fn_group_banner 66 'library.at:138' \
   "round_down_pow2() function" "                     " 7
 at_xfail=no
 (
@@ -33575,15 +33566,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util round_down_pow2"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util round_down_pow2"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util round_down_pow2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33594,7 +33585,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_66
 #AT_START_67
-at_fn_group_banner 67 'library.at:137' \
+at_fn_group_banner 67 'library.at:138' \
   "count_1bits() function" "                         " 7
 at_xfail=no
 (
@@ -33605,15 +33596,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util count_1bits"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util count_1bits"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util count_1bits
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33624,7 +33615,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_67
 #AT_START_68
-at_fn_group_banner 68 'library.at:137' \
+at_fn_group_banner 68 'library.at:138' \
   "log_2_floor() function" "                         " 7
 at_xfail=no
 (
@@ -33635,15 +33626,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util log_2_floor"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util log_2_floor"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util log_2_floor
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33654,7 +33645,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_68
 #AT_START_69
-at_fn_group_banner 69 'library.at:137' \
+at_fn_group_banner 69 'library.at:138' \
   "bitwise_copy() function" "                        " 7
 at_xfail=no
 (
@@ -33665,15 +33656,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util bitwise_copy"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util bitwise_copy"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util bitwise_copy
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33684,7 +33675,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_69
 #AT_START_70
-at_fn_group_banner 70 'library.at:137' \
+at_fn_group_banner 70 'library.at:138' \
   "bitwise_zero() function" "                        " 7
 at_xfail=no
 (
@@ -33695,15 +33686,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util bitwise_zero"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util bitwise_zero"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util bitwise_zero
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33714,7 +33705,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_70
 #AT_START_71
-at_fn_group_banner 71 'library.at:137' \
+at_fn_group_banner 71 'library.at:138' \
   "bitwise_one() function" "                         " 7
 at_xfail=no
 (
@@ -33725,15 +33716,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util bitwise_one"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util bitwise_one"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util bitwise_one
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33744,7 +33735,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_71
 #AT_START_72
-at_fn_group_banner 72 'library.at:137' \
+at_fn_group_banner 72 'library.at:138' \
   "bitwise_is_all_zeros() function" "                " 7
 at_xfail=no
 (
@@ -33755,15 +33746,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util bitwise_is_all_zeros"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util bitwise_is_all_zeros"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util bitwise_is_all_zeros
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33774,7 +33765,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_72
 #AT_START_73
-at_fn_group_banner 73 'library.at:137' \
+at_fn_group_banner 73 'library.at:138' \
   "bitwise_rscan() function" "                       " 7
 at_xfail=no
 (
@@ -33785,15 +33776,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util bitwise_rscan"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util bitwise_rscan"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util bitwise_rscan
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33804,7 +33795,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_73
 #AT_START_74
-at_fn_group_banner 74 'library.at:137' \
+at_fn_group_banner 74 'library.at:138' \
   "ovs_scan() function" "                            " 7
 at_xfail=no
 (
@@ -33815,15 +33806,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/library.at:137: ovstest test-util ovs_scan"
-at_fn_check_prepare_trace "library.at:137"
+$as_echo "$at_srcdir/library.at:138: ovstest test-util ovs_scan"
+at_fn_check_prepare_trace "library.at:138"
 ( $at_check_trace; ovstest test-util ovs_scan
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:137"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:138"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33834,7 +33825,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_74
 #AT_START_75
-at_fn_group_banner 75 'library.at:156' \
+at_fn_group_banner 75 'library.at:157' \
   "unix socket, short pathname - C" "                " 7
 at_xfail=no
 (
@@ -33843,19 +33834,19 @@
 
 ovs_init
 
-$as_echo "library.at:157" >"$at_check_line_file"
+$as_echo "library.at:158" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/library.at:157"
+  && at_fn_check_skip 77 "$at_srcdir/library.at:158"
 { set +x
-$as_echo "$at_srcdir/library.at:158: ovstest test-unix-socket x"
-at_fn_check_prepare_trace "library.at:158"
+$as_echo "$at_srcdir/library.at:159: ovstest test-unix-socket x"
+at_fn_check_prepare_trace "library.at:159"
 ( $at_check_trace; ovstest test-unix-socket x
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:158"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:159"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33866,7 +33857,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_75
 #AT_START_76
-at_fn_group_banner 76 'library.at:166' \
+at_fn_group_banner 76 'library.at:167' \
   "unix socket, long pathname - C" "                 " 7
 at_xfail=no
 (
@@ -33875,35 +33866,35 @@
 
 ovs_init
 
-$as_echo "library.at:167" >"$at_check_line_file"
+$as_echo "library.at:168" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/library.at:167"
+  && at_fn_check_skip 77 "$at_srcdir/library.at:168"
 longname=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012
 
 { set +x
-$as_echo "$at_srcdir/library.at:174: mkdir \$longname || exit 77"
-at_fn_check_prepare_dynamic "mkdir $longname || exit 77" "library.at:174"
+$as_echo "$at_srcdir/library.at:175: mkdir \$longname || exit 77"
+at_fn_check_prepare_dynamic "mkdir $longname || exit 77" "library.at:175"
 ( $at_check_trace; mkdir $longname || exit 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:174"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:175"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/library.at:176: cd \$longname && ovstest test-unix-socket ../\$longname/socket socket"
-at_fn_check_prepare_dynamic "cd $longname && ovstest test-unix-socket ../$longname/socket socket" "library.at:176"
+$as_echo "$at_srcdir/library.at:177: cd \$longname && ovstest test-unix-socket ../\$longname/socket socket"
+at_fn_check_prepare_dynamic "cd $longname && ovstest test-unix-socket ../$longname/socket socket" "library.at:177"
 ( $at_check_trace; cd $longname && ovstest test-unix-socket ../$longname/socket socket
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:176"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:177"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33914,7 +33905,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_76
 #AT_START_77
-at_fn_group_banner 77 'library.at:179' \
+at_fn_group_banner 77 'library.at:180' \
   "unix socket, short pathname - Python3" "          " 7
 at_xfail=no
 (
@@ -33923,20 +33914,20 @@
 
 ovs_init
 
-$as_echo "library.at:180" >"$at_check_line_file"
+$as_echo "library.at:181" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/library.at:180"
+  && at_fn_check_skip 77 "$at_srcdir/library.at:181"
 
 { set +x
-$as_echo "$at_srcdir/library.at:182: \$PYTHON3 \$srcdir/test-unix-socket.py x"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-unix-socket.py x" "library.at:182"
+$as_echo "$at_srcdir/library.at:183: \$PYTHON3 \$srcdir/test-unix-socket.py x"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-unix-socket.py x" "library.at:183"
 ( $at_check_trace; $PYTHON3 $srcdir/test-unix-socket.py x
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:182"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:183"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33947,7 +33938,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_77
 #AT_START_78
-at_fn_group_banner 78 'library.at:190' \
+at_fn_group_banner 78 'library.at:191' \
   "unix socket, long pathname - Python3" "           " 7
 at_xfail=no
 (
@@ -33956,35 +33947,35 @@
 
 ovs_init
 
-$as_echo "library.at:191" >"$at_check_line_file"
+$as_echo "library.at:192" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/library.at:191"
+  && at_fn_check_skip 77 "$at_srcdir/library.at:192"
 
 longname=01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012
 
 { set +x
-$as_echo "$at_srcdir/library.at:199: mkdir \$longname || exit 77"
-at_fn_check_prepare_dynamic "mkdir $longname || exit 77" "library.at:199"
+$as_echo "$at_srcdir/library.at:200: mkdir \$longname || exit 77"
+at_fn_check_prepare_dynamic "mkdir $longname || exit 77" "library.at:200"
 ( $at_check_trace; mkdir $longname || exit 77
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:199"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:200"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/library.at:200: cd \$longname && \$PYTHON3 \$abs_srcdir/test-unix-socket.py ../\$longname/socket socket"
-at_fn_check_prepare_dynamic "cd $longname && $PYTHON3 $abs_srcdir/test-unix-socket.py ../$longname/socket socket" "library.at:200"
+$as_echo "$at_srcdir/library.at:201: cd \$longname && \$PYTHON3 \$abs_srcdir/test-unix-socket.py ../\$longname/socket socket"
+at_fn_check_prepare_dynamic "cd $longname && $PYTHON3 $abs_srcdir/test-unix-socket.py ../$longname/socket socket" "library.at:201"
 ( $at_check_trace; cd $longname && $PYTHON3 $abs_srcdir/test-unix-socket.py ../$longname/socket socket
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:200"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:201"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -33995,7 +33986,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_78
 #AT_START_79
-at_fn_group_banner 79 'library.at:203' \
+at_fn_group_banner 79 'library.at:204' \
   "ovs_assert" "                                     " 7
 at_xfail=no
 (
@@ -34011,23 +34002,23 @@
   exit_status=134
 fi
 { set +x
-$as_echo "$at_srcdir/library.at:210: ovstest test-util -voff -vfile:info '-vPATTERN:file:%c|%p|%m' --log-file assert"
-at_fn_check_prepare_notrace 'a shell pipeline' "library.at:210"
+$as_echo "$at_srcdir/library.at:211: ovstest test-util -voff -vfile:info '-vPATTERN:file:%c|%p|%m' --log-file assert"
+at_fn_check_prepare_notrace 'a shell pipeline' "library.at:211"
 ( $at_check_trace; ovstest test-util -voff -vfile:info '-vPATTERN:file:%c|%p|%m' --log-file assert
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status $exit_status $at_status "$at_srcdir/library.at:210"
+at_fn_check_status $exit_status $at_status "$at_srcdir/library.at:211"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/library.at:213: sed 's/\\(opened log file\\) .*/\\1/
+$as_echo "$at_srcdir/library.at:214: sed 's/\\(opened log file\\) .*/\\1/
 s/|[^|]*: /|/' test-util.log"
-at_fn_check_prepare_notrace 'an embedded newline' "library.at:213"
+at_fn_check_prepare_notrace 'an embedded newline' "library.at:214"
 ( $at_check_trace; sed 's/\(opened log file\) .*/\1/
 s/|[^|]*: /|/' test-util.log
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -34038,15 +34029,15 @@
 util|EMER|assertion false failed in test_assert()
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:213"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:214"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/library.at:219: sed 's/.*: //
+$as_echo "$at_srcdir/library.at:220: sed 's/.*: //
 1q' stderr"
-at_fn_check_prepare_notrace 'an embedded newline' "library.at:219"
+at_fn_check_prepare_notrace 'an embedded newline' "library.at:220"
 ( $at_check_trace; sed 's/.*: //
 1q' stderr
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -34056,7 +34047,7 @@
 echo >>"$at_stdout"; $as_echo "assertion false failed in test_assert()
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:219"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:220"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -34068,7 +34059,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_79
 #AT_START_80
-at_fn_group_banner 80 'library.at:226' \
+at_fn_group_banner 80 'library.at:227' \
   "saturating arithmetic" "                          " 7
 at_xfail=no
 (
@@ -34079,15 +34070,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/library.at:228: ovstest test-util sat_math"
-at_fn_check_prepare_trace "library.at:228"
+$as_echo "$at_srcdir/library.at:229: ovstest test-util sat_math"
+at_fn_check_prepare_trace "library.at:229"
 ( $at_check_trace; ovstest test-util sat_math
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:228"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:229"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -34098,7 +34089,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_80
 #AT_START_81
-at_fn_group_banner 81 'library.at:231' \
+at_fn_group_banner 81 'library.at:232' \
   "snprintf" "                                       " 7
 at_xfail=no
 (
@@ -34108,15 +34099,15 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:232: ovstest test-util snprintf"
-at_fn_check_prepare_trace "library.at:232"
+$as_echo "$at_srcdir/library.at:233: ovstest test-util snprintf"
+at_fn_check_prepare_trace "library.at:233"
 ( $at_check_trace; ovstest test-util snprintf
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:233"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -34127,7 +34118,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_81
 #AT_START_82
-at_fn_group_banner 82 'library.at:235' \
+at_fn_group_banner 82 'library.at:236' \
   "bitmap functions" "                               " 7
 at_xfail=no
 (
@@ -34137,8 +34128,8 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:236: ovstest test-bitmap check"
-at_fn_check_prepare_trace "library.at:236"
+$as_echo "$at_srcdir/library.at:237: ovstest test-bitmap check"
+at_fn_check_prepare_trace "library.at:237"
 ( $at_check_trace; ovstest test-bitmap check
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -34147,7 +34138,7 @@
 echo >>"$at_stdout"; $as_echo "..
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:236"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:237"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -34158,7 +34149,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_82
 #AT_START_83
-at_fn_group_banner 83 'library.at:240' \
+at_fn_group_banner 83 'library.at:241' \
   "use of public headers" "                          " 7
 at_xfail=no
 (
@@ -34168,15 +34159,15 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:241: test-lib"
-at_fn_check_prepare_trace "library.at:241"
+$as_echo "$at_srcdir/library.at:242: test-lib"
+at_fn_check_prepare_trace "library.at:242"
 ( $at_check_trace; test-lib
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:241"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:242"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -34187,7 +34178,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_83
 #AT_START_84
-at_fn_group_banner 84 'library.at:244' \
+at_fn_group_banner 84 'library.at:245' \
   "ofpbuf module" "                                  " 7
 at_xfail=no
 (
@@ -34197,15 +34188,15 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:245: ovstest test-ofpbuf"
-at_fn_check_prepare_trace "library.at:245"
+$as_echo "$at_srcdir/library.at:246: ovstest test-ofpbuf"
+at_fn_check_prepare_trace "library.at:246"
 ( $at_check_trace; ovstest test-ofpbuf
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:245"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:246"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -34216,7 +34207,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_84
 #AT_START_85
-at_fn_group_banner 85 'library.at:248' \
+at_fn_group_banner 85 'library.at:249' \
   "rcu" "                                            " 7
 at_xfail=no
 (
@@ -34226,15 +34217,15 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:249: ovstest test-rcu-quiesce"
-at_fn_check_prepare_trace "library.at:249"
+$as_echo "$at_srcdir/library.at:250: ovstest test-rcu-quiesce"
+at_fn_check_prepare_trace "library.at:250"
 ( $at_check_trace; ovstest test-rcu-quiesce
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:249"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:250"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -34245,7 +34236,7 @@
 read at_status <"$at_status_file"
 #AT_STOP_85
 #AT_START_86
-at_fn_group_banner 86 'library.at:252' \
+at_fn_group_banner 86 'library.at:253' \
   "stopwatch module" "                               " 7
 at_xfail=no
 (
@@ -34255,8 +34246,8 @@
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/library.at:253: ovstest test-stopwatch"
-at_fn_check_prepare_trace "library.at:253"
+$as_echo "$at_srcdir/library.at:254: ovstest test-stopwatch"
+at_fn_check_prepare_trace "library.at:254"
 ( $at_check_trace; ovstest test-stopwatch
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -34265,7 +34256,7 @@
 echo >>"$at_stdout"; $as_echo "......
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/library.at:253"
+at_fn_check_status 0 $at_status "$at_srcdir/library.at:254"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -39293,8 +39284,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_131
 #AT_START_132
-at_fn_group_banner 132 'check-structs.at:10' \
-  "check struct tail padding" "                      " 15
+at_fn_group_banner 132 'classifier.at:309' \
+  "flow classifier - packet with extra padding" "    " 14
 at_xfail=no
 (
   $as_echo "132. $at_setup_line: testing $at_desc ..."
@@ -39302,6 +39293,381 @@
 
 ovs_init
 
+   touch .conf.db.~lock~
+   { set +x
+$as_echo "$at_srcdir/classifier.at:310: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "classifier.at:310"
+( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:310"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/classifier.at:310: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "classifier.at:310"
+( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:310"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   on_exit "kill `cat ovsdb-server.pid`"
+   { set +x
+$as_echo "$at_srcdir/classifier.at:310: sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "classifier.at:310"
+( $at_check_trace; sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:310"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/classifier.at:310: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "classifier.at:310"
+( $at_check_trace; ovs-vsctl --no-wait init
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:310"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/classifier.at:310: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "classifier.at:310"
+( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:310"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+   on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
+   { set +x
+$as_echo "$at_srcdir/classifier.at:310: sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "classifier.at:310"
+( $at_check_trace; sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:310"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+   { set +x
+$as_echo "$at_srcdir/classifier.at:310: add_of_br 0  "
+at_fn_check_prepare_trace "classifier.at:310"
+( $at_check_trace; add_of_br 0
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:310"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+add_of_ports br0 1 2
+cat >flows.txt <<'_ATEOF'
+priority=5,ip,ip_dst=1.1.1.1,actions=1
+priority=5,ip,ip_dst=1.1.1.2,actions=2
+priority=0,actions=drop
+_ATEOF
+
+{ set +x
+$as_echo "$at_srcdir/classifier.at:317: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "classifier.at:317"
+( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:317"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+packet=00020202020000010101010008004500001c00010000401176cc01010101010101020d6a00350008ee3a
+{ set +x
+$as_echo "$at_srcdir/classifier.at:319: ovs-appctl ofproto/trace br0 in_port=1 \$packet "
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace br0 in_port=1 $packet " "classifier.at:319"
+( $at_check_trace; ovs-appctl ofproto/trace br0 in_port=1 $packet
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:319"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/classifier.at:320: tail -2 stdout"
+at_fn_check_prepare_trace "classifier.at:320"
+( $at_check_trace; tail -2 stdout
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:320"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+# normal packet plus 255 bytes of padding (8bit padding).
+# 255 * 2 = 510
+padding=$(printf '%*s' 510 | tr ' ' '0')
+{ set +x
+$as_echo "$at_srcdir/classifier.at:327: ovs-appctl ofproto/trace br0 in_port=1 \${packet}\${padding} "
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "classifier.at:327"
+( $at_check_trace; ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:327"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/classifier.at:328: tail -2 stdout"
+at_fn_check_prepare_trace "classifier.at:328"
+( $at_check_trace; tail -2 stdout
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:328"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+# normal packet plus padding up to 65535 bytes of length (16bit limit).
+# 65535 - 43 = 65492
+# 65492 * 2 = 130984
+padding=$(printf '%*s' 130984 | tr ' ' '0')
+{ set +x
+$as_echo "$at_srcdir/classifier.at:336: ovs-appctl ofproto/trace br0 in_port=1 \${packet}\${padding}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "classifier.at:336"
+( $at_check_trace; ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:336"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/classifier.at:337: tail -2 stdout"
+at_fn_check_prepare_trace "classifier.at:337"
+( $at_check_trace; tail -2 stdout
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "Megaflow: recirc_id=0,eth,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:337"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/classifier.at:341: check_logs "
+at_fn_check_prepare_trace "classifier.at:341"
+( $at_check_trace; check_logs
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:341"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/classifier.at:341: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "classifier.at:341"
+( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:341"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
+   { set +x
+$as_echo "$at_srcdir/classifier.at:341: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "classifier.at:341"
+( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:341"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "classifier.at:341" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/classifier.at:341: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "classifier.at:341"
+( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:341"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/classifier.at:341: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "classifier.at:341"
+( $at_check_trace; ovs-appctl -t ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/classifier.at:341"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "classifier.at:341" "while kill -0 \$TMPPID 2>/dev/null"
+
+ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_132
+#AT_START_133
+at_fn_group_banner 133 'check-structs.at:10' \
+  "check struct tail padding" "                      " 15
+at_xfail=no
+(
+  $as_echo "133. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
 
    cat >test.h <<'_ATEOF'
 struct xyz {
@@ -39329,13 +39695,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_132
-#AT_START_133
-at_fn_group_banner 133 'check-structs.at:20' \
+#AT_STOP_133
+#AT_START_134
+at_fn_group_banner 134 'check-structs.at:20' \
   "check struct internal alignment" "                " 15
 at_xfail=no
 (
-  $as_echo "133. $at_setup_line: testing $at_desc ..."
+  $as_echo "134. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -39368,13 +39734,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_133
-#AT_START_134
-at_fn_group_banner 134 'check-structs.at:31' \
+#AT_STOP_134
+#AT_START_135
+at_fn_group_banner 135 'check-structs.at:31' \
   "check struct declared size" "                     " 15
 at_xfail=no
 (
-  $as_echo "134. $at_setup_line: testing $at_desc ..."
+  $as_echo "135. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -39408,13 +39774,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_134
-#AT_START_135
-at_fn_group_banner 135 'check-structs.at:43' \
+#AT_STOP_135
+#AT_START_136
+at_fn_group_banner 136 'check-structs.at:43' \
   "check wrong struct's declared size" "             " 15
 at_xfail=no
 (
-  $as_echo "135. $at_setup_line: testing $at_desc ..."
+  $as_echo "136. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -39452,13 +39818,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_135
-#AT_START_136
-at_fn_group_banner 136 'daemon.at:48' \
+#AT_STOP_136
+#AT_START_137
+at_fn_group_banner 137 'daemon.at:48' \
   "daemon" "                                         " 16
 at_xfail=no
 (
-  $as_echo "136. $at_setup_line: testing $at_desc ..."
+  $as_echo "137. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -39567,13 +39933,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_136
-#AT_START_137
-at_fn_group_banner 137 'daemon.at:78' \
+#AT_STOP_137
+#AT_START_138
+at_fn_group_banner 138 'daemon.at:78' \
   "daemon --monitor" "                               " 16
 at_xfail=no
 (
-  $as_echo "137. $at_setup_line: testing $at_desc ..."
+  $as_echo "138. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -39699,13 +40065,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_137
-#AT_START_138
-at_fn_group_banner 138 'daemon.at:121' \
+#AT_STOP_138
+#AT_START_139
+at_fn_group_banner 139 'daemon.at:121' \
   "daemon --detach" "                                " 16
 at_xfail=no
 (
-  $as_echo "138. $at_setup_line: testing $at_desc ..."
+  $as_echo "139. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -39827,13 +40193,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_138
-#AT_START_139
-at_fn_group_banner 139 'daemon.at:146' \
+#AT_STOP_139
+#AT_START_140
+at_fn_group_banner 140 'daemon.at:146' \
   "daemon --detach --monitor" "                      " 16
 at_xfail=no
 (
-  $as_echo "139. $at_setup_line: testing $at_desc ..."
+  $as_echo "140. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -39951,13 +40317,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_139
-#AT_START_140
-at_fn_group_banner 140 'daemon.at:185' \
+#AT_STOP_140
+#AT_START_141
+at_fn_group_banner 141 'daemon.at:185' \
   "daemon --detach startup errors" "                 " 16
 at_xfail=no
 (
-  $as_echo "140. $at_setup_line: testing $at_desc ..."
+  $as_echo "141. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40006,13 +40372,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_140
-#AT_START_141
-at_fn_group_banner 141 'daemon.at:193' \
+#AT_STOP_141
+#AT_START_142
+at_fn_group_banner 142 'daemon.at:193' \
   "daemon --detach --monitor startup errors" "       " 16
 at_xfail=no
 (
-  $as_echo "141. $at_setup_line: testing $at_desc ..."
+  $as_echo "142. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40064,13 +40430,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_141
-#AT_START_142
-at_fn_group_banner 142 'daemon.at:202' \
+#AT_STOP_142
+#AT_START_143
+at_fn_group_banner 143 'daemon.at:202' \
   "daemon --service" "                               " 16
 at_xfail=no
 (
-  $as_echo "142. $at_setup_line: testing $at_desc ..."
+  $as_echo "143. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40232,13 +40598,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_142
-#AT_START_143
-at_fn_group_banner 143 'daemon-py.at:3' \
+#AT_STOP_143
+#AT_START_144
+at_fn_group_banner 144 'daemon-py.at:3' \
   "daemon - Python3" "                               " 17
 at_xfail=no
 (
-  $as_echo "143. $at_setup_line: testing $at_desc ..."
+  $as_echo "144. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40334,13 +40700,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_143
-#AT_START_144
-at_fn_group_banner 144 'daemon-py.at:26' \
+#AT_STOP_144
+#AT_START_145
+at_fn_group_banner 145 'daemon-py.at:26' \
   "daemon --monitor - Python3" "                     " 17
 at_xfail=no
 (
-  $as_echo "144. $at_setup_line: testing $at_desc ..."
+  $as_echo "145. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40451,13 +40817,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_144
-#AT_START_145
-at_fn_group_banner 145 'daemon-py.at:60' \
+#AT_STOP_145
+#AT_START_146
+at_fn_group_banner 146 'daemon-py.at:60' \
   "daemon --monitor restart exit code - Python3" "   " 17
 at_xfail=no
 (
-  $as_echo "145. $at_setup_line: testing $at_desc ..."
+  $as_echo "146. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40568,13 +40934,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_145
-#AT_START_146
-at_fn_group_banner 146 'daemon-py.at:94' \
+#AT_STOP_146
+#AT_START_147
+at_fn_group_banner 147 'daemon-py.at:94' \
   "daemon --detach - Python3" "                      " 17
 at_xfail=no
 (
-  $as_echo "146. $at_setup_line: testing $at_desc ..."
+  $as_echo "147. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40661,13 +41027,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_146
-#AT_START_147
-at_fn_group_banner 147 'daemon-py.at:116' \
+#AT_STOP_147
+#AT_START_148
+at_fn_group_banner 148 'daemon-py.at:116' \
   "daemon --detach --monitor - Python3" "            " 17
 at_xfail=no
 (
-  $as_echo "147. $at_setup_line: testing $at_desc ..."
+  $as_echo "148. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40799,13 +41165,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_147
-#AT_START_148
-at_fn_group_banner 148 'daemon-py.at:155' \
+#AT_STOP_148
+#AT_START_149
+at_fn_group_banner 149 'daemon-py.at:155' \
   "daemon --detach startup errors - Python3" "       " 17
 at_xfail=no
 (
-  $as_echo "148. $at_setup_line: testing $at_desc ..."
+  $as_echo "149. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40854,13 +41220,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_148
-#AT_START_149
-at_fn_group_banner 149 'daemon-py.at:162' \
+#AT_STOP_149
+#AT_START_150
+at_fn_group_banner 150 'daemon-py.at:162' \
   "daemon --detach --monitor startup errors - Python3" "" 17
 at_xfail=no
 (
-  $as_echo "149. $at_setup_line: testing $at_desc ..."
+  $as_echo "150. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40913,13 +41279,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_149
-#AT_START_150
-at_fn_group_banner 150 'daemon-py.at:170' \
+#AT_STOP_150
+#AT_START_151
+at_fn_group_banner 151 'daemon-py.at:170' \
   "daemon --detach closes standard fds - Python3" "  " 17
 at_xfail=no
 (
-  $as_echo "150. $at_setup_line: testing $at_desc ..."
+  $as_echo "151. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -40996,13 +41362,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_150
-#AT_START_151
-at_fn_group_banner 151 'daemon-py.at:189' \
+#AT_STOP_151
+#AT_START_152
+at_fn_group_banner 152 'daemon-py.at:189' \
   "daemon --detach --monitor closes standard fds - Python3" "" 17
 at_xfail=no
 (
-  $as_echo "151. $at_setup_line: testing $at_desc ..."
+  $as_echo "152. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -41078,13 +41444,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_151
-#AT_START_152
-at_fn_group_banner 152 'ofp-actions.at:3' \
+#AT_STOP_152
+#AT_START_153
+at_fn_group_banner 153 'ofp-actions.at:3' \
   "OpenFlow 1.0 action translation" "                " 18
 at_xfail=no
 (
-  $as_echo "152. $at_setup_line: testing $at_desc ..."
+  $as_echo "153. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -41385,13 +41751,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_152
-#AT_START_153
-at_fn_group_banner 153 'ofp-actions.at:331' \
+#AT_STOP_153
+#AT_START_154
+at_fn_group_banner 154 'ofp-actions.at:331' \
   "OpenFlow 1.0 \"instruction\" translations" "        " 18
 at_xfail=no
 (
-  $as_echo "153. $at_setup_line: testing $at_desc ..."
+  $as_echo "154. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -41439,13 +41805,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_153
-#AT_START_154
-at_fn_group_banner 154 'ofp-actions.at:361' \
+#AT_STOP_154
+#AT_START_155
+at_fn_group_banner 155 'ofp-actions.at:361' \
   "OpenFlow 1.1 action translation" "                " 18
 at_xfail=no
 (
-  $as_echo "154. $at_setup_line: testing $at_desc ..."
+  $as_echo "155. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -41598,13 +41964,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_154
-#AT_START_155
-at_fn_group_banner 155 'ofp-actions.at:504' \
+#AT_STOP_155
+#AT_START_156
+at_fn_group_banner 156 'ofp-actions.at:504' \
   "OpenFlow 1.1 instruction translation" "           " 18
 at_xfail=no
 (
-  $as_echo "155. $at_setup_line: testing $at_desc ..."
+  $as_echo "156. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -41809,13 +42175,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_155
-#AT_START_156
-at_fn_group_banner 156 'ofp-actions.at:715' \
+#AT_STOP_156
+#AT_START_157
+at_fn_group_banner 157 'ofp-actions.at:715' \
   "OpenFlow 1.2 action translation" "                " 18
 at_xfail=no
 (
-  $as_echo "156. $at_setup_line: testing $at_desc ..."
+  $as_echo "157. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -41860,13 +42226,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_156
-#AT_START_157
-at_fn_group_banner 157 'ofp-actions.at:741' \
+#AT_STOP_157
+#AT_START_158
+at_fn_group_banner 158 'ofp-actions.at:741' \
   "OpenFlow 1.3 action translation" "                " 18
 at_xfail=no
 (
-  $as_echo "157. $at_setup_line: testing $at_desc ..."
+  $as_echo "158. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -41894,6 +42260,15 @@
 & 00000010  00 00 00 10 00 00 00 01-
 0019 0010 80000807 000102030405 000000000010 00000001
 
+# actions=encap(nsh(md_type=1))
+ffff 0018 00002320 002e 0000 0001894f 0004 01 05 01 000000
+
+# actions=encap(nsh(md_type=1))
+# 21: 12 -> 00
+# 22: 34 -> 00
+# 23: 56 -> 00
+ffff 0018 00002320 002e 0000 0001894f 0004 01 05 01 123456
+
 _ATEOF
 
 sed '/^[#&]/d' < test-data > input.txt
@@ -41903,15 +42278,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:776: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow13 < input.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:776"
+$as_echo "$at_srcdir/ofp-actions.at:787: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow13 < input.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:787"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow13 < input.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:776"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:787"
 $at_failed && at_fn_log_failure  \
 "input.txt" \
 "expout" \
@@ -41923,13 +42298,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_157
-#AT_START_158
-at_fn_group_banner 158 'ofp-actions.at:783' \
+#AT_STOP_158
+#AT_START_159
+at_fn_group_banner 159 'ofp-actions.at:794' \
   "OpenFlow 1.5 action translation" "                " 18
 at_xfail=no
 (
-  $as_echo "158. $at_setup_line: testing $at_desc ..."
+  $as_echo "159. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -41957,15 +42332,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:805: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow15 < input.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:805"
+$as_echo "$at_srcdir/ofp-actions.at:816: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow15 < input.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:816"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-actions OpenFlow15 < input.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:805"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:816"
 $at_failed && at_fn_log_failure  \
 "input.txt" \
 "expout" \
@@ -41977,51 +42352,51 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_158
-#AT_START_159
-at_fn_group_banner 159 'ofp-actions.at:810' \
+#AT_STOP_159
+#AT_START_160
+at_fn_group_banner 160 'ofp-actions.at:821' \
   "ofp-actions - inconsistent MPLS actions" "        " 18
 at_xfail=no
 (
-  $as_echo "159. $at_setup_line: testing $at_desc ..."
+  $as_echo "160. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:811: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:811"
+$as_echo "$at_srcdir/ofp-actions.at:822: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:822"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:822"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:811: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:811"
+$as_echo "$at_srcdir/ofp-actions.at:822: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:822"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:822"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:811: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:822: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:811"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:822"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -42030,37 +42405,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:822"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:811: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ofp-actions.at:811"
+$as_echo "$at_srcdir/ofp-actions.at:822: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ofp-actions.at:822"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:822"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:811: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ofp-actions.at:811"
+$as_echo "$at_srcdir/ofp-actions.at:822: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ofp-actions.at:822"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:822"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -42068,7 +42443,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:811: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:822: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -42081,7 +42456,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:811"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:822"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -42100,7 +42475,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:822"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42108,15 +42483,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:811: add_of_br 0  "
-at_fn_check_prepare_trace "ofp-actions.at:811"
+$as_echo "$at_srcdir/ofp-actions.at:822: add_of_br 0  "
+at_fn_check_prepare_trace "ofp-actions.at:822"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:811"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:822"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42124,23 +42499,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:813: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=fin_timeout(idle_timeout=1)'"
-at_fn_check_prepare_trace "ofp-actions.at:813"
+$as_echo "$at_srcdir/ofp-actions.at:824: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=fin_timeout(idle_timeout=1)'"
+at_fn_check_prepare_trace "ofp-actions.at:824"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=fin_timeout(idle_timeout=1)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:813"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:824"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:815: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=push_mpls:0x8847,fin_timeout(idle_timeout=1)'"
-at_fn_check_prepare_trace "ofp-actions.at:815"
+$as_echo "$at_srcdir/ofp-actions.at:826: ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=push_mpls:0x8847,fin_timeout(idle_timeout=1)'"
+at_fn_check_prepare_trace "ofp-actions.at:826"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 -vwarn add-flow br0 'tcp actions=push_mpls:0x8847,fin_timeout(idle_timeout=1)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -42149,37 +42524,37 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofp-actions.at:815"
+at_fn_check_status 1 $at_status "$at_srcdir/ofp-actions.at:826"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:819: check_logs "
-at_fn_check_prepare_trace "ofp-actions.at:819"
+$as_echo "$at_srcdir/ofp-actions.at:830: check_logs "
+at_fn_check_prepare_trace "ofp-actions.at:830"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:819"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:819: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:819"
+$as_echo "$at_srcdir/ofp-actions.at:830: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:830"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:819"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42187,15 +42562,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:819: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ofp-actions.at:819"
+$as_echo "$at_srcdir/ofp-actions.at:830: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ofp-actions.at:830"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:819"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42208,18 +42583,18 @@
     :
 
 }
-ovs_wait "ofp-actions.at:819" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:830" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:819: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:819"
+$as_echo "$at_srcdir/ofp-actions.at:830: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:830"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:819"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42227,15 +42602,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:819: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofp-actions.at:819"
+$as_echo "$at_srcdir/ofp-actions.at:830: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofp-actions.at:830"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:819"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:830"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42248,20 +42623,20 @@
     :
 
 }
-ovs_wait "ofp-actions.at:819" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:830" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_159
-#AT_START_160
-at_fn_group_banner 160 'ofp-actions.at:822' \
+#AT_STOP_160
+#AT_START_161
+at_fn_group_banner 161 'ofp-actions.at:833' \
   "reg_load <-> set_field translation corner case" " " 18
 at_xfail=no
 (
-  $as_echo "160. $at_setup_line: testing $at_desc ..."
+  $as_echo "161. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -42269,38 +42644,38 @@
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:824: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:824"
+$as_echo "$at_srcdir/ofp-actions.at:835: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:835"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:824"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:835"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:824: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:824"
+$as_echo "$at_srcdir/ofp-actions.at:835: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:835"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:824"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:835"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:824: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:835: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:824"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:835"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -42309,37 +42684,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:824"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:835"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:824: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ofp-actions.at:824"
+$as_echo "$at_srcdir/ofp-actions.at:835: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ofp-actions.at:835"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:824"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:835"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:824: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ofp-actions.at:824"
+$as_echo "$at_srcdir/ofp-actions.at:835: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ofp-actions.at:835"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:824"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:835"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -42347,7 +42722,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:824: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:835: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -42360,7 +42735,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:824"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:835"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -42379,7 +42754,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:824"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:835"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42387,15 +42762,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:824: add_of_br 0  "
-at_fn_check_prepare_trace "ofp-actions.at:824"
+$as_echo "$at_srcdir/ofp-actions.at:835: add_of_br 0  "
+at_fn_check_prepare_trace "ofp-actions.at:835"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:824"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:835"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42403,23 +42778,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:829: ovs-ofctl -O OpenFlow13 add-flow br0 mpls,actions=set_field:10-\\>mpls_label"
-at_fn_check_prepare_trace "ofp-actions.at:829"
+$as_echo "$at_srcdir/ofp-actions.at:840: ovs-ofctl -O OpenFlow13 add-flow br0 mpls,actions=set_field:10-\\>mpls_label"
+at_fn_check_prepare_trace "ofp-actions.at:840"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 add-flow br0 mpls,actions=set_field:10-\>mpls_label
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:829"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:840"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:830: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:830"
+$as_echo "$at_srcdir/ofp-actions.at:841: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:841"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -42429,37 +42804,37 @@
  mpls actions=load:0xa->OXM_OF_MPLS_LABEL[]
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:830"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:841"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:834: check_logs "
-at_fn_check_prepare_trace "ofp-actions.at:834"
+$as_echo "$at_srcdir/ofp-actions.at:845: check_logs "
+at_fn_check_prepare_trace "ofp-actions.at:845"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:834: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:834"
+$as_echo "$at_srcdir/ofp-actions.at:845: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:845"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42467,15 +42842,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:834: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ofp-actions.at:834"
+$as_echo "$at_srcdir/ofp-actions.at:845: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ofp-actions.at:845"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42488,18 +42863,18 @@
     :
 
 }
-ovs_wait "ofp-actions.at:834" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:845" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:834: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:834"
+$as_echo "$at_srcdir/ofp-actions.at:845: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:845"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42507,15 +42882,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:834: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofp-actions.at:834"
+$as_echo "$at_srcdir/ofp-actions.at:845: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofp-actions.at:845"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:834"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:845"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42528,20 +42903,20 @@
     :
 
 }
-ovs_wait "ofp-actions.at:834" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:845" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_160
-#AT_START_161
-at_fn_group_banner 161 'ofp-actions.at:837' \
+#AT_STOP_161
+#AT_START_162
+at_fn_group_banner 162 'ofp-actions.at:848' \
   "enqueue action for OF1.1+" "                      " 18
 at_xfail=no
 (
-  $as_echo "161. $at_setup_line: testing $at_desc ..."
+  $as_echo "162. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -42549,38 +42924,38 @@
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:839: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:839"
+$as_echo "$at_srcdir/ofp-actions.at:850: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:850"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:850"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:839: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:839"
+$as_echo "$at_srcdir/ofp-actions.at:850: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:850"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:850"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:839: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:850: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:839"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:850"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -42589,37 +42964,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:850"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:839: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ofp-actions.at:839"
+$as_echo "$at_srcdir/ofp-actions.at:850: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ofp-actions.at:850"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:850"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:839: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ofp-actions.at:839"
+$as_echo "$at_srcdir/ofp-actions.at:850: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ofp-actions.at:850"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:850"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -42627,7 +43002,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:839: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:850: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -42640,7 +43015,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:839"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:850"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -42659,7 +43034,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:850"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42667,15 +43042,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:839: add_of_br 0  "
-at_fn_check_prepare_trace "ofp-actions.at:839"
+$as_echo "$at_srcdir/ofp-actions.at:850: add_of_br 0  "
+at_fn_check_prepare_trace "ofp-actions.at:850"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:839"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:850"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42683,23 +43058,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:842: ovs-ofctl -O OpenFlow10 add-flow br0 'actions=enqueue(123,456)'"
-at_fn_check_prepare_trace "ofp-actions.at:842"
+$as_echo "$at_srcdir/ofp-actions.at:853: ovs-ofctl -O OpenFlow10 add-flow br0 'actions=enqueue(123,456)'"
+at_fn_check_prepare_trace "ofp-actions.at:853"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 add-flow br0 'actions=enqueue(123,456)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:842"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:853"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:843: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:843"
+$as_echo "$at_srcdir/ofp-actions.at:854: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:854"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -42709,15 +43084,15 @@
  actions=enqueue:123:456
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:843"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:854"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:847: ovs-ofctl -O OpenFlow13 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:847"
+$as_echo "$at_srcdir/ofp-actions.at:858: ovs-ofctl -O OpenFlow13 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:858"
 ( $at_check_trace; ovs-ofctl -O OpenFlow13 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -42727,37 +43102,37 @@
  reset_counts actions=set_queue:456,output:123,pop_queue
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:847"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:858"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:851: check_logs "
-at_fn_check_prepare_trace "ofp-actions.at:851"
+$as_echo "$at_srcdir/ofp-actions.at:862: check_logs "
+at_fn_check_prepare_trace "ofp-actions.at:862"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:862"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:851: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:851"
+$as_echo "$at_srcdir/ofp-actions.at:862: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:862"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:862"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42765,15 +43140,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:851: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ofp-actions.at:851"
+$as_echo "$at_srcdir/ofp-actions.at:862: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ofp-actions.at:862"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:862"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42786,18 +43161,18 @@
     :
 
 }
-ovs_wait "ofp-actions.at:851" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:862" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:851: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:851"
+$as_echo "$at_srcdir/ofp-actions.at:862: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:862"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:862"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42805,15 +43180,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:851: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofp-actions.at:851"
+$as_echo "$at_srcdir/ofp-actions.at:862: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofp-actions.at:862"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:862"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42826,20 +43201,20 @@
     :
 
 }
-ovs_wait "ofp-actions.at:851" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:862" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_161
-#AT_START_162
-at_fn_group_banner 162 'ofp-actions.at:854' \
+#AT_STOP_162
+#AT_START_163
+at_fn_group_banner 163 'ofp-actions.at:865' \
   "mod_nw_ttl action for OF1.0" "                    " 18
 at_xfail=no
 (
-  $as_echo "162. $at_setup_line: testing $at_desc ..."
+  $as_echo "163. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -42847,38 +43222,38 @@
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:856: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:856"
+$as_echo "$at_srcdir/ofp-actions.at:867: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:867"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:867"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:856: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:856"
+$as_echo "$at_srcdir/ofp-actions.at:867: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:867"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:867"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:856: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:867: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:856"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:867"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -42887,37 +43262,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:867"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:856: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ofp-actions.at:856"
+$as_echo "$at_srcdir/ofp-actions.at:867: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ofp-actions.at:867"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:867"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:856: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ofp-actions.at:856"
+$as_echo "$at_srcdir/ofp-actions.at:867: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ofp-actions.at:867"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:867"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -42925,7 +43300,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:856: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:867: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -42938,7 +43313,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:856"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:867"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -42957,7 +43332,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:867"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42965,15 +43340,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:856: add_of_br 0  "
-at_fn_check_prepare_trace "ofp-actions.at:856"
+$as_echo "$at_srcdir/ofp-actions.at:867: add_of_br 0  "
+at_fn_check_prepare_trace "ofp-actions.at:867"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:856"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:867"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -42981,23 +43356,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:859: ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ttl:123'"
-at_fn_check_prepare_trace "ofp-actions.at:859"
+$as_echo "$at_srcdir/ofp-actions.at:870: ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ttl:123'"
+at_fn_check_prepare_trace "ofp-actions.at:870"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ttl:123'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:859"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:870"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:860: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:860"
+$as_echo "$at_srcdir/ofp-actions.at:871: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:871"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -43007,15 +43382,15 @@
  ip actions=load:0x7b->NXM_NX_IP_TTL[]
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:860"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:871"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:864: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:864"
+$as_echo "$at_srcdir/ofp-actions.at:875: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:875"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -43025,37 +43400,37 @@
  ip actions=mod_nw_ttl:123
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:864"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:875"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:868: check_logs "
-at_fn_check_prepare_trace "ofp-actions.at:868"
+$as_echo "$at_srcdir/ofp-actions.at:879: check_logs "
+at_fn_check_prepare_trace "ofp-actions.at:879"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:868"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:879"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:868: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:868"
+$as_echo "$at_srcdir/ofp-actions.at:879: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:879"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:868"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:879"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43063,15 +43438,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:868: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ofp-actions.at:868"
+$as_echo "$at_srcdir/ofp-actions.at:879: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ofp-actions.at:879"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:868"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:879"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43084,18 +43459,18 @@
     :
 
 }
-ovs_wait "ofp-actions.at:868" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:879" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:868: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:868"
+$as_echo "$at_srcdir/ofp-actions.at:879: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:879"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:868"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:879"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43103,15 +43478,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:868: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofp-actions.at:868"
+$as_echo "$at_srcdir/ofp-actions.at:879: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofp-actions.at:879"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:868"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:879"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43124,20 +43499,20 @@
     :
 
 }
-ovs_wait "ofp-actions.at:868" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:879" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_162
-#AT_START_163
-at_fn_group_banner 163 'ofp-actions.at:871' \
+#AT_STOP_163
+#AT_START_164
+at_fn_group_banner 164 'ofp-actions.at:882' \
   "mod_nw_ecn action translation" "                  " 18
 at_xfail=no
 (
-  $as_echo "163. $at_setup_line: testing $at_desc ..."
+  $as_echo "164. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -43145,38 +43520,38 @@
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:873: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:873"
+$as_echo "$at_srcdir/ofp-actions.at:884: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ofp-actions.at:884"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:873"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:884"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:873: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:873"
+$as_echo "$at_srcdir/ofp-actions.at:884: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ofp-actions.at:884"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:873"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:884"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:873: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:884: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:873"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:884"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -43185,37 +43560,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:873"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:884"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:873: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ofp-actions.at:873"
+$as_echo "$at_srcdir/ofp-actions.at:884: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ofp-actions.at:884"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:873"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ofp-actions.at:873: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ofp-actions.at:873"
+$as_echo "$at_srcdir/ofp-actions.at:884: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ofp-actions.at:884"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:873"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -43223,7 +43598,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:873: sed < stderr '
+$as_echo "$at_srcdir/ofp-actions.at:884: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -43236,7 +43611,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:873"
+at_fn_check_prepare_notrace 'an embedded newline' "ofp-actions.at:884"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -43255,7 +43630,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:873"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43263,15 +43638,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:873: add_of_br 0  "
-at_fn_check_prepare_trace "ofp-actions.at:873"
+$as_echo "$at_srcdir/ofp-actions.at:884: add_of_br 0  "
+at_fn_check_prepare_trace "ofp-actions.at:884"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:873"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43280,23 +43655,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:878: ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ecn:2'"
-at_fn_check_prepare_trace "ofp-actions.at:878"
+$as_echo "$at_srcdir/ofp-actions.at:889: ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ecn:2'"
+at_fn_check_prepare_trace "ofp-actions.at:889"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=mod_nw_ecn:2'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:878"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:889"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:879: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:879"
+$as_echo "$at_srcdir/ofp-actions.at:890: ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:890"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -43306,15 +43681,15 @@
  ip actions=load:0x2->NXM_NX_IP_ECN[]
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:879"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:883: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:883"
+$as_echo "$at_srcdir/ofp-actions.at:894: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:894"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -43324,15 +43699,15 @@
  ip actions=mod_nw_ecn:2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:883"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:894"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:887: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:887"
+$as_echo "$at_srcdir/ofp-actions.at:898: ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:898"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -43342,7 +43717,7 @@
  ip actions=set_field:2->nw_ecn
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:887"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:898"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43350,38 +43725,38 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:899: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofp-actions.at:899"
+$as_echo "$at_srcdir/ofp-actions.at:910: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofp-actions.at:910"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:899"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:910"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:900: ovs-ofctl -O OpenFlow12 add-flow br0 'ip,actions=set_field:2->ip_ecn'"
-at_fn_check_prepare_trace "ofp-actions.at:900"
+$as_echo "$at_srcdir/ofp-actions.at:911: ovs-ofctl -O OpenFlow12 add-flow br0 'ip,actions=set_field:2->ip_ecn'"
+at_fn_check_prepare_trace "ofp-actions.at:911"
 ( $at_check_trace; ovs-ofctl -O OpenFlow12 add-flow br0 'ip,actions=set_field:2->ip_ecn'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:900"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:911"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:901: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:901"
+$as_echo "$at_srcdir/ofp-actions.at:912: ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ofp-actions.at:912"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -43391,7 +43766,7 @@
  ip actions=mod_nw_ecn:2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:901"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:912"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43399,60 +43774,60 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:908: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofp-actions.at:908"
+$as_echo "$at_srcdir/ofp-actions.at:919: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofp-actions.at:919"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:908"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:909: ovs-ofctl -O OpenFlow10 add-flow br0 'ip,actions=set_field:2->ip_ecn'"
-at_fn_check_prepare_trace "ofp-actions.at:909"
+$as_echo "$at_srcdir/ofp-actions.at:920: ovs-ofctl -O OpenFlow10 add-flow br0 'ip,actions=set_field:2->ip_ecn'"
+at_fn_check_prepare_trace "ofp-actions.at:920"
 ( $at_check_trace; ovs-ofctl -O OpenFlow10 add-flow br0 'ip,actions=set_field:2->ip_ecn'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:909"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:920"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:910: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "ofp-actions.at:910"
+$as_echo "$at_srcdir/ofp-actions.at:921: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "ofp-actions.at:921"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:910"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:921"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:911: ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=set_field:2->ip_ecn'"
-at_fn_check_prepare_trace "ofp-actions.at:911"
+$as_echo "$at_srcdir/ofp-actions.at:922: ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=set_field:2->ip_ecn'"
+at_fn_check_prepare_trace "ofp-actions.at:922"
 ( $at_check_trace; ovs-ofctl -O OpenFlow11 add-flow br0 'ip,actions=set_field:2->ip_ecn'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:911"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:922"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43460,30 +43835,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:913: check_logs "
-at_fn_check_prepare_trace "ofp-actions.at:913"
+$as_echo "$at_srcdir/ofp-actions.at:924: check_logs "
+at_fn_check_prepare_trace "ofp-actions.at:924"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:913"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:924"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:913: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:913"
+$as_echo "$at_srcdir/ofp-actions.at:924: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ofp-actions.at:924"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:913"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:924"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43491,15 +43866,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:913: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ofp-actions.at:913"
+$as_echo "$at_srcdir/ofp-actions.at:924: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ofp-actions.at:924"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:913"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:924"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43512,18 +43887,18 @@
     :
 
 }
-ovs_wait "ofp-actions.at:913" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:924" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:913: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:913"
+$as_echo "$at_srcdir/ofp-actions.at:924: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ofp-actions.at:924"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:913"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:924"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43531,15 +43906,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ofp-actions.at:913: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ofp-actions.at:913"
+$as_echo "$at_srcdir/ofp-actions.at:924: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ofp-actions.at:924"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:913"
+at_fn_check_status 0 $at_status "$at_srcdir/ofp-actions.at:924"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -43552,28 +43927,28 @@
     :
 
 }
-ovs_wait "ofp-actions.at:913" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ofp-actions.at:924" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_163
-#AT_START_164
-at_fn_group_banner 164 'ofp-actions.at:916' \
+#AT_STOP_164
+#AT_START_165
+at_fn_group_banner 165 'ofp-actions.at:927' \
   "action parsing errors" "                          " 18
 at_xfail=no
 (
-  $as_echo "164. $at_setup_line: testing $at_desc ..."
+  $as_echo "165. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 bad_action () {
   { set +x
-$as_echo "$at_srcdir/ofp-actions.at:918: ovs-ofctl parse-flow \"actions=\$1\""
-at_fn_check_prepare_dynamic "ovs-ofctl parse-flow \"actions=$1\"" "ofp-actions.at:918"
+$as_echo "$at_srcdir/ofp-actions.at:929: ovs-ofctl parse-flow \"actions=\$1\""
+at_fn_check_prepare_dynamic "ovs-ofctl parse-flow \"actions=$1\"" "ofp-actions.at:929"
 ( $at_check_trace; ovs-ofctl parse-flow "actions=$1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -43582,7 +43957,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofp-actions.at:918"
+at_fn_check_status 1 $at_status "$at_srcdir/ofp-actions.at:929"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -43781,8 +44156,8 @@
 bad_action 'goto_table:5,clone()' \
   'invalid instruction ordering: apply_actions must appear before goto_table, for OpenFlow 1.1+ compatibility'
 { set +x
-$as_echo "$at_srcdir/ofp-actions.at:1115: ovs-ofctl parse-group 'group_id=1,type=select,bucket=actions=clear_actions'"
-at_fn_check_prepare_trace "ofp-actions.at:1115"
+$as_echo "$at_srcdir/ofp-actions.at:1126: ovs-ofctl parse-group 'group_id=1,type=select,bucket=actions=clear_actions'"
+at_fn_check_prepare_trace "ofp-actions.at:1126"
 ( $at_check_trace; ovs-ofctl parse-group 'group_id=1,type=select,bucket=actions=clear_actions'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -43791,7 +44166,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ofp-actions.at:1115"
+at_fn_check_status 1 $at_status "$at_srcdir/ofp-actions.at:1126"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -43806,13 +44181,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_164
-#AT_START_165
-at_fn_group_banner 165 'ofp-print.at:3' \
+#AT_STOP_165
+#AT_START_166
+at_fn_group_banner 166 'ofp-print.at:3' \
   "empty" "                                          " 19
 at_xfail=no
 (
-  $as_echo "165. $at_setup_line: testing $at_desc ..."
+  $as_echo "166. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -43838,13 +44213,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_165
-#AT_START_166
-at_fn_group_banner 166 'ofp-print.at:9' \
+#AT_STOP_166
+#AT_START_167
+at_fn_group_banner 167 'ofp-print.at:9' \
   "too short" "                                      " 19
 at_xfail=no
 (
-  $as_echo "166. $at_setup_line: testing $at_desc ..."
+  $as_echo "167. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -43871,13 +44246,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_166
-#AT_START_167
-at_fn_group_banner 167 'ofp-print.at:17' \
+#AT_STOP_167
+#AT_START_168
+at_fn_group_banner 168 'ofp-print.at:17' \
   "wrong OpenFlow version" "                         " 19
 at_xfail=no
 (
-  $as_echo "167. $at_setup_line: testing $at_desc ..."
+  $as_echo "168. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -43906,13 +44281,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_167
-#AT_START_168
-at_fn_group_banner 168 'ofp-print.at:27' \
+#AT_STOP_168
+#AT_START_169
+at_fn_group_banner 169 'ofp-print.at:27' \
   "truncated message" "                              " 19
 at_xfail=no
 (
-  $as_echo "168. $at_setup_line: testing $at_desc ..."
+  $as_echo "169. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -43939,13 +44314,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_168
-#AT_START_169
-at_fn_group_banner 169 'ofp-print.at:35' \
+#AT_STOP_169
+#AT_START_170
+at_fn_group_banner 170 'ofp-print.at:35' \
   "message only uses part of buffer" "               " 19
 at_xfail=no
 (
-  $as_echo "169. $at_setup_line: testing $at_desc ..."
+  $as_echo "170. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -43973,13 +44348,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_169
-#AT_START_170
-at_fn_group_banner 170 'ofp-print.at:44' \
+#AT_STOP_170
+#AT_START_171
+at_fn_group_banner 171 'ofp-print.at:44' \
   "OFPT_HELLO - ordinary" "                          " 19
 at_xfail=no
 (
-  $as_echo "170. $at_setup_line: testing $at_desc ..."
+  $as_echo "171. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44006,13 +44381,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_170
-#AT_START_171
-at_fn_group_banner 171 'ofp-print.at:52' \
+#AT_STOP_171
+#AT_START_172
+at_fn_group_banner 172 'ofp-print.at:52' \
   "OFPT_HELLO with extra data" "                     " 19
 at_xfail=no
 (
-  $as_echo "171. $at_setup_line: testing $at_desc ..."
+  $as_echo "172. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44042,13 +44417,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_171
-#AT_START_172
-at_fn_group_banner 172 'ofp-print.at:64' \
+#AT_STOP_172
+#AT_START_173
+at_fn_group_banner 173 'ofp-print.at:64' \
   "OFPT_HELLO with version bitmap" "                 " 19
 at_xfail=no
 (
-  $as_echo "172. $at_setup_line: testing $at_desc ..."
+  $as_echo "173. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44075,13 +44450,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_172
-#AT_START_173
-at_fn_group_banner 173 'ofp-print.at:73' \
+#AT_STOP_173
+#AT_START_174
+at_fn_group_banner 174 'ofp-print.at:73' \
   "OFPT_HELLO with version bitmap and extra data" "  " 19
 at_xfail=no
 (
-  $as_echo "173. $at_setup_line: testing $at_desc ..."
+  $as_echo "174. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44115,13 +44490,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_173
-#AT_START_174
-at_fn_group_banner 174 'ofp-print.at:87' \
+#AT_STOP_174
+#AT_START_175
+at_fn_group_banner 175 'ofp-print.at:87' \
   "OFPT_HELLO with higher than supported version" "  " 19
 at_xfail=no
 (
-  $as_echo "174. $at_setup_line: testing $at_desc ..."
+  $as_echo "175. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44180,13 +44555,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_174
-#AT_START_175
-at_fn_group_banner 175 'ofp-print.at:106' \
+#AT_STOP_175
+#AT_START_176
+at_fn_group_banner 176 'ofp-print.at:106' \
   "OFPT_HELLO with contradictory version bitmaps" "  " 19
 at_xfail=no
 (
-  $as_echo "175. $at_setup_line: testing $at_desc ..."
+  $as_echo "176. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44277,13 +44652,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_175
-#AT_START_176
-at_fn_group_banner 176 'ofp-print.at:148' \
+#AT_STOP_176
+#AT_START_177
+at_fn_group_banner 177 'ofp-print.at:148' \
   "OFPT_ECHO_REQUEST, empty payload" "               " 19
 at_xfail=no
 (
-  $as_echo "176. $at_setup_line: testing $at_desc ..."
+  $as_echo "177. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44309,13 +44684,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_176
-#AT_START_177
-at_fn_group_banner 177 'ofp-print.at:155' \
+#AT_STOP_177
+#AT_START_178
+at_fn_group_banner 178 'ofp-print.at:155' \
   "OFPT_ECHO_REQUEST, 5-byte payload" "              " 19
 at_xfail=no
 (
-  $as_echo "177. $at_setup_line: testing $at_desc ..."
+  $as_echo "178. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44342,13 +44717,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_177
-#AT_START_178
-at_fn_group_banner 178 'ofp-print.at:163' \
+#AT_STOP_178
+#AT_START_179
+at_fn_group_banner 179 'ofp-print.at:163' \
   "OFPT_ECHO_REPLY, empty payload" "                 " 19
 at_xfail=no
 (
-  $as_echo "178. $at_setup_line: testing $at_desc ..."
+  $as_echo "179. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44374,13 +44749,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_178
-#AT_START_179
-at_fn_group_banner 179 'ofp-print.at:170' \
+#AT_STOP_179
+#AT_START_180
+at_fn_group_banner 180 'ofp-print.at:170' \
   "OFPT_ECHO_REPLY, 5-byte payload" "                " 19
 at_xfail=no
 (
-  $as_echo "179. $at_setup_line: testing $at_desc ..."
+  $as_echo "180. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44407,13 +44782,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_179
-#AT_START_180
-at_fn_group_banner 180 'ofp-print.at:178' \
+#AT_STOP_180
+#AT_START_181
+at_fn_group_banner 181 'ofp-print.at:178' \
   "OFPT_FEATURES_REQUEST" "                          " 19
 at_xfail=no
 (
-  $as_echo "180. $at_setup_line: testing $at_desc ..."
+  $as_echo "181. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44439,13 +44814,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_180
-#AT_START_181
-at_fn_group_banner 181 'ofp-print.at:185' \
+#AT_STOP_181
+#AT_START_182
+at_fn_group_banner 182 'ofp-print.at:185' \
   "OFPT_FEATURES_REPLY - OF1.0" "                    " 19
 at_xfail=no
 (
-  $as_echo "181. $at_setup_line: testing $at_desc ..."
+  $as_echo "182. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44529,13 +44904,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_181
-#AT_START_182
-at_fn_group_banner 182 'ofp-print.at:235' \
+#AT_STOP_182
+#AT_START_183
+at_fn_group_banner 183 'ofp-print.at:235' \
   "OFPT_FEATURES_REPLY cut off mid-port - OF1.0" "   " 19
 at_xfail=no
 (
-  $as_echo "182. $at_setup_line: testing $at_desc ..."
+  $as_echo "183. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44620,13 +44995,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_182
-#AT_START_183
-at_fn_group_banner 183 'ofp-print.at:274' \
+#AT_STOP_183
+#AT_START_184
+at_fn_group_banner 184 'ofp-print.at:274' \
   "OFPT_FEATURES_REPLY - OF1.1" "                    " 19
 at_xfail=no
 (
-  $as_echo "183. $at_setup_line: testing $at_desc ..."
+  $as_echo "184. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44687,13 +45062,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_183
-#AT_START_184
-at_fn_group_banner 184 'ofp-print.at:305' \
+#AT_STOP_184
+#AT_START_185
+at_fn_group_banner 185 'ofp-print.at:305' \
   "OFPT_FEATURES_REPLY cut off mid-port - OF1.1" "   " 19
 at_xfail=no
 (
-  $as_echo "184. $at_setup_line: testing $at_desc ..."
+  $as_echo "185. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44763,13 +45138,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_184
-#AT_START_185
-at_fn_group_banner 185 'ofp-print.at:334' \
+#AT_STOP_185
+#AT_START_186
+at_fn_group_banner 186 'ofp-print.at:334' \
   "OFPT_FEATURES_REPLY - OF1.2" "                    " 19
 at_xfail=no
 (
-  $as_echo "185. $at_setup_line: testing $at_desc ..."
+  $as_echo "186. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44830,13 +45205,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_185
-#AT_START_186
-at_fn_group_banner 186 'ofp-print.at:365' \
+#AT_STOP_186
+#AT_START_187
+at_fn_group_banner 187 'ofp-print.at:365' \
   "OFPT_FEATURES_REPLY cut off mid-port - OF1.2" "   " 19
 at_xfail=no
 (
-  $as_echo "186. $at_setup_line: testing $at_desc ..."
+  $as_echo "187. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44905,13 +45280,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_186
-#AT_START_187
-at_fn_group_banner 187 'ofp-print.at:394' \
+#AT_STOP_187
+#AT_START_188
+at_fn_group_banner 188 'ofp-print.at:394' \
   "OFPT_FEATURES_REPLY - OF1.3" "                    " 19
 at_xfail=no
 (
-  $as_echo "187. $at_setup_line: testing $at_desc ..."
+  $as_echo "188. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44945,13 +45320,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_187
-#AT_START_188
-at_fn_group_banner 188 'ofp-print.at:406' \
+#AT_STOP_188
+#AT_START_189
+at_fn_group_banner 189 'ofp-print.at:406' \
   "OFPT_FEATURES_REPLY - OF1.4" "                    " 19
 at_xfail=no
 (
-  $as_echo "188. $at_setup_line: testing $at_desc ..."
+  $as_echo "189. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -44985,13 +45360,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_188
-#AT_START_189
-at_fn_group_banner 189 'ofp-print.at:418' \
+#AT_STOP_189
+#AT_START_190
+at_fn_group_banner 190 'ofp-print.at:418' \
   "OFPT_FEATURES_REPLY - OF1.5" "                    " 19
 at_xfail=no
 (
-  $as_echo "189. $at_setup_line: testing $at_desc ..."
+  $as_echo "190. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45025,13 +45400,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_189
-#AT_START_190
-at_fn_group_banner 190 'ofp-print.at:430' \
+#AT_STOP_190
+#AT_START_191
+at_fn_group_banner 191 'ofp-print.at:430' \
   "OFPT_FEATURES_REPLY - with auxiliary_id - OF1.3" "" 19
 at_xfail=no
 (
-  $as_echo "190. $at_setup_line: testing $at_desc ..."
+  $as_echo "191. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45065,13 +45440,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_190
-#AT_START_191
-at_fn_group_banner 191 'ofp-print.at:442' \
+#AT_STOP_191
+#AT_START_192
+at_fn_group_banner 192 'ofp-print.at:442' \
   "OFPT_GET_CONFIG_REQUEST" "                        " 19
 at_xfail=no
 (
-  $as_echo "191. $at_setup_line: testing $at_desc ..."
+  $as_echo "192. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45097,13 +45472,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_191
-#AT_START_192
-at_fn_group_banner 192 'ofp-print.at:449' \
+#AT_STOP_192
+#AT_START_193
+at_fn_group_banner 193 'ofp-print.at:449' \
   "OFPT_GET_CONFIG_REPLY, most common form" "        " 19
 at_xfail=no
 (
-  $as_echo "192. $at_setup_line: testing $at_desc ..."
+  $as_echo "193. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45129,13 +45504,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_192
-#AT_START_193
-at_fn_group_banner 193 'ofp-print.at:457' \
+#AT_STOP_193
+#AT_START_194
+at_fn_group_banner 194 'ofp-print.at:457' \
   "OFPT_GET_CONFIG_REPLY, frags and miss_send_len" " " 19
 at_xfail=no
 (
-  $as_echo "193. $at_setup_line: testing $at_desc ..."
+  $as_echo "194. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45161,13 +45536,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_193
-#AT_START_194
-at_fn_group_banner 194 'ofp-print.at:464' \
+#AT_STOP_194
+#AT_START_195
+at_fn_group_banner 195 'ofp-print.at:464' \
   "OFPT_PACKET_IN - OF1.0" "                         " 19
 at_xfail=no
 (
-  $as_echo "194. $at_setup_line: testing $at_desc ..."
+  $as_echo "195. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45206,13 +45581,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_194
-#AT_START_195
-at_fn_group_banner 195 'ofp-print.at:478' \
+#AT_STOP_195
+#AT_START_196
+at_fn_group_banner 196 'ofp-print.at:478' \
   "OFPT_PACKET_IN - OF1.0, with hex output of packet data" "" 19
 at_xfail=no
 (
-  $as_echo "195. $at_setup_line: testing $at_desc ..."
+  $as_echo "196. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45255,13 +45630,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_195
-#AT_START_196
-at_fn_group_banner 196 'ofp-print.at:496' \
+#AT_STOP_196
+#AT_START_197
+at_fn_group_banner 197 'ofp-print.at:496' \
   "OFPT_PACKET_IN - OF1.1" "                         " 19
 at_xfail=no
 (
-  $as_echo "196. $at_setup_line: testing $at_desc ..."
+  $as_echo "197. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45302,13 +45677,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_196
-#AT_START_197
-at_fn_group_banner 197 'ofp-print.at:511' \
+#AT_STOP_197
+#AT_START_198
+at_fn_group_banner 198 'ofp-print.at:511' \
   "OFPT_PACKET_IN - OF1.2" "                         " 19
 at_xfail=no
 (
-  $as_echo "197. $at_setup_line: testing $at_desc ..."
+  $as_echo "198. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45347,13 +45722,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_197
-#AT_START_198
-at_fn_group_banner 198 'ofp-print.at:525' \
+#AT_STOP_198
+#AT_START_199
+at_fn_group_banner 199 'ofp-print.at:525' \
   "OFPT_PACKET_IN - OF1.2, with hex output of packet data" "" 19
 at_xfail=no
 (
-  $as_echo "198. $at_setup_line: testing $at_desc ..."
+  $as_echo "199. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45395,13 +45770,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_198
-#AT_START_199
-at_fn_group_banner 199 'ofp-print.at:542' \
+#AT_STOP_199
+#AT_START_200
+at_fn_group_banner 200 'ofp-print.at:542' \
   "OFPT_PACKET_IN - OF1.3" "                         " 19
 at_xfail=no
 (
-  $as_echo "199. $at_setup_line: testing $at_desc ..."
+  $as_echo "200. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45442,13 +45817,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_199
-#AT_START_200
-at_fn_group_banner 200 'ofp-print.at:557' \
+#AT_STOP_200
+#AT_START_201
+at_fn_group_banner 201 'ofp-print.at:557' \
   "OFPT_PACKET_IN - OF1.4" "                         " 19
 at_xfail=no
 (
-  $as_echo "200. $at_setup_line: testing $at_desc ..."
+  $as_echo "201. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45489,13 +45864,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_200
-#AT_START_201
-at_fn_group_banner 201 'ofp-print.at:572' \
+#AT_STOP_201
+#AT_START_202
+at_fn_group_banner 202 'ofp-print.at:572' \
   "OFPT_PACKET_IN - OF1.5" "                         " 19
 at_xfail=no
 (
-  $as_echo "201. $at_setup_line: testing $at_desc ..."
+  $as_echo "202. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45536,13 +45911,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_201
-#AT_START_202
-at_fn_group_banner 202 'ofp-print.at:587' \
+#AT_STOP_202
+#AT_START_203
+at_fn_group_banner 203 'ofp-print.at:587' \
   "OFPT_PACKET_IN - OF1.3, with hex output of packet data" "" 19
 at_xfail=no
 (
-  $as_echo "202. $at_setup_line: testing $at_desc ..."
+  $as_echo "203. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45586,13 +45961,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_202
-#AT_START_203
-at_fn_group_banner 203 'ofp-print.at:605' \
+#AT_STOP_203
+#AT_START_204
+at_fn_group_banner 204 'ofp-print.at:605' \
   "OFPT_FLOW_REMOVED - OF1.0" "                      " 19
 at_xfail=no
 (
-  $as_echo "203. $at_setup_line: testing $at_desc ..."
+  $as_echo "204. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45632,13 +46007,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_203
-#AT_START_204
-at_fn_group_banner 204 'ofp-print.at:619' \
+#AT_STOP_204
+#AT_START_205
+at_fn_group_banner 205 'ofp-print.at:619' \
   "OFPT_FLOW_REMOVED - OF1.2" "                      " 19
 at_xfail=no
 (
-  $as_echo "204. $at_setup_line: testing $at_desc ..."
+  $as_echo "205. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45672,13 +46047,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_204
-#AT_START_205
-at_fn_group_banner 205 'ofp-print.at:630' \
+#AT_STOP_205
+#AT_START_206
+at_fn_group_banner 206 'ofp-print.at:630' \
   "OFPT_FLOW_REMOVED - OF1.3" "                      " 19
 at_xfail=no
 (
-  $as_echo "205. $at_setup_line: testing $at_desc ..."
+  $as_echo "206. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45712,13 +46087,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_205
-#AT_START_206
-at_fn_group_banner 206 'ofp-print.at:641' \
+#AT_STOP_206
+#AT_START_207
+at_fn_group_banner 207 'ofp-print.at:641' \
   "OFPT_FLOW_REMOVED - OF1.5" "                      " 19
 at_xfail=no
 (
-  $as_echo "206. $at_setup_line: testing $at_desc ..."
+  $as_echo "207. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45762,13 +46137,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_206
-#AT_START_207
-at_fn_group_banner 207 'ofp-print.at:657' \
+#AT_STOP_207
+#AT_START_208
+at_fn_group_banner 208 'ofp-print.at:657' \
   "OFPT_PORT_STATUS - OF1.0" "                       " 19
 at_xfail=no
 (
-  $as_echo "207. $at_setup_line: testing $at_desc ..."
+  $as_echo "208. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45810,13 +46185,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_207
-#AT_START_208
-at_fn_group_banner 208 'ofp-print.at:675' \
+#AT_STOP_208
+#AT_START_209
+at_fn_group_banner 209 'ofp-print.at:675' \
   "OFPT_PORT_STATUS - OF1.1" "                       " 19
 at_xfail=no
 (
-  $as_echo "208. $at_setup_line: testing $at_desc ..."
+  $as_echo "209. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45860,13 +46235,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_208
-#AT_START_209
-at_fn_group_banner 209 'ofp-print.at:694' \
+#AT_STOP_209
+#AT_START_210
+at_fn_group_banner 210 'ofp-print.at:694' \
   "OFPT_PORT_STATUS - OF1.4" "                       " 19
 at_xfail=no
 (
-  $as_echo "209. $at_setup_line: testing $at_desc ..."
+  $as_echo "210. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45912,13 +46287,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_209
-#AT_START_210
-at_fn_group_banner 210 'ofp-print.at:714' \
+#AT_STOP_210
+#AT_START_211
+at_fn_group_banner 211 'ofp-print.at:714' \
   "OFPT_PACKET_OUT - OF1.0" "                        " 19
 at_xfail=no
 (
-  $as_echo "210. $at_setup_line: testing $at_desc ..."
+  $as_echo "211. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -45958,13 +46333,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_210
-#AT_START_211
-at_fn_group_banner 211 'ofp-print.at:728' \
+#AT_STOP_211
+#AT_START_212
+at_fn_group_banner 212 'ofp-print.at:728' \
   "OFPT_PACKET_OUT - OF1.0, with packet" "           " 19
 at_xfail=no
 (
-  $as_echo "211. $at_setup_line: testing $at_desc ..."
+  $as_echo "212. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46005,13 +46380,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_211
-#AT_START_212
-at_fn_group_banner 212 'ofp-print.at:743' \
+#AT_STOP_212
+#AT_START_213
+at_fn_group_banner 213 'ofp-print.at:743' \
   "OFPT_PACKET_OUT - OF1.0, with hex output of packet data" "" 19
 at_xfail=no
 (
-  $as_echo "212. $at_setup_line: testing $at_desc ..."
+  $as_echo "213. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46056,13 +46431,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_212
-#AT_START_213
-at_fn_group_banner 213 'ofp-print.at:762' \
+#AT_STOP_213
+#AT_START_214
+at_fn_group_banner 214 'ofp-print.at:762' \
   "OFPT_PACKET_OUT - OF1.1" "                        " 19
 at_xfail=no
 (
-  $as_echo "213. $at_setup_line: testing $at_desc ..."
+  $as_echo "214. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46096,13 +46471,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_213
-#AT_START_214
-at_fn_group_banner 214 'ofp-print.at:773' \
+#AT_STOP_214
+#AT_START_215
+at_fn_group_banner 215 'ofp-print.at:773' \
   "OFPT_PACKET_OUT - OF1.1, with packet" "           " 19
 at_xfail=no
 (
-  $as_echo "214. $at_setup_line: testing $at_desc ..."
+  $as_echo "215. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46145,13 +46520,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_214
-#AT_START_215
-at_fn_group_banner 215 'ofp-print.at:789' \
+#AT_STOP_215
+#AT_START_216
+at_fn_group_banner 216 'ofp-print.at:789' \
   "OFPT_PACKET_OUT - OF1.5" "                        " 19
 at_xfail=no
 (
-  $as_echo "215. $at_setup_line: testing $at_desc ..."
+  $as_echo "216. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46274,13 +46649,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_215
-#AT_START_216
-at_fn_group_banner 216 'ofp-print.at:840' \
+#AT_STOP_216
+#AT_START_217
+at_fn_group_banner 217 'ofp-print.at:840' \
   "OFPT_PACKET_OUT - OF1.5, with packet" "           " 19
 at_xfail=no
 (
-  $as_echo "216. $at_setup_line: testing $at_desc ..."
+  $as_echo "217. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46325,13 +46700,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_216
-#AT_START_217
-at_fn_group_banner 217 'ofp-print.at:858' \
+#AT_STOP_217
+#AT_START_218
+at_fn_group_banner 218 'ofp-print.at:858' \
   "OFPT_FLOW_MOD - OF1.0 - low verbosity" "          " 19
 at_xfail=no
 (
-  $as_echo "217. $at_setup_line: testing $at_desc ..."
+  $as_echo "218. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46373,13 +46748,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_217
-#AT_START_218
-at_fn_group_banner 218 'ofp-print.at:876' \
+#AT_STOP_218
+#AT_START_219
+at_fn_group_banner 219 'ofp-print.at:876' \
   "OFPT_FLOW_MOD - OF1.1 - low verbosity" "          " 19
 at_xfail=no
 (
-  $as_echo "218. $at_setup_line: testing $at_desc ..."
+  $as_echo "219. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46429,13 +46804,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_218
-#AT_START_219
-at_fn_group_banner 219 'ofp-print.at:896' \
+#AT_STOP_219
+#AT_START_220
+at_fn_group_banner 220 'ofp-print.at:896' \
   "OFPT_FLOW_MOD - OF1.2 - low verbosity" "          " 19
 at_xfail=no
 (
-  $as_echo "219. $at_setup_line: testing $at_desc ..."
+  $as_echo "220. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46481,13 +46856,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_219
-#AT_START_220
-at_fn_group_banner 220 'ofp-print.at:916' \
+#AT_STOP_220
+#AT_START_221
+at_fn_group_banner 221 'ofp-print.at:916' \
   "OFPT_FLOW_MOD - OF1.0 - high verbosity" "         " 19
 at_xfail=no
 (
-  $as_echo "220. $at_setup_line: testing $at_desc ..."
+  $as_echo "221. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46529,13 +46904,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_220
-#AT_START_221
-at_fn_group_banner 221 'ofp-print.at:934' \
+#AT_STOP_221
+#AT_START_222
+at_fn_group_banner 222 'ofp-print.at:934' \
   "OFPT_FLOW_MOD - OF1.2 - low verbosity" "          " 19
 at_xfail=no
 (
-  $as_echo "221. $at_setup_line: testing $at_desc ..."
+  $as_echo "222. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46581,13 +46956,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_221
-#AT_START_222
-at_fn_group_banner 222 'ofp-print.at:953' \
+#AT_STOP_222
+#AT_START_223
+at_fn_group_banner 223 'ofp-print.at:953' \
   "OFPT_FLOW_MOD - OF1.3 - flags - low verbosity" "  " 19
 at_xfail=no
 (
-  $as_echo "222. $at_setup_line: testing $at_desc ..."
+  $as_echo "223. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46633,13 +47008,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_222
-#AT_START_223
-at_fn_group_banner 223 'ofp-print.at:971' \
+#AT_STOP_223
+#AT_START_224
+at_fn_group_banner 224 'ofp-print.at:971' \
   "OFPT_FLOW_MOD - OF1.2 - set-field ip_src" "       " 19
 at_xfail=no
 (
-  $as_echo "223. $at_setup_line: testing $at_desc ..."
+  $as_echo "224. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46679,13 +47054,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_223
-#AT_START_224
-at_fn_group_banner 224 'ofp-print.at:986' \
+#AT_STOP_224
+#AT_START_225
+at_fn_group_banner 225 'ofp-print.at:986' \
   "OFPT_FLOW_MOD - OF1.2 - set-field ip_dst" "       " 19
 at_xfail=no
 (
-  $as_echo "224. $at_setup_line: testing $at_desc ..."
+  $as_echo "225. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46725,13 +47100,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_224
-#AT_START_225
-at_fn_group_banner 225 'ofp-print.at:1001' \
+#AT_STOP_225
+#AT_START_226
+at_fn_group_banner 226 'ofp-print.at:1001' \
   "OFPT_FLOW_MOD - OF1.2 - set-field sctp_src" "     " 19
 at_xfail=no
 (
-  $as_echo "225. $at_setup_line: testing $at_desc ..."
+  $as_echo "226. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46771,13 +47146,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_225
-#AT_START_226
-at_fn_group_banner 226 'ofp-print.at:1016' \
+#AT_STOP_226
+#AT_START_227
+at_fn_group_banner 227 'ofp-print.at:1016' \
   "OFPT_FLOW_MOD - OF1.2 - set-field sctp_dst" "     " 19
 at_xfail=no
 (
-  $as_echo "226. $at_setup_line: testing $at_desc ..."
+  $as_echo "227. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46817,13 +47192,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_226
-#AT_START_227
-at_fn_group_banner 227 'ofp-print.at:1031' \
+#AT_STOP_227
+#AT_START_228
+at_fn_group_banner 228 'ofp-print.at:1031' \
   "OFPT_FLOW_MOD - OF1.2 - experimenter OXM" "       " 19
 at_xfail=no
 (
-  $as_echo "227. $at_setup_line: testing $at_desc ..."
+  $as_echo "228. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46861,13 +47236,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_227
-#AT_START_228
-at_fn_group_banner 228 'ofp-print.at:1045' \
+#AT_STOP_228
+#AT_START_229
+at_fn_group_banner 229 'ofp-print.at:1045' \
   "OFPT_FLOW_MOD - OF1.2 - set-field nd_target, nd_sll" "" 19
 at_xfail=no
 (
-  $as_echo "228. $at_setup_line: testing $at_desc ..."
+  $as_echo "229. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46911,13 +47286,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_228
-#AT_START_229
-at_fn_group_banner 229 'ofp-print.at:1063' \
+#AT_STOP_229
+#AT_START_230
+at_fn_group_banner 230 'ofp-print.at:1063' \
   "OFPT_FLOW_MOD - OF1.3 - meter" "                  " 19
 at_xfail=no
 (
-  $as_echo "229. $at_setup_line: testing $at_desc ..."
+  $as_echo "230. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -46951,13 +47326,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_229
-#AT_START_230
-at_fn_group_banner 230 'ofp-print.at:1074' \
+#AT_STOP_230
+#AT_START_231
+at_fn_group_banner 231 'ofp-print.at:1074' \
   "OFPT_FLOW reply - OF1.2 - set-field ip_src" "     " 19
 at_xfail=no
 (
-  $as_echo "230. $at_setup_line: testing $at_desc ..."
+  $as_echo "231. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47000,13 +47375,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_230
-#AT_START_231
-at_fn_group_banner 231 'ofp-print.at:1091' \
+#AT_STOP_231
+#AT_START_232
+at_fn_group_banner 232 'ofp-print.at:1091' \
   "OFPT_FLOW reply - OF1.2 - set-field ip_dst" "     " 19
 at_xfail=no
 (
-  $as_echo "231. $at_setup_line: testing $at_desc ..."
+  $as_echo "232. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47049,13 +47424,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_231
-#AT_START_232
-at_fn_group_banner 232 'ofp-print.at:1108' \
+#AT_STOP_232
+#AT_START_233
+at_fn_group_banner 233 'ofp-print.at:1108' \
   "OFPT_FLOW reply - OF1.2 - set-field sctp_src" "   " 19
 at_xfail=no
 (
-  $as_echo "232. $at_setup_line: testing $at_desc ..."
+  $as_echo "233. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47098,13 +47473,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_232
-#AT_START_233
-at_fn_group_banner 233 'ofp-print.at:1125' \
+#AT_STOP_233
+#AT_START_234
+at_fn_group_banner 234 'ofp-print.at:1125' \
   "OFPT_FLOW reply - OF1.2 - set-field sctp_dst" "   " 19
 at_xfail=no
 (
-  $as_echo "233. $at_setup_line: testing $at_desc ..."
+  $as_echo "234. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47147,13 +47522,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_233
-#AT_START_234
-at_fn_group_banner 234 'ofp-print.at:1142' \
+#AT_STOP_234
+#AT_START_235
+at_fn_group_banner 235 'ofp-print.at:1142' \
   "OFPT_PORT_MOD - OF1.0" "                          " 19
 at_xfail=no
 (
-  $as_echo "234. $at_setup_line: testing $at_desc ..."
+  $as_echo "235. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47188,13 +47563,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_234
-#AT_START_235
-at_fn_group_banner 235 'ofp-print.at:1155' \
+#AT_STOP_235
+#AT_START_236
+at_fn_group_banner 236 'ofp-print.at:1155' \
   "OFPT_PORT_MOD - OF1.1" "                          " 19
 at_xfail=no
 (
-  $as_echo "235. $at_setup_line: testing $at_desc ..."
+  $as_echo "236. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47231,13 +47606,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_235
-#AT_START_236
-at_fn_group_banner 236 'ofp-print.at:1169' \
+#AT_STOP_236
+#AT_START_237
+at_fn_group_banner 237 'ofp-print.at:1169' \
   "OFPT_PORT_MOD - OF1.2" "                          " 19
 at_xfail=no
 (
-  $as_echo "236. $at_setup_line: testing $at_desc ..."
+  $as_echo "237. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47274,13 +47649,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_236
-#AT_START_237
-at_fn_group_banner 237 'ofp-print.at:1183' \
+#AT_STOP_237
+#AT_START_238
+at_fn_group_banner 238 'ofp-print.at:1183' \
   "OFPT_PORT_MOD - OF1.3" "                          " 19
 at_xfail=no
 (
-  $as_echo "237. $at_setup_line: testing $at_desc ..."
+  $as_echo "238. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47317,13 +47692,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_237
-#AT_START_238
-at_fn_group_banner 238 'ofp-print.at:1197' \
+#AT_STOP_238
+#AT_START_239
+at_fn_group_banner 239 'ofp-print.at:1197' \
   "OFPT_PORT_MOD - OF1.4" "                          " 19
 at_xfail=no
 (
-  $as_echo "238. $at_setup_line: testing $at_desc ..."
+  $as_echo "239. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47360,13 +47735,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_238
-#AT_START_239
-at_fn_group_banner 239 'ofp-print.at:1211' \
+#AT_STOP_239
+#AT_START_240
+at_fn_group_banner 240 'ofp-print.at:1211' \
   "OFPT_TABLE_MOD - OF1.1" "                         " 19
 at_xfail=no
 (
-  $as_echo "239. $at_setup_line: testing $at_desc ..."
+  $as_echo "240. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47396,13 +47771,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_239
-#AT_START_240
-at_fn_group_banner 240 'ofp-print.at:1220' \
+#AT_STOP_240
+#AT_START_241
+at_fn_group_banner 241 'ofp-print.at:1220' \
   "OFPT_TABLE_MOD - OF1.2" "                         " 19
 at_xfail=no
 (
-  $as_echo "240. $at_setup_line: testing $at_desc ..."
+  $as_echo "241. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47432,13 +47807,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_240
-#AT_START_241
-at_fn_group_banner 241 'ofp-print.at:1229' \
+#AT_STOP_241
+#AT_START_242
+at_fn_group_banner 242 'ofp-print.at:1229' \
   "OFPT_TABLE_MOD - OF1.3" "                         " 19
 at_xfail=no
 (
-  $as_echo "241. $at_setup_line: testing $at_desc ..."
+  $as_echo "242. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47468,13 +47843,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_241
-#AT_START_242
-at_fn_group_banner 242 'ofp-print.at:1238' \
+#AT_STOP_242
+#AT_START_243
+at_fn_group_banner 243 'ofp-print.at:1238' \
   "OFPT_TABLE_MOD - OF1.4" "                         " 19
 at_xfail=no
 (
-  $as_echo "242. $at_setup_line: testing $at_desc ..."
+  $as_echo "243. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47504,13 +47879,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_242
-#AT_START_243
-at_fn_group_banner 243 'ofp-print.at:1247' \
+#AT_STOP_243
+#AT_START_244
+at_fn_group_banner 244 'ofp-print.at:1247' \
   "OFPST_DESC request" "                             " 19
 at_xfail=no
 (
-  $as_echo "243. $at_setup_line: testing $at_desc ..."
+  $as_echo "244. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47536,13 +47911,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_243
-#AT_START_244
-at_fn_group_banner 244 'ofp-print.at:1254' \
+#AT_STOP_244
+#AT_START_245
+at_fn_group_banner 245 'ofp-print.at:1254' \
   "OFPST_DESC reply" "                               " 19
 at_xfail=no
 (
-  $as_echo "244. $at_setup_line: testing $at_desc ..."
+  $as_echo "245. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47709,13 +48084,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_244
-#AT_START_245
-at_fn_group_banner 245 'ofp-print.at:1334' \
+#AT_STOP_245
+#AT_START_246
+at_fn_group_banner 246 'ofp-print.at:1334' \
   "OFPST_FLOW request - OF1.0" "                     " 19
 at_xfail=no
 (
-  $as_echo "245. $at_setup_line: testing $at_desc ..."
+  $as_echo "246. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47751,13 +48126,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_245
-#AT_START_246
-at_fn_group_banner 246 'ofp-print.at:1346' \
+#AT_STOP_246
+#AT_START_247
+at_fn_group_banner 247 'ofp-print.at:1346' \
   "OFPST_FLOW request - OF1.2" "                     " 19
 at_xfail=no
 (
-  $as_echo "246. $at_setup_line: testing $at_desc ..."
+  $as_echo "247. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47793,13 +48168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_246
-#AT_START_247
-at_fn_group_banner 247 'ofp-print.at:1358' \
+#AT_STOP_247
+#AT_START_248
+at_fn_group_banner 248 'ofp-print.at:1358' \
   "OFPST_FLOW request - OF1.3" "                     " 19
 at_xfail=no
 (
-  $as_echo "247. $at_setup_line: testing $at_desc ..."
+  $as_echo "248. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47835,13 +48210,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_247
-#AT_START_248
-at_fn_group_banner 248 'ofp-print.at:1370' \
+#AT_STOP_248
+#AT_START_249
+at_fn_group_banner 249 'ofp-print.at:1370' \
   "OFPST_FLOW request - OF1.5" "                     " 19
 at_xfail=no
 (
-  $as_echo "248. $at_setup_line: testing $at_desc ..."
+  $as_echo "249. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47877,13 +48252,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_248
-#AT_START_249
-at_fn_group_banner 249 'ofp-print.at:1382' \
+#AT_STOP_249
+#AT_START_250
+at_fn_group_banner 250 'ofp-print.at:1382' \
   "OFPST_FLOW reply - OF1.0" "                       " 19
 at_xfail=no
 (
-  $as_echo "249. $at_setup_line: testing $at_desc ..."
+  $as_echo "250. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -47978,13 +48353,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_249
-#AT_START_250
-at_fn_group_banner 250 'ofp-print.at:1426' \
+#AT_STOP_250
+#AT_START_251
+at_fn_group_banner 251 'ofp-print.at:1426' \
   "OFPST_FLOW reply - OF1.2" "                       " 19
 at_xfail=no
 (
-  $as_echo "250. $at_setup_line: testing $at_desc ..."
+  $as_echo "251. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48063,13 +48438,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_250
-#AT_START_251
-at_fn_group_banner 251 'ofp-print.at:1461' \
+#AT_STOP_251
+#AT_START_252
+at_fn_group_banner 252 'ofp-print.at:1461' \
   "OFPST_FLOW reply - OF1.5" "                       " 19
 at_xfail=no
 (
-  $as_echo "251. $at_setup_line: testing $at_desc ..."
+  $as_echo "252. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48131,13 +48506,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_251
-#AT_START_252
-at_fn_group_banner 252 'ofp-print.at:1487' \
+#AT_STOP_252
+#AT_START_253
+at_fn_group_banner 253 'ofp-print.at:1487' \
   "OFPST_AGGREGATE request - OF1.0" "                " 19
 at_xfail=no
 (
-  $as_echo "252. $at_setup_line: testing $at_desc ..."
+  $as_echo "253. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48173,13 +48548,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_252
-#AT_START_253
-at_fn_group_banner 253 'ofp-print.at:1499' \
+#AT_STOP_253
+#AT_START_254
+at_fn_group_banner 254 'ofp-print.at:1499' \
   "OFPST_AGGREGATE request - OF1.2" "                " 19
 at_xfail=no
 (
-  $as_echo "253. $at_setup_line: testing $at_desc ..."
+  $as_echo "254. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48215,13 +48590,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_253
-#AT_START_254
-at_fn_group_banner 254 'ofp-print.at:1511' \
+#AT_STOP_254
+#AT_START_255
+at_fn_group_banner 255 'ofp-print.at:1511' \
   "OFPST_AGGREGATE request - OF1.3" "                " 19
 at_xfail=no
 (
-  $as_echo "254. $at_setup_line: testing $at_desc ..."
+  $as_echo "255. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48257,13 +48632,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_254
-#AT_START_255
-at_fn_group_banner 255 'ofp-print.at:1523' \
+#AT_STOP_255
+#AT_START_256
+at_fn_group_banner 256 'ofp-print.at:1523' \
   "OFPST_AGGREGATE request - OF1.5" "                " 19
 at_xfail=no
 (
-  $as_echo "255. $at_setup_line: testing $at_desc ..."
+  $as_echo "256. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48303,13 +48678,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_255
-#AT_START_256
-at_fn_group_banner 256 'ofp-print.at:1537' \
+#AT_STOP_256
+#AT_START_257
+at_fn_group_banner 257 'ofp-print.at:1537' \
   "OFPST_AGGREGATE reply - OF1.0" "                  " 19
 at_xfail=no
 (
-  $as_echo "256. $at_setup_line: testing $at_desc ..."
+  $as_echo "257. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48343,13 +48718,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_256
-#AT_START_257
-at_fn_group_banner 257 'ofp-print.at:1548' \
+#AT_STOP_257
+#AT_START_258
+at_fn_group_banner 258 'ofp-print.at:1548' \
   "OFPST_AGGREGATE reply - OF1.2" "                  " 19
 at_xfail=no
 (
-  $as_echo "257. $at_setup_line: testing $at_desc ..."
+  $as_echo "258. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48383,13 +48758,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_257
-#AT_START_258
-at_fn_group_banner 258 'ofp-print.at:1559' \
+#AT_STOP_258
+#AT_START_259
+at_fn_group_banner 259 'ofp-print.at:1559' \
   "OFPST_AGGREGATE reply - OF1.3" "                  " 19
 at_xfail=no
 (
-  $as_echo "258. $at_setup_line: testing $at_desc ..."
+  $as_echo "259. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48423,13 +48798,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_258
-#AT_START_259
-at_fn_group_banner 259 'ofp-print.at:1570' \
+#AT_STOP_259
+#AT_START_260
+at_fn_group_banner 260 'ofp-print.at:1570' \
   "OFPST_AGGREGATE reply - OF1.5" "                  " 19
 at_xfail=no
 (
-  $as_echo "259. $at_setup_line: testing $at_desc ..."
+  $as_echo "260. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48465,13 +48840,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_259
-#AT_START_260
-at_fn_group_banner 260 'ofp-print.at:1582' \
+#AT_STOP_260
+#AT_START_261
+at_fn_group_banner 261 'ofp-print.at:1582' \
   "OFPST_TABLE request - OF1.0" "                    " 19
 at_xfail=no
 (
-  $as_echo "260. $at_setup_line: testing $at_desc ..."
+  $as_echo "261. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48497,13 +48872,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_260
-#AT_START_261
-at_fn_group_banner 261 'ofp-print.at:1589' \
+#AT_STOP_261
+#AT_START_262
+at_fn_group_banner 262 'ofp-print.at:1589' \
   "OFPST_TABLE request - OF1.1" "                    " 19
 at_xfail=no
 (
-  $as_echo "261. $at_setup_line: testing $at_desc ..."
+  $as_echo "262. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48529,13 +48904,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_261
-#AT_START_262
-at_fn_group_banner 262 'ofp-print.at:1596' \
+#AT_STOP_262
+#AT_START_263
+at_fn_group_banner 263 'ofp-print.at:1596' \
   "OFPST_TABLE request - OF1.2" "                    " 19
 at_xfail=no
 (
-  $as_echo "262. $at_setup_line: testing $at_desc ..."
+  $as_echo "263. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48561,13 +48936,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_262
-#AT_START_263
-at_fn_group_banner 263 'ofp-print.at:1603' \
+#AT_STOP_263
+#AT_START_264
+at_fn_group_banner 264 'ofp-print.at:1603' \
   "OFPST_TABLE request - OF1.3" "                    " 19
 at_xfail=no
 (
-  $as_echo "263. $at_setup_line: testing $at_desc ..."
+  $as_echo "264. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48593,13 +48968,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_263
-#AT_START_264
-at_fn_group_banner 264 'ofp-print.at:1610' \
+#AT_STOP_264
+#AT_START_265
+at_fn_group_banner 265 'ofp-print.at:1610' \
   "OFPST_TABLE reply - OF1.0" "                      " 19
 at_xfail=no
 (
-  $as_echo "264. $at_setup_line: testing $at_desc ..."
+  $as_echo "265. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48642,13 +49017,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_264
-#AT_START_265
-at_fn_group_banner 265 'ofp-print.at:1628' \
+#AT_STOP_265
+#AT_START_266
+at_fn_group_banner 266 'ofp-print.at:1628' \
   "OFPST_TABLE reply - OF1.2" "                      " 19
 at_xfail=no
 (
-  $as_echo "265. $at_setup_line: testing $at_desc ..."
+  $as_echo "266. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48724,13 +49099,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_265
-#AT_START_266
-at_fn_group_banner 266 'ofp-print.at:1685' \
+#AT_STOP_266
+#AT_START_267
+at_fn_group_banner 267 'ofp-print.at:1685' \
   "OFPST_TABLE reply - OF1.3" "                      " 19
 at_xfail=no
 (
-  $as_echo "266. $at_setup_line: testing $at_desc ..."
+  $as_echo "267. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48771,13 +49146,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_266
-#AT_START_267
-at_fn_group_banner 267 'ofp-print.at:1702' \
+#AT_STOP_267
+#AT_START_268
+at_fn_group_banner 268 'ofp-print.at:1702' \
   "OFPST_PORT request - 1.0" "                       " 19
 at_xfail=no
 (
-  $as_echo "267. $at_setup_line: testing $at_desc ..."
+  $as_echo "268. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48809,13 +49184,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_267
-#AT_START_268
-at_fn_group_banner 268 'ofp-print.at:1712' \
+#AT_STOP_268
+#AT_START_269
+at_fn_group_banner 269 'ofp-print.at:1712' \
   "OFPST_PORT request - 1.1" "                       " 19
 at_xfail=no
 (
-  $as_echo "268. $at_setup_line: testing $at_desc ..."
+  $as_echo "269. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48847,13 +49222,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_268
-#AT_START_269
-at_fn_group_banner 269 'ofp-print.at:1722' \
+#AT_STOP_269
+#AT_START_270
+at_fn_group_banner 270 'ofp-print.at:1722' \
   "OFPST_PORT request - 1.2" "                       " 19
 at_xfail=no
 (
-  $as_echo "269. $at_setup_line: testing $at_desc ..."
+  $as_echo "270. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48885,13 +49260,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_269
-#AT_START_270
-at_fn_group_banner 270 'ofp-print.at:1732' \
+#AT_STOP_270
+#AT_START_271
+at_fn_group_banner 271 'ofp-print.at:1732' \
   "OFPST_PORT request - 1.3" "                       " 19
 at_xfail=no
 (
-  $as_echo "270. $at_setup_line: testing $at_desc ..."
+  $as_echo "271. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -48923,13 +49298,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_270
-#AT_START_271
-at_fn_group_banner 271 'ofp-print.at:1742' \
+#AT_STOP_271
+#AT_START_272
+at_fn_group_banner 272 'ofp-print.at:1742' \
   "OFPST_PORT reply - OF1.0" "                       " 19
 at_xfail=no
 (
-  $as_echo "271. $at_setup_line: testing $at_desc ..."
+  $as_echo "272. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49019,13 +49394,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_271
-#AT_START_272
-at_fn_group_banner 272 'ofp-print.at:1785' \
+#AT_STOP_272
+#AT_START_273
+at_fn_group_banner 273 'ofp-print.at:1785' \
   "OFPST_PORT reply - OF1.2" "                       " 19
 at_xfail=no
 (
-  $as_echo "272. $at_setup_line: testing $at_desc ..."
+  $as_echo "273. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49101,13 +49476,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_272
-#AT_START_273
-at_fn_group_banner 273 'ofp-print.at:1820' \
+#AT_STOP_273
+#AT_START_274
+at_fn_group_banner 274 'ofp-print.at:1820' \
   "OFPST_PORT reply - OF1.3" "                       " 19
 at_xfail=no
 (
-  $as_echo "273. $at_setup_line: testing $at_desc ..."
+  $as_echo "274. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49189,13 +49564,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_273
-#AT_START_274
-at_fn_group_banner 274 'ofp-print.at:1859' \
+#AT_STOP_274
+#AT_START_275
+at_fn_group_banner 275 'ofp-print.at:1859' \
   "OFPST_PORT reply - OF1.4" "                       " 19
 at_xfail=no
 (
-  $as_echo "274. $at_setup_line: testing $at_desc ..."
+  $as_echo "275. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49244,13 +49619,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_274
-#AT_START_275
-at_fn_group_banner 275 'ofp-print.at:1879' \
+#AT_STOP_275
+#AT_START_276
+at_fn_group_banner 276 'ofp-print.at:1879' \
   "OFPST_QUEUE request - OF1.0" "                    " 19
 at_xfail=no
 (
-  $as_echo "275. $at_setup_line: testing $at_desc ..."
+  $as_echo "276. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49282,13 +49657,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_275
-#AT_START_276
-at_fn_group_banner 276 'ofp-print.at:1889' \
+#AT_STOP_276
+#AT_START_277
+at_fn_group_banner 277 'ofp-print.at:1889' \
   "OFPST_QUEUE request - OF1.1" "                    " 19
 at_xfail=no
 (
-  $as_echo "276. $at_setup_line: testing $at_desc ..."
+  $as_echo "277. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49320,13 +49695,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_276
-#AT_START_277
-at_fn_group_banner 277 'ofp-print.at:1899' \
+#AT_STOP_277
+#AT_START_278
+at_fn_group_banner 278 'ofp-print.at:1899' \
   "OFPST_QUEUE request - OF1.2" "                    " 19
 at_xfail=no
 (
-  $as_echo "277. $at_setup_line: testing $at_desc ..."
+  $as_echo "278. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49358,13 +49733,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_277
-#AT_START_278
-at_fn_group_banner 278 'ofp-print.at:1909' \
+#AT_STOP_278
+#AT_START_279
+at_fn_group_banner 279 'ofp-print.at:1909' \
   "OFPST_QUEUE request - OF1.3" "                    " 19
 at_xfail=no
 (
-  $as_echo "278. $at_setup_line: testing $at_desc ..."
+  $as_echo "279. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49396,13 +49771,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_278
-#AT_START_279
-at_fn_group_banner 279 'ofp-print.at:1919' \
+#AT_STOP_279
+#AT_START_280
+at_fn_group_banner 280 'ofp-print.at:1919' \
   "OFPST_QUEUE reply - OF1.0" "                      " 19
 at_xfail=no
 (
-  $as_echo "279. $at_setup_line: testing $at_desc ..."
+  $as_echo "280. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49462,13 +49837,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_279
-#AT_START_280
-at_fn_group_banner 280 'ofp-print.at:1946' \
+#AT_STOP_280
+#AT_START_281
+at_fn_group_banner 281 'ofp-print.at:1946' \
   "OFPST_QUEUE reply - OF1.1" "                      " 19
 at_xfail=no
 (
-  $as_echo "280. $at_setup_line: testing $at_desc ..."
+  $as_echo "281. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49528,13 +49903,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_280
-#AT_START_281
-at_fn_group_banner 281 'ofp-print.at:1973' \
+#AT_STOP_281
+#AT_START_282
+at_fn_group_banner 282 'ofp-print.at:1973' \
   "OFPST_QUEUE reply - OF1.2" "                      " 19
 at_xfail=no
 (
-  $as_echo "281. $at_setup_line: testing $at_desc ..."
+  $as_echo "282. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49594,13 +49969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_281
-#AT_START_282
-at_fn_group_banner 282 'ofp-print.at:2000' \
+#AT_STOP_282
+#AT_START_283
+at_fn_group_banner 283 'ofp-print.at:2000' \
   "OFPST_QUEUE reply - OF1.3" "                      " 19
 at_xfail=no
 (
-  $as_echo "282. $at_setup_line: testing $at_desc ..."
+  $as_echo "283. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49672,13 +50047,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_282
-#AT_START_283
-at_fn_group_banner 283 'ofp-print.at:2033' \
+#AT_STOP_283
+#AT_START_284
+at_fn_group_banner 284 'ofp-print.at:2033' \
   "OFPST_QUEUE reply - OF1.4" "                      " 19
 at_xfail=no
 (
-  $as_echo "283. $at_setup_line: testing $at_desc ..."
+  $as_echo "284. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49752,13 +50127,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_283
-#AT_START_284
-at_fn_group_banner 284 'ofp-print.at:2067' \
+#AT_STOP_284
+#AT_START_285
+at_fn_group_banner 285 'ofp-print.at:2067' \
   "NXST_GROUP request - OF1.0" "                     " 19
 at_xfail=no
 (
-  $as_echo "284. $at_setup_line: testing $at_desc ..."
+  $as_echo "285. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49790,13 +50165,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_284
-#AT_START_285
-at_fn_group_banner 285 'ofp-print.at:2076' \
+#AT_STOP_285
+#AT_START_286
+at_fn_group_banner 286 'ofp-print.at:2076' \
   "OFPST_GROUP request - OF1.1" "                    " 19
 at_xfail=no
 (
-  $as_echo "285. $at_setup_line: testing $at_desc ..."
+  $as_echo "286. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49828,13 +50203,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_285
-#AT_START_286
-at_fn_group_banner 286 'ofp-print.at:2085' \
+#AT_STOP_286
+#AT_START_287
+at_fn_group_banner 287 'ofp-print.at:2085' \
   "NXST_GROUP reply - OF1.0" "                       " 19
 at_xfail=no
 (
-  $as_echo "286. $at_setup_line: testing $at_desc ..."
+  $as_echo "287. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49888,13 +50263,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_286
-#AT_START_287
-at_fn_group_banner 287 'ofp-print.at:2107' \
+#AT_STOP_287
+#AT_START_288
+at_fn_group_banner 288 'ofp-print.at:2107' \
   "OFPST_GROUP reply - OF1.1" "                      " 19
 at_xfail=no
 (
-  $as_echo "287. $at_setup_line: testing $at_desc ..."
+  $as_echo "288. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -49944,13 +50319,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_287
-#AT_START_288
-at_fn_group_banner 288 'ofp-print.at:2127' \
+#AT_STOP_288
+#AT_START_289
+at_fn_group_banner 289 'ofp-print.at:2127' \
   "OFPST_GROUP reply - OF1.3" "                      " 19
 at_xfail=no
 (
-  $as_echo "288. $at_setup_line: testing $at_desc ..."
+  $as_echo "289. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50004,13 +50379,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_288
-#AT_START_289
-at_fn_group_banner 289 'ofp-print.at:2149' \
+#AT_STOP_289
+#AT_START_290
+at_fn_group_banner 290 'ofp-print.at:2149' \
   "NXST_GROUP_DESC request - OF1.0" "                " 19
 at_xfail=no
 (
-  $as_echo "289. $at_setup_line: testing $at_desc ..."
+  $as_echo "290. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50042,13 +50417,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_289
-#AT_START_290
-at_fn_group_banner 290 'ofp-print.at:2158' \
+#AT_STOP_290
+#AT_START_291
+at_fn_group_banner 291 'ofp-print.at:2158' \
   "OFPST_GROUP_DESC request - OF1.1" "               " 19
 at_xfail=no
 (
-  $as_echo "290. $at_setup_line: testing $at_desc ..."
+  $as_echo "291. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50078,13 +50453,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_290
-#AT_START_291
-at_fn_group_banner 291 'ofp-print.at:2166' \
+#AT_STOP_291
+#AT_START_292
+at_fn_group_banner 292 'ofp-print.at:2166' \
   "OFPST_GROUP_DESC request - OF1.5" "               " 19
 at_xfail=no
 (
-  $as_echo "291. $at_setup_line: testing $at_desc ..."
+  $as_echo "292. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50116,13 +50491,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_291
-#AT_START_292
-at_fn_group_banner 292 'ofp-print.at:2175' \
+#AT_STOP_292
+#AT_START_293
+at_fn_group_banner 293 'ofp-print.at:2175' \
   "NXST_GROUP_DESC reply - OF1.0" "                  " 19
 at_xfail=no
 (
-  $as_echo "292. $at_setup_line: testing $at_desc ..."
+  $as_echo "293. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50183,13 +50558,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_292
-#AT_START_293
-at_fn_group_banner 293 'ofp-print.at:2200' \
+#AT_STOP_293
+#AT_START_294
+at_fn_group_banner 294 'ofp-print.at:2200' \
   "OFPST_GROUP_DESC reply - OF1.1" "                 " 19
 at_xfail=no
 (
-  $as_echo "293. $at_setup_line: testing $at_desc ..."
+  $as_echo "294. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50234,13 +50609,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_293
-#AT_START_294
-at_fn_group_banner 294 'ofp-print.at:2217' \
+#AT_STOP_294
+#AT_START_295
+at_fn_group_banner 295 'ofp-print.at:2217' \
   "OFPST_GROUP_DESC reply - OF1.5" "                 " 19
 at_xfail=no
 (
-  $as_echo "294. $at_setup_line: testing $at_desc ..."
+  $as_echo "295. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50301,13 +50676,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_294
-#AT_START_295
-at_fn_group_banner 295 'ofp-print.at:2242' \
+#AT_STOP_295
+#AT_START_296
+at_fn_group_banner 296 'ofp-print.at:2242' \
   "NXST_GROUP_FEATURES request" "                    " 19
 at_xfail=no
 (
-  $as_echo "295. $at_setup_line: testing $at_desc ..."
+  $as_echo "296. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50337,13 +50712,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_295
-#AT_START_296
-at_fn_group_banner 296 'ofp-print.at:2250' \
+#AT_STOP_296
+#AT_START_297
+at_fn_group_banner 297 'ofp-print.at:2250' \
   "OFPST_GROUP_FEATURES request" "                   " 19
 at_xfail=no
 (
-  $as_echo "296. $at_setup_line: testing $at_desc ..."
+  $as_echo "297. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50373,13 +50748,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_296
-#AT_START_297
-at_fn_group_banner 297 'ofp-print.at:2258' \
+#AT_STOP_297
+#AT_START_298
+at_fn_group_banner 298 'ofp-print.at:2258' \
   "NXST_GROUP_FEATURES reply" "                      " 19
 at_xfail=no
 (
-  $as_echo "297. $at_setup_line: testing $at_desc ..."
+  $as_echo "298. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50430,13 +50805,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_297
-#AT_START_298
-at_fn_group_banner 298 'ofp-print.at:2285' \
+#AT_STOP_298
+#AT_START_299
+at_fn_group_banner 299 'ofp-print.at:2285' \
   "OFPST_GROUP_FEATURES reply" "                     " 19
 at_xfail=no
 (
-  $as_echo "298. $at_setup_line: testing $at_desc ..."
+  $as_echo "299. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50487,13 +50862,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_298
-#AT_START_299
-at_fn_group_banner 299 'ofp-print.at:2312' \
+#AT_STOP_299
+#AT_START_300
+at_fn_group_banner 300 'ofp-print.at:2312' \
   "OFPST_PORT_DESC request - OF1.0" "                " 19
 at_xfail=no
 (
-  $as_echo "299. $at_setup_line: testing $at_desc ..."
+  $as_echo "300. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50519,13 +50894,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_299
-#AT_START_300
-at_fn_group_banner 300 'ofp-print.at:2319' \
+#AT_STOP_300
+#AT_START_301
+at_fn_group_banner 301 'ofp-print.at:2319' \
   "OFPST_PORT_DESC request - OF1.5" "                " 19
 at_xfail=no
 (
-  $as_echo "300. $at_setup_line: testing $at_desc ..."
+  $as_echo "301. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50555,13 +50930,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_300
-#AT_START_301
-at_fn_group_banner 301 'ofp-print.at:2328' \
+#AT_STOP_301
+#AT_START_302
+at_fn_group_banner 302 'ofp-print.at:2328' \
   "OFPST_PORT_DESC reply - OF1.0" "                  " 19
 at_xfail=no
 (
-  $as_echo "301. $at_setup_line: testing $at_desc ..."
+  $as_echo "302. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50604,13 +50979,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_301
-#AT_START_302
-at_fn_group_banner 302 'ofp-print.at:2347' \
+#AT_STOP_302
+#AT_START_303
+at_fn_group_banner 303 'ofp-print.at:2347' \
   "OFPST_PORT_DESC reply - OF1.4" "                  " 19
 at_xfail=no
 (
-  $as_echo "302. $at_setup_line: testing $at_desc ..."
+  $as_echo "303. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50657,13 +51032,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_302
-#AT_START_303
-at_fn_group_banner 303 'ofp-print.at:2368' \
+#AT_STOP_303
+#AT_START_304
+at_fn_group_banner 304 'ofp-print.at:2368' \
   "OFPT_METER_MOD request - OF1.3" "                 " 19
 at_xfail=no
 (
-  $as_echo "303. $at_setup_line: testing $at_desc ..."
+  $as_echo "304. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50696,13 +51071,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_303
-#AT_START_304
-at_fn_group_banner 304 'ofp-print.at:2379' \
+#AT_STOP_304
+#AT_START_305
+at_fn_group_banner 305 'ofp-print.at:2379' \
   "OFPT_METER_MOD request - bad band - OF1.3" "      " 19
 at_xfail=no
 (
-  $as_echo "304. $at_setup_line: testing $at_desc ..."
+  $as_echo "305. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50736,13 +51111,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_304
-#AT_START_305
-at_fn_group_banner 305 'ofp-print.at:2391' \
+#AT_STOP_305
+#AT_START_306
+at_fn_group_banner 306 'ofp-print.at:2391' \
   "OFPT_METER_MOD request - bad command - OF1.3" "   " 19
 at_xfail=no
 (
-  $as_echo "305. $at_setup_line: testing $at_desc ..."
+  $as_echo "306. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50773,13 +51148,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_305
-#AT_START_306
-at_fn_group_banner 306 'ofp-print.at:2401' \
+#AT_STOP_306
+#AT_START_307
+at_fn_group_banner 307 'ofp-print.at:2401' \
   "OFPT_METER_MOD request - bad flags - OF1.3" "     " 19
 at_xfail=no
 (
-  $as_echo "306. $at_setup_line: testing $at_desc ..."
+  $as_echo "307. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50813,13 +51188,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_306
-#AT_START_307
-at_fn_group_banner 307 'ofp-print.at:2413' \
+#AT_STOP_307
+#AT_START_308
+at_fn_group_banner 308 'ofp-print.at:2413' \
   "OFPST_METER request - OF1.3" "                    " 19
 at_xfail=no
 (
-  $as_echo "307. $at_setup_line: testing $at_desc ..."
+  $as_echo "308. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50845,13 +51220,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_307
-#AT_START_308
-at_fn_group_banner 308 'ofp-print.at:2420' \
+#AT_STOP_308
+#AT_START_309
+at_fn_group_banner 309 'ofp-print.at:2420' \
   "OFPST_METER_CONFIG request - OF1.3" "             " 19
 at_xfail=no
 (
-  $as_echo "308. $at_setup_line: testing $at_desc ..."
+  $as_echo "309. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50877,13 +51252,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_308
-#AT_START_309
-at_fn_group_banner 309 'ofp-print.at:2427' \
+#AT_STOP_309
+#AT_START_310
+at_fn_group_banner 310 'ofp-print.at:2427' \
   "OFPST_METER_FEATURES request - OF1.3" "           " 19
 at_xfail=no
 (
-  $as_echo "309. $at_setup_line: testing $at_desc ..."
+  $as_echo "310. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50909,13 +51284,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_309
-#AT_START_310
-at_fn_group_banner 310 'ofp-print.at:2434' \
+#AT_STOP_310
+#AT_START_311
+at_fn_group_banner 311 'ofp-print.at:2434' \
   "OFPST_METER_FEATURES reply - OF1.3" "             " 19
 at_xfail=no
 (
-  $as_echo "310. $at_setup_line: testing $at_desc ..."
+  $as_echo "311. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -50950,13 +51325,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_310
-#AT_START_311
-at_fn_group_banner 311 'ofp-print.at:2447' \
+#AT_STOP_311
+#AT_START_312
+at_fn_group_banner 312 'ofp-print.at:2447' \
   "OFPST_METER_CONFIG reply - OF1.3" "               " 19
 at_xfail=no
 (
-  $as_echo "311. $at_setup_line: testing $at_desc ..."
+  $as_echo "312. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51002,13 +51377,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_311
-#AT_START_312
-at_fn_group_banner 312 'ofp-print.at:2467' \
+#AT_STOP_312
+#AT_START_313
+at_fn_group_banner 313 'ofp-print.at:2467' \
   "OFPST_METER reply - OF1.3" "                      " 19
 at_xfail=no
 (
-  $as_echo "312. $at_setup_line: testing $at_desc ..."
+  $as_echo "313. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51062,13 +51437,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_312
-#AT_START_313
-at_fn_group_banner 313 'ofp-print.at:2491' \
+#AT_STOP_313
+#AT_START_314
+at_fn_group_banner 314 'ofp-print.at:2491' \
   "OFPST_TABLE_FEATURES request - OF1.3" "           " 19
 at_xfail=no
 (
-  $as_echo "313. $at_setup_line: testing $at_desc ..."
+  $as_echo "314. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51403,13 +51778,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_313
-#AT_START_314
-at_fn_group_banner 314 'ofp-print.at:2657' \
+#AT_STOP_314
+#AT_START_315
+at_fn_group_banner 315 'ofp-print.at:2657' \
   "OFPT_BARRIER_REQUEST - OF1.0" "                   " 19
 at_xfail=no
 (
-  $as_echo "314. $at_setup_line: testing $at_desc ..."
+  $as_echo "315. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51435,13 +51810,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_314
-#AT_START_315
-at_fn_group_banner 315 'ofp-print.at:2664' \
+#AT_STOP_315
+#AT_START_316
+at_fn_group_banner 316 'ofp-print.at:2664' \
   "OFPT_BARRIER_REQUEST - OF1.1" "                   " 19
 at_xfail=no
 (
-  $as_echo "315. $at_setup_line: testing $at_desc ..."
+  $as_echo "316. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51467,13 +51842,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_315
-#AT_START_316
-at_fn_group_banner 316 'ofp-print.at:2671' \
+#AT_STOP_316
+#AT_START_317
+at_fn_group_banner 317 'ofp-print.at:2671' \
   "OFPT_BARRIER_REQUEST - OF1.2" "                   " 19
 at_xfail=no
 (
-  $as_echo "316. $at_setup_line: testing $at_desc ..."
+  $as_echo "317. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51499,13 +51874,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_316
-#AT_START_317
-at_fn_group_banner 317 'ofp-print.at:2678' \
+#AT_STOP_317
+#AT_START_318
+at_fn_group_banner 318 'ofp-print.at:2678' \
   "OFPT_BARRIER_REQUEST - OF1.3" "                   " 19
 at_xfail=no
 (
-  $as_echo "317. $at_setup_line: testing $at_desc ..."
+  $as_echo "318. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51531,13 +51906,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_317
-#AT_START_318
-at_fn_group_banner 318 'ofp-print.at:2685' \
+#AT_STOP_318
+#AT_START_319
+at_fn_group_banner 319 'ofp-print.at:2685' \
   "OFPT_BARRIER_REPLY - OF1.0" "                     " 19
 at_xfail=no
 (
-  $as_echo "318. $at_setup_line: testing $at_desc ..."
+  $as_echo "319. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51563,13 +51938,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_318
-#AT_START_319
-at_fn_group_banner 319 'ofp-print.at:2692' \
+#AT_STOP_319
+#AT_START_320
+at_fn_group_banner 320 'ofp-print.at:2692' \
   "OFPT_BARRIER_REPLY - OF1.1" "                     " 19
 at_xfail=no
 (
-  $as_echo "319. $at_setup_line: testing $at_desc ..."
+  $as_echo "320. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51595,13 +51970,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_319
-#AT_START_320
-at_fn_group_banner 320 'ofp-print.at:2699' \
+#AT_STOP_320
+#AT_START_321
+at_fn_group_banner 321 'ofp-print.at:2699' \
   "OFPT_BARRIER_REPLY - OF1.2" "                     " 19
 at_xfail=no
 (
-  $as_echo "320. $at_setup_line: testing $at_desc ..."
+  $as_echo "321. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51627,13 +52002,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_320
-#AT_START_321
-at_fn_group_banner 321 'ofp-print.at:2706' \
+#AT_STOP_321
+#AT_START_322
+at_fn_group_banner 322 'ofp-print.at:2706' \
   "OFPT_BARRIER_REPLY - OF1.3" "                     " 19
 at_xfail=no
 (
-  $as_echo "321. $at_setup_line: testing $at_desc ..."
+  $as_echo "322. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51659,13 +52034,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_321
-#AT_START_322
-at_fn_group_banner 322 'ofp-print.at:2713' \
+#AT_STOP_322
+#AT_START_323
+at_fn_group_banner 323 'ofp-print.at:2713' \
   "OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.0" "          " 19
 at_xfail=no
 (
-  $as_echo "322. $at_setup_line: testing $at_desc ..."
+  $as_echo "323. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51691,13 +52066,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_322
-#AT_START_323
-at_fn_group_banner 323 'ofp-print.at:2720' \
+#AT_STOP_323
+#AT_START_324
+at_fn_group_banner 324 'ofp-print.at:2720' \
   "OFPT_QUEUE_GET_CONFIG_REQUEST - OF1.2" "          " 19
 at_xfail=no
 (
-  $as_echo "323. $at_setup_line: testing $at_desc ..."
+  $as_echo "324. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51725,13 +52100,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_323
-#AT_START_324
-at_fn_group_banner 324 'ofp-print.at:2728' \
+#AT_STOP_324
+#AT_START_325
+at_fn_group_banner 325 'ofp-print.at:2728' \
   "OFPST_QUEUE_DESC request - OF1.4" "               " 19
 at_xfail=no
 (
-  $as_echo "324. $at_setup_line: testing $at_desc ..."
+  $as_echo "325. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51761,13 +52136,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_324
-#AT_START_325
-at_fn_group_banner 325 'ofp-print.at:2737' \
+#AT_STOP_325
+#AT_START_326
+at_fn_group_banner 326 'ofp-print.at:2737' \
   "OFPT_QUEUE_GET_CONFIG_REPLY - OF1.0" "            " 19
 at_xfail=no
 (
-  $as_echo "325. $at_setup_line: testing $at_desc ..."
+  $as_echo "326. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51807,13 +52182,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_325
-#AT_START_326
-at_fn_group_banner 326 'ofp-print.at:2752' \
+#AT_STOP_326
+#AT_START_327
+at_fn_group_banner 327 'ofp-print.at:2752' \
   "OFPT_QUEUE_GET_CONFIG_REPLY - OF1.1" "            " 19
 at_xfail=no
 (
-  $as_echo "326. $at_setup_line: testing $at_desc ..."
+  $as_echo "327. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51853,13 +52228,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_326
-#AT_START_327
-at_fn_group_banner 327 'ofp-print.at:2767' \
+#AT_STOP_327
+#AT_START_328
+at_fn_group_banner 328 'ofp-print.at:2767' \
   "OFPT_QUEUE_GET_CONFIG_REPLY - OF1.2" "            " 19
 at_xfail=no
 (
-  $as_echo "327. $at_setup_line: testing $at_desc ..."
+  $as_echo "328. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51899,13 +52274,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_327
-#AT_START_328
-at_fn_group_banner 328 'ofp-print.at:2782' \
+#AT_STOP_328
+#AT_START_329
+at_fn_group_banner 329 'ofp-print.at:2782' \
   "OFPT_QUEUE_GET_CONFIG_REPLY - OF1.3" "            " 19
 at_xfail=no
 (
-  $as_echo "328. $at_setup_line: testing $at_desc ..."
+  $as_echo "329. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51945,13 +52320,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_328
-#AT_START_329
-at_fn_group_banner 329 'ofp-print.at:2798' \
+#AT_STOP_329
+#AT_START_330
+at_fn_group_banner 330 'ofp-print.at:2798' \
   "OFPST_QUEUE_DESC reply - OF1.4" "                 " 19
 at_xfail=no
 (
-  $as_echo "329. $at_setup_line: testing $at_desc ..."
+  $as_echo "330. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -51998,13 +52373,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_329
-#AT_START_330
-at_fn_group_banner 330 'ofp-print.at:2817' \
+#AT_STOP_330
+#AT_START_331
+at_fn_group_banner 331 'ofp-print.at:2817' \
   "OFPT_SET_ASYNC - OF1.3" "                         " 19
 at_xfail=no
 (
-  $as_echo "330. $at_setup_line: testing $at_desc ..."
+  $as_echo "331. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52051,13 +52426,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_330
-#AT_START_331
-at_fn_group_banner 331 'ofp-print.at:2846' \
+#AT_STOP_331
+#AT_START_332
+at_fn_group_banner 332 'ofp-print.at:2846' \
   "OFPT_ROLE_REQUEST - OF1.2" "                      " 19
 at_xfail=no
 (
-  $as_echo "331. $at_setup_line: testing $at_desc ..."
+  $as_echo "332. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52089,13 +52464,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_331
-#AT_START_332
-at_fn_group_banner 332 'ofp-print.at:2856' \
+#AT_STOP_332
+#AT_START_333
+at_fn_group_banner 333 'ofp-print.at:2856' \
   "OFPT_ROLE_REQUEST - nochange - OF1.2" "           " 19
 at_xfail=no
 (
-  $as_echo "332. $at_setup_line: testing $at_desc ..."
+  $as_echo "333. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52127,13 +52502,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_332
-#AT_START_333
-at_fn_group_banner 333 'ofp-print.at:2866' \
+#AT_STOP_333
+#AT_START_334
+at_fn_group_banner 334 'ofp-print.at:2866' \
   "NXT_ROLE_REQUEST" "                               " 19
 at_xfail=no
 (
-  $as_echo "333. $at_setup_line: testing $at_desc ..."
+  $as_echo "334. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52165,13 +52540,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_333
-#AT_START_334
-at_fn_group_banner 334 'ofp-print.at:2876' \
+#AT_STOP_334
+#AT_START_335
+at_fn_group_banner 335 'ofp-print.at:2876' \
   "OFPT_ROLE_REPLY - OF1.2" "                        " 19
 at_xfail=no
 (
-  $as_echo "334. $at_setup_line: testing $at_desc ..."
+  $as_echo "335. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52203,13 +52578,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_334
-#AT_START_335
-at_fn_group_banner 335 'ofp-print.at:2886' \
+#AT_STOP_335
+#AT_START_336
+at_fn_group_banner 336 'ofp-print.at:2886' \
   "NXT_ROLE_REPLY" "                                 " 19
 at_xfail=no
 (
-  $as_echo "335. $at_setup_line: testing $at_desc ..."
+  $as_echo "336. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52241,13 +52616,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_335
-#AT_START_336
-at_fn_group_banner 336 'ofp-print.at:2896' \
+#AT_STOP_336
+#AT_START_337
+at_fn_group_banner 337 'ofp-print.at:2896' \
   "OFP_ROLE_STATUS - master, experimenter - OF1.3" " " 19
 at_xfail=no
 (
-  $as_echo "336. $at_setup_line: testing $at_desc ..."
+  $as_echo "337. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52279,13 +52654,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_336
-#AT_START_337
-at_fn_group_banner 337 'ofp-print.at:2906' \
+#AT_STOP_337
+#AT_START_338
+at_fn_group_banner 338 'ofp-print.at:2906' \
   "OFP_ROLE_STATUS - master, config - OF1.3" "       " 19
 at_xfail=no
 (
-  $as_echo "337. $at_setup_line: testing $at_desc ..."
+  $as_echo "338. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52317,13 +52692,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_337
-#AT_START_338
-at_fn_group_banner 338 'ofp-print.at:2916' \
+#AT_STOP_338
+#AT_START_339
+at_fn_group_banner 339 'ofp-print.at:2916' \
   "OFP_ROLE_STATUS - master, config,generation - OF1.3" "" 19
 at_xfail=no
 (
-  $as_echo "338. $at_setup_line: testing $at_desc ..."
+  $as_echo "339. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52355,13 +52730,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_338
-#AT_START_339
-at_fn_group_banner 339 'ofp-print.at:2926' \
+#AT_STOP_339
+#AT_START_340
+at_fn_group_banner 340 'ofp-print.at:2926' \
   "OFP_ROLE_STATUS - master, experimenter - OF1.4" " " 19
 at_xfail=no
 (
-  $as_echo "339. $at_setup_line: testing $at_desc ..."
+  $as_echo "340. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52393,13 +52768,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_339
-#AT_START_340
-at_fn_group_banner 340 'ofp-print.at:2936' \
+#AT_STOP_340
+#AT_START_341
+at_fn_group_banner 341 'ofp-print.at:2936' \
   "OFP_ROLE_STATUS - master, config - OF1.4" "       " 19
 at_xfail=no
 (
-  $as_echo "340. $at_setup_line: testing $at_desc ..."
+  $as_echo "341. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52431,13 +52806,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_340
-#AT_START_341
-at_fn_group_banner 341 'ofp-print.at:2946' \
+#AT_STOP_341
+#AT_START_342
+at_fn_group_banner 342 'ofp-print.at:2946' \
   "OFP_ROLE_STATUS - master, config,generation - OF1.4" "" 19
 at_xfail=no
 (
-  $as_echo "341. $at_setup_line: testing $at_desc ..."
+  $as_echo "342. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52469,13 +52844,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_341
-#AT_START_342
-at_fn_group_banner 342 'ofp-print.at:2956' \
+#AT_STOP_342
+#AT_START_343
+at_fn_group_banner 343 'ofp-print.at:2956' \
   "OFP_REQUESTFORWARD - OF1.4" "                     " 19
 at_xfail=no
 (
-  $as_echo "342. $at_setup_line: testing $at_desc ..."
+  $as_echo "343. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52510,13 +52885,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_342
-#AT_START_343
-at_fn_group_banner 343 'ofp-print.at:2968' \
+#AT_STOP_343
+#AT_START_344
+at_fn_group_banner 344 'ofp-print.at:2968' \
   "OFP_REQUESTFORWARD - OF1.4" "                     " 19
 at_xfail=no
 (
-  $as_echo "343. $at_setup_line: testing $at_desc ..."
+  $as_echo "344. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52551,13 +52926,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_343
-#AT_START_344
-at_fn_group_banner 344 'ofp-print.at:2980' \
+#AT_STOP_344
+#AT_START_345
+at_fn_group_banner 345 'ofp-print.at:2980' \
   "OFP_REQUESTFORWARD - OF1.4" "                     " 19
 at_xfail=no
 (
-  $as_echo "344. $at_setup_line: testing $at_desc ..."
+  $as_echo "345. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52591,13 +52966,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_344
-#AT_START_345
-at_fn_group_banner 345 'ofp-print.at:2991' \
+#AT_STOP_345
+#AT_START_346
+at_fn_group_banner 346 'ofp-print.at:2991' \
   "OFP_REQUESTFORWARD - OF1.4" "                     " 19
 at_xfail=no
 (
-  $as_echo "345. $at_setup_line: testing $at_desc ..."
+  $as_echo "346. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52631,13 +53006,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_345
-#AT_START_346
-at_fn_group_banner 346 'ofp-print.at:3002' \
+#AT_STOP_346
+#AT_START_347
+at_fn_group_banner 347 'ofp-print.at:3002' \
   "NXT_REQUESTFORWARD - inner NXT_GROUP_MOD" "       " 19
 at_xfail=no
 (
-  $as_echo "346. $at_setup_line: testing $at_desc ..."
+  $as_echo "347. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52690,13 +53065,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_346
-#AT_START_347
-at_fn_group_banner 347 'ofp-print.at:3029' \
+#AT_STOP_347
+#AT_START_348
+at_fn_group_banner 348 'ofp-print.at:3029' \
   "NXT_REQUESTFORWARD - inner OFPT_GROUP_MOD - OF1.1" "" 19
 at_xfail=no
 (
-  $as_echo "347. $at_setup_line: testing $at_desc ..."
+  $as_echo "348. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52749,13 +53124,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_347
-#AT_START_348
-at_fn_group_banner 348 'ofp-print.at:3056' \
+#AT_STOP_348
+#AT_START_349
+at_fn_group_banner 349 'ofp-print.at:3056' \
   "ONFT_REQUESTFORWARD - inner OFPT_METER_MOD - OF1.3" "" 19
 at_xfail=no
 (
-  $as_echo "348. $at_setup_line: testing $at_desc ..."
+  $as_echo "349. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52798,13 +53173,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_348
-#AT_START_349
-at_fn_group_banner 349 'ofp-print.at:3078' \
+#AT_STOP_349
+#AT_START_350
+at_fn_group_banner 350 'ofp-print.at:3078' \
   "NXT_SET_PACKET_IN" "                              " 19
 at_xfail=no
 (
-  $as_echo "349. $at_setup_line: testing $at_desc ..."
+  $as_echo "350. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52836,13 +53211,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_349
-#AT_START_350
-at_fn_group_banner 350 'ofp-print.at:3088' \
+#AT_STOP_350
+#AT_START_351
+at_fn_group_banner 351 'ofp-print.at:3088' \
   "NXT_PACKET_IN" "                                  " 19
 at_xfail=no
 (
-  $as_echo "350. $at_setup_line: testing $at_desc ..."
+  $as_echo "351. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52895,13 +53270,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_350
-#AT_START_351
-at_fn_group_banner 351 'ofp-print.at:3109' \
+#AT_STOP_351
+#AT_START_352
+at_fn_group_banner 352 'ofp-print.at:3109' \
   "NXT_PACKET_IN, with hex output of packet data" "  " 19
 at_xfail=no
 (
-  $as_echo "351. $at_setup_line: testing $at_desc ..."
+  $as_echo "352. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -52958,13 +53333,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_351
-#AT_START_352
-at_fn_group_banner 352 'ofp-print.at:3134' \
+#AT_STOP_352
+#AT_START_353
+at_fn_group_banner 353 'ofp-print.at:3134' \
   "NX_PACKET_IN2" "                                  " 19
 at_xfail=no
 (
-  $as_echo "352. $at_setup_line: testing $at_desc ..."
+  $as_echo "353. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53020,13 +53395,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_352
-#AT_START_353
-at_fn_group_banner 353 'ofp-print.at:3157' \
+#AT_STOP_353
+#AT_START_354
+at_fn_group_banner 354 'ofp-print.at:3157' \
   "NXT_SET_ASYNC_CONFIG" "                           " 19
 at_xfail=no
 (
-  $as_echo "353. $at_setup_line: testing $at_desc ..."
+  $as_echo "354. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53075,13 +53450,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_353
-#AT_START_354
-at_fn_group_banner 354 'ofp-print.at:3185' \
+#AT_STOP_354
+#AT_START_355
+at_fn_group_banner 355 'ofp-print.at:3185' \
   "OFPT_SET_ASYNC_CONFIG" "                          " 19
 at_xfail=no
 (
-  $as_echo "354. $at_setup_line: testing $at_desc ..."
+  $as_echo "355. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53132,13 +53507,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_354
-#AT_START_355
-at_fn_group_banner 355 'ofp-print.at:3212' \
+#AT_STOP_355
+#AT_START_356
+at_fn_group_banner 356 'ofp-print.at:3212' \
   "OFPT_SET_ASYNC_CONFIG - invalid mask - OF1.4" "   " 19
 at_xfail=no
 (
-  $as_echo "355. $at_setup_line: testing $at_desc ..."
+  $as_echo "356. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53193,13 +53568,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_355
-#AT_START_356
-at_fn_group_banner 356 'ofp-print.at:3231' \
+#AT_STOP_356
+#AT_START_357
+at_fn_group_banner 357 'ofp-print.at:3231' \
   "OFPT_SET_ASYNC_CONFIG - unsupported configuration - OF1.4" "" 19
 at_xfail=no
 (
-  $as_echo "356. $at_setup_line: testing $at_desc ..."
+  $as_echo "357. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53254,13 +53629,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_356
-#AT_START_357
-at_fn_group_banner 357 'ofp-print.at:3250' \
+#AT_STOP_357
+#AT_START_358
+at_fn_group_banner 358 'ofp-print.at:3250' \
   "NXT_SET_CONTROLLER_ID" "                          " 19
 at_xfail=no
 (
-  $as_echo "357. $at_setup_line: testing $at_desc ..."
+  $as_echo "358. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53292,13 +53667,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_357
-#AT_START_358
-at_fn_group_banner 358 'ofp-print.at:3260' \
+#AT_STOP_358
+#AT_START_359
+at_fn_group_banner 359 'ofp-print.at:3260' \
   "NXT_FLOW_MONITOR_CANCEL" "                        " 19
 at_xfail=no
 (
-  $as_echo "358. $at_setup_line: testing $at_desc ..."
+  $as_echo "359. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53330,13 +53705,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_358
-#AT_START_359
-at_fn_group_banner 359 'ofp-print.at:3270' \
+#AT_STOP_359
+#AT_START_360
+at_fn_group_banner 360 'ofp-print.at:3270' \
   "NXT_FLOW_MONITOR_PAUSED" "                        " 19
 at_xfail=no
 (
-  $as_echo "359. $at_setup_line: testing $at_desc ..."
+  $as_echo "360. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53366,13 +53741,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_359
-#AT_START_360
-at_fn_group_banner 360 'ofp-print.at:3279' \
+#AT_STOP_360
+#AT_START_361
+at_fn_group_banner 361 'ofp-print.at:3279' \
   "NXT_FLOW_MONITOR_RESUMED" "                       " 19
 at_xfail=no
 (
-  $as_echo "360. $at_setup_line: testing $at_desc ..."
+  $as_echo "361. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53402,13 +53777,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_360
-#AT_START_361
-at_fn_group_banner 361 'ofp-print.at:3288' \
+#AT_STOP_361
+#AT_START_362
+at_fn_group_banner 362 'ofp-print.at:3288' \
   "NXT_SET_FLOW_FORMAT" "                            " 19
 at_xfail=no
 (
-  $as_echo "361. $at_setup_line: testing $at_desc ..."
+  $as_echo "362. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53440,13 +53815,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_361
-#AT_START_362
-at_fn_group_banner 362 'ofp-print.at:3299' \
+#AT_STOP_362
+#AT_START_363
+at_fn_group_banner 363 'ofp-print.at:3299' \
   "NXT_FLOW_MOD, low verbosity" "                    " 19
 at_xfail=no
 (
-  $as_echo "362. $at_setup_line: testing $at_desc ..."
+  $as_echo "363. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53486,13 +53861,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_362
-#AT_START_363
-at_fn_group_banner 363 'ofp-print.at:3315' \
+#AT_STOP_363
+#AT_START_364
+at_fn_group_banner 364 'ofp-print.at:3315' \
   "NXT_FLOW_MOD, high verbosity" "                   " 19
 at_xfail=no
 (
-  $as_echo "363. $at_setup_line: testing $at_desc ..."
+  $as_echo "364. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53532,13 +53907,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_363
-#AT_START_364
-at_fn_group_banner 364 'ofp-print.at:3329' \
+#AT_STOP_364
+#AT_START_365
+at_fn_group_banner 365 'ofp-print.at:3329' \
   "NXT_GROUP_MOD add - OF1.0" "                      " 19
 at_xfail=no
 (
-  $as_echo "364. $at_setup_line: testing $at_desc ..."
+  $as_echo "365. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53597,13 +53972,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_364
-#AT_START_365
-at_fn_group_banner 365 'ofp-print.at:3353' \
+#AT_STOP_365
+#AT_START_366
+at_fn_group_banner 366 'ofp-print.at:3353' \
   "OFPT_GROUP_MOD - OF1.1" "                         " 19
 at_xfail=no
 (
-  $as_echo "365. $at_setup_line: testing $at_desc ..."
+  $as_echo "366. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53646,13 +54021,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_365
-#AT_START_366
-at_fn_group_banner 366 'ofp-print.at:3369' \
+#AT_STOP_366
+#AT_START_367
+at_fn_group_banner 367 'ofp-print.at:3369' \
   "OFPT_GROUP_MOD add - OF1.5" "                     " 19
 at_xfail=no
 (
-  $as_echo "366. $at_setup_line: testing $at_desc ..."
+  $as_echo "367. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53705,13 +54080,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_366
-#AT_START_367
-at_fn_group_banner 367 'ofp-print.at:3390' \
+#AT_STOP_367
+#AT_START_368
+at_fn_group_banner 368 'ofp-print.at:3390' \
   "OFPT_GROUP_MOD insert bucket - OF1.5" "           " 19
 at_xfail=no
 (
-  $as_echo "367. $at_setup_line: testing $at_desc ..."
+  $as_echo "368. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53758,13 +54133,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_367
-#AT_START_368
-at_fn_group_banner 368 'ofp-print.at:3408' \
+#AT_STOP_368
+#AT_START_369
+at_fn_group_banner 369 'ofp-print.at:3408' \
   "NXT_FLOW_REMOVED" "                               " 19
 at_xfail=no
 (
-  $as_echo "368. $at_setup_line: testing $at_desc ..."
+  $as_echo "369. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53808,13 +54183,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_368
-#AT_START_369
-at_fn_group_banner 369 'ofp-print.at:3424' \
+#AT_STOP_369
+#AT_START_370
+at_fn_group_banner 370 'ofp-print.at:3424' \
   "NXT_FLOW_MOD_TABLE_ID" "                          " 19
 at_xfail=no
 (
-  $as_echo "369. $at_setup_line: testing $at_desc ..."
+  $as_echo "370. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53846,13 +54221,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_369
-#AT_START_370
-at_fn_group_banner 370 'ofp-print.at:3434' \
+#AT_STOP_370
+#AT_START_371
+at_fn_group_banner 371 'ofp-print.at:3434' \
   "NXT_RESUME" "                                     " 19
 at_xfail=no
 (
-  $as_echo "370. $at_setup_line: testing $at_desc ..."
+  $as_echo "371. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53887,13 +54262,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_370
-#AT_START_371
-at_fn_group_banner 371 'ofp-print.at:3446' \
+#AT_STOP_371
+#AT_START_372
+at_fn_group_banner 372 'ofp-print.at:3446' \
   "NXST_FLOW request" "                              " 19
 at_xfail=no
 (
-  $as_echo "371. $at_setup_line: testing $at_desc ..."
+  $as_echo "372. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -53925,13 +54300,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_371
-#AT_START_372
-at_fn_group_banner 372 'ofp-print.at:3456' \
+#AT_STOP_372
+#AT_START_373
+at_fn_group_banner 373 'ofp-print.at:3456' \
   "NXST_FLOW reply" "                                " 19
 at_xfail=no
 (
-  $as_echo "372. $at_setup_line: testing $at_desc ..."
+  $as_echo "373. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54235,13 +54610,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_372
-#AT_START_373
-at_fn_group_banner 373 'ofp-print.at:3610' \
+#AT_STOP_373
+#AT_START_374
+at_fn_group_banner 374 'ofp-print.at:3610' \
   "NXST_AGGREGATE request" "                         " 19
 at_xfail=no
 (
-  $as_echo "373. $at_setup_line: testing $at_desc ..."
+  $as_echo "374. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54273,13 +54648,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_373
-#AT_START_374
-at_fn_group_banner 374 'ofp-print.at:3620' \
+#AT_STOP_374
+#AT_START_375
+at_fn_group_banner 375 'ofp-print.at:3620' \
   "NXST_AGGREGATE reply" "                           " 19
 at_xfail=no
 (
-  $as_echo "374. $at_setup_line: testing $at_desc ..."
+  $as_echo "375. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54313,13 +54688,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_374
-#AT_START_375
-at_fn_group_banner 375 'ofp-print.at:3631' \
+#AT_STOP_375
+#AT_START_376
+at_fn_group_banner 376 'ofp-print.at:3631' \
   "NXST_FLOW_MONITOR request" "                      " 19
 at_xfail=no
 (
-  $as_echo "375. $at_setup_line: testing $at_desc ..."
+  $as_echo "376. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54355,13 +54730,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_375
-#AT_START_376
-at_fn_group_banner 376 'ofp-print.at:3644' \
+#AT_STOP_376
+#AT_START_377
+at_fn_group_banner 377 'ofp-print.at:3644' \
   "NXST_FLOW_MONITOR reply" "                        " 19
 at_xfail=no
 (
-  $as_echo "376. $at_setup_line: testing $at_desc ..."
+  $as_echo "377. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54399,13 +54774,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_376
-#AT_START_377
-at_fn_group_banner 377 'ofp-print.at:3659' \
+#AT_STOP_377
+#AT_START_378
+at_fn_group_banner 378 'ofp-print.at:3659' \
   "OFPT_BUNDLE_CONTROL - atomic OPEN_REQUEST" "      " 19
 at_xfail=no
 (
-  $as_echo "377. $at_setup_line: testing $at_desc ..."
+  $as_echo "378. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54438,13 +54813,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_377
-#AT_START_378
-at_fn_group_banner 378 'ofp-print.at:3670' \
+#AT_STOP_378
+#AT_START_379
+at_fn_group_banner 379 'ofp-print.at:3670' \
   "OFPT_BUNDLE_CONTROL - ordered OPEN_REQUEST" "     " 19
 at_xfail=no
 (
-  $as_echo "378. $at_setup_line: testing $at_desc ..."
+  $as_echo "379. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54477,13 +54852,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_378
-#AT_START_379
-at_fn_group_banner 379 'ofp-print.at:3681' \
+#AT_STOP_379
+#AT_START_380
+at_fn_group_banner 380 'ofp-print.at:3681' \
   "OFPT_BUNDLE_CONTROL - atomic ordered OPEN_REQUEST" "" 19
 at_xfail=no
 (
-  $as_echo "379. $at_setup_line: testing $at_desc ..."
+  $as_echo "380. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54516,13 +54891,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_379
-#AT_START_380
-at_fn_group_banner 380 'ofp-print.at:3692' \
+#AT_STOP_380
+#AT_START_381
+at_fn_group_banner 381 'ofp-print.at:3692' \
   "OFPT_BUNDLE_CONTROL - OPEN_REPLY" "               " 19
 at_xfail=no
 (
-  $as_echo "380. $at_setup_line: testing $at_desc ..."
+  $as_echo "381. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54555,13 +54930,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_380
-#AT_START_381
-at_fn_group_banner 381 'ofp-print.at:3703' \
+#AT_STOP_381
+#AT_START_382
+at_fn_group_banner 382 'ofp-print.at:3703' \
   "OFPT_BUNDLE_CONTROL - CLOSE_REQUEST" "            " 19
 at_xfail=no
 (
-  $as_echo "381. $at_setup_line: testing $at_desc ..."
+  $as_echo "382. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54594,13 +54969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_381
-#AT_START_382
-at_fn_group_banner 382 'ofp-print.at:3714' \
+#AT_STOP_382
+#AT_START_383
+at_fn_group_banner 383 'ofp-print.at:3714' \
   "OFPT_BUNDLE_CONTROL - CLOSE_REPLY" "              " 19
 at_xfail=no
 (
-  $as_echo "382. $at_setup_line: testing $at_desc ..."
+  $as_echo "383. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54633,13 +55008,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_382
-#AT_START_383
-at_fn_group_banner 383 'ofp-print.at:3725' \
+#AT_STOP_383
+#AT_START_384
+at_fn_group_banner 384 'ofp-print.at:3725' \
   "OFPT_BUNDLE_CONTROL - COMMIT_REQUEST" "           " 19
 at_xfail=no
 (
-  $as_echo "383. $at_setup_line: testing $at_desc ..."
+  $as_echo "384. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54672,13 +55047,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_383
-#AT_START_384
-at_fn_group_banner 384 'ofp-print.at:3736' \
+#AT_STOP_384
+#AT_START_385
+at_fn_group_banner 385 'ofp-print.at:3736' \
   "OFPT_BUNDLE_CONTROL - COMMIT_REPLY" "             " 19
 at_xfail=no
 (
-  $as_echo "384. $at_setup_line: testing $at_desc ..."
+  $as_echo "385. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54711,13 +55086,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_384
-#AT_START_385
-at_fn_group_banner 385 'ofp-print.at:3747' \
+#AT_STOP_385
+#AT_START_386
+at_fn_group_banner 386 'ofp-print.at:3747' \
   "OFPT_BUNDLE_CONTROL - DISCARD_REQUEST" "          " 19
 at_xfail=no
 (
-  $as_echo "385. $at_setup_line: testing $at_desc ..."
+  $as_echo "386. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54750,13 +55125,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_385
-#AT_START_386
-at_fn_group_banner 386 'ofp-print.at:3758' \
+#AT_STOP_386
+#AT_START_387
+at_fn_group_banner 387 'ofp-print.at:3758' \
   "OFPT_BUNDLE_CONTROL - DISCARD_REPLY" "            " 19
 at_xfail=no
 (
-  $as_echo "386. $at_setup_line: testing $at_desc ..."
+  $as_echo "387. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54789,13 +55164,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_386
-#AT_START_387
-at_fn_group_banner 387 'ofp-print.at:3769' \
+#AT_STOP_387
+#AT_START_388
+at_fn_group_banner 388 'ofp-print.at:3769' \
   "OFPT_BUNDLE_ADD_MESSAGE - verify xid" "           " 19
 at_xfail=no
 (
-  $as_echo "387. $at_setup_line: testing $at_desc ..."
+  $as_echo "388. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54829,13 +55204,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_387
-#AT_START_388
-at_fn_group_banner 388 'ofp-print.at:3781' \
+#AT_STOP_388
+#AT_START_389
+at_fn_group_banner 389 'ofp-print.at:3781' \
   "OFPT_BUNDLE_ADD_MESSAGE - reject OFPT_HELLO" "    " 19
 at_xfail=no
 (
-  $as_echo "388. $at_setup_line: testing $at_desc ..."
+  $as_echo "389. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54871,13 +55246,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_388
-#AT_START_389
-at_fn_group_banner 389 'ofp-print.at:3795' \
+#AT_STOP_389
+#AT_START_390
+at_fn_group_banner 390 'ofp-print.at:3795' \
   "OFPT_BUNDLE_ADD_MESSAGE - FLOW_MOD" "             " 19
 at_xfail=no
 (
-  $as_echo "389. $at_setup_line: testing $at_desc ..."
+  $as_echo "390. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54927,13 +55302,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_389
-#AT_START_390
-at_fn_group_banner 390 'ofp-print.at:3815' \
+#AT_STOP_390
+#AT_START_391
+at_fn_group_banner 391 'ofp-print.at:3815' \
   "OFPT_BUNDLE_ADD_MESSAGE - PORT_MOD" "             " 19
 at_xfail=no
 (
-  $as_echo "390. $at_setup_line: testing $at_desc ..."
+  $as_echo "391. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -54974,13 +55349,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_390
-#AT_START_391
-at_fn_group_banner 391 'ofp-print.at:3832' \
+#AT_STOP_391
+#AT_START_392
+at_fn_group_banner 392 'ofp-print.at:3832' \
   "OFPT_BUNDLE_ADD_MESSAGE - GROUP_MOD" "            " 19
 at_xfail=no
 (
-  $as_echo "391. $at_setup_line: testing $at_desc ..."
+  $as_echo "392. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55037,13 +55412,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_391
-#AT_START_392
-at_fn_group_banner 392 'ofp-print.at:3856' \
+#AT_STOP_392
+#AT_START_393
+at_fn_group_banner 393 'ofp-print.at:3856' \
   "OFPT_BUNDLE_ADD_MESSAGE - PACKET_OUT" "           " 19
 at_xfail=no
 (
-  $as_echo "392. $at_setup_line: testing $at_desc ..."
+  $as_echo "393. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55090,13 +55465,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_392
-#AT_START_393
-at_fn_group_banner 393 'ofp-print.at:3875' \
+#AT_STOP_393
+#AT_START_394
+at_fn_group_banner 394 'ofp-print.at:3875' \
   "NXST_IPFIX_BRIDGE - request" "                    " 19
 at_xfail=no
 (
-  $as_echo "393. $at_setup_line: testing $at_desc ..."
+  $as_echo "394. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55128,13 +55503,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_393
-#AT_START_394
-at_fn_group_banner 394 'ofp-print.at:3885' \
+#AT_STOP_394
+#AT_START_395
+at_fn_group_banner 395 'ofp-print.at:3885' \
   "NXST_IPFIX_BRIDGE - reply" "                      " 19
 at_xfail=no
 (
-  $as_echo "394. $at_setup_line: testing $at_desc ..."
+  $as_echo "395. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55190,13 +55565,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_394
-#AT_START_395
-at_fn_group_banner 395 'ofp-print.at:3908' \
+#AT_STOP_395
+#AT_START_396
+at_fn_group_banner 396 'ofp-print.at:3908' \
   "NXST_IPFIX_FLOW - request" "                      " 19
 at_xfail=no
 (
-  $as_echo "395. $at_setup_line: testing $at_desc ..."
+  $as_echo "396. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55228,13 +55603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_395
-#AT_START_396
-at_fn_group_banner 396 'ofp-print.at:3918' \
+#AT_STOP_396
+#AT_START_397
+at_fn_group_banner 397 'ofp-print.at:3918' \
   "NXST_IPFIX_FLOW - reply" "                        " 19
 at_xfail=no
 (
-  $as_echo "396. $at_setup_line: testing $at_desc ..."
+  $as_echo "397. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55314,13 +55689,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_396
-#AT_START_397
-at_fn_group_banner 397 'ofp-print.at:3954' \
+#AT_STOP_397
+#AT_START_398
+at_fn_group_banner 398 'ofp-print.at:3954' \
   "NXT_CT_FLUSH_ZONE" "                              " 19
 at_xfail=no
 (
-  $as_echo "397. $at_setup_line: testing $at_desc ..."
+  $as_echo "398. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55352,13 +55727,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_397
-#AT_START_398
-at_fn_group_banner 398 'ofp-util.at:3' \
+#AT_STOP_398
+#AT_START_399
+at_fn_group_banner 399 'ofp-util.at:3' \
   "encoding hellos" "                                " 20
 at_xfail=no
 (
-  $as_echo "398. $at_setup_line: testing $at_desc ..."
+  $as_echo "399. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55522,13 +55897,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_398
-#AT_START_399
-at_fn_group_banner 399 'ofp-util.at:54' \
+#AT_STOP_399
+#AT_START_400
+at_fn_group_banner 400 'ofp-util.at:54' \
   "parsing key-value pairs" "                        " 20
 at_xfail=no
 (
-  $as_echo "399. $at_setup_line: testing $at_desc ..."
+  $as_echo "400. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55634,13 +56009,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_399
-#AT_START_400
-at_fn_group_banner 400 'ofp-errors.at:3' \
+#AT_STOP_400
+#AT_START_401
+at_fn_group_banner 401 'ofp-errors.at:3' \
   "OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.0" "" 21
 at_xfail=no
 (
-  $as_echo "400. $at_setup_line: testing $at_desc ..."
+  $as_echo "401. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55667,13 +56042,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_400
-#AT_START_401
-at_fn_group_banner 401 'ofp-errors.at:11' \
+#AT_STOP_401
+#AT_START_402
+at_fn_group_banner 402 'ofp-errors.at:11' \
   "OFPT_ERROR with type OFPET_HELLO_FAILED - OF1.1" "" 21
 at_xfail=no
 (
-  $as_echo "401. $at_setup_line: testing $at_desc ..."
+  $as_echo "402. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55700,13 +56075,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_401
-#AT_START_402
-at_fn_group_banner 402 'ofp-errors.at:19' \
+#AT_STOP_402
+#AT_START_403
+at_fn_group_banner 403 'ofp-errors.at:19' \
   "OFPT_ERROR with type OFPET_BAD_REQUEST - OF1.0" " " 21
 at_xfail=no
 (
-  $as_echo "402. $at_setup_line: testing $at_desc ..."
+  $as_echo "403. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55735,13 +56110,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_402
-#AT_START_403
-at_fn_group_banner 403 'ofp-errors.at:29' \
+#AT_STOP_403
+#AT_START_404
+at_fn_group_banner 404 'ofp-errors.at:29' \
   "OFPT_ERROR prints type of truncated inner messages" "" 21
 at_xfail=no
 (
-  $as_echo "403. $at_setup_line: testing $at_desc ..."
+  $as_echo "404. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55781,13 +56156,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_403
-#AT_START_404
-at_fn_group_banner 404 'ofp-errors.at:46' \
+#AT_STOP_404
+#AT_START_405
+at_fn_group_banner 405 'ofp-errors.at:46' \
   "OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.0" " " 21
 at_xfail=no
 (
-  $as_echo "404. $at_setup_line: testing $at_desc ..."
+  $as_echo "405. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55814,13 +56189,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_404
-#AT_START_405
-at_fn_group_banner 405 'ofp-errors.at:54' \
+#AT_STOP_405
+#AT_START_406
+at_fn_group_banner 406 'ofp-errors.at:54' \
   "OFPT_ERROR with code OFPBMC_BAD_PREREQ - OF1.1" " " 21
 at_xfail=no
 (
-  $as_echo "405. $at_setup_line: testing $at_desc ..."
+  $as_echo "406. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55847,13 +56222,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_405
-#AT_START_406
-at_fn_group_banner 406 'ofp-errors.at:64' \
+#AT_STOP_406
+#AT_START_407
+at_fn_group_banner 407 'ofp-errors.at:64' \
   "OFPT_ERROR with type OFPFMFC_OVERLAP - OF1.0" "   " 21
 at_xfail=no
 (
-  $as_echo "406. $at_setup_line: testing $at_desc ..."
+  $as_echo "407. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55882,13 +56257,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_406
-#AT_START_407
-at_fn_group_banner 407 'ofp-errors.at:73' \
+#AT_STOP_407
+#AT_START_408
+at_fn_group_banner 408 'ofp-errors.at:73' \
   "OFPT_ERROR with type OFPBIC_UNSUP_INST - OF1.1" " " 21
 at_xfail=no
 (
-  $as_echo "407. $at_setup_line: testing $at_desc ..."
+  $as_echo "408. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55917,13 +56292,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_407
-#AT_START_408
-at_fn_group_banner 408 'ofp-errors.at:83' \
+#AT_STOP_408
+#AT_START_409
+at_fn_group_banner 409 'ofp-errors.at:83' \
   "OFPT_ERROR with type OFPBIC_DUP_INST - OF1.4" "   " 21
 at_xfail=no
 (
-  $as_echo "408. $at_setup_line: testing $at_desc ..."
+  $as_echo "409. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -55952,13 +56327,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_408
-#AT_START_409
-at_fn_group_banner 409 'ofp-errors.at:97' \
+#AT_STOP_409
+#AT_START_410
+at_fn_group_banner 410 'ofp-errors.at:97' \
   "encoding OFPBIC_* experimenter errors" "          " 21
 at_xfail=no
 (
-  $as_echo "409. $at_setup_line: testing $at_desc ..."
+  $as_echo "410. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56007,13 +56382,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_409
-#AT_START_410
-at_fn_group_banner 410 'ofp-errors.at:117' \
+#AT_STOP_410
+#AT_START_411
+at_fn_group_banner 411 'ofp-errors.at:117' \
   "encoding errors extension that became official" " " 21
 at_xfail=no
 (
-  $as_echo "410. $at_setup_line: testing $at_desc ..."
+  $as_echo "411. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56072,13 +56447,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_410
-#AT_START_411
-at_fn_group_banner 411 'ofp-errors.at:136' \
+#AT_STOP_411
+#AT_START_412
+at_fn_group_banner 412 'ofp-errors.at:136' \
   "decoding OFPBIC_* experimenter errors" "          " 21
 at_xfail=no
 (
-  $as_echo "411. $at_setup_line: testing $at_desc ..."
+  $as_echo "412. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56137,13 +56512,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_411
-#AT_START_412
-at_fn_group_banner 412 'ofp-errors.at:152' \
+#AT_STOP_412
+#AT_START_413
+at_fn_group_banner 413 'ofp-errors.at:152' \
   "decoding experimenter errors" "                   " 21
 at_xfail=no
 (
-  $as_echo "412. $at_setup_line: testing $at_desc ..."
+  $as_echo "413. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56254,13 +56629,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_412
-#AT_START_413
-at_fn_group_banner 413 'ofp-errors.at:184' \
+#AT_STOP_413
+#AT_START_414
+at_fn_group_banner 414 'ofp-errors.at:184' \
   "encoding experimenter errors" "                   " 21
 at_xfail=no
 (
-  $as_echo "413. $at_setup_line: testing $at_desc ..."
+  $as_echo "414. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56410,13 +56785,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_413
-#AT_START_414
-at_fn_group_banner 414 'ovs-ofctl.at:3' \
-  "ovs-ofctl parse-flows choice of protocol" "       " 22
+#AT_STOP_414
+#AT_START_415
+at_fn_group_banner 415 'ovs-ofctl.at:3' \
+  "ovs-ofctl parse-flows choice of protocol" "       " 22
 at_xfail=no
 (
-  $as_echo "414. $at_setup_line: testing $at_desc ..."
+  $as_echo "415. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56521,6 +56896,7 @@
     'mpls,mpls_label=5                           NXM,OXM,OpenFlow11' \
     'mpls,mpls_tc=1                              NXM,OXM,OpenFlow11' \
     'mpls,mpls_bos=0                             NXM,OXM' \
+    'mpls,mpls_ttl=5                             NXM,OXM' \
     'ip,ip_src=1.2.3.4                           any' \
     'ip,ip_src=192.168.0.0/24                    any' \
     'ip,ip_src=192.0.168.0/255.0.255.0           NXM,OXM,OpenFlow11' \
@@ -56586,8 +56962,8 @@
     echo "### test case: '$1' should have usable protocols '$2'"
     if test "$2" = none; then
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:168: ovs-ofctl parse-flow \"\$1,actions=drop\""
-at_fn_check_prepare_dynamic "ovs-ofctl parse-flow \"$1,actions=drop\"" "ovs-ofctl.at:168"
+$as_echo "$at_srcdir/ovs-ofctl.at:169: ovs-ofctl parse-flow \"\$1,actions=drop\""
+at_fn_check_prepare_dynamic "ovs-ofctl parse-flow \"$1,actions=drop\"" "ovs-ofctl.at:169"
 ( $at_check_trace; ovs-ofctl parse-flow "$1,actions=drop"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -56596,14 +56972,14 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:168"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:169"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
     else
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:174: ovs-ofctl parse-flow \"\$1,actions=drop\" | sed 1q"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:174"
+$as_echo "$at_srcdir/ovs-ofctl.at:175: ovs-ofctl parse-flow \"\$1,actions=drop\" | sed 1q"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:175"
 ( $at_check_trace; ovs-ofctl parse-flow "$1,actions=drop" | sed 1q
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -56612,7 +56988,7 @@
 echo >>"$at_stdout"; $as_echo "usable protocols: $2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:174"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:175"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -56623,13 +56999,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_414
-#AT_START_415
-at_fn_group_banner 415 'ovs-ofctl.at:181' \
+#AT_STOP_415
+#AT_START_416
+at_fn_group_banner 416 'ovs-ofctl.at:182' \
   "ovs-ofctl parse-flows (OpenFlow 1.0)" "           " 22
 at_xfail=no
 (
-  $as_echo "415. $at_setup_line: testing $at_desc ..."
+  $as_echo "416. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56668,9 +57044,9 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:213: ovs-ofctl parse-flows flows.txt
+$as_echo "$at_srcdir/ovs-ofctl.at:214: ovs-ofctl parse-flows flows.txt
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:213"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:214"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
 
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -56678,13 +57054,13 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:213"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:214"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:215: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:215"
+$as_echo "$at_srcdir/ovs-ofctl.at:216: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:216"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -56721,7 +57097,7 @@
 OFPT_FLOW_MOD: ADD actions=IN_PORT,IN_PORT
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:215"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:216"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -56730,13 +57106,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_415
-#AT_START_416
-at_fn_group_banner 416 'ovs-ofctl.at:248' \
+#AT_STOP_416
+#AT_START_417
+at_fn_group_banner 417 'ovs-ofctl.at:249' \
   "ovs-ofctl parse-flows (OpenFlow 1.1)" "           " 22
 at_xfail=no
 (
-  $as_echo "416. $at_setup_line: testing $at_desc ..."
+  $as_echo "417. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56761,9 +57137,9 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:266: ovs-ofctl --protocols OpenFlow11 parse-flows flows.txt
+$as_echo "$at_srcdir/ovs-ofctl.at:267: ovs-ofctl --protocols OpenFlow11 parse-flows flows.txt
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:266"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:267"
 ( $at_check_trace; ovs-ofctl --protocols OpenFlow11 parse-flows flows.txt
 
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -56771,13 +57147,13 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:266"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:267"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:268: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:268"
+$as_echo "$at_srcdir/ovs-ofctl.at:269: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:269"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -56800,7 +57176,7 @@
 OFPT_FLOW_MOD (OF1.1): ADD actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678,sampling_port=56789)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:268"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:269"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -56809,13 +57185,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_416
-#AT_START_417
-at_fn_group_banner 417 'ovs-ofctl.at:287' \
+#AT_STOP_417
+#AT_START_418
+at_fn_group_banner 418 'ovs-ofctl.at:288' \
   "ovs-ofctl parse-flows (OpenFlow 1.2)" "           " 22
 at_xfail=no
 (
-  $as_echo "417. $at_setup_line: testing $at_desc ..."
+  $as_echo "418. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56846,9 +57222,9 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:311: ovs-ofctl --protocols OpenFlow12 parse-flows flows.txt
+$as_echo "$at_srcdir/ovs-ofctl.at:312: ovs-ofctl --protocols OpenFlow12 parse-flows flows.txt
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:311"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:312"
 ( $at_check_trace; ovs-ofctl --protocols OpenFlow12 parse-flows flows.txt
 
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -56856,13 +57232,13 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:311"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:312"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:313: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:313"
+$as_echo "$at_srcdir/ovs-ofctl.at:314: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:314"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -56891,7 +57267,7 @@
 OFPT_FLOW_MOD (OF1.2): ADD actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678,sampling_port=56789)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:313"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:314"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -56900,13 +57276,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_417
-#AT_START_418
-at_fn_group_banner 418 'ovs-ofctl.at:338' \
+#AT_STOP_418
+#AT_START_419
+at_fn_group_banner 419 'ovs-ofctl.at:339' \
   "ovs-ofctl parse-flow with invalid mask" "         " 22
 at_xfail=no
 (
-  $as_echo "418. $at_setup_line: testing $at_desc ..."
+  $as_echo "419. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -56944,8 +57320,8 @@
         prereq= field=$1 value=$2
     fi
     { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:371: ovs-ofctl parse-flow \"\$prereq\$field=\$value,actions=drop\""
-at_fn_check_prepare_dynamic "ovs-ofctl parse-flow \"$prereq$field=$value,actions=drop\"" "ovs-ofctl.at:371"
+$as_echo "$at_srcdir/ovs-ofctl.at:372: ovs-ofctl parse-flow \"\$prereq\$field=\$value,actions=drop\""
+at_fn_check_prepare_dynamic "ovs-ofctl parse-flow \"$prereq$field=$value,actions=drop\"" "ovs-ofctl.at:372"
 ( $at_check_trace; ovs-ofctl parse-flow "$prereq$field=$value,actions=drop"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -56954,7 +57330,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:371"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:372"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -56964,51 +57340,51 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_418
-#AT_START_419
-at_fn_group_banner 419 'ovs-ofctl.at:377' \
+#AT_STOP_419
+#AT_START_420
+at_fn_group_banner 420 'ovs-ofctl.at:378' \
   "ovs-ofctl action inconsistency (OpenFlow 1.1)" "  " 22
 at_xfail=no
 (
-  $as_echo "419. $at_setup_line: testing $at_desc ..."
+  $as_echo "420. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:378: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:378"
+$as_echo "$at_srcdir/ovs-ofctl.at:379: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:379"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:379"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:378: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:378"
+$as_echo "$at_srcdir/ovs-ofctl.at:379: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:379"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:379"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:378: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:379: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:378"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:379"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -57017,37 +57393,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:379"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:378: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:378"
+$as_echo "$at_srcdir/ovs-ofctl.at:379: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:379"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:379"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:378: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:378"
+$as_echo "$at_srcdir/ovs-ofctl.at:379: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:379"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:379"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -57055,7 +57431,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:378: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:379: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -57068,7 +57444,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:378"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:379"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -57087,7 +57463,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:379"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -57095,15 +57471,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:378: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:378"
+$as_echo "$at_srcdir/ovs-ofctl.at:379: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:379"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:379"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -57112,9 +57488,9 @@
 
 add_of_ports br0 1 2 3
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:380: ovs-ofctl --protocols OpenFlow11 add-flow br0 'ip actions=mod_tp_dst:1234'
+$as_echo "$at_srcdir/ovs-ofctl.at:381: ovs-ofctl --protocols OpenFlow11 add-flow br0 'ip actions=mod_tp_dst:1234'
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:380"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:381"
 ( $at_check_trace; ovs-ofctl --protocols OpenFlow11 add-flow br0 'ip actions=mod_tp_dst:1234'
 
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -57124,37 +57500,37 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:380"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:381"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:383: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:383"
+$as_echo "$at_srcdir/ovs-ofctl.at:384: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:384"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:383"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:384"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:383: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:383"
+$as_echo "$at_srcdir/ovs-ofctl.at:384: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:384"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:383"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:384"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -57162,15 +57538,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:383: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:383"
+$as_echo "$at_srcdir/ovs-ofctl.at:384: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:384"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:383"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:384"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -57183,18 +57559,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:384" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:383: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:383"
+$as_echo "$at_srcdir/ovs-ofctl.at:384: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:384"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:383"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:384"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -57202,15 +57578,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:383: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:383"
+$as_echo "$at_srcdir/ovs-ofctl.at:384: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:384"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:383"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:384"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -57223,20 +57599,20 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:384" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_419
-#AT_START_420
-at_fn_group_banner 420 'ovs-ofctl.at:386' \
+#AT_STOP_420
+#AT_START_421
+at_fn_group_banner 421 'ovs-ofctl.at:387' \
   "ovs-ofctl parse-flows (skb_priority)" "           " 22
 at_xfail=no
 (
-  $as_echo "420. $at_setup_line: testing $at_desc ..."
+  $as_echo "421. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -57248,9 +57624,9 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:391: ovs-ofctl parse-flows flows.txt
+$as_echo "$at_srcdir/ovs-ofctl.at:392: ovs-ofctl parse-flows flows.txt
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:391"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:392"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
 
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -57258,7 +57634,7 @@
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:391"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:392"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -57268,13 +57644,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_420
-#AT_START_421
-at_fn_group_banner 421 'ovs-ofctl.at:398' \
+#AT_STOP_421
+#AT_START_422
+at_fn_group_banner 422 'ovs-ofctl.at:399' \
   "ovs-ofctl parse-flows (NXM)" "                    " 22
 at_xfail=no
 (
-  $as_echo "421. $at_setup_line: testing $at_desc ..."
+  $as_echo "422. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -57318,6 +57694,7 @@
 actions=controller(max_len=123,reason=invalid_ttl,id=555)
 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678)
 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678,sampling_port=56789)
+mpls,mpls_label=5,mpls_tc=1,mpls_ttl=1,mpls_bos=0,actions=drop
 ip,actions=ct(commit,zone=5)
 ip,actions=ct(commit,exec(load(1->NXM_NX_CT_MARK[])))
 ip,actions=ct(commit,exec(load(0x1->NXM_NX_CT_LABEL[])))
@@ -57335,9 +57712,9 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:452: ovs-ofctl parse-flows flows.txt
+$as_echo "$at_srcdir/ovs-ofctl.at:454: ovs-ofctl parse-flows flows.txt
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:452"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:454"
 ( $at_check_trace; ovs-ofctl parse-flows flows.txt
 
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -57345,13 +57722,13 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:454"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:454: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:454"
+$as_echo "$at_srcdir/ovs-ofctl.at:456: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:456"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -57395,6 +57772,7 @@
 NXT_FLOW_MOD: ADD table:255 actions=controller(reason=invalid_ttl,max_len=123,id=555)
 NXT_FLOW_MOD: ADD table:255 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678)
 NXT_FLOW_MOD: ADD table:255 actions=sample(probability=12345,collector_set_id=23456,obs_domain_id=34567,obs_point_id=45678,sampling_port=56789)
+NXT_FLOW_MOD: ADD table:255 mpls,mpls_label=5,mpls_tc=1,mpls_ttl=1,mpls_bos=0 actions=drop
 NXT_FLOW_MOD: ADD table:255 ip actions=ct(commit,zone=5)
 NXT_FLOW_MOD: ADD table:255 ip actions=ct(commit,exec(load:0x1->NXM_NX_CT_MARK[]))
 NXT_FLOW_MOD: ADD table:255 ip actions=ct(commit,exec(load:0x1->NXM_NX_CT_LABEL[0..63],load:0->NXM_NX_CT_LABEL[64..127]))
@@ -57410,7 +57788,7 @@
 NXT_FLOW_MOD: ADD table:255 actions=output(port=IN_PORT,max_len=123)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:454"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:456"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -57419,13 +57797,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_421
-#AT_START_422
-at_fn_group_banner 422 'ovs-ofctl.at:509' \
+#AT_STOP_422
+#AT_START_423
+at_fn_group_banner 423 'ovs-ofctl.at:512' \
   "ovs-ofctl -F nxm parse-flows" "                   " 22
 at_xfail=no
 (
-  $as_echo "422. $at_setup_line: testing $at_desc ..."
+  $as_echo "423. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -57468,15 +57846,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:545: ovs-ofctl -F nxm parse-flows flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:545"
+$as_echo "$at_srcdir/ovs-ofctl.at:548: ovs-ofctl -F nxm parse-flows flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:548"
 ( $at_check_trace; ovs-ofctl -F nxm parse-flows flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:548"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -57484,9 +57862,9 @@
 # The substitution for fec0:0: is because some libcs (e.g. MUSL)
 # abbreviate a single zero and others (e.g. glibc) don't.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:549: sed 's/ (xid=0x[0-9a-fA-F]*)//
+$as_echo "$at_srcdir/ovs-ofctl.at:552: sed 's/ (xid=0x[0-9a-fA-F]*)//
 s/fec0:0:/fec0::/g' stdout"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:549"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:552"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//
 s/fec0:0:/fec0::/g' stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -57529,7 +57907,7 @@
 NXT_FLOW_MOD: ADD ip actions=ct(commit,exec(load:0x1->NXM_NX_CT_LABEL[0..63],load:0->NXM_NX_CT_LABEL[64..127]))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:549"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:552"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -57538,13 +57916,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_422
-#AT_START_423
-at_fn_group_banner 423 'ovs-ofctl.at:588' \
+#AT_STOP_423
+#AT_START_424
+at_fn_group_banner 424 'ovs-ofctl.at:591' \
   "ovs-ofctl -F nxm -mmm parse-flows" "              " 22
 at_xfail=no
 (
-  $as_echo "423. $at_setup_line: testing $at_desc ..."
+  $as_echo "424. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -57590,21 +57968,21 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:627: ovs-ofctl -F nxm -mmm parse-flows flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:627"
+$as_echo "$at_srcdir/ovs-ofctl.at:630: ovs-ofctl -F nxm -mmm parse-flows flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:630"
 ( $at_check_trace; ovs-ofctl -F nxm -mmm parse-flows flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:627"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:630"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:628: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:628"
+$as_echo "$at_srcdir/ovs-ofctl.at:631: sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:631"
 ( $at_check_trace; sed 's/ (xid=0x[0-9a-fA-F]*)//' stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -57649,7 +58027,7 @@
 NXT_FLOW_MOD: ADD NXM_OF_ETH_TYPE(0800) actions=ct(commit,exec(load:0x1->NXM_NX_CT_LABEL[0..63],load:0->NXM_NX_CT_LABEL[64..127]))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:628"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:631"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -57658,13 +58036,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_423
-#AT_START_424
-at_fn_group_banner 424 'ovs-ofctl.at:669' \
+#AT_STOP_424
+#AT_START_425
+at_fn_group_banner 425 'ovs-ofctl.at:672' \
   "ovs-ofctl parse-nx-match" "                       " 22
 at_xfail=no
 (
-  $as_echo "424. $at_setup_line: testing $at_desc ..."
+  $as_echo "425. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -57971,8 +58349,8 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:970: ovs-ofctl -vPATTERN:'console:%c|%p|%m' --strict parse-nx-match < nx-match.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:970"
+$as_echo "$at_srcdir/ovs-ofctl.at:973: ovs-ofctl -vPATTERN:'console:%c|%p|%m' --strict parse-nx-match < nx-match.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:973"
 ( $at_check_trace; ovs-ofctl -vPATTERN:'console:%c|%p|%m' --strict parse-nx-match < nx-match.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -58277,7 +58655,7 @@
 nx_pull_match() returned error OFPBMC_BAD_FIELD
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:970"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:973"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -58285,8 +58663,8 @@
 # Check that at least the first warning made it.  (It's rate-limited
 # so a variable number could show up, especially under valgrind etc.)
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:1275: grep '1-bits in value' stderr | sed 1q"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1275"
+$as_echo "$at_srcdir/ovs-ofctl.at:1278: grep '1-bits in value' stderr | sed 1q"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1278"
 ( $at_check_trace; grep '1-bits in value' stderr | sed 1q
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -58295,22 +58673,22 @@
 echo >>"$at_stdout"; $as_echo "nx_match|WARN|Rejecting NXM/OXM entry 0:0:1:1:12 with 1-bits in value for bits wildcarded by the mask.
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1275"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1278"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 # Check that there wasn't any other stderr output.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:1280: grep -v '1-bits in value' stderr"
-at_fn_check_prepare_trace "ovs-ofctl.at:1280"
+$as_echo "$at_srcdir/ovs-ofctl.at:1283: grep -v '1-bits in value' stderr"
+at_fn_check_prepare_trace "ovs-ofctl.at:1283"
 ( $at_check_trace; grep -v '1-bits in value' stderr
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:1280"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:1283"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -58319,13 +58697,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_424
-#AT_START_425
-at_fn_group_banner 425 'ovs-ofctl.at:1283' \
+#AT_STOP_425
+#AT_START_426
+at_fn_group_banner 426 'ovs-ofctl.at:1286' \
   "ovs-ofctl parse-ofp10-match" "                    " 22
 at_xfail=no
 (
-  $as_echo "425. $at_setup_line: testing $at_desc ..."
+  $as_echo "426. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -58494,15 +58872,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:1495: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp10-match < input.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1495"
+$as_echo "$at_srcdir/ovs-ofctl.at:1498: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp10-match < input.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1498"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp10-match < input.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1495"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1498"
 $at_failed && at_fn_log_failure  \
 "input.txt" \
 "expout" \
@@ -58514,13 +58892,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_425
-#AT_START_426
-at_fn_group_banner 426 'ovs-ofctl.at:1500' \
+#AT_STOP_426
+#AT_START_427
+at_fn_group_banner 427 'ovs-ofctl.at:1503' \
   "ovs-ofctl parse-ofp11-match" "                    " 22
 at_xfail=no
 (
-  $as_echo "426. $at_setup_line: testing $at_desc ..."
+  $as_echo "427. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -58699,15 +59077,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:1821: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp11-match < input.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1821"
+$as_echo "$at_srcdir/ovs-ofctl.at:1824: ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp11-match < input.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:1824"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' parse-ofp11-match < input.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 $at_diff experr "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1821"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1824"
 $at_failed && at_fn_log_failure  \
 "input.txt" \
 "expout" \
@@ -58719,13 +59097,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_426
-#AT_START_427
-at_fn_group_banner 427 'ovs-ofctl.at:1826' \
+#AT_STOP_427
+#AT_START_428
+at_fn_group_banner 428 'ovs-ofctl.at:1829' \
   "ovs-ofctl parse-nx-match loose" "                 " 22
 at_xfail=no
 (
-  $as_echo "427. $at_setup_line: testing $at_desc ..."
+  $as_echo "428. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -58739,8 +59117,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:1834: ovs-ofctl --strict parse-nx-match < nx-match.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:1834"
+$as_echo "$at_srcdir/ovs-ofctl.at:1837: ovs-ofctl --strict parse-nx-match < nx-match.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:1837"
 ( $at_check_trace; ovs-ofctl --strict parse-nx-match < nx-match.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -58751,14 +59129,14 @@
 nx_pull_match() returned error OFPBMC_BAD_FIELD
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1834"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1837"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:1840: ovs-ofctl parse-nx-match < nx-match.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:1840"
+$as_echo "$at_srcdir/ovs-ofctl.at:1843: ovs-ofctl parse-nx-match < nx-match.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:1843"
 ( $at_check_trace; ovs-ofctl parse-nx-match < nx-match.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -58769,7 +59147,7 @@
 NXM_OF_IN_PORT(0001), NXM_OF_ETH_TYPE(0800)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1840"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:1843"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -58778,13 +59156,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_427
-#AT_START_428
-at_fn_group_banner 428 'ovs-ofctl.at:1847' \
+#AT_STOP_428
+#AT_START_429
+at_fn_group_banner 429 'ovs-ofctl.at:1850' \
   "ovs-ofctl parse-oxm (OpenFlow 1.2)" "             " 22
 at_xfail=no
 (
-  $as_echo "428. $at_setup_line: testing $at_desc ..."
+  $as_echo "429. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -59032,8 +59410,8 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2089: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow12 < oxm.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2089"
+$as_echo "$at_srcdir/ovs-ofctl.at:2092: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow12 < oxm.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2092"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow12 < oxm.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59279,7 +59657,7 @@
 nx_pull_match() returned error OFPBMC_BAD_FIELD
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2089"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2092"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59287,8 +59665,8 @@
 # Check that at least the first warning made it.  (It's rate-limited
 # so a variable number could show up, especially under valgrind etc.)
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2333: grep '1-bits in value' stderr | sed 1q"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2333"
+$as_echo "$at_srcdir/ovs-ofctl.at:2336: grep '1-bits in value' stderr | sed 1q"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2336"
 ( $at_check_trace; grep '1-bits in value' stderr | sed 1q
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59297,22 +59675,22 @@
 echo >>"$at_stdout"; $as_echo "nx_match|WARN|Rejecting NXM/OXM entry 0:32768:2:1:16 with 1-bits in value for bits wildcarded by the mask.
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2333"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2336"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 # Check that there wasn't any other stderr output.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2338: grep -v '1-bits in value' stderr"
-at_fn_check_prepare_trace "ovs-ofctl.at:2338"
+$as_echo "$at_srcdir/ovs-ofctl.at:2341: grep -v '1-bits in value' stderr"
+at_fn_check_prepare_trace "ovs-ofctl.at:2341"
 ( $at_check_trace; grep -v '1-bits in value' stderr
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2338"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2341"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59321,13 +59699,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_428
-#AT_START_429
-at_fn_group_banner 429 'ovs-ofctl.at:2341' \
+#AT_STOP_429
+#AT_START_430
+at_fn_group_banner 430 'ovs-ofctl.at:2344' \
   "ovs-ofctl parse-oxm (OpenFlow 1.3)" "             " 22
 at_xfail=no
 (
-  $as_echo "429. $at_setup_line: testing $at_desc ..."
+  $as_echo "430. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -59344,8 +59722,8 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2352: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow13 < oxm.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2352"
+$as_echo "$at_srcdir/ovs-ofctl.at:2355: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow13 < oxm.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2355"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow13 < oxm.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59360,7 +59738,7 @@
 ONFOXM_ET_ACTSET_OUTPUT(fffffff7)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2352"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2355"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59369,13 +59747,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_429
-#AT_START_430
-at_fn_group_banner 430 'ovs-ofctl.at:2364' \
+#AT_STOP_430
+#AT_START_431
+at_fn_group_banner 431 'ovs-ofctl.at:2367' \
   "ovs-ofctl parse-oxm (OpenFlow 1.5)" "             " 22
 at_xfail=no
 (
-  $as_echo "430. $at_setup_line: testing $at_desc ..."
+  $as_echo "431. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -59413,8 +59791,8 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2396: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow15 < oxm.txt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2396"
+$as_echo "$at_srcdir/ovs-ofctl.at:2399: ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow15 < oxm.txt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2399"
 ( $at_check_trace; ovs-ofctl '-vPATTERN:console:%c|%p|%m' --strict parse-oxm OpenFlow15 < oxm.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59450,7 +59828,7 @@
 OXM_OF_ACTSET_OUTPUT(fffffff7)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2396"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2399"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59459,13 +59837,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_430
-#AT_START_431
-at_fn_group_banner 431 'ovs-ofctl.at:2429' \
+#AT_STOP_431
+#AT_START_432
+at_fn_group_banner 432 'ovs-ofctl.at:2432' \
   "ovs-ofctl parse-oxm loose" "                      " 22
 at_xfail=no
 (
-  $as_echo "431. $at_setup_line: testing $at_desc ..."
+  $as_echo "432. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -59479,8 +59857,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2437: ovs-ofctl --strict parse-oxm OpenFlow12 < oxm.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2437"
+$as_echo "$at_srcdir/ovs-ofctl.at:2440: ovs-ofctl --strict parse-oxm OpenFlow12 < oxm.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2440"
 ( $at_check_trace; ovs-ofctl --strict parse-oxm OpenFlow12 < oxm.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59491,14 +59869,14 @@
 nx_pull_match() returned error OFPBMC_BAD_FIELD
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2437"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2440"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2443: ovs-ofctl parse-oxm OpenFlow12 < oxm.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2443"
+$as_echo "$at_srcdir/ovs-ofctl.at:2446: ovs-ofctl parse-oxm OpenFlow12 < oxm.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2446"
 ( $at_check_trace; ovs-ofctl parse-oxm OpenFlow12 < oxm.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59509,7 +59887,7 @@
 OXM_OF_IN_PORT(00000001), OXM_OF_ETH_TYPE(0800)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2443"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2446"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59518,13 +59896,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_431
-#AT_START_432
-at_fn_group_banner 432 'ovs-ofctl.at:2450' \
+#AT_STOP_432
+#AT_START_433
+at_fn_group_banner 433 'ovs-ofctl.at:2453' \
   "experimenter OXM encoding" "                      " 22
 at_xfail=no
 (
-  $as_echo "432. $at_setup_line: testing $at_desc ..."
+  $as_echo "433. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -59543,8 +59921,8 @@
 
 # Test experimenter OXM encoding.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2463: ovs-ofctl -m --strict parse-oxm OpenFlow15 < oxm.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2463"
+$as_echo "$at_srcdir/ovs-ofctl.at:2466: ovs-ofctl -m --strict parse-oxm OpenFlow15 < oxm.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2466"
 ( $at_check_trace; ovs-ofctl -m --strict parse-oxm OpenFlow15 < oxm.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59566,14 +59944,14 @@
 00000000  00 01 00 0e ff ff 1d 06-00 00 23 20 12 12 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2463"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2466"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2480: ovs-ofctl -m --strict parse-oxm OpenFlow12 < oxm.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2480"
+$as_echo "$at_srcdir/ovs-ofctl.at:2483: ovs-ofctl -m --strict parse-oxm OpenFlow12 < oxm.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2483"
 ( $at_check_trace; ovs-ofctl -m --strict parse-oxm OpenFlow12 < oxm.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59595,7 +59973,7 @@
 00000000  00 01 00 0e ff ff 1d 06-00 00 23 20 12 12 00 00
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2480"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2483"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59604,13 +59982,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_432
-#AT_START_433
-at_fn_group_banner 433 'ovs-ofctl.at:2498' \
+#AT_STOP_433
+#AT_START_434
+at_fn_group_banner 434 'ovs-ofctl.at:2501' \
   "check TCP flags expression in OXM and NXM" "      " 22
 at_xfail=no
 (
-  $as_echo "433. $at_setup_line: testing $at_desc ..."
+  $as_echo "434. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -59620,8 +59998,8 @@
 
 # Check that marshaling into NXM gives all NXM headers.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2503: echo \"\$tcp_flags\" | ovs-ofctl parse-nxm"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2503"
+$as_echo "$at_srcdir/ovs-ofctl.at:2506: echo \"\$tcp_flags\" | ovs-ofctl parse-nxm"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2506"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-nxm
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59630,7 +60008,7 @@
 echo >>"$at_stdout"; $as_echo "NXM_OF_ETH_TYPE(0800), NXM_OF_IP_PROTO(06), NXM_NX_TCP_FLAGS(0fff)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2503"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2506"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59638,8 +60016,8 @@
 # Check that marshaling in OXM for OF1.2 gives OXM headers except for
 # TCP flags, which didn't have an OXM definition.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2509: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow12"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2509"
+$as_echo "$at_srcdir/ovs-ofctl.at:2512: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow12"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2512"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow12
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59648,7 +60026,7 @@
 echo >>"$at_stdout"; $as_echo "OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), NXM_NX_TCP_FLAGS(0fff)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2509"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2512"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59656,8 +60034,8 @@
 # Check that marshaling in OXM for OF1.3 and OF1.4 gives OXM headers,
 # including the ONF extension for TCP flags introduced in OF1.3.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2515: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow13"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2515"
+$as_echo "$at_srcdir/ovs-ofctl.at:2518: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow13"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2518"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow13
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59666,13 +60044,13 @@
 echo >>"$at_stdout"; $as_echo "OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), ONFOXM_ET_TCP_FLAGS(0fff)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2515"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2518"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2518: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow14"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2518"
+$as_echo "$at_srcdir/ovs-ofctl.at:2521: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow14"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2521"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow14
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59681,15 +60059,15 @@
 echo >>"$at_stdout"; $as_echo "OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), ONFOXM_ET_TCP_FLAGS(0fff)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2518"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2521"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 # OpenFlow 1.5 added an OXM header for TCP flags:
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2523: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow15"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2523"
+$as_echo "$at_srcdir/ovs-ofctl.at:2526: echo \"\$tcp_flags\" | ovs-ofctl parse-oxm OpenFlow15"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2526"
 ( $at_check_trace; echo "$tcp_flags" | ovs-ofctl parse-oxm OpenFlow15
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59698,7 +60076,7 @@
 echo >>"$at_stdout"; $as_echo "OXM_OF_ETH_TYPE(0800), OXM_OF_IP_PROTO(06), OXM_OF_TCP_FLAGS(0fff)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2523"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2526"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59707,13 +60085,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_433
-#AT_START_434
-at_fn_group_banner 434 'ovs-ofctl.at:2530' \
+#AT_STOP_434
+#AT_START_435
+at_fn_group_banner 435 'ovs-ofctl.at:2533' \
   "ovs-ofctl check-vlan" "                           " 22
 at_xfail=no
 (
-  $as_echo "434. $at_setup_line: testing $at_desc ..."
+  $as_echo "435. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -59721,8 +60099,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2534: ovs-ofctl check-vlan 0000 0000"
-at_fn_check_prepare_trace "ovs-ofctl.at:2534"
+$as_echo "$at_srcdir/ovs-ofctl.at:2537: ovs-ofctl check-vlan 0000 0000"
+at_fn_check_prepare_trace "ovs-ofctl.at:2537"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 0000
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59735,14 +60113,14 @@
 OF1.1: 0000/1,00/1 -> 0000/0000
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2534"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2537"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2543: ovs-ofctl check-vlan 0000 ffff"
-at_fn_check_prepare_trace "ovs-ofctl.at:2543"
+$as_echo "$at_srcdir/ovs-ofctl.at:2546: ovs-ofctl check-vlan 0000 ffff"
+at_fn_check_prepare_trace "ovs-ofctl.at:2546"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 ffff
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59755,14 +60133,14 @@
 OF1.1: ffff/0,00/1 -> 0000/ffff
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2543"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2546"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2552: ovs-ofctl check-vlan 1abc 1fff"
-at_fn_check_prepare_trace "ovs-ofctl.at:2552"
+$as_echo "$at_srcdir/ovs-ofctl.at:2555: ovs-ofctl check-vlan 1abc 1fff"
+at_fn_check_prepare_trace "ovs-ofctl.at:2555"
 ( $at_check_trace; ovs-ofctl check-vlan 1abc 1fff
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59775,14 +60153,14 @@
 OF1.1: 0abc/0,00/1 -> 1abc/1fff
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2552"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2561: ovs-ofctl check-vlan b000 f000"
-at_fn_check_prepare_trace "ovs-ofctl.at:2561"
+$as_echo "$at_srcdir/ovs-ofctl.at:2564: ovs-ofctl check-vlan b000 f000"
+at_fn_check_prepare_trace "ovs-ofctl.at:2564"
 ( $at_check_trace; ovs-ofctl check-vlan b000 f000
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59795,14 +60173,14 @@
 OF1.1: fffe/0,05/0 -> b000/f000
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2564"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2570: ovs-ofctl check-vlan babc ffff"
-at_fn_check_prepare_trace "ovs-ofctl.at:2570"
+$as_echo "$at_srcdir/ovs-ofctl.at:2573: ovs-ofctl check-vlan babc ffff"
+at_fn_check_prepare_trace "ovs-ofctl.at:2573"
 ( $at_check_trace; ovs-ofctl check-vlan babc ffff
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59815,14 +60193,14 @@
 OF1.1: 0abc/0,05/0 -> babc/ffff
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2570"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2573"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2579: ovs-ofctl check-vlan 0000 0fff"
-at_fn_check_prepare_trace "ovs-ofctl.at:2579"
+$as_echo "$at_srcdir/ovs-ofctl.at:2582: ovs-ofctl check-vlan 0000 0fff"
+at_fn_check_prepare_trace "ovs-ofctl.at:2582"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 0fff
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59835,14 +60213,14 @@
 OF1.1: 0000/0,00/1 -> 1000/1fff
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2579"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2582"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2588: ovs-ofctl check-vlan 0000 f000"
-at_fn_check_prepare_trace "ovs-ofctl.at:2588"
+$as_echo "$at_srcdir/ovs-ofctl.at:2591: ovs-ofctl check-vlan 0000 f000"
+at_fn_check_prepare_trace "ovs-ofctl.at:2591"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 f000
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59855,14 +60233,14 @@
 OF1.1: ffff/0,00/1 -> 0000/ffff
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2588"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2591"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2597: ovs-ofctl check-vlan 0000 efff"
-at_fn_check_prepare_trace "ovs-ofctl.at:2597"
+$as_echo "$at_srcdir/ovs-ofctl.at:2600: ovs-ofctl check-vlan 0000 efff"
+at_fn_check_prepare_trace "ovs-ofctl.at:2600"
 ( $at_check_trace; ovs-ofctl check-vlan 0000 efff
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59875,14 +60253,14 @@
 OF1.1: 0000/0,00/0 -> 1000/ffff
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2597"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2600"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2606: ovs-ofctl check-vlan 1001 1001"
-at_fn_check_prepare_trace "ovs-ofctl.at:2606"
+$as_echo "$at_srcdir/ovs-ofctl.at:2609: ovs-ofctl check-vlan 1001 1001"
+at_fn_check_prepare_trace "ovs-ofctl.at:2609"
 ( $at_check_trace; ovs-ofctl check-vlan 1001 1001
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59895,14 +60273,14 @@
 OF1.1: 0001/0,00/1 -> 1001/1fff
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2606"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2615: ovs-ofctl check-vlan 3000 3000"
-at_fn_check_prepare_trace "ovs-ofctl.at:2615"
+$as_echo "$at_srcdir/ovs-ofctl.at:2618: ovs-ofctl check-vlan 3000 3000"
+at_fn_check_prepare_trace "ovs-ofctl.at:2618"
 ( $at_check_trace; ovs-ofctl check-vlan 3000 3000
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -59915,20 +60293,20 @@
 OF1.1: fffe/0,01/0 -> 3000/f000
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2618"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2622: "
-at_fn_check_prepare_trace "ovs-ofctl.at:2622"
+$as_echo "$at_srcdir/ovs-ofctl.at:2625: "
+at_fn_check_prepare_trace "ovs-ofctl.at:2625"
 ( $at_check_trace;
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2622"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -59937,51 +60315,51 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_434
-#AT_START_435
-at_fn_group_banner 435 'ovs-ofctl.at:2627' \
+#AT_STOP_435
+#AT_START_436
+at_fn_group_banner 436 'ovs-ofctl.at:2630' \
   "ovs-ofctl -F option and NXM features" "           " 22
 at_xfail=no
 (
-  $as_echo "435. $at_setup_line: testing $at_desc ..."
+  $as_echo "436. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2628: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2628"
+$as_echo "$at_srcdir/ovs-ofctl.at:2631: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2631"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2628"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2631"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2628: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2628"
+$as_echo "$at_srcdir/ovs-ofctl.at:2631: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2631"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2628"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2631"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2628: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2631: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2628"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2631"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -59990,37 +60368,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2628"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2631"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2628: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2628"
+$as_echo "$at_srcdir/ovs-ofctl.at:2631: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2631"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2628"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2631"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2628: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2628"
+$as_echo "$at_srcdir/ovs-ofctl.at:2631: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2631"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2628"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2631"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -60028,7 +60406,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2628: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2631: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -60041,7 +60419,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2628"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2631"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -60060,7 +60438,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2628"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2631"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60068,15 +60446,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2628: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2628"
+$as_echo "$at_srcdir/ovs-ofctl.at:2631: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2631"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2628"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2631"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60084,8 +60462,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2629: ovs-ofctl -F openflow10 add-flow br0 tun_id=123,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2629"
+$as_echo "$at_srcdir/ovs-ofctl.at:2632: ovs-ofctl -F openflow10 add-flow br0 tun_id=123,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2632"
 ( $at_check_trace; ovs-ofctl -F openflow10 add-flow br0 tun_id=123,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -60094,15 +60472,15 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2629"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2632"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2632: ovs-ofctl -F openflow10 add-flow br0 metadata=123,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2632"
+$as_echo "$at_srcdir/ovs-ofctl.at:2635: ovs-ofctl -F openflow10 add-flow br0 metadata=123,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2635"
 ( $at_check_trace; ovs-ofctl -F openflow10 add-flow br0 metadata=123,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -60111,37 +60489,37 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2632"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2635"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2635: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2635"
+$as_echo "$at_srcdir/ovs-ofctl.at:2638: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2638"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2635"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2638"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2635: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2635"
+$as_echo "$at_srcdir/ovs-ofctl.at:2638: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2638"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2635"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2638"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60149,15 +60527,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2635: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2635"
+$as_echo "$at_srcdir/ovs-ofctl.at:2638: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2638"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2635"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2638"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60170,18 +60548,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2635" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2638" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2635: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2635"
+$as_echo "$at_srcdir/ovs-ofctl.at:2638: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2638"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2635"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2638"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60189,15 +60567,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2635: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2635"
+$as_echo "$at_srcdir/ovs-ofctl.at:2638: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2638"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2635"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2638"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60210,58 +60588,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2635" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2638" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_435
-#AT_START_436
-at_fn_group_banner 436 'ovs-ofctl.at:2642' \
+#AT_STOP_436
+#AT_START_437
+at_fn_group_banner 437 'ovs-ofctl.at:2645' \
   "ovs-ofctl -F option with flow_mods" "             " 22
 at_xfail=no
 (
-  $as_echo "436. $at_setup_line: testing $at_desc ..."
+  $as_echo "437. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2643: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2643"
+$as_echo "$at_srcdir/ovs-ofctl.at:2646: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2646"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2643"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2646"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2643: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2643"
+$as_echo "$at_srcdir/ovs-ofctl.at:2646: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2646"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2643"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2646"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2643: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2646: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2643"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2646"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -60270,37 +60648,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2643"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2646"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2643: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2643"
+$as_echo "$at_srcdir/ovs-ofctl.at:2646: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2646"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2643"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2646"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2643: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2643"
+$as_echo "$at_srcdir/ovs-ofctl.at:2646: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2646"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2643"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2646"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -60308,7 +60686,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2643: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2646: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -60321,7 +60699,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2643"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2646"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -60340,7 +60718,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2643"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2646"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60348,15 +60726,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2643: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2643"
+$as_echo "$at_srcdir/ovs-ofctl.at:2646: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2646"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2643"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2646"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60364,23 +60742,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2644: ovs-ofctl -F nxm add-flow br0 tun_id=0x12345678,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2644"
+$as_echo "$at_srcdir/ovs-ofctl.at:2647: ovs-ofctl -F nxm add-flow br0 tun_id=0x12345678,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2647"
 ( $at_check_trace; ovs-ofctl -F nxm add-flow br0 tun_id=0x12345678,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2644"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2647"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2645: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2645"
+$as_echo "$at_srcdir/ovs-ofctl.at:2648: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2648"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -60390,37 +60768,37 @@
  tun_id=0x12345678 actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2645"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2648"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2649: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2649"
+$as_echo "$at_srcdir/ovs-ofctl.at:2652: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2652"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2649"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2649: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2649"
+$as_echo "$at_srcdir/ovs-ofctl.at:2652: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2652"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2649"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60428,15 +60806,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2649: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2649"
+$as_echo "$at_srcdir/ovs-ofctl.at:2652: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2652"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2649"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60449,18 +60827,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2649" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2652" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2649: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2649"
+$as_echo "$at_srcdir/ovs-ofctl.at:2652: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2652"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2649"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60468,15 +60846,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2649: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2649"
+$as_echo "$at_srcdir/ovs-ofctl.at:2652: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2652"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2649"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60489,58 +60867,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2649" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2652" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_436
-#AT_START_437
-at_fn_group_banner 437 'ovs-ofctl.at:2654' \
+#AT_STOP_437
+#AT_START_438
+at_fn_group_banner 438 'ovs-ofctl.at:2657' \
   "ovs-ofctl dump-flows honors -F option" "          " 22
 at_xfail=no
 (
-  $as_echo "437. $at_setup_line: testing $at_desc ..."
+  $as_echo "438. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2655: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2655"
+$as_echo "$at_srcdir/ovs-ofctl.at:2658: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2658"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2655"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2658"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2655: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2655"
+$as_echo "$at_srcdir/ovs-ofctl.at:2658: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2658"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2655"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2658"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2655: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2658: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2655"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2658"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -60549,37 +60927,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2655"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2658"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2655: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2655"
+$as_echo "$at_srcdir/ovs-ofctl.at:2658: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2658"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2655"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2658"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2655: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2655"
+$as_echo "$at_srcdir/ovs-ofctl.at:2658: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2658"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2655"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2658"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -60587,7 +60965,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2655: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2658: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -60600,7 +60978,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2655"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2658"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -60619,7 +60997,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2655"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2658"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60627,15 +61005,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2655: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2655"
+$as_echo "$at_srcdir/ovs-ofctl.at:2658: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2658"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2655"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2658"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60643,23 +61021,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2656: ovs-ofctl add-flow br0 reg0=0x12345,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2656"
+$as_echo "$at_srcdir/ovs-ofctl.at:2659: ovs-ofctl add-flow br0 reg0=0x12345,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2659"
 ( $at_check_trace; ovs-ofctl add-flow br0 reg0=0x12345,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2656"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2659"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2657: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2657"
+$as_echo "$at_srcdir/ovs-ofctl.at:2660: ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2660"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -60669,37 +61047,37 @@
  actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2657"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2660"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2661: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2661"
+$as_echo "$at_srcdir/ovs-ofctl.at:2664: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2664"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2661"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2664"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2661: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2661"
+$as_echo "$at_srcdir/ovs-ofctl.at:2664: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2664"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2661"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2664"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60707,15 +61085,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2661: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2661"
+$as_echo "$at_srcdir/ovs-ofctl.at:2664: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2664"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2661"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2664"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60728,18 +61106,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2661" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2664" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2661: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2661"
+$as_echo "$at_srcdir/ovs-ofctl.at:2664: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2664"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2661"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2664"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60747,15 +61125,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2661: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2661"
+$as_echo "$at_srcdir/ovs-ofctl.at:2664: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2664"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2661"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2664"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60768,58 +61146,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2661" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2664" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_437
-#AT_START_438
-at_fn_group_banner 438 'ovs-ofctl.at:2666' \
+#AT_STOP_438
+#AT_START_439
+at_fn_group_banner 439 'ovs-ofctl.at:2669' \
   "ovs-ofctl dump-flows rejects bad -F option" "     " 22
 at_xfail=no
 (
-  $as_echo "438. $at_setup_line: testing $at_desc ..."
+  $as_echo "439. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2667: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2667"
+$as_echo "$at_srcdir/ovs-ofctl.at:2670: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2670"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2667"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2670"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2667: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2667"
+$as_echo "$at_srcdir/ovs-ofctl.at:2670: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2670"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2667"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2670"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2667: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2670: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2667"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2670"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -60828,37 +61206,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2667"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2670"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2667: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2667"
+$as_echo "$at_srcdir/ovs-ofctl.at:2670: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2670"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2667"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2667: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2667"
+$as_echo "$at_srcdir/ovs-ofctl.at:2670: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2670"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2667"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -60866,7 +61244,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2667: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2670: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -60879,7 +61257,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2667"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2670"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -60898,7 +61276,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2667"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60906,15 +61284,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2667: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2667"
+$as_echo "$at_srcdir/ovs-ofctl.at:2670: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2670"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2667"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2670"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60922,8 +61300,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2668: ovs-ofctl -F openflow10 dump-flows unix:br0.mgmt reg0=0xabcdef"
-at_fn_check_prepare_trace "ovs-ofctl.at:2668"
+$as_echo "$at_srcdir/ovs-ofctl.at:2671: ovs-ofctl -F openflow10 dump-flows unix:br0.mgmt reg0=0xabcdef"
+at_fn_check_prepare_trace "ovs-ofctl.at:2671"
 ( $at_check_trace; ovs-ofctl -F openflow10 dump-flows unix:br0.mgmt reg0=0xabcdef
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -60932,37 +61310,37 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2668"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2671"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2671: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2671"
+$as_echo "$at_srcdir/ovs-ofctl.at:2674: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2674"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2671"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2674"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2671: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2671"
+$as_echo "$at_srcdir/ovs-ofctl.at:2674: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2674"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2671"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2674"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60970,15 +61348,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2671: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2671"
+$as_echo "$at_srcdir/ovs-ofctl.at:2674: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2674"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2671"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2674"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -60991,18 +61369,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2671" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2674" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2671: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2671"
+$as_echo "$at_srcdir/ovs-ofctl.at:2674: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2674"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2671"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2674"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61010,15 +61388,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2671: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2671"
+$as_echo "$at_srcdir/ovs-ofctl.at:2674: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2674"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2671"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2674"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61031,58 +61409,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2671" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2674" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_438
-#AT_START_439
-at_fn_group_banner 439 'ovs-ofctl.at:2675' \
+#AT_STOP_439
+#AT_START_440
+at_fn_group_banner 440 'ovs-ofctl.at:2678' \
   "ovs-ofctl add-flow reports non-normalized flows" "" 22
 at_xfail=no
 (
-  $as_echo "439. $at_setup_line: testing $at_desc ..."
+  $as_echo "440. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2676: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2676"
+$as_echo "$at_srcdir/ovs-ofctl.at:2679: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2679"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2676"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2679"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2676: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2676"
+$as_echo "$at_srcdir/ovs-ofctl.at:2679: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2679"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2676"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2679"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2676: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2679: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2676"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2679"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -61091,37 +61469,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2676"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2679"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2676: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2676"
+$as_echo "$at_srcdir/ovs-ofctl.at:2679: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2679"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2676"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2679"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2676: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2676"
+$as_echo "$at_srcdir/ovs-ofctl.at:2679: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2679"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2676"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2679"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -61129,7 +61507,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2676: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2679: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -61142,7 +61520,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2676"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2679"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -61161,7 +61539,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2676"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2679"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61169,15 +61547,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2676: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2676"
+$as_echo "$at_srcdir/ovs-ofctl.at:2679: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2679"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2676"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2679"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61185,8 +61563,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2677: ovs-ofctl -vPATTERN:ANY:'%c|%p|%m' add-flow br0 nw_src=1.2.3.4,actions=5"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2677"
+$as_echo "$at_srcdir/ovs-ofctl.at:2680: ovs-ofctl -vPATTERN:ANY:'%c|%p|%m' add-flow br0 nw_src=1.2.3.4,actions=5"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2680"
 ( $at_check_trace; ovs-ofctl -vPATTERN:ANY:'%c|%p|%m' add-flow br0 nw_src=1.2.3.4,actions=5
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61197,37 +61575,37 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2677"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2680"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2683: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2683"
+$as_echo "$at_srcdir/ovs-ofctl.at:2686: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2686"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2683"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2686"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2683: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2683"
+$as_echo "$at_srcdir/ovs-ofctl.at:2686: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2686"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2683"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2686"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61235,15 +61613,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2683: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2683"
+$as_echo "$at_srcdir/ovs-ofctl.at:2686: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2686"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2683"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2686"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61256,18 +61634,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2683" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2686" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2683: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2683"
+$as_echo "$at_srcdir/ovs-ofctl.at:2686: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2686"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2683"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2686"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61275,15 +61653,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2683: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2683"
+$as_echo "$at_srcdir/ovs-ofctl.at:2686: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2686"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2683"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2686"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61296,58 +61674,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2683" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2686" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_439
-#AT_START_440
-at_fn_group_banner 440 'ovs-ofctl.at:2689' \
+#AT_STOP_440
+#AT_START_441
+at_fn_group_banner 441 'ovs-ofctl.at:2692' \
   "ovs-ofctl dump-flows with sorting" "              " 22
 at_xfail=no
 (
-  $as_echo "440. $at_setup_line: testing $at_desc ..."
+  $as_echo "441. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2690: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2690"
+$as_echo "$at_srcdir/ovs-ofctl.at:2693: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2693"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2693"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2690: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2690"
+$as_echo "$at_srcdir/ovs-ofctl.at:2693: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2693"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2693"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2690: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2693: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2690"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2693"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -61356,37 +61734,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2693"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2690: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2690"
+$as_echo "$at_srcdir/ovs-ofctl.at:2693: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2693"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2693"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2690: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2690"
+$as_echo "$at_srcdir/ovs-ofctl.at:2693: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2693"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2693"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -61394,7 +61772,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2690: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2693: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -61407,7 +61785,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2690"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2693"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -61426,7 +61804,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2693"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61434,15 +61812,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2690: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2690"
+$as_echo "$at_srcdir/ovs-ofctl.at:2693: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2693"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2690"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2693"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61467,24 +61845,24 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2706: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0\""
-at_fn_check_prepare_trace "ovs-ofctl.at:2706"
+$as_echo "$at_srcdir/ovs-ofctl.at:2709: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0\""
+at_fn_check_prepare_trace "ovs-ofctl.at:2709"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=0,len=4}->tun_metadata0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2706"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2709"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2707: ovs-ofctl add-flows br0 allflows.txt
+$as_echo "$at_srcdir/ovs-ofctl.at:2710: ovs-ofctl add-flows br0 allflows.txt
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2707"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2710"
 ( $at_check_trace; ovs-ofctl add-flows br0 allflows.txt
 
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -61492,7 +61870,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2707"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2710"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61500,8 +61878,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2710: ovs-ofctl --sort dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2710"
+$as_echo "$at_srcdir/ovs-ofctl.at:2713: ovs-ofctl --sort dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2713"
 ( $at_check_trace; ovs-ofctl --sort dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61520,15 +61898,15 @@
  priority=11,tun_metadata0=0xcd actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2710"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2713"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2723: ovs-ofctl --rsort dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2723"
+$as_echo "$at_srcdir/ovs-ofctl.at:2726: ovs-ofctl --rsort dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2726"
 ( $at_check_trace; ovs-ofctl --rsort dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61547,15 +61925,15 @@
  priority=1,in_port=1026 actions=output:45
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2723"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2726"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2736: ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2736"
+$as_echo "$at_srcdir/ovs-ofctl.at:2739: ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2739"
 ( $at_check_trace; ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61574,15 +61952,15 @@
  priority=8,tcp,tp_src=5 actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2736"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2739"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2749: ovs-ofctl --rsort=in_port dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2749"
+$as_echo "$at_srcdir/ovs-ofctl.at:2752: ovs-ofctl --rsort=in_port dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2752"
 ( $at_check_trace; ovs-ofctl --rsort=in_port dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61601,15 +61979,15 @@
  priority=8,tcp,tp_src=5 actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2749"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2752"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2762: ovs-ofctl --sort=tcp_src dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2762"
+$as_echo "$at_srcdir/ovs-ofctl.at:2765: ovs-ofctl --sort=tcp_src dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2765"
 ( $at_check_trace; ovs-ofctl --sort=tcp_src dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61628,15 +62006,15 @@
  priority=1,in_port=1026 actions=output:45
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2762"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2765"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2775: ovs-ofctl --sort=in_port --sort=tcp_src --sort=tun_metadata0 dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2775"
+$as_echo "$at_srcdir/ovs-ofctl.at:2778: ovs-ofctl --sort=in_port --sort=tcp_src --sort=tun_metadata0 dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2778"
 ( $at_check_trace; ovs-ofctl --sort=in_port --sort=tcp_src --sort=tun_metadata0 dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61655,37 +62033,37 @@
  priority=11,tun_metadata0=0xcd actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2775"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2778"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2789: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2789"
+$as_echo "$at_srcdir/ovs-ofctl.at:2792: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2792"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2789"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2792"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2789: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2789"
+$as_echo "$at_srcdir/ovs-ofctl.at:2792: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2792"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2789"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2792"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61693,15 +62071,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2789: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2789"
+$as_echo "$at_srcdir/ovs-ofctl.at:2792: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2792"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2789"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2792"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61714,18 +62092,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2789" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2792" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2789: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2789"
+$as_echo "$at_srcdir/ovs-ofctl.at:2792: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2792"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2789"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2792"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61733,15 +62111,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2789: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2789"
+$as_echo "$at_srcdir/ovs-ofctl.at:2792: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2792"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2789"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2792"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61754,20 +62132,20 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2789" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2792" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_440
-#AT_START_441
-at_fn_group_banner 441 'ovs-ofctl.at:2792' \
+#AT_STOP_441
+#AT_START_442
+at_fn_group_banner 442 'ovs-ofctl.at:2795' \
   "ovs-ofctl dump-flows --names" "                   " 22
 at_xfail=no
 (
-  $as_echo "441. $at_setup_line: testing $at_desc ..."
+  $as_echo "442. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -61775,38 +62153,38 @@
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2794: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2794"
+$as_echo "$at_srcdir/ovs-ofctl.at:2797: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2797"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2794"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2797"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2794: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2794"
+$as_echo "$at_srcdir/ovs-ofctl.at:2797: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2797"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2794"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2797"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2794: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2797: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2794"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2797"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -61815,37 +62193,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2794"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2797"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2794: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2794"
+$as_echo "$at_srcdir/ovs-ofctl.at:2797: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2797"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2794"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2794: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2794"
+$as_echo "$at_srcdir/ovs-ofctl.at:2797: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2797"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2794"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -61853,7 +62231,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2794: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2797: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -61866,7 +62244,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2794"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2797"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -61885,7 +62263,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2794"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61893,14 +62271,14 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2794: add_of_br 0 \\
+$as_echo "$at_srcdir/ovs-ofctl.at:2797: add_of_br 0 \\
     -- add-port br0 xyzzy -- set Interface xyzzy type=dummy -- \\
     -- add-port br0 x-y -- set Interface x-y type=dummy -- \\
     -- add-port br0 abc123 -- set Interface abc123 type=dummy -- \\
     -- add-port br0 reallyverylongportname -- set Interface reallyverylongportname type=dummy -- \\
     -- add-port br0 conflictinglongportname1 -- set Interface conflictinglongportname1 type=dummy -- \\
     -- add-port br0 conflictinglongportname2 -- set Interface conflictinglongportname2 type=dummy "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2794"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2797"
 ( $at_check_trace; add_of_br 0 \
     -- add-port br0 xyzzy -- set Interface xyzzy type=dummy -- \
     -- add-port br0 x-y -- set Interface x-y type=dummy -- \
@@ -61913,7 +62291,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2794"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61923,15 +62301,15 @@
 
 # These plain port names should be accepted.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2803: ovs-ofctl add-flow br0 in_port=xyzzy,actions=x-y,abc123"
-at_fn_check_prepare_trace "ovs-ofctl.at:2803"
+$as_echo "$at_srcdir/ovs-ofctl.at:2806: ovs-ofctl add-flow br0 in_port=xyzzy,actions=x-y,abc123"
+at_fn_check_prepare_trace "ovs-ofctl.at:2806"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=xyzzy,actions=x-y,abc123
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2803"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2806"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61940,23 +62318,23 @@
 
 # reallyverylongportname is accepted truncated, but not in full.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2806: ovs-ofctl add-flow br0 in_port=reallyverylongp,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2806"
+$as_echo "$at_srcdir/ovs-ofctl.at:2809: ovs-ofctl add-flow br0 in_port=reallyverylongp,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2809"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=reallyverylongp,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2806"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2809"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2807: ovs-ofctl add-flow br0 in_port=reallyverylongportname,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2807"
+$as_echo "$at_srcdir/ovs-ofctl.at:2810: ovs-ofctl add-flow br0 in_port=reallyverylongportname,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2810"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=reallyverylongportname,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61965,7 +62343,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2807"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2810"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -61975,8 +62353,8 @@
 # conflictinglongportname1 and 2 can't be accepted even truncated, since
 # they conflict when truncated.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2813: ovs-ofctl add-flow br0 in_port=conflictinglongportname1,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2813"
+$as_echo "$at_srcdir/ovs-ofctl.at:2816: ovs-ofctl add-flow br0 in_port=conflictinglongportname1,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2816"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=conflictinglongportname1,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -61985,15 +62363,15 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2813"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2816"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2815: ovs-ofctl add-flow br0 in_port=conflictinglongportname2,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2815"
+$as_echo "$at_srcdir/ovs-ofctl.at:2818: ovs-ofctl add-flow br0 in_port=conflictinglongportname2,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2818"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=conflictinglongportname2,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -62002,15 +62380,15 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2815"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2818"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2817: ovs-ofctl add-flow br0 in_port=conflictinglong,actions=drop"
-at_fn_check_prepare_trace "ovs-ofctl.at:2817"
+$as_echo "$at_srcdir/ovs-ofctl.at:2820: ovs-ofctl add-flow br0 in_port=conflictinglong,actions=drop"
+at_fn_check_prepare_trace "ovs-ofctl.at:2820"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=conflictinglong,actions=drop
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -62019,7 +62397,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2817"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2820"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62029,8 +62407,8 @@
 # Show that the port names get displayed properly and that port names that
 # aren't alphanumeric get quoted.
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2822: ovs-ofctl --names dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2822"
+$as_echo "$at_srcdir/ovs-ofctl.at:2825: ovs-ofctl --names dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2825"
 ( $at_check_trace; ovs-ofctl --names dump-flows br0 | ofctl_strip | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -62040,37 +62418,37 @@
  in_port=xyzzy actions=output:\"x-y\",output:abc123
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2822"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2825"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2826: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2826"
+$as_echo "$at_srcdir/ovs-ofctl.at:2829: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2829"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2826"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2829"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2826: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2826"
+$as_echo "$at_srcdir/ovs-ofctl.at:2829: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2829"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2826"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2829"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62078,15 +62456,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2826: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2826"
+$as_echo "$at_srcdir/ovs-ofctl.at:2829: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2829"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2826"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2829"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62099,18 +62477,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2826" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2829" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2826: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2826"
+$as_echo "$at_srcdir/ovs-ofctl.at:2829: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2829"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2826"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2829"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62118,15 +62496,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2826: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2826"
+$as_echo "$at_srcdir/ovs-ofctl.at:2829: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2829"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2826"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2829"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62139,58 +62517,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2826" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2829" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_441
-#AT_START_442
-at_fn_group_banner 442 'ovs-ofctl.at:2829' \
+#AT_STOP_442
+#AT_START_443
+at_fn_group_banner 443 'ovs-ofctl.at:2832' \
   "ovs-ofctl diff-flows" "                           " 22
 at_xfail=no
 (
-  $as_echo "442. $at_setup_line: testing $at_desc ..."
+  $as_echo "443. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2830: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2830"
+$as_echo "$at_srcdir/ovs-ofctl.at:2833: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2833"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2830"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2830: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2830"
+$as_echo "$at_srcdir/ovs-ofctl.at:2833: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2833"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2830"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2830: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2833: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2830"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2833"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -62199,37 +62577,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2830"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2830: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2830"
+$as_echo "$at_srcdir/ovs-ofctl.at:2833: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2833"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2830"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2830: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2830"
+$as_echo "$at_srcdir/ovs-ofctl.at:2833: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2833"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2830"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -62237,7 +62615,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2830: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2833: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -62250,7 +62628,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2830"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2833"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -62269,7 +62647,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2830"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62277,15 +62655,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2830: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2830"
+$as_echo "$at_srcdir/ovs-ofctl.at:2833: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2833"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2830"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62296,15 +62674,15 @@
 # Add tons of flows to br0.
 for i in `seq 0 1023`; do echo "dl_vlan=$i,actions=drop"; done > add-flows.txt
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2834: ovs-ofctl add-flows br0 add-flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2834"
+$as_echo "$at_srcdir/ovs-ofctl.at:2837: ovs-ofctl add-flows br0 add-flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2837"
 ( $at_check_trace; ovs-ofctl add-flows br0 add-flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2834"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2837"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62314,30 +62692,30 @@
 # Dump them and compare against what we expect by hand, then with diff-flows.
 for i in `seq 0 1023`; do echo " dl_vlan=$i actions=drop"; done | sort > expout
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2838: ovs-ofctl dump-flows br0 | ofctl_strip | sed '/NXST_FLOW/d' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2838"
+$as_echo "$at_srcdir/ovs-ofctl.at:2841: ovs-ofctl dump-flows br0 | ofctl_strip | sed '/NXST_FLOW/d' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2841"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sed '/NXST_FLOW/d' | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2838"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2841"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2840: ovs-ofctl diff-flows br0 add-flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2840"
+$as_echo "$at_srcdir/ovs-ofctl.at:2843: ovs-ofctl diff-flows br0 add-flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2843"
 ( $at_check_trace; ovs-ofctl diff-flows br0 add-flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2840"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2843"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62347,15 +62725,15 @@
 # Remove even-numbered flows, compare again.
 for i in `seq 0 1023 2`; do echo "dl_vlan=$i"; done > del-flows.txt
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2844: ovs-ofctl del-flows br0 - < del-flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2844"
+$as_echo "$at_srcdir/ovs-ofctl.at:2847: ovs-ofctl del-flows br0 - < del-flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2847"
 ( $at_check_trace; ovs-ofctl del-flows br0 - < del-flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2844"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2847"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62363,15 +62741,15 @@
 
 for i in `seq 0 1023 2`; do echo "+dl_vlan=$i actions=drop"; done | sort > expout
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2846: ovs-ofctl diff-flows br0 add-flows.txt | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2846"
+$as_echo "$at_srcdir/ovs-ofctl.at:2849: ovs-ofctl diff-flows br0 add-flows.txt | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2849"
 ( $at_check_trace; ovs-ofctl diff-flows br0 add-flows.txt | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2846"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2849"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62379,15 +62757,15 @@
 
 for i in `seq 0 1023 2`; do echo "-dl_vlan=$i actions=drop"; done | sort > expout
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2848: ovs-ofctl diff-flows add-flows.txt br0 | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2848"
+$as_echo "$at_srcdir/ovs-ofctl.at:2851: ovs-ofctl diff-flows add-flows.txt br0 | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2851"
 ( $at_check_trace; ovs-ofctl diff-flows add-flows.txt br0 | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2848"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2851"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62395,30 +62773,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2850: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2850"
+$as_echo "$at_srcdir/ovs-ofctl.at:2853: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2853"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2850"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2853"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2850: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2850"
+$as_echo "$at_srcdir/ovs-ofctl.at:2853: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2853"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2850"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2853"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62426,15 +62804,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2850: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2850"
+$as_echo "$at_srcdir/ovs-ofctl.at:2853: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2853"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2850"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2853"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62447,18 +62825,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2850" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2853" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2850: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2850"
+$as_echo "$at_srcdir/ovs-ofctl.at:2853: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2853"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2850"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2853"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62466,15 +62844,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2850: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2850"
+$as_echo "$at_srcdir/ovs-ofctl.at:2853: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2853"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2850"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2853"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62487,58 +62865,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2850" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2853" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_442
-#AT_START_443
-at_fn_group_banner 443 'ovs-ofctl.at:2853' \
+#AT_STOP_443
+#AT_START_444
+at_fn_group_banner 444 'ovs-ofctl.at:2856' \
   "ovs-ofctl diff-flows - tunnel metadata" "         " 22
 at_xfail=no
 (
-  $as_echo "443. $at_setup_line: testing $at_desc ..."
+  $as_echo "444. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2854: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2854"
+$as_echo "$at_srcdir/ovs-ofctl.at:2857: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2857"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2854"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2857"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2854: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2854"
+$as_echo "$at_srcdir/ovs-ofctl.at:2857: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2857"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2854"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2857"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2854: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2857: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2854"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2857"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -62547,37 +62925,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2854"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2857"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2854: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2854"
+$as_echo "$at_srcdir/ovs-ofctl.at:2857: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2857"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2854"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2857"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2854: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2854"
+$as_echo "$at_srcdir/ovs-ofctl.at:2857: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2857"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2854"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2857"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -62585,7 +62963,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2854: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2857: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -62598,7 +62976,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2854"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2857"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -62617,7 +62995,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2854"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2857"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62625,15 +63003,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2854: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2854"
+$as_echo "$at_srcdir/ovs-ofctl.at:2857: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2857"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2854"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2857"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62642,15 +63020,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2856: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=8}->tun_metadata1\""
-at_fn_check_prepare_trace "ovs-ofctl.at:2856"
+$as_echo "$at_srcdir/ovs-ofctl.at:2859: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=8}->tun_metadata1\""
+at_fn_check_prepare_trace "ovs-ofctl.at:2859"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=8}->tun_metadata1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2856"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2859"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62675,23 +63053,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2873: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2873"
+$as_echo "$at_srcdir/ovs-ofctl.at:2876: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2876"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2873"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2876"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2874: ovs-ofctl diff-flows br0 flows2.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2874"
+$as_echo "$at_srcdir/ovs-ofctl.at:2877: ovs-ofctl diff-flows br0 flows2.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2877"
 ( $at_check_trace; ovs-ofctl diff-flows br0 flows2.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -62700,7 +63078,7 @@
 echo >>"$at_stdout"; $as_echo "-priority=1,tun_metadata0=0xabcd,tun_metadata1=0xef/0xff actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ovs-ofctl.at:2874"
+at_fn_check_status 2 $at_status "$at_srcdir/ovs-ofctl.at:2877"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62708,30 +63086,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2878: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2878"
+$as_echo "$at_srcdir/ovs-ofctl.at:2881: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2881"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2878"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2878: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2878"
+$as_echo "$at_srcdir/ovs-ofctl.at:2881: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2881"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2878"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62739,15 +63117,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2878: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2878"
+$as_echo "$at_srcdir/ovs-ofctl.at:2881: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2881"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2878"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62760,18 +63138,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2878" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2881" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2878: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2878"
+$as_echo "$at_srcdir/ovs-ofctl.at:2881: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2881"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2878"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62779,15 +63157,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2878: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2878"
+$as_echo "$at_srcdir/ovs-ofctl.at:2881: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2881"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2878"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2881"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62800,58 +63178,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2878" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2881" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_443
-#AT_START_444
-at_fn_group_banner 444 'ovs-ofctl.at:2889' \
+#AT_STOP_444
+#AT_START_445
+at_fn_group_banner 445 'ovs-ofctl.at:2892' \
   "ovs-ofctl diff-flows - suppress false differences" "" 22
 at_xfail=no
 (
-  $as_echo "444. $at_setup_line: testing $at_desc ..."
+  $as_echo "445. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2890: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2890"
+$as_echo "$at_srcdir/ovs-ofctl.at:2893: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2893"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2890"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2893"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2890: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2890"
+$as_echo "$at_srcdir/ovs-ofctl.at:2893: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2893"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2890"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2893"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2890: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2893: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2890"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2893"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -62860,37 +63238,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2890"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2893"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2890: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2890"
+$as_echo "$at_srcdir/ovs-ofctl.at:2893: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2893"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2890"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2890: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2890"
+$as_echo "$at_srcdir/ovs-ofctl.at:2893: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2893"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2890"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -62898,7 +63276,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2890: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2893: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -62911,7 +63289,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2890"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2893"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -62930,7 +63308,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2890"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62938,15 +63316,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2890: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:2890"
+$as_echo "$at_srcdir/ovs-ofctl.at:2893: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:2893"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2890"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2893"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -62958,53 +63336,53 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2893: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2893"
+$as_echo "$at_srcdir/ovs-ofctl.at:2896: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2896"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2893"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2896"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2894: ovs-ofctl diff-flows br0 flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2894"
+$as_echo "$at_srcdir/ovs-ofctl.at:2897: ovs-ofctl diff-flows br0 flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2897"
 ( $at_check_trace; ovs-ofctl diff-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2894"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2897"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2895: ovs-ofctl add-flow br0 idle_timeout=60,dl_vlan=9,actions=output:1"
-at_fn_check_prepare_trace "ovs-ofctl.at:2895"
+$as_echo "$at_srcdir/ovs-ofctl.at:2898: ovs-ofctl add-flow br0 idle_timeout=60,dl_vlan=9,actions=output:1"
+at_fn_check_prepare_trace "ovs-ofctl.at:2898"
 ( $at_check_trace; ovs-ofctl add-flow br0 idle_timeout=60,dl_vlan=9,actions=output:1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2895"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2898"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2896: ovs-ofctl diff-flows br0 flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2896"
+$as_echo "$at_srcdir/ovs-ofctl.at:2899: ovs-ofctl diff-flows br0 flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2899"
 ( $at_check_trace; ovs-ofctl diff-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63013,30 +63391,30 @@
 echo >>"$at_stdout"; $as_echo "-dl_vlan=9 idle_timeout=60 actions=output:1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ovs-ofctl.at:2896"
+at_fn_check_status 2 $at_status "$at_srcdir/ovs-ofctl.at:2899"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2899: ovs-ofctl add-flow br0 hard_timeout=120,cookie=1234,dl_vlan=9,actions=output:1"
-at_fn_check_prepare_trace "ovs-ofctl.at:2899"
+$as_echo "$at_srcdir/ovs-ofctl.at:2902: ovs-ofctl add-flow br0 hard_timeout=120,cookie=1234,dl_vlan=9,actions=output:1"
+at_fn_check_prepare_trace "ovs-ofctl.at:2902"
 ( $at_check_trace; ovs-ofctl add-flow br0 hard_timeout=120,cookie=1234,dl_vlan=9,actions=output:1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2899"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2902"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2900: ovs-ofctl diff-flows flows.txt br0"
-at_fn_check_prepare_trace "ovs-ofctl.at:2900"
+$as_echo "$at_srcdir/ovs-ofctl.at:2903: ovs-ofctl diff-flows flows.txt br0"
+at_fn_check_prepare_trace "ovs-ofctl.at:2903"
 ( $at_check_trace; ovs-ofctl diff-flows flows.txt br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63045,37 +63423,37 @@
 echo >>"$at_stdout"; $as_echo "+dl_vlan=9 cookie=0x4d2 hard_timeout=120 actions=output:1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 2 $at_status "$at_srcdir/ovs-ofctl.at:2900"
+at_fn_check_status 2 $at_status "$at_srcdir/ovs-ofctl.at:2903"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2903: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:2903"
+$as_echo "$at_srcdir/ovs-ofctl.at:2906: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:2906"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2903"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2906"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2903: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2903"
+$as_echo "$at_srcdir/ovs-ofctl.at:2906: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:2906"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2903"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2906"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63083,15 +63461,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2903: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:2903"
+$as_echo "$at_srcdir/ovs-ofctl.at:2906: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:2906"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2903"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2906"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63104,18 +63482,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2903" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2906" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2903: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2903"
+$as_echo "$at_srcdir/ovs-ofctl.at:2906: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:2906"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2903"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2906"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63123,15 +63501,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2903: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:2903"
+$as_echo "$at_srcdir/ovs-ofctl.at:2906: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:2906"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2903"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2906"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63144,27 +63522,27 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:2903" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:2906" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_444
-#AT_START_445
-at_fn_group_banner 445 'ovs-ofctl.at:2906' \
+#AT_STOP_445
+#AT_START_446
+at_fn_group_banner 446 'ovs-ofctl.at:2909' \
   "ovs-ofctl -F and -O interaction" "                " 22
 at_xfail=no
 (
-  $as_echo "445. $at_setup_line: testing $at_desc ..."
+  $as_echo "446. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2907: ovs-ofctl -F oxm -O openflow10"
-at_fn_check_prepare_trace "ovs-ofctl.at:2907"
+$as_echo "$at_srcdir/ovs-ofctl.at:2910: ovs-ofctl -F oxm -O openflow10"
+at_fn_check_prepare_trace "ovs-ofctl.at:2910"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow10
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63173,13 +63551,13 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2907"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2910"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2910: ovs-ofctl -F oxm -O openflow11"
-at_fn_check_prepare_trace "ovs-ofctl.at:2910"
+$as_echo "$at_srcdir/ovs-ofctl.at:2913: ovs-ofctl -F oxm -O openflow11"
+at_fn_check_prepare_trace "ovs-ofctl.at:2913"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow11
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63188,13 +63566,13 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2910"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2913"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2913: ovs-ofctl -F oxm -O openflow10,openflow11"
-at_fn_check_prepare_trace "ovs-ofctl.at:2913"
+$as_echo "$at_srcdir/ovs-ofctl.at:2916: ovs-ofctl -F oxm -O openflow10,openflow11"
+at_fn_check_prepare_trace "ovs-ofctl.at:2916"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow10,openflow11
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63203,13 +63581,13 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2913"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2916"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2916: ovs-ofctl -F oxm -O openflow10,openflow12"
-at_fn_check_prepare_trace "ovs-ofctl.at:2916"
+$as_echo "$at_srcdir/ovs-ofctl.at:2919: ovs-ofctl -F oxm -O openflow10,openflow12"
+at_fn_check_prepare_trace "ovs-ofctl.at:2919"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow10,openflow12
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63218,13 +63596,13 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2916"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2919"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2919: ovs-ofctl -F oxm -O openflow12"
-at_fn_check_prepare_trace "ovs-ofctl.at:2919"
+$as_echo "$at_srcdir/ovs-ofctl.at:2922: ovs-ofctl -F oxm -O openflow12"
+at_fn_check_prepare_trace "ovs-ofctl.at:2922"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow12
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63233,13 +63611,13 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2919"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2922"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2922: ovs-ofctl -F oxm -O openflow13"
-at_fn_check_prepare_trace "ovs-ofctl.at:2922"
+$as_echo "$at_srcdir/ovs-ofctl.at:2925: ovs-ofctl -F oxm -O openflow13"
+at_fn_check_prepare_trace "ovs-ofctl.at:2925"
 ( $at_check_trace; ovs-ofctl -F oxm -O openflow13
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63248,7 +63626,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2922"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2925"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -63257,34 +63635,34 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_445
-#AT_START_446
-at_fn_group_banner 446 'ovs-ofctl.at:2927' \
+#AT_STOP_446
+#AT_START_447
+at_fn_group_banner 447 'ovs-ofctl.at:2930' \
   "ovs-ofctl ofp-parse" "                            " 22
 at_xfail=no
 (
-  $as_echo "446. $at_setup_line: testing $at_desc ..."
+  $as_echo "447. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 # Test the echo request/reply messages (0 payload).
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2929: printf '\\1\\2\\0\\10\\0\\0\\0\\0\\1\\3\\0\\10\\0\\0\\0\\0' > binary_ofp_msg"
-at_fn_check_prepare_trace "ovs-ofctl.at:2929"
+$as_echo "$at_srcdir/ovs-ofctl.at:2932: printf '\\1\\2\\0\\10\\0\\0\\0\\0\\1\\3\\0\\10\\0\\0\\0\\0' > binary_ofp_msg"
+at_fn_check_prepare_trace "ovs-ofctl.at:2932"
 ( $at_check_trace; printf '\1\2\0\10\0\0\0\0\1\3\0\10\0\0\0\0' > binary_ofp_msg
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2929"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2932"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2930: ovs-ofctl ofp-parse binary_ofp_msg"
-at_fn_check_prepare_trace "ovs-ofctl.at:2930"
+$as_echo "$at_srcdir/ovs-ofctl.at:2933: ovs-ofctl ofp-parse binary_ofp_msg"
+at_fn_check_prepare_trace "ovs-ofctl.at:2933"
 ( $at_check_trace; ovs-ofctl ofp-parse binary_ofp_msg
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63294,28 +63672,28 @@
 OFPT_ECHO_REPLY (xid=0x0): 0 bytes of payload
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2930"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2933"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 # Test the hello (xid:1 3-byte payload).
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2936: printf '\\1\\0\\0\\13\\0\\0\\0\\1\\101\\102\\103' > binary_ofp_msg"
-at_fn_check_prepare_trace "ovs-ofctl.at:2936"
+$as_echo "$at_srcdir/ovs-ofctl.at:2939: printf '\\1\\0\\0\\13\\0\\0\\0\\1\\101\\102\\103' > binary_ofp_msg"
+at_fn_check_prepare_trace "ovs-ofctl.at:2939"
 ( $at_check_trace; printf '\1\0\0\13\0\0\0\1\101\102\103' > binary_ofp_msg
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2936"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2939"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2937: ovs-ofctl ofp-parse - < binary_ofp_msg"
-at_fn_check_prepare_trace "ovs-ofctl.at:2937"
+$as_echo "$at_srcdir/ovs-ofctl.at:2940: ovs-ofctl ofp-parse - < binary_ofp_msg"
+at_fn_check_prepare_trace "ovs-ofctl.at:2940"
 ( $at_check_trace; ovs-ofctl ofp-parse - < binary_ofp_msg
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63327,7 +63705,7 @@
 00000000  01 00 00 0b 00 00 00 01-41 42 43                |........ABC     |
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2937"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2940"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -63336,51 +63714,51 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_446
-#AT_START_447
-at_fn_group_banner 447 'ovs-ofctl.at:2945' \
+#AT_STOP_447
+#AT_START_448
+at_fn_group_banner 448 'ovs-ofctl.at:2948' \
   "tcp flags - filtering" "                          " 22
 at_xfail=no
 (
-  $as_echo "447. $at_setup_line: testing $at_desc ..."
+  $as_echo "448. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2946: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2946"
+$as_echo "$at_srcdir/ovs-ofctl.at:2949: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:2949"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2946"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2949"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2946: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2946"
+$as_echo "$at_srcdir/ovs-ofctl.at:2949: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:2949"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2946"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2949"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2946: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2949: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2946"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2949"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -63389,37 +63767,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2946"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2949"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2946: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:2946"
+$as_echo "$at_srcdir/ovs-ofctl.at:2949: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:2949"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2946"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2946: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:2946"
+$as_echo "$at_srcdir/ovs-ofctl.at:2949: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:2949"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2946"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -63427,7 +63805,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2946: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:2949: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -63440,7 +63818,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2946"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2949"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -63459,7 +63837,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2946"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63467,9 +63845,9 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2946: add_of_br 0 add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \\
+$as_echo "$at_srcdir/ovs-ofctl.at:2949: add_of_br 0 add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \\
                     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2946"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:2949"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=dummy ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -63477,7 +63855,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2946"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63496,15 +63874,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2958: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:2958"
+$as_echo "$at_srcdir/ovs-ofctl.at:2961: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:2961"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2958"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2961"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63512,8 +63890,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2960: ovs-ofctl add-flow br0 \"tcp,tcp_flags=+ack-ack,action=\""
-at_fn_check_prepare_trace "ovs-ofctl.at:2960"
+$as_echo "$at_srcdir/ovs-ofctl.at:2963: ovs-ofctl add-flow br0 \"tcp,tcp_flags=+ack-ack,action=\""
+at_fn_check_prepare_trace "ovs-ofctl.at:2963"
 ( $at_check_trace; ovs-ofctl add-flow br0 "tcp,tcp_flags=+ack-ack,action="
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63522,7 +63900,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2960"
+at_fn_check_status 1 $at_status "$at_srcdir/ovs-ofctl.at:2963"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63530,8 +63908,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2964: ovs-appctl dpif/show | tail -n +4"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2964"
+$as_echo "$at_srcdir/ovs-ofctl.at:2967: ovs-appctl dpif/show | tail -n +4"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:2967"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +4
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63541,7 +63919,7 @@
     p2 2/2: (dummy)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2964"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2967"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63549,23 +63927,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2970: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x002)'"
-at_fn_check_prepare_trace "ovs-ofctl.at:2970"
+$as_echo "$at_srcdir/ovs-ofctl.at:2973: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x002)'"
+at_fn_check_prepare_trace "ovs-ofctl.at:2973"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x002)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2970"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2973"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2971: tail -1 stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:2971"
+$as_echo "$at_srcdir/ovs-ofctl.at:2974: tail -1 stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:2974"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63574,7 +63952,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2971"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2974"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63582,23 +63960,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2976: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x110)'"
-at_fn_check_prepare_trace "ovs-ofctl.at:2976"
+$as_echo "$at_srcdir/ovs-ofctl.at:2979: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x110)'"
+at_fn_check_prepare_trace "ovs-ofctl.at:2979"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x110)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2976"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2977: tail -1 stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:2977"
+$as_echo "$at_srcdir/ovs-ofctl.at:2980: tail -1 stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:2980"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63607,7 +63985,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2977"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2980"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63615,23 +63993,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2982: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x104)'"
-at_fn_check_prepare_trace "ovs-ofctl.at:2982"
+$as_echo "$at_srcdir/ovs-ofctl.at:2985: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x104)'"
+at_fn_check_prepare_trace "ovs-ofctl.at:2985"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=80),tcp_flags(0x104)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2982"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2983: tail -1 stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:2983"
+$as_echo "$at_srcdir/ovs-ofctl.at:2986: tail -1 stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:2986"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63640,7 +64018,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2983"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2986"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63648,23 +64026,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2988: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x010)'"
-at_fn_check_prepare_trace "ovs-ofctl.at:2988"
+$as_echo "$at_srcdir/ovs-ofctl.at:2991: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x010)'"
+at_fn_check_prepare_trace "ovs-ofctl.at:2991"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x010)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2988"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2991"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2989: tail -1 stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:2989"
+$as_echo "$at_srcdir/ovs-ofctl.at:2992: tail -1 stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:2992"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63673,7 +64051,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2989"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2992"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63681,23 +64059,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2994: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x014)'"
-at_fn_check_prepare_trace "ovs-ofctl.at:2994"
+$as_echo "$at_srcdir/ovs-ofctl.at:2997: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x014)'"
+at_fn_check_prepare_trace "ovs-ofctl.at:2997"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0x014)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2994"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2997"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:2995: tail -1 stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:2995"
+$as_echo "$at_srcdir/ovs-ofctl.at:2998: tail -1 stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:2998"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63706,7 +64084,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: 1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2995"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:2998"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63714,23 +64092,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3000: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0xfeb)'"
-at_fn_check_prepare_trace "ovs-ofctl.at:3000"
+$as_echo "$at_srcdir/ovs-ofctl.at:3003: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0xfeb)'"
+at_fn_check_prepare_trace "ovs-ofctl.at:3003"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:07,dst=50:54:00:00:00:05),eth_type(0x0800),ipv4(src=192.168.0.2,dst=192.168.0.1,proto=6,tos=0,ttl=64,frag=no),tcp(src=80,dst=8),tcp_flags(0xfeb)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3000"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3003"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3001: tail -1 stdout"
-at_fn_check_prepare_trace "ovs-ofctl.at:3001"
+$as_echo "$at_srcdir/ovs-ofctl.at:3004: tail -1 stdout"
+at_fn_check_prepare_trace "ovs-ofctl.at:3004"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -63739,7 +64117,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3001"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3004"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63747,30 +64125,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3005: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:3005"
+$as_echo "$at_srcdir/ovs-ofctl.at:3008: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:3008"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3005"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3008"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3005: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3005"
+$as_echo "$at_srcdir/ovs-ofctl.at:3008: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3008"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3005"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3008"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63778,15 +64156,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3005: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:3005"
+$as_echo "$at_srcdir/ovs-ofctl.at:3008: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:3008"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3005"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3008"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63799,18 +64177,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3005" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3008" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3005: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3005"
+$as_echo "$at_srcdir/ovs-ofctl.at:3008: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3008"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3005"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3008"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63818,15 +64196,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3005: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:3005"
+$as_echo "$at_srcdir/ovs-ofctl.at:3008: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:3008"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3005"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3008"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63839,58 +64217,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3005" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3008" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_447
-#AT_START_448
-at_fn_group_banner 448 'ovs-ofctl.at:3014' \
+#AT_STOP_448
+#AT_START_449
+at_fn_group_banner 449 'ovs-ofctl.at:3017' \
   "ovs-ofctl rule with importance" "                 " 22
 at_xfail=no
 (
-  $as_echo "448. $at_setup_line: testing $at_desc ..."
+  $as_echo "449. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3015: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3015"
+$as_echo "$at_srcdir/ovs-ofctl.at:3018: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3018"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3015"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3015: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3015"
+$as_echo "$at_srcdir/ovs-ofctl.at:3018: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3018"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3015"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3015: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3018: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3015"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3018"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -63899,37 +64277,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3015"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3018"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3015: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:3015"
+$as_echo "$at_srcdir/ovs-ofctl.at:3018: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:3018"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3015"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3015: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:3015"
+$as_echo "$at_srcdir/ovs-ofctl.at:3018: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:3018"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3015"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -63937,7 +64315,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3015: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3018: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -63950,7 +64328,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3015"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3018"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -63969,7 +64347,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3015"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63977,15 +64355,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3015: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:3015"
+$as_echo "$at_srcdir/ovs-ofctl.at:3018: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:3018"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3015"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3018"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -63993,30 +64371,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3017: ovs-ofctl -O OpenFlow14 add-flow br0 priority=21,importance=21,actions=normal"
-at_fn_check_prepare_trace "ovs-ofctl.at:3017"
+$as_echo "$at_srcdir/ovs-ofctl.at:3020: ovs-ofctl -O OpenFlow14 add-flow br0 priority=21,importance=21,actions=normal"
+at_fn_check_prepare_trace "ovs-ofctl.at:3020"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 add-flow br0 priority=21,importance=21,actions=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3017"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3020"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3018: ovs-ofctl add-flow br0 priority=22,importance=22,actions=normal"
-at_fn_check_prepare_trace "ovs-ofctl.at:3018"
+$as_echo "$at_srcdir/ovs-ofctl.at:3021: ovs-ofctl add-flow br0 priority=22,importance=22,actions=normal"
+at_fn_check_prepare_trace "ovs-ofctl.at:3021"
 ( $at_check_trace; ovs-ofctl add-flow br0 priority=22,importance=22,actions=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3018"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3021"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64024,8 +64402,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3021: ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3021"
+$as_echo "$at_srcdir/ovs-ofctl.at:3024: ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3024"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -64035,7 +64413,7 @@
  reset_counts priority=22 actions=NORMAL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3021"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64043,8 +64421,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3027: ovs-ofctl dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3027"
+$as_echo "$at_srcdir/ovs-ofctl.at:3030: ovs-ofctl dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3030"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sed '/ST_FLOW reply/d' | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -64054,7 +64432,7 @@
  priority=22 actions=NORMAL
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3027"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3030"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64062,30 +64440,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3032: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:3032"
+$as_echo "$at_srcdir/ovs-ofctl.at:3035: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:3035"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3032"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3035"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3032: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3032"
+$as_echo "$at_srcdir/ovs-ofctl.at:3035: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3035"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3032"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3035"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64093,15 +64471,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3032: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:3032"
+$as_echo "$at_srcdir/ovs-ofctl.at:3035: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:3035"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3032"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3035"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64114,18 +64492,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3032" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3035" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3032: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3032"
+$as_echo "$at_srcdir/ovs-ofctl.at:3035: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3035"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3032"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3035"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64133,15 +64511,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3032: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:3032"
+$as_echo "$at_srcdir/ovs-ofctl.at:3035: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:3035"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3032"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3035"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64154,58 +64532,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3032" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3035" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_448
-#AT_START_449
-at_fn_group_banner 449 'ovs-ofctl.at:3041' \
+#AT_STOP_449
+#AT_START_450
+at_fn_group_banner 450 'ovs-ofctl.at:3044' \
   "ovs-ofctl replace-flows with importance" "        " 22
 at_xfail=no
 (
-  $as_echo "449. $at_setup_line: testing $at_desc ..."
+  $as_echo "450. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3042: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3042"
+$as_echo "$at_srcdir/ovs-ofctl.at:3045: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3045"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3045"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3042: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3042"
+$as_echo "$at_srcdir/ovs-ofctl.at:3045: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3045"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3045"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3042: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3045: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3042"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3045"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -64214,37 +64592,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3045"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3042: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:3042"
+$as_echo "$at_srcdir/ovs-ofctl.at:3045: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:3045"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3042: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:3042"
+$as_echo "$at_srcdir/ovs-ofctl.at:3045: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:3045"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -64252,7 +64630,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3042: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3045: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -64265,7 +64643,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3042"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3045"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -64284,7 +64662,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64292,15 +64670,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3042: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:3042"
+$as_echo "$at_srcdir/ovs-ofctl.at:3045: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:3045"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3042"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3045"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64310,15 +64688,15 @@
 
 for i in 1 2 3 4 5 6 7 8; do echo "dl_vlan=$i,importance=$i,actions=drop"; done > add-flows.txt
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3046: ovs-ofctl -O OpenFlow14 add-flows br0 add-flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:3046"
+$as_echo "$at_srcdir/ovs-ofctl.at:3049: ovs-ofctl -O OpenFlow14 add-flows br0 add-flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:3049"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 add-flows br0 add-flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3046"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3049"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64327,15 +64705,15 @@
 
 for i in 1 3 5 7; do echo " importance=`expr $i + 10`, dl_vlan=$i actions=drop"; done > replace-flows.txt
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3050: ovs-ofctl -O OpenFlow14 replace-flows br0 replace-flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:3050"
+$as_echo "$at_srcdir/ovs-ofctl.at:3053: ovs-ofctl -O OpenFlow14 replace-flows br0 replace-flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:3053"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 replace-flows br0 replace-flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3050"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3053"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64344,15 +64722,15 @@
 
 cat replace-flows.txt > expout
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3054: ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3054"
+$as_echo "$at_srcdir/ovs-ofctl.at:3057: ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3057"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3054"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3057"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64360,30 +64738,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3057: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:3057"
+$as_echo "$at_srcdir/ovs-ofctl.at:3060: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:3060"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3057"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3057: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3057"
+$as_echo "$at_srcdir/ovs-ofctl.at:3060: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3060"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3057"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64391,15 +64769,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3057: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:3057"
+$as_echo "$at_srcdir/ovs-ofctl.at:3060: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:3060"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3057"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64412,18 +64790,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3057" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3060" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3057: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3057"
+$as_echo "$at_srcdir/ovs-ofctl.at:3060: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3060"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3057"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64431,15 +64809,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3057: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:3057"
+$as_echo "$at_srcdir/ovs-ofctl.at:3060: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:3060"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3057"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3060"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64452,58 +64830,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3057" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3060" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_449
-#AT_START_450
-at_fn_group_banner 450 'ovs-ofctl.at:3060' \
+#AT_STOP_450
+#AT_START_451
+at_fn_group_banner 451 'ovs-ofctl.at:3063' \
   "ovs-ofctl replace-flows with --bundle" "          " 22
 at_xfail=no
 (
-  $as_echo "450. $at_setup_line: testing $at_desc ..."
+  $as_echo "451. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3061: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3061"
+$as_echo "$at_srcdir/ovs-ofctl.at:3064: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3064"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3061"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3064"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3061: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3061"
+$as_echo "$at_srcdir/ovs-ofctl.at:3064: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3064"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3061"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3064"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3061: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3064: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3061"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3064"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -64512,37 +64890,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3061"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3064"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3061: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:3061"
+$as_echo "$at_srcdir/ovs-ofctl.at:3064: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:3064"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3061"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3064"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3061: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:3061"
+$as_echo "$at_srcdir/ovs-ofctl.at:3064: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:3064"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3061"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3064"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -64550,7 +64928,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3061: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3064: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -64563,7 +64941,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3061"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3064"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -64582,7 +64960,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3061"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3064"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64590,15 +64968,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3061: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:3061"
+$as_echo "$at_srcdir/ovs-ofctl.at:3064: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:3064"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3061"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3064"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64607,15 +64985,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3063: ovs-appctl vlog/set vconn:dbg"
-at_fn_check_prepare_trace "ovs-ofctl.at:3063"
+$as_echo "$at_srcdir/ovs-ofctl.at:3066: ovs-appctl vlog/set vconn:dbg"
+at_fn_check_prepare_trace "ovs-ofctl.at:3066"
 ( $at_check_trace; ovs-appctl vlog/set vconn:dbg
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3063"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3066"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64624,15 +65002,15 @@
 
 for i in 1 2 3 4 5 6 7 8; do echo "table=$i,dl_vlan=$i,importance=$i,actions=drop"; done > add-flows.txt
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3067: ovs-ofctl --bundle --no-names add-flows br0 add-flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:3067"
+$as_echo "$at_srcdir/ovs-ofctl.at:3070: ovs-ofctl --bundle --no-names add-flows br0 add-flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:3070"
 ( $at_check_trace; ovs-ofctl --bundle --no-names add-flows br0 add-flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3067"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3070"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64641,15 +65019,15 @@
 
 for i in 1 3 5 7; do echo " table=$i, importance=`expr $i + 10`, dl_vlan=$i actions=drop"; done > replace-flows.txt
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3071: ovs-ofctl --bundle --no-names replace-flows br0 replace-flows.txt"
-at_fn_check_prepare_trace "ovs-ofctl.at:3071"
+$as_echo "$at_srcdir/ovs-ofctl.at:3074: ovs-ofctl --bundle --no-names replace-flows br0 replace-flows.txt"
+at_fn_check_prepare_trace "ovs-ofctl.at:3074"
 ( $at_check_trace; ovs-ofctl --bundle --no-names replace-flows br0 replace-flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3071"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3074"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64658,15 +65036,15 @@
 
 cat replace-flows.txt > expout
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3075: ovs-ofctl -O OpenFlow14 --no-names dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3075"
+$as_echo "$at_srcdir/ovs-ofctl.at:3078: ovs-ofctl -O OpenFlow14 --no-names dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3078"
 ( $at_check_trace; ovs-ofctl -O OpenFlow14 --no-names dump-flows br0 | ofctl_strip | sed '/OFPST_FLOW/d' | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3075"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3078"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64681,12 +65059,12 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3080" "until vconn_sub < ovs-vswitchd.log | test \`grep -- \"|vconn|DBG|unix: sent (Success): OFPST_FLOW reply\" | wc -l\` -ge 2"
+ovs_wait "ovs-ofctl.at:3083" "until vconn_sub < ovs-vswitchd.log | test \`grep -- \"|vconn|DBG|unix: sent (Success): OFPST_FLOW reply\" | wc -l\` -ge 2"
 
 # AT_CHECK([sed -n "s/^.*\(|vconn|DBG|.*xid=.*:\).*$/\1/p" ovs-vswitchd.log], [0], [dnl
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3082: print_vconn_debug | vconn_sub | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3082"
+$as_echo "$at_srcdir/ovs-ofctl.at:3085: print_vconn_debug | vconn_sub | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3085"
 ( $at_check_trace; print_vconn_debug | vconn_sub | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -64793,7 +65171,7 @@
  table=7, importance=17, dl_vlan=7 actions=drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3082"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3085"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64801,30 +65179,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3184: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:3184"
+$as_echo "$at_srcdir/ovs-ofctl.at:3187: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:3187"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3184"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3184: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3184"
+$as_echo "$at_srcdir/ovs-ofctl.at:3187: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3187"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3184"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64832,15 +65210,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3184: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:3184"
+$as_echo "$at_srcdir/ovs-ofctl.at:3187: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:3187"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3184"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64853,18 +65231,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3184" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3187" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3184: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3184"
+$as_echo "$at_srcdir/ovs-ofctl.at:3187: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3187"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3184"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64872,15 +65250,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3184: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:3184"
+$as_echo "$at_srcdir/ovs-ofctl.at:3187: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:3187"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3184"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -64893,58 +65271,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3184" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3187" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_450
-#AT_START_451
-at_fn_group_banner 451 'ovs-ofctl.at:3188' \
+#AT_STOP_451
+#AT_START_452
+at_fn_group_banner 452 'ovs-ofctl.at:3191' \
   "ovs-ofctl ct-flush-zone" "                        " 22
 at_xfail=no
 (
-  $as_echo "451. $at_setup_line: testing $at_desc ..."
+  $as_echo "452. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3189: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3189"
+$as_echo "$at_srcdir/ovs-ofctl.at:3192: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3192"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3189"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3192"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3189: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3189"
+$as_echo "$at_srcdir/ovs-ofctl.at:3192: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3192"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3189"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3192"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3189: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3192: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3189"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3192"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -64953,37 +65331,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3189"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3192"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3189: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:3189"
+$as_echo "$at_srcdir/ovs-ofctl.at:3192: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:3192"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3189"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3192"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3189: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:3189"
+$as_echo "$at_srcdir/ovs-ofctl.at:3192: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:3192"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3189"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3192"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -64991,7 +65369,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3189: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3192: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -65004,7 +65382,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3189"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3192"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -65023,7 +65401,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3189"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3192"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65031,15 +65409,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3189: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:3189"
+$as_echo "$at_srcdir/ovs-ofctl.at:3192: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:3192"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3189"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3192"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65048,30 +65426,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3191: ovs-appctl vlog/set ct_dpif:dbg"
-at_fn_check_prepare_trace "ovs-ofctl.at:3191"
+$as_echo "$at_srcdir/ovs-ofctl.at:3194: ovs-appctl vlog/set ct_dpif:dbg"
+at_fn_check_prepare_trace "ovs-ofctl.at:3194"
 ( $at_check_trace; ovs-appctl vlog/set ct_dpif:dbg
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3191"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3194"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3192: ovs-ofctl ct-flush-zone br0 123"
-at_fn_check_prepare_trace "ovs-ofctl.at:3192"
+$as_echo "$at_srcdir/ovs-ofctl.at:3195: ovs-ofctl ct-flush-zone br0 123"
+at_fn_check_prepare_trace "ovs-ofctl.at:3195"
 ( $at_check_trace; ovs-ofctl ct-flush-zone br0 123
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3192"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3195"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65085,18 +65463,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3194" "until grep -q \"|ct_dpif|DBG|.*ct_flush:\" ovs-vswitchd.log"
+ovs_wait "ovs-ofctl.at:3197" "until grep -q \"|ct_dpif|DBG|.*ct_flush:\" ovs-vswitchd.log"
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3195: grep -q \"ct_dpif|DBG|.*ct_flush: zone 123\" ovs-vswitchd.log"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3195"
+$as_echo "$at_srcdir/ovs-ofctl.at:3198: grep -q \"ct_dpif|DBG|.*ct_flush: zone 123\" ovs-vswitchd.log"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovs-ofctl.at:3198"
 ( $at_check_trace; grep -q "ct_dpif|DBG|.*ct_flush: zone 123" ovs-vswitchd.log
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3195"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3198"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65104,30 +65482,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3197: check_logs "
-at_fn_check_prepare_trace "ovs-ofctl.at:3197"
+$as_echo "$at_srcdir/ovs-ofctl.at:3200: check_logs "
+at_fn_check_prepare_trace "ovs-ofctl.at:3200"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3197"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3197: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3197"
+$as_echo "$at_srcdir/ovs-ofctl.at:3200: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3200"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3197"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65135,15 +65513,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3197: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:3197"
+$as_echo "$at_srcdir/ovs-ofctl.at:3200: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:3200"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3197"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65156,18 +65534,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3197" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3200" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3197: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3197"
+$as_echo "$at_srcdir/ovs-ofctl.at:3200: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3200"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3197"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65175,15 +65553,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3197: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:3197"
+$as_echo "$at_srcdir/ovs-ofctl.at:3200: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:3200"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3197"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3200"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65196,58 +65574,58 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3197" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3200" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_451
-#AT_START_452
-at_fn_group_banner 452 'ovs-ofctl.at:3201' \
+#AT_STOP_452
+#AT_START_453
+at_fn_group_banner 453 'ovs-ofctl.at:3204' \
   "ovs-ofctl snoop" "                                " 22
 at_xfail=no
 (
-  $as_echo "452. $at_setup_line: testing $at_desc ..."
+  $as_echo "453. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3202: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3202"
+$as_echo "$at_srcdir/ovs-ofctl.at:3205: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "ovs-ofctl.at:3205"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3202"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3205"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3202: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3202"
+$as_echo "$at_srcdir/ovs-ofctl.at:3205: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "ovs-ofctl.at:3205"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3202"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3205"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3202: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3205: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3202"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3205"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -65256,37 +65634,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3202"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3205"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3202: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "ovs-ofctl.at:3202"
+$as_echo "$at_srcdir/ovs-ofctl.at:3205: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "ovs-ofctl.at:3205"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3202"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3205"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3202: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "ovs-ofctl.at:3202"
+$as_echo "$at_srcdir/ovs-ofctl.at:3205: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "ovs-ofctl.at:3205"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3202"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3205"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -65294,7 +65672,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3202: sed < stderr '
+$as_echo "$at_srcdir/ovs-ofctl.at:3205: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -65307,7 +65685,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3202"
+at_fn_check_prepare_notrace 'an embedded newline' "ovs-ofctl.at:3205"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -65326,7 +65704,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3202"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3205"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65334,15 +65712,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3202: add_of_br 0  "
-at_fn_check_prepare_trace "ovs-ofctl.at:3202"
+$as_echo "$at_srcdir/ovs-ofctl.at:3205: add_of_br 0  "
+at_fn_check_prepare_trace "ovs-ofctl.at:3205"
 ( $at_check_trace; add_of_br 0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3202"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3205"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65351,15 +65729,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3205: ovs-vsctl -vsyslog:off set-controller br0 unix:testcontroller"
-at_fn_check_prepare_trace "ovs-ofctl.at:3205"
+$as_echo "$at_srcdir/ovs-ofctl.at:3208: ovs-vsctl -vsyslog:off set-controller br0 unix:testcontroller"
+at_fn_check_prepare_trace "ovs-ofctl.at:3208"
 ( $at_check_trace; ovs-vsctl -vsyslog:off set-controller br0 unix:testcontroller
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3205"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65368,15 +65746,15 @@
 
 on_exit 'kill `cat ovs-ofctl-snoop.pid`'
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3209: ovs-ofctl -vsyslog:off --detach --no-chdir --pidfile=ovs-ofctl-snoop.pid snoop br0 > snoopbr0.txt 2>&1"
-at_fn_check_prepare_trace "ovs-ofctl.at:3209"
+$as_echo "$at_srcdir/ovs-ofctl.at:3212: ovs-ofctl -vsyslog:off --detach --no-chdir --pidfile=ovs-ofctl-snoop.pid snoop br0 > snoopbr0.txt 2>&1"
+at_fn_check_prepare_trace "ovs-ofctl.at:3212"
 ( $at_check_trace; ovs-ofctl -vsyslog:off --detach --no-chdir --pidfile=ovs-ofctl-snoop.pid snoop br0 > snoopbr0.txt 2>&1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3209"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65385,15 +65763,15 @@
 
 on_exit 'kill `cat ovs-testcontroller.pid`'
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3213: ovs-testcontroller -vsyslog:off --detach --no-chdir --pidfile punix:testcontroller"
-at_fn_check_prepare_trace "ovs-ofctl.at:3213"
+$as_echo "$at_srcdir/ovs-ofctl.at:3216: ovs-testcontroller -vsyslog:off --detach --no-chdir --pidfile punix:testcontroller"
+at_fn_check_prepare_trace "ovs-ofctl.at:3216"
 ( $at_check_trace; ovs-testcontroller -vsyslog:off --detach --no-chdir --pidfile punix:testcontroller
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3213"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3216"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65406,7 +65784,7 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3214" "until test -e testcontroller"
+ovs_wait "ovs-ofctl.at:3217" "until test -e testcontroller"
 
 
 ovs_wait_cond () {
@@ -65416,7 +65794,7 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3217" "until egrep \"OFPT_FEATURES_REQUEST\" snoopbr0.txt >/dev/null 2>&1"
+ovs_wait "ovs-ofctl.at:3220" "until egrep \"OFPT_FEATURES_REQUEST\" snoopbr0.txt >/dev/null 2>&1"
 
 ovs_wait_cond () {
     egrep "OFPT_FEATURES_REPLY" snoopbr0.txt >/dev/null 2>&1
@@ -65425,7 +65803,7 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3218" "until egrep \"OFPT_FEATURES_REPLY\" snoopbr0.txt >/dev/null 2>&1"
+ovs_wait "ovs-ofctl.at:3221" "until egrep \"OFPT_FEATURES_REPLY\" snoopbr0.txt >/dev/null 2>&1"
 
 ovs_wait_cond () {
     egrep "OFPT_SET_CONFIG" snoopbr0.txt >/dev/null 2>&1
@@ -65434,34 +65812,34 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3219" "until egrep \"OFPT_SET_CONFIG\" snoopbr0.txt >/dev/null 2>&1"
+ovs_wait "ovs-ofctl.at:3222" "until egrep \"OFPT_SET_CONFIG\" snoopbr0.txt >/dev/null 2>&1"
 
 
 { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3224: check_logs \"/connection failed (No such file or directory)/d\""
-at_fn_check_prepare_trace "ovs-ofctl.at:3224"
+$as_echo "$at_srcdir/ovs-ofctl.at:3227: check_logs \"/connection failed (No such file or directory)/d\""
+at_fn_check_prepare_trace "ovs-ofctl.at:3227"
 ( $at_check_trace; check_logs "/connection failed (No such file or directory)/d"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3224"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3224: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3224"
+$as_echo "$at_srcdir/ovs-ofctl.at:3227: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "ovs-ofctl.at:3227"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3224"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65469,15 +65847,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3224: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "ovs-ofctl.at:3224"
+$as_echo "$at_srcdir/ovs-ofctl.at:3227: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "ovs-ofctl.at:3227"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3224"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65490,18 +65868,18 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3224" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3227" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3224: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3224"
+$as_echo "$at_srcdir/ovs-ofctl.at:3227: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "ovs-ofctl.at:3227"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3224"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65509,15 +65887,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovs-ofctl.at:3224: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "ovs-ofctl.at:3224"
+$as_echo "$at_srcdir/ovs-ofctl.at:3227: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "ovs-ofctl.at:3227"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3224"
+at_fn_check_status 0 $at_status "$at_srcdir/ovs-ofctl.at:3227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -65530,35 +65908,17 @@
     :
 
 }
-ovs_wait "ovs-ofctl.at:3224" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovs-ofctl.at:3227" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_452
-#AT_START_453
-at_fn_group_banner 453 'fuzz-regression-list.at:1' \
-  "fuzz regression - flow_extract_fuzzer-5112775280951296" "" 23
-at_xfail=no
-(
-  $as_echo "453. $at_setup_line: testing $at_desc ..."
-  $at_traceon
-
-ovs_init
-
-   test_fuzz_regression flow_extract_fuzzer-5112775280951296
-   ovs_cleanup
-$as_echo "$at_setup_line" >"$at_check_line_file"
-  set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
 #AT_STOP_453
 #AT_START_454
-at_fn_group_banner 454 'fuzz-regression-list.at:2' \
-  "fuzz regression - flow_extract_fuzzer-5457710546944000" "" 23
+at_fn_group_banner 454 'fuzz-regression-list.at:1' \
+  "fuzz regression - flow_extract_fuzzer-5112775280951296" "" 23
 at_xfail=no
 (
   $as_echo "454. $at_setup_line: testing $at_desc ..."
@@ -65566,7 +65926,7 @@
 
 ovs_init
 
-   test_fuzz_regression flow_extract_fuzzer-5457710546944000
+   test_fuzz_regression flow_extract_fuzzer-5112775280951296
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65575,8 +65935,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_454
 #AT_START_455
-at_fn_group_banner 455 'fuzz-regression-list.at:3' \
-  "fuzz regression - json_parser_fuzzer-4790908707930112" "" 23
+at_fn_group_banner 455 'fuzz-regression-list.at:2' \
+  "fuzz regression - flow_extract_fuzzer-5457710546944000" "" 23
 at_xfail=no
 (
   $as_echo "455. $at_setup_line: testing $at_desc ..."
@@ -65584,7 +65944,7 @@
 
 ovs_init
 
-   test_fuzz_regression json_parser_fuzzer-4790908707930112
+   test_fuzz_regression flow_extract_fuzzer-5457710546944000
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65593,8 +65953,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_455
 #AT_START_456
-at_fn_group_banner 456 'fuzz-regression-list.at:4' \
-  "fuzz regression - ofp_print_fuzzer-4584019764183040" "" 23
+at_fn_group_banner 456 'fuzz-regression-list.at:3' \
+  "fuzz regression - json_parser_fuzzer-4790908707930112" "" 23
 at_xfail=no
 (
   $as_echo "456. $at_setup_line: testing $at_desc ..."
@@ -65602,7 +65962,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-4584019764183040
+   test_fuzz_regression json_parser_fuzzer-4790908707930112
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65611,8 +65971,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_456
 #AT_START_457
-at_fn_group_banner 457 'fuzz-regression-list.at:5' \
-  "fuzz regression - ofp_print_fuzzer-4730143510626304" "" 23
+at_fn_group_banner 457 'fuzz-regression-list.at:4' \
+  "fuzz regression - ofp_print_fuzzer-4584019764183040" "" 23
 at_xfail=no
 (
   $as_echo "457. $at_setup_line: testing $at_desc ..."
@@ -65620,7 +65980,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-4730143510626304
+   test_fuzz_regression ofp_print_fuzzer-4584019764183040
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65629,8 +65989,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_457
 #AT_START_458
-at_fn_group_banner 458 'fuzz-regression-list.at:6' \
-  "fuzz regression - ofp_print_fuzzer-4854119633256448" "" 23
+at_fn_group_banner 458 'fuzz-regression-list.at:5' \
+  "fuzz regression - ofp_print_fuzzer-4730143510626304" "" 23
 at_xfail=no
 (
   $as_echo "458. $at_setup_line: testing $at_desc ..."
@@ -65638,7 +65998,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-4854119633256448
+   test_fuzz_regression ofp_print_fuzzer-4730143510626304
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65647,8 +66007,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_458
 #AT_START_459
-at_fn_group_banner 459 'fuzz-regression-list.at:7' \
-  "fuzz regression - ofp_print_fuzzer-5070973479944192" "" 23
+at_fn_group_banner 459 'fuzz-regression-list.at:6' \
+  "fuzz regression - ofp_print_fuzzer-4854119633256448" "" 23
 at_xfail=no
 (
   $as_echo "459. $at_setup_line: testing $at_desc ..."
@@ -65656,7 +66016,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5070973479944192
+   test_fuzz_regression ofp_print_fuzzer-4854119633256448
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65665,8 +66025,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_459
 #AT_START_460
-at_fn_group_banner 460 'fuzz-regression-list.at:8' \
-  "fuzz regression - ofp_print_fuzzer-5072291707748352" "" 23
+at_fn_group_banner 460 'fuzz-regression-list.at:7' \
+  "fuzz regression - ofp_print_fuzzer-5070973479944192" "" 23
 at_xfail=no
 (
   $as_echo "460. $at_setup_line: testing $at_desc ..."
@@ -65674,7 +66034,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5072291707748352
+   test_fuzz_regression ofp_print_fuzzer-5070973479944192
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65683,8 +66043,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_460
 #AT_START_461
-at_fn_group_banner 461 'fuzz-regression-list.at:9' \
-  "fuzz regression - ofp_print_fuzzer-5147430386401280" "" 23
+at_fn_group_banner 461 'fuzz-regression-list.at:8' \
+  "fuzz regression - ofp_print_fuzzer-5072291707748352" "" 23
 at_xfail=no
 (
   $as_echo "461. $at_setup_line: testing $at_desc ..."
@@ -65692,7 +66052,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5147430386401280
+   test_fuzz_regression ofp_print_fuzzer-5072291707748352
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65701,8 +66061,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_461
 #AT_START_462
-at_fn_group_banner 462 'fuzz-regression-list.at:10' \
-  "fuzz regression - ofp_print_fuzzer-5168455220199424" "" 23
+at_fn_group_banner 462 'fuzz-regression-list.at:9' \
+  "fuzz regression - ofp_print_fuzzer-5147430386401280" "" 23
 at_xfail=no
 (
   $as_echo "462. $at_setup_line: testing $at_desc ..."
@@ -65710,7 +66070,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5168455220199424
+   test_fuzz_regression ofp_print_fuzzer-5147430386401280
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65719,8 +66079,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_462
 #AT_START_463
-at_fn_group_banner 463 'fuzz-regression-list.at:11' \
-  "fuzz regression - ofp_print_fuzzer-5190507327127552" "" 23
+at_fn_group_banner 463 'fuzz-regression-list.at:10' \
+  "fuzz regression - ofp_print_fuzzer-5168455220199424" "" 23
 at_xfail=no
 (
   $as_echo "463. $at_setup_line: testing $at_desc ..."
@@ -65728,7 +66088,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5190507327127552
+   test_fuzz_regression ofp_print_fuzzer-5168455220199424
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65737,8 +66097,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_463
 #AT_START_464
-at_fn_group_banner 464 'fuzz-regression-list.at:12' \
-  "fuzz regression - ofp_print_fuzzer-5204186701496320" "" 23
+at_fn_group_banner 464 'fuzz-regression-list.at:11' \
+  "fuzz regression - ofp_print_fuzzer-5190507327127552" "" 23
 at_xfail=no
 (
   $as_echo "464. $at_setup_line: testing $at_desc ..."
@@ -65746,7 +66106,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5204186701496320
+   test_fuzz_regression ofp_print_fuzzer-5190507327127552
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65755,8 +66115,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_464
 #AT_START_465
-at_fn_group_banner 465 'fuzz-regression-list.at:13' \
-  "fuzz regression - ofp_print_fuzzer-5394482341085184" "" 23
+at_fn_group_banner 465 'fuzz-regression-list.at:12' \
+  "fuzz regression - ofp_print_fuzzer-5204186701496320" "" 23
 at_xfail=no
 (
   $as_echo "465. $at_setup_line: testing $at_desc ..."
@@ -65764,7 +66124,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5394482341085184
+   test_fuzz_regression ofp_print_fuzzer-5204186701496320
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65773,8 +66133,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_465
 #AT_START_466
-at_fn_group_banner 466 'fuzz-regression-list.at:14' \
-  "fuzz regression - ofp_print_fuzzer-5395207246839808" "" 23
+at_fn_group_banner 466 'fuzz-regression-list.at:13' \
+  "fuzz regression - ofp_print_fuzzer-5394482341085184" "" 23
 at_xfail=no
 (
   $as_echo "466. $at_setup_line: testing $at_desc ..."
@@ -65782,7 +66142,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5395207246839808
+   test_fuzz_regression ofp_print_fuzzer-5394482341085184
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65791,8 +66151,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_466
 #AT_START_467
-at_fn_group_banner 467 'fuzz-regression-list.at:15' \
-  "fuzz regression - ofp_print_fuzzer-5647458888581120" "" 23
+at_fn_group_banner 467 'fuzz-regression-list.at:14' \
+  "fuzz regression - ofp_print_fuzzer-5395207246839808" "" 23
 at_xfail=no
 (
   $as_echo "467. $at_setup_line: testing $at_desc ..."
@@ -65800,7 +66160,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5647458888581120
+   test_fuzz_regression ofp_print_fuzzer-5395207246839808
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65809,8 +66169,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_467
 #AT_START_468
-at_fn_group_banner 468 'fuzz-regression-list.at:16' \
-  "fuzz regression - ofp_print_fuzzer-5674119268925440" "" 23
+at_fn_group_banner 468 'fuzz-regression-list.at:15' \
+  "fuzz regression - ofp_print_fuzzer-5647458888581120" "" 23
 at_xfail=no
 (
   $as_echo "468. $at_setup_line: testing $at_desc ..."
@@ -65818,7 +66178,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5674119268925440
+   test_fuzz_regression ofp_print_fuzzer-5647458888581120
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65827,8 +66187,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_468
 #AT_START_469
-at_fn_group_banner 469 'fuzz-regression-list.at:17' \
-  "fuzz regression - ofp_print_fuzzer-5674419757252608" "" 23
+at_fn_group_banner 469 'fuzz-regression-list.at:16' \
+  "fuzz regression - ofp_print_fuzzer-5674119268925440" "" 23
 at_xfail=no
 (
   $as_echo "469. $at_setup_line: testing $at_desc ..."
@@ -65836,7 +66196,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5674419757252608
+   test_fuzz_regression ofp_print_fuzzer-5674119268925440
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65845,8 +66205,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_469
 #AT_START_470
-at_fn_group_banner 470 'fuzz-regression-list.at:18' \
-  "fuzz regression - ofp_print_fuzzer-5677588436484096" "" 23
+at_fn_group_banner 470 'fuzz-regression-list.at:17' \
+  "fuzz regression - ofp_print_fuzzer-5674419757252608" "" 23
 at_xfail=no
 (
   $as_echo "470. $at_setup_line: testing $at_desc ..."
@@ -65854,7 +66214,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5677588436484096
+   test_fuzz_regression ofp_print_fuzzer-5674419757252608
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65863,8 +66223,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_470
 #AT_START_471
-at_fn_group_banner 471 'fuzz-regression-list.at:19' \
-  "fuzz regression - ofp_print_fuzzer-5706562554298368" "" 23
+at_fn_group_banner 471 'fuzz-regression-list.at:18' \
+  "fuzz regression - ofp_print_fuzzer-5677588436484096" "" 23
 at_xfail=no
 (
   $as_echo "471. $at_setup_line: testing $at_desc ..."
@@ -65872,7 +66232,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5706562554298368
+   test_fuzz_regression ofp_print_fuzzer-5677588436484096
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65881,8 +66241,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_471
 #AT_START_472
-at_fn_group_banner 472 'fuzz-regression-list.at:20' \
-  "fuzz regression - ofp_print_fuzzer-5722747668791296" "" 23
+at_fn_group_banner 472 'fuzz-regression-list.at:19' \
+  "fuzz regression - ofp_print_fuzzer-5706562554298368" "" 23
 at_xfail=no
 (
   $as_echo "472. $at_setup_line: testing $at_desc ..."
@@ -65890,7 +66250,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-5722747668791296
+   test_fuzz_regression ofp_print_fuzzer-5706562554298368
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65899,8 +66259,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_472
 #AT_START_473
-at_fn_group_banner 473 'fuzz-regression-list.at:21' \
-  "fuzz regression - ofp_print_fuzzer-6285128790704128" "" 23
+at_fn_group_banner 473 'fuzz-regression-list.at:20' \
+  "fuzz regression - ofp_print_fuzzer-5722747668791296" "" 23
 at_xfail=no
 (
   $as_echo "473. $at_setup_line: testing $at_desc ..."
@@ -65908,7 +66268,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-6285128790704128
+   test_fuzz_regression ofp_print_fuzzer-5722747668791296
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65917,8 +66277,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_473
 #AT_START_474
-at_fn_group_banner 474 'fuzz-regression-list.at:22' \
-  "fuzz regression - ofp_print_fuzzer-6470117922701312" "" 23
+at_fn_group_banner 474 'fuzz-regression-list.at:21' \
+  "fuzz regression - ofp_print_fuzzer-6285128790704128" "" 23
 at_xfail=no
 (
   $as_echo "474. $at_setup_line: testing $at_desc ..."
@@ -65926,7 +66286,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-6470117922701312
+   test_fuzz_regression ofp_print_fuzzer-6285128790704128
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65935,8 +66295,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_474
 #AT_START_475
-at_fn_group_banner 475 'fuzz-regression-list.at:23' \
-  "fuzz regression - ofp_print_fuzzer-6502620041576448" "" 23
+at_fn_group_banner 475 'fuzz-regression-list.at:22' \
+  "fuzz regression - ofp_print_fuzzer-6470117922701312" "" 23
 at_xfail=no
 (
   $as_echo "475. $at_setup_line: testing $at_desc ..."
@@ -65944,7 +66304,7 @@
 
 ovs_init
 
-   test_fuzz_regression ofp_print_fuzzer-6502620041576448
+   test_fuzz_regression ofp_print_fuzzer-6470117922701312
    ovs_cleanup
 $as_echo "$at_setup_line" >"$at_check_line_file"
   set +x
@@ -65953,8 +66313,8 @@
 read at_status <"$at_status_file"
 #AT_STOP_475
 #AT_START_476
-at_fn_group_banner 476 'odp.at:3' \
-  "OVS datapath key parsing and formatting - valid forms" "" 24
+at_fn_group_banner 476 'fuzz-regression-list.at:23' \
+  "fuzz regression - ofp_print_fuzzer-6502620041576448" "" 23
 at_xfail=no
 (
   $as_echo "476. $at_setup_line: testing $at_desc ..."
@@ -65962,6 +66322,24 @@
 
 ovs_init
 
+   test_fuzz_regression ofp_print_fuzzer-6502620041576448
+   ovs_cleanup
+$as_echo "$at_setup_line" >"$at_check_line_file"
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_476
+#AT_START_477
+at_fn_group_banner 477 'odp.at:3' \
+  "OVS datapath key parsing and formatting - valid forms" "" 24
+at_xfail=no
+(
+  $as_echo "477. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
 cat >odp-base.txt <<'_ATEOF'
 in_port(1),eth(src=00:01:02:03:04:05,dst=10:11:12:13:14:15)
 in_port(1),eth(src=00:01:02:03:04:05,dst=10:11:12:13:14:15),eth_type(0x1234)
@@ -66082,13 +66460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_476
-#AT_START_477
-at_fn_group_banner 477 'odp.at:112' \
+#AT_STOP_477
+#AT_START_478
+at_fn_group_banner 478 'odp.at:112' \
   "OVS datapath wildcarded key parsing and formatting - valid forms" "" 24
 at_xfail=no
 (
-  $as_echo "477. $at_setup_line: testing $at_desc ..."
+  $as_echo "478. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -66196,13 +66574,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_477
-#AT_START_478
-at_fn_group_banner 478 'odp.at:199' \
+#AT_STOP_478
+#AT_START_479
+at_fn_group_banner 479 'odp.at:199' \
   "OVS datapath wildcarded key filtering." "         " 24
 at_xfail=no
 (
-  $as_echo "478. $at_setup_line: testing $at_desc ..."
+  $as_echo "479. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -66412,13 +66790,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_478
-#AT_START_479
-at_fn_group_banner 479 'odp.at:264' \
+#AT_STOP_479
+#AT_START_480
+at_fn_group_banner 480 'odp.at:264' \
   "OVS datapath actions parsing and formatting - valid forms" "" 24
 at_xfail=no
 (
-  $as_echo "479. $at_setup_line: testing $at_desc ..."
+  $as_echo "480. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -66566,13 +66944,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_479
-#AT_START_480
-at_fn_group_banner 480 'odp.at:392' \
+#AT_STOP_480
+#AT_START_481
+at_fn_group_banner 481 'odp.at:392' \
   "OVS datapath actions parsing and formatting - invalid forms" "" 24
 at_xfail=no
 (
-  $as_echo "480. $at_setup_line: testing $at_desc ..."
+  $as_echo "481. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -66599,13 +66977,60 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_480
-#AT_START_481
-at_fn_group_banner 481 'odp.at:400' \
+#AT_STOP_481
+#AT_START_482
+at_fn_group_banner 482 'odp.at:400' \
+  "OVS datapath actions parsing and formatting - userdata overflow" "" 24
+at_xfail=no
+(
+  $as_echo "482. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+
+data_valid=$(  printf '%*s' 131024 | tr ' ' "a")
+data_invalid=$(printf '%*s' 131026 | tr ' ' "a")
+
+echo "userspace(pid=1234567,userdata(${data_valid}),actions)" > actions.txt
+echo "userspace(pid=1234567,userdata(${data_invalid}),actions)" >> actions.txt
+
+data_valid=$(  printf '%*s' 131016 | tr ' ' "a")
+data_invalid=$(printf '%*s' 131018 | tr ' ' "a")
+
+echo "userspace(pid=1234567,userdata(${data_valid}),tunnel_out_port=10)" >> actions.txt
+echo "userspace(pid=1234567,userdata(${data_invalid}),tunnel_out_port=10)" >> actions.txt
+
+{ set +x
+$as_echo "$at_srcdir/odp.at:429: ovstest test-odp parse-actions < actions.txt"
+at_fn_check_prepare_trace "odp.at:429"
+( $at_check_trace; ovstest test-odp parse-actions < actions.txt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "`cat actions.txt | head -1`
+odp_actions_from_string: error
+`cat actions.txt | head -3 | tail -1`
+odp_actions_from_string: error
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/odp.at:429"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_482
+#AT_START_483
+at_fn_group_banner 483 'odp.at:437' \
   "OVS datapath keys parsing and formatting - 33 nested encap " "" 24
 at_xfail=no
 (
-  $as_echo "481. $at_setup_line: testing $at_desc ..."
+  $as_echo "483. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -66615,8 +67040,8 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/odp.at:404: ovstest test-odp parse-keys < odp-in.txt"
-at_fn_check_prepare_trace "odp.at:404"
+$as_echo "$at_srcdir/odp.at:441: ovstest test-odp parse-keys < odp-in.txt"
+at_fn_check_prepare_trace "odp.at:441"
 ( $at_check_trace; ovstest test-odp parse-keys < odp-in.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -66625,7 +67050,7 @@
 echo >>"$at_stdout"; $as_echo "odp_flow_from_string: error (syntax error at encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap(encap())))))))))))))))))))))))))))))))))
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/odp.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/odp.at:441"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -66634,13 +67059,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_481
-#AT_START_482
-at_fn_group_banner 482 'mpls-xlate.at:3' \
+#AT_STOP_483
+#AT_START_484
+at_fn_group_banner 484 'mpls-xlate.at:3' \
   "MPLS xlate action" "                              " 25
 at_xfail=no
 (
-  $as_echo "482. $at_setup_line: testing $at_desc ..."
+  $as_echo "484. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -67629,13 +68054,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_482
-#AT_START_483
-at_fn_group_banner 483 'mpls-xlate.at:147' \
+#AT_STOP_484
+#AT_START_485
+at_fn_group_banner 485 'mpls-xlate.at:147' \
   "MPLS xlate action - patch-port" "                 " 25
 at_xfail=no
 (
-  $as_echo "483. $at_setup_line: testing $at_desc ..."
+  $as_echo "485. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -68018,13 +68443,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_483
-#AT_START_484
-at_fn_group_banner 484 'mpls-xlate.at:191' \
+#AT_STOP_485
+#AT_START_486
+at_fn_group_banner 486 'mpls-xlate.at:191' \
   "MPLS xlate action - group bucket" "               " 25
 at_xfail=no
 (
-  $as_echo "484. $at_setup_line: testing $at_desc ..."
+  $as_echo "486. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -68362,13 +68787,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_484
-#AT_START_485
-at_fn_group_banner 485 'multipath.at:10' \
+#AT_STOP_486
+#AT_START_487
+at_fn_group_banner 487 'multipath.at:10' \
   "modulo_n multipath link selection" "              " 26
 at_xfail=no
 (
-  $as_echo "485. $at_setup_line: testing $at_desc ..."
+  $as_echo "487. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -68454,13 +68879,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_485
-#AT_START_486
-at_fn_group_banner 486 'multipath.at:78' \
+#AT_STOP_487
+#AT_START_488
+at_fn_group_banner 488 'multipath.at:78' \
   "hash_threshold multipath link selection" "        " 26
 at_xfail=no
 (
-  $as_echo "486. $at_setup_line: testing $at_desc ..."
+  $as_echo "488. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -68546,13 +68971,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_486
-#AT_START_487
-at_fn_group_banner 487 'multipath.at:146' \
+#AT_STOP_488
+#AT_START_489
+at_fn_group_banner 489 'multipath.at:146' \
   "hrw multipath link selection" "                   " 26
 at_xfail=no
 (
-  $as_echo "487. $at_setup_line: testing $at_desc ..."
+  $as_echo "489. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -68638,13 +69063,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_487
-#AT_START_488
-at_fn_group_banner 488 'multipath.at:214' \
+#AT_STOP_489
+#AT_START_490
+at_fn_group_banner 490 'multipath.at:214' \
   "iter_hash multipath link selection" "             " 26
 at_xfail=no
 (
-  $as_echo "488. $at_setup_line: testing $at_desc ..."
+  $as_echo "490. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -68730,13 +69155,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_488
-#AT_START_489
-at_fn_group_banner 489 'multipath.at:282' \
+#AT_STOP_490
+#AT_START_491
+at_fn_group_banner 491 'multipath.at:282' \
   "modulo_n multipath symmetric_l3 link selection" " " 26
 at_xfail=no
 (
-  $as_echo "489. $at_setup_line: testing $at_desc ..."
+  $as_echo "491. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -68822,13 +69247,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_489
-#AT_START_490
-at_fn_group_banner 490 'multipath.at:350' \
+#AT_STOP_491
+#AT_START_492
+at_fn_group_banner 492 'multipath.at:350' \
   "hash_threshold multipath symmetric_l3 link selection" "" 26
 at_xfail=no
 (
-  $as_echo "490. $at_setup_line: testing $at_desc ..."
+  $as_echo "492. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -68914,13 +69339,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_490
-#AT_START_491
-at_fn_group_banner 491 'multipath.at:418' \
+#AT_STOP_492
+#AT_START_493
+at_fn_group_banner 493 'multipath.at:418' \
   "hrw multipath symmetric_l3 link selection" "      " 26
 at_xfail=no
 (
-  $as_echo "491. $at_setup_line: testing $at_desc ..."
+  $as_echo "493. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69006,13 +69431,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_491
-#AT_START_492
-at_fn_group_banner 492 'multipath.at:486' \
+#AT_STOP_493
+#AT_START_494
+at_fn_group_banner 494 'multipath.at:486' \
   "iter_hash symmetric_l3 multipath link selection" "" 26
 at_xfail=no
 (
-  $as_echo "492. $at_setup_line: testing $at_desc ..."
+  $as_echo "494. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69098,13 +69523,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_492
-#AT_START_493
-at_fn_group_banner 493 'learn.at:3' \
+#AT_STOP_494
+#AT_START_495
+at_fn_group_banner 495 'learn.at:3' \
   "learning action - parsing and formatting" "       " 27
 at_xfail=no
 (
-  $as_echo "493. $at_setup_line: testing $at_desc ..."
+  $as_echo "495. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69150,13 +69575,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_493
-#AT_START_494
-at_fn_group_banner 494 'learn.at:28' \
+#AT_STOP_495
+#AT_START_496
+at_fn_group_banner 496 'learn.at:28' \
   "learning action - parsing and formatting - illegal in_port_oxm" "" 27
 at_xfail=no
 (
-  $as_echo "494. $at_setup_line: testing $at_desc ..."
+  $as_echo "496. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69195,13 +69620,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_494
-#AT_START_495
-at_fn_group_banner 495 'learn.at:37' \
+#AT_STOP_496
+#AT_START_497
+at_fn_group_banner 497 'learn.at:37' \
   "learning action - parsing and formatting - OXM" " " 27
 at_xfail=no
 (
-  $as_echo "495. $at_setup_line: testing $at_desc ..."
+  $as_echo "497. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69235,13 +69660,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_495
-#AT_START_496
-at_fn_group_banner 496 'learn.at:50' \
+#AT_STOP_497
+#AT_START_498
+at_fn_group_banner 498 'learn.at:50' \
   "learning action - examples" "                     " 27
 at_xfail=no
 (
-  $as_echo "496. $at_setup_line: testing $at_desc ..."
+  $as_echo "498. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69280,13 +69705,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_496
-#AT_START_497
-at_fn_group_banner 497 'learn.at:68' \
+#AT_STOP_498
+#AT_START_499
+at_fn_group_banner 499 'learn.at:68' \
   "learning action - satisfied prerequisites" "      " 27
 at_xfail=no
 (
-  $as_echo "497. $at_setup_line: testing $at_desc ..."
+  $as_echo "499. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69321,13 +69746,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_497
-#AT_START_498
-at_fn_group_banner 498 'learn.at:83' \
+#AT_STOP_499
+#AT_START_500
+at_fn_group_banner 500 'learn.at:83' \
   "learning action - invalid prerequisites" "        " 27
 at_xfail=no
 (
-  $as_echo "498. $at_setup_line: testing $at_desc ..."
+  $as_echo "500. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69395,13 +69820,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_498
-#AT_START_499
-at_fn_group_banner 499 'learn.at:98' \
+#AT_STOP_500
+#AT_START_501
+at_fn_group_banner 501 'learn.at:98' \
   "learning action - too-long immediate value" "     " 27
 at_xfail=no
 (
-  $as_echo "499. $at_setup_line: testing $at_desc ..."
+  $as_echo "501. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69456,13 +69881,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_499
-#AT_START_500
-at_fn_group_banner 500 'learn.at:112' \
+#AT_STOP_501
+#AT_START_502
+at_fn_group_banner 502 'learn.at:112' \
   "learning action - standard VLAN+MAC learning" "   " 27
 at_xfail=no
 (
-  $as_echo "500. $at_setup_line: testing $at_desc ..."
+  $as_echo "502. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -69929,13 +70354,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_500
-#AT_START_501
-at_fn_group_banner 501 'learn.at:178' \
+#AT_STOP_502
+#AT_START_503
+at_fn_group_banner 503 'learn.at:178' \
   "learning action - learn refreshes hard_age" "     " 27
 at_xfail=no
 (
-  $as_echo "501. $at_setup_line: testing $at_desc ..."
+  $as_echo "503. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -70379,13 +70804,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_501
-#AT_START_502
-at_fn_group_banner 502 'learn.at:244' \
+#AT_STOP_503
+#AT_START_504
+at_fn_group_banner 504 'learn.at:244' \
   "learning action - TCPv4 port learning" "          " 27
 at_xfail=no
 (
-  $as_echo "502. $at_setup_line: testing $at_desc ..."
+  $as_echo "504. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -70716,13 +71141,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_502
-#AT_START_503
-at_fn_group_banner 503 'learn.at:269' \
+#AT_STOP_504
+#AT_START_505
+at_fn_group_banner 505 'learn.at:269' \
   "learning action - TCPv6 port learning" "          " 27
 at_xfail=no
 (
-  $as_echo "503. $at_setup_line: testing $at_desc ..."
+  $as_echo "505. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -71056,13 +71481,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_503
-#AT_START_504
-at_fn_group_banner 504 'learn.at:300' \
+#AT_STOP_505
+#AT_START_506
+at_fn_group_banner 506 'learn.at:300' \
   "learning action - self-modifying flow" "          " 27
 at_xfail=no
 (
-  $as_echo "504. $at_setup_line: testing $at_desc ..."
+  $as_echo "506. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -71377,13 +71802,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_504
-#AT_START_505
-at_fn_group_banner 505 'learn.at:342' \
+#AT_STOP_506
+#AT_START_507
+at_fn_group_banner 507 'learn.at:342' \
   "learning action - self-modifying flow with idle_timeout" "" 27
 at_xfail=no
 (
-  $as_echo "505. $at_setup_line: testing $at_desc ..."
+  $as_echo "507. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -71714,13 +72139,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_505
-#AT_START_506
-at_fn_group_banner 506 'learn.at:400' \
+#AT_STOP_507
+#AT_START_508
+at_fn_group_banner 508 'learn.at:400' \
   "learning action - self-modifying flow with hard_timeout" "" 27
 at_xfail=no
 (
-  $as_echo "506. $at_setup_line: testing $at_desc ..."
+  $as_echo "508. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -72105,13 +72530,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_506
-#AT_START_507
-at_fn_group_banner 507 'learn.at:496' \
+#AT_STOP_508
+#AT_START_509
+at_fn_group_banner 509 'learn.at:496' \
   "learning action - fin_timeout feature" "          " 27
 at_xfail=no
 (
-  $as_echo "507. $at_setup_line: testing $at_desc ..."
+  $as_echo "509. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -72401,13 +72826,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_507
-#AT_START_508
-at_fn_group_banner 508 'learn.at:510' \
+#AT_STOP_509
+#AT_START_510
+at_fn_group_banner 510 'learn.at:510' \
   "learning action - delete_learned feature" "       " 27
 at_xfail=no
 (
-  $as_echo "508. $at_setup_line: testing $at_desc ..."
+  $as_echo "510. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -73028,13 +73453,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_508
-#AT_START_509
-at_fn_group_banner 509 'learn.at:628' \
+#AT_STOP_510
+#AT_START_511
+at_fn_group_banner 511 'learn.at:628' \
   "learning action - delete_learned/limit with packet" "" 27
 at_xfail=no
 (
-  $as_echo "509. $at_setup_line: testing $at_desc ..."
+  $as_echo "511. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -73432,13 +73857,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_509
-#AT_START_510
-at_fn_group_banner 510 'learn.at:666' \
+#AT_STOP_511
+#AT_START_512
+at_fn_group_banner 512 'learn.at:666' \
   "learning action - limit" "                        " 27
 at_xfail=no
 (
-  $as_echo "510. $at_setup_line: testing $at_desc ..."
+  $as_echo "512. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -73868,13 +74293,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_510
-#AT_START_511
-at_fn_group_banner 511 'learn.at:705' \
+#AT_STOP_512
+#AT_START_513
+at_fn_group_banner 513 'learn.at:705' \
   "learning action - limit result_dst" "             " 27
 at_xfail=no
 (
-  $as_echo "511. $at_setup_line: testing $at_desc ..."
+  $as_echo "513. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74267,13 +74692,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_511
-#AT_START_512
-at_fn_group_banner 512 'learn.at:738' \
+#AT_STOP_513
+#AT_START_514
+at_fn_group_banner 514 'learn.at:738' \
   "learning action - different limits" "             " 27
 at_xfail=no
 (
-  $as_echo "512. $at_setup_line: testing $at_desc ..."
+  $as_echo "514. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74728,13 +75153,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_512
-#AT_START_513
-at_fn_group_banner 513 'vconn.at:20' \
+#AT_STOP_514
+#AT_START_515
+at_fn_group_banner 515 'vconn.at:20' \
   "unix vconn - refuse connection" "                 " 28
 at_xfail=no
 (
-  $as_echo "513. $at_setup_line: testing $at_desc ..."
+  $as_echo "515. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74758,13 +75183,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_513
-#AT_START_514
-at_fn_group_banner 514 'vconn.at:20' \
+#AT_STOP_515
+#AT_START_516
+at_fn_group_banner 516 'vconn.at:20' \
   "unix vconn - accept then close" "                 " 28
 at_xfail=no
 (
-  $as_echo "514. $at_setup_line: testing $at_desc ..."
+  $as_echo "516. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74788,13 +75213,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_514
-#AT_START_515
-at_fn_group_banner 515 'vconn.at:20' \
+#AT_STOP_516
+#AT_START_517
+at_fn_group_banner 517 'vconn.at:20' \
   "unix vconn - read hello" "                        " 28
 at_xfail=no
 (
-  $as_echo "515. $at_setup_line: testing $at_desc ..."
+  $as_echo "517. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74818,13 +75243,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_515
-#AT_START_516
-at_fn_group_banner 516 'vconn.at:20' \
+#AT_STOP_517
+#AT_START_518
+at_fn_group_banner 518 'vconn.at:20' \
   "unix vconn - send plain hello" "                  " 28
 at_xfail=no
 (
-  $as_echo "516. $at_setup_line: testing $at_desc ..."
+  $as_echo "518. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74848,13 +75273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_516
-#AT_START_517
-at_fn_group_banner 517 'vconn.at:20' \
+#AT_STOP_518
+#AT_START_519
+at_fn_group_banner 519 'vconn.at:20' \
   "unix vconn - send long hello" "                   " 28
 at_xfail=no
 (
-  $as_echo "517. $at_setup_line: testing $at_desc ..."
+  $as_echo "519. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74878,13 +75303,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_517
-#AT_START_518
-at_fn_group_banner 518 'vconn.at:20' \
+#AT_STOP_519
+#AT_START_520
+at_fn_group_banner 520 'vconn.at:20' \
   "unix vconn - send echo hello" "                   " 28
 at_xfail=no
 (
-  $as_echo "518. $at_setup_line: testing $at_desc ..."
+  $as_echo "520. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74908,13 +75333,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_518
-#AT_START_519
-at_fn_group_banner 519 'vconn.at:20' \
+#AT_STOP_520
+#AT_START_521
+at_fn_group_banner 521 'vconn.at:20' \
   "unix vconn - send short hello" "                  " 28
 at_xfail=no
 (
-  $as_echo "519. $at_setup_line: testing $at_desc ..."
+  $as_echo "521. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74938,13 +75363,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_519
-#AT_START_520
-at_fn_group_banner 520 'vconn.at:20' \
+#AT_STOP_521
+#AT_START_522
+at_fn_group_banner 522 'vconn.at:20' \
   "unix vconn - send invalid version hello" "        " 28
 at_xfail=no
 (
-  $as_echo "520. $at_setup_line: testing $at_desc ..."
+  $as_echo "522. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74968,13 +75393,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_520
-#AT_START_521
-at_fn_group_banner 521 'vconn.at:21' \
+#AT_STOP_522
+#AT_START_523
+at_fn_group_banner 523 'vconn.at:21' \
   "tcp vconn - refuse connection" "                  " 29
 at_xfail=no
 (
-  $as_echo "521. $at_setup_line: testing $at_desc ..."
+  $as_echo "523. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -74998,13 +75423,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_521
-#AT_START_522
-at_fn_group_banner 522 'vconn.at:21' \
+#AT_STOP_523
+#AT_START_524
+at_fn_group_banner 524 'vconn.at:21' \
   "tcp vconn - accept then close" "                  " 29
 at_xfail=no
 (
-  $as_echo "522. $at_setup_line: testing $at_desc ..."
+  $as_echo "524. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75028,13 +75453,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_522
-#AT_START_523
-at_fn_group_banner 523 'vconn.at:21' \
+#AT_STOP_524
+#AT_START_525
+at_fn_group_banner 525 'vconn.at:21' \
   "tcp vconn - read hello" "                         " 29
 at_xfail=no
 (
-  $as_echo "523. $at_setup_line: testing $at_desc ..."
+  $as_echo "525. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75058,13 +75483,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_523
-#AT_START_524
-at_fn_group_banner 524 'vconn.at:21' \
+#AT_STOP_525
+#AT_START_526
+at_fn_group_banner 526 'vconn.at:21' \
   "tcp vconn - send plain hello" "                   " 29
 at_xfail=no
 (
-  $as_echo "524. $at_setup_line: testing $at_desc ..."
+  $as_echo "526. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75088,13 +75513,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_524
-#AT_START_525
-at_fn_group_banner 525 'vconn.at:21' \
+#AT_STOP_526
+#AT_START_527
+at_fn_group_banner 527 'vconn.at:21' \
   "tcp vconn - send long hello" "                    " 29
 at_xfail=no
 (
-  $as_echo "525. $at_setup_line: testing $at_desc ..."
+  $as_echo "527. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75118,13 +75543,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_525
-#AT_START_526
-at_fn_group_banner 526 'vconn.at:21' \
+#AT_STOP_527
+#AT_START_528
+at_fn_group_banner 528 'vconn.at:21' \
   "tcp vconn - send echo hello" "                    " 29
 at_xfail=no
 (
-  $as_echo "526. $at_setup_line: testing $at_desc ..."
+  $as_echo "528. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75148,13 +75573,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_526
-#AT_START_527
-at_fn_group_banner 527 'vconn.at:21' \
+#AT_STOP_528
+#AT_START_529
+at_fn_group_banner 529 'vconn.at:21' \
   "tcp vconn - send short hello" "                   " 29
 at_xfail=no
 (
-  $as_echo "527. $at_setup_line: testing $at_desc ..."
+  $as_echo "529. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75178,13 +75603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_527
-#AT_START_528
-at_fn_group_banner 528 'vconn.at:21' \
+#AT_STOP_529
+#AT_START_530
+at_fn_group_banner 530 'vconn.at:21' \
   "tcp vconn - send invalid version hello" "         " 29
 at_xfail=no
 (
-  $as_echo "528. $at_setup_line: testing $at_desc ..."
+  $as_echo "530. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75208,13 +75633,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_528
-#AT_START_529
-at_fn_group_banner 529 'vconn.at:22' \
+#AT_STOP_530
+#AT_START_531
+at_fn_group_banner 531 'vconn.at:22' \
   "ssl vconn - refuse connection" "                  " 30
 at_xfail=no
 (
-  $as_echo "529. $at_setup_line: testing $at_desc ..."
+  $as_echo "531. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75254,13 +75679,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_529
-#AT_START_530
-at_fn_group_banner 530 'vconn.at:22' \
+#AT_STOP_531
+#AT_START_532
+at_fn_group_banner 532 'vconn.at:22' \
   "ssl vconn - accept then close" "                  " 30
 at_xfail=no
 (
-  $as_echo "530. $at_setup_line: testing $at_desc ..."
+  $as_echo "532. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75300,13 +75725,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_530
-#AT_START_531
-at_fn_group_banner 531 'vconn.at:22' \
+#AT_STOP_532
+#AT_START_533
+at_fn_group_banner 533 'vconn.at:22' \
   "ssl vconn - read hello" "                         " 30
 at_xfail=no
 (
-  $as_echo "531. $at_setup_line: testing $at_desc ..."
+  $as_echo "533. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75346,13 +75771,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_531
-#AT_START_532
-at_fn_group_banner 532 'vconn.at:22' \
+#AT_STOP_533
+#AT_START_534
+at_fn_group_banner 534 'vconn.at:22' \
   "ssl vconn - send plain hello" "                   " 30
 at_xfail=no
 (
-  $as_echo "532. $at_setup_line: testing $at_desc ..."
+  $as_echo "534. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75392,13 +75817,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_532
-#AT_START_533
-at_fn_group_banner 533 'vconn.at:22' \
+#AT_STOP_534
+#AT_START_535
+at_fn_group_banner 535 'vconn.at:22' \
   "ssl vconn - send long hello" "                    " 30
 at_xfail=no
 (
-  $as_echo "533. $at_setup_line: testing $at_desc ..."
+  $as_echo "535. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75438,13 +75863,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_533
-#AT_START_534
-at_fn_group_banner 534 'vconn.at:22' \
+#AT_STOP_535
+#AT_START_536
+at_fn_group_banner 536 'vconn.at:22' \
   "ssl vconn - send echo hello" "                    " 30
 at_xfail=no
 (
-  $as_echo "534. $at_setup_line: testing $at_desc ..."
+  $as_echo "536. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75484,13 +75909,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_534
-#AT_START_535
-at_fn_group_banner 535 'vconn.at:22' \
+#AT_STOP_536
+#AT_START_537
+at_fn_group_banner 537 'vconn.at:22' \
   "ssl vconn - send short hello" "                   " 30
 at_xfail=no
 (
-  $as_echo "535. $at_setup_line: testing $at_desc ..."
+  $as_echo "537. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75530,13 +75955,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_535
-#AT_START_536
-at_fn_group_banner 536 'vconn.at:22' \
+#AT_STOP_537
+#AT_START_538
+at_fn_group_banner 538 'vconn.at:22' \
   "ssl vconn - send invalid version hello" "         " 30
 at_xfail=no
 (
-  $as_echo "536. $at_setup_line: testing $at_desc ..."
+  $as_echo "538. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75576,13 +76001,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_536
-#AT_START_537
-at_fn_group_banner 537 'file_name.at:13' \
+#AT_STOP_538
+#AT_START_539
+at_fn_group_banner 539 'file_name.at:13' \
   "components of \"/usr/lib\" are \"/usr\", \"lib\"" "     " 31
 at_xfail=no
 (
-  $as_echo "537. $at_setup_line: testing $at_desc ..."
+  $as_echo "539. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75612,13 +76037,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_537
-#AT_START_538
-at_fn_group_banner 538 'file_name.at:14' \
+#AT_STOP_539
+#AT_START_540
+at_fn_group_banner 540 'file_name.at:14' \
   "components of \"/usr/\" are \"/\", \"usr\"" "           " 31
 at_xfail=no
 (
-  $as_echo "538. $at_setup_line: testing $at_desc ..."
+  $as_echo "540. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75648,13 +76073,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_538
-#AT_START_539
-at_fn_group_banner 539 'file_name.at:15' \
+#AT_STOP_540
+#AT_START_541
+at_fn_group_banner 541 'file_name.at:15' \
   "components of \"usr\" are \".\", \"usr\"" "             " 31
 at_xfail=no
 (
-  $as_echo "539. $at_setup_line: testing $at_desc ..."
+  $as_echo "541. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75684,13 +76109,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_539
-#AT_START_540
-at_fn_group_banner 540 'file_name.at:16' \
+#AT_STOP_541
+#AT_START_542
+at_fn_group_banner 542 'file_name.at:16' \
   "components of \"/\" are \"/\", \"/\"" "                 " 31
 at_xfail=no
 (
-  $as_echo "540. $at_setup_line: testing $at_desc ..."
+  $as_echo "542. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75720,13 +76145,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_540
-#AT_START_541
-at_fn_group_banner 541 'file_name.at:17' \
+#AT_STOP_542
+#AT_START_543
+at_fn_group_banner 543 'file_name.at:17' \
   "components of \".\" are \".\", \".\"" "                 " 31
 at_xfail=no
 (
-  $as_echo "541. $at_setup_line: testing $at_desc ..."
+  $as_echo "543. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75756,13 +76181,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_541
-#AT_START_542
-at_fn_group_banner 542 'file_name.at:18' \
+#AT_STOP_543
+#AT_START_544
+at_fn_group_banner 544 'file_name.at:18' \
   "components of \"..\" are \".\", \"..\"" "               " 31
 at_xfail=no
 (
-  $as_echo "542. $at_setup_line: testing $at_desc ..."
+  $as_echo "544. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75792,13 +76217,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_542
-#AT_START_543
-at_fn_group_banner 543 'file_name.at:19' \
+#AT_STOP_544
+#AT_START_545
+at_fn_group_banner 545 'file_name.at:19' \
   "components of \"//\" are \"//\", \"//\"" "              " 31
 at_xfail=no
 (
-  $as_echo "543. $at_setup_line: testing $at_desc ..."
+  $as_echo "545. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75828,13 +76253,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_543
-#AT_START_544
-at_fn_group_banner 544 'file_name.at:20' \
+#AT_STOP_545
+#AT_START_546
+at_fn_group_banner 546 'file_name.at:20' \
   "components of \"//foo\" are \"//\", \"foo\"" "          " 31
 at_xfail=no
 (
-  $as_echo "544. $at_setup_line: testing $at_desc ..."
+  $as_echo "546. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75864,13 +76289,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_544
-#AT_START_545
-at_fn_group_banner 545 'file_name.at:21' \
+#AT_STOP_546
+#AT_START_547
+at_fn_group_banner 547 'file_name.at:21' \
   "components of \"\" are \".\", \".\"" "                  " 31
 at_xfail=no
 (
-  $as_echo "545. $at_setup_line: testing $at_desc ..."
+  $as_echo "547. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75900,13 +76325,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_545
-#AT_START_546
-at_fn_group_banner 546 'file_name.at:24' \
+#AT_STOP_547
+#AT_START_548
+at_fn_group_banner 548 'file_name.at:24' \
   "components of \"dir/file\" are \"dir\", \"file\"" "     " 31
 at_xfail=no
 (
-  $as_echo "546. $at_setup_line: testing $at_desc ..."
+  $as_echo "548. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75936,13 +76361,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_546
-#AT_START_547
-at_fn_group_banner 547 'file_name.at:25' \
+#AT_STOP_548
+#AT_START_549
+at_fn_group_banner 549 'file_name.at:25' \
   "components of \"dir/file/\" are \"dir\", \"file\"" "    " 31
 at_xfail=no
 (
-  $as_echo "547. $at_setup_line: testing $at_desc ..."
+  $as_echo "549. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -75972,13 +76397,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_547
-#AT_START_548
-at_fn_group_banner 548 'file_name.at:26' \
+#AT_STOP_549
+#AT_START_550
+at_fn_group_banner 550 'file_name.at:26' \
   "components of \"dir/file//\" are \"dir\", \"file\"" "   " 31
 at_xfail=no
 (
-  $as_echo "548. $at_setup_line: testing $at_desc ..."
+  $as_echo "550. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76008,13 +76433,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_548
-#AT_START_549
-at_fn_group_banner 549 'file_name.at:27' \
+#AT_STOP_550
+#AT_START_551
+at_fn_group_banner 551 'file_name.at:27' \
   "components of \"///foo\" are \"/\", \"foo\"" "          " 31
 at_xfail=no
 (
-  $as_echo "549. $at_setup_line: testing $at_desc ..."
+  $as_echo "551. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76044,13 +76469,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_549
-#AT_START_550
-at_fn_group_banner 550 'file_name.at:37' \
+#AT_STOP_551
+#AT_START_552
+at_fn_group_banner 552 'file_name.at:37' \
   "follow_symlinks - relative symlinks" "            " 32
 at_xfail=no
 (
-  $as_echo "550. $at_setup_line: testing $at_desc ..."
+  $as_echo "552. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76124,13 +76549,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_550
-#AT_START_551
-at_fn_group_banner 551 'file_name.at:54' \
+#AT_STOP_552
+#AT_START_553
+at_fn_group_banner 553 'file_name.at:54' \
   "follow_symlinks - absolute symlinks" "            " 32
 at_xfail=no
 (
-  $as_echo "551. $at_setup_line: testing $at_desc ..."
+  $as_echo "553. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76204,13 +76629,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_551
-#AT_START_552
-at_fn_group_banner 552 'file_name.at:71' \
+#AT_STOP_553
+#AT_START_554
+at_fn_group_banner 554 'file_name.at:71' \
   "follow_symlinks - symlinks to directories" "      " 32
 at_xfail=no
 (
-  $as_echo "552. $at_setup_line: testing $at_desc ..."
+  $as_echo "554. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76280,13 +76705,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_552
-#AT_START_553
-at_fn_group_banner 553 'file_name.at:84' \
+#AT_STOP_554
+#AT_START_555
+at_fn_group_banner 555 'file_name.at:84' \
   "follow_symlinks - nonexistent targets" "          " 32
 at_xfail=no
 (
-  $as_echo "553. $at_setup_line: testing $at_desc ..."
+  $as_echo "555. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76351,13 +76776,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_553
-#AT_START_554
-at_fn_group_banner 554 'file_name.at:92' \
+#AT_STOP_555
+#AT_START_556
+at_fn_group_banner 556 'file_name.at:92' \
   "follow_symlinks - regular files" "                " 32
 at_xfail=no
 (
-  $as_echo "554. $at_setup_line: testing $at_desc ..."
+  $as_echo "556. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76385,13 +76810,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_554
-#AT_START_555
-at_fn_group_banner 555 'file_name.at:97' \
+#AT_STOP_556
+#AT_START_557
+at_fn_group_banner 557 'file_name.at:97' \
   "follow_symlinks - device targets" "               " 32
 at_xfail=no
 (
-  $as_echo "555. $at_setup_line: testing $at_desc ..."
+  $as_echo "557. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76443,13 +76868,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_555
-#AT_START_556
-at_fn_group_banner 556 'file_name.at:106' \
+#AT_STOP_557
+#AT_START_558
+at_fn_group_banner 558 'file_name.at:106' \
   "follow_symlinks - nonexistent files" "            " 32
 at_xfail=no
 (
-  $as_echo "556. $at_setup_line: testing $at_desc ..."
+  $as_echo "558. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76530,13 +76955,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_556
-#AT_START_557
-at_fn_group_banner 557 'file_name.at:114' \
+#AT_STOP_558
+#AT_START_559
+at_fn_group_banner 559 'file_name.at:114' \
   "follow_symlinks - symlink loop" "                 " 32
 at_xfail=no
 (
-  $as_echo "557. $at_setup_line: testing $at_desc ..."
+  $as_echo "559. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76585,13 +77010,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_557
-#AT_START_558
-at_fn_group_banner 558 'aes128.at:10' \
+#AT_STOP_559
+#AT_START_560
+at_fn_group_banner 560 'aes128.at:10' \
   "wikipedia test vector 1" "                        " 33
 at_xfail=no
 (
-  $as_echo "558. $at_setup_line: testing $at_desc ..."
+  $as_echo "560. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76617,13 +77042,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_558
-#AT_START_559
-at_fn_group_banner 559 'aes128.at:16' \
+#AT_STOP_560
+#AT_START_561
+at_fn_group_banner 561 'aes128.at:16' \
   "wikipedia test vector 2" "                        " 33
 at_xfail=no
 (
-  $as_echo "559. $at_setup_line: testing $at_desc ..."
+  $as_echo "561. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76649,13 +77074,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_559
-#AT_START_560
-at_fn_group_banner 560 'aes128.at:22' \
+#AT_STOP_561
+#AT_START_562
+at_fn_group_banner 562 'aes128.at:22' \
   "NIST KAT ECBKeySbox128e vector 0" "               " 33
 at_xfail=no
 (
-  $as_echo "560. $at_setup_line: testing $at_desc ..."
+  $as_echo "562. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76681,13 +77106,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_560
-#AT_START_561
-at_fn_group_banner 561 'aes128.at:28' \
+#AT_STOP_562
+#AT_START_563
+at_fn_group_banner 563 'aes128.at:28' \
   "NIST KAT ECBKeySbox128e vector 1" "               " 33
 at_xfail=no
 (
-  $as_echo "561. $at_setup_line: testing $at_desc ..."
+  $as_echo "563. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76713,13 +77138,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_561
-#AT_START_562
-at_fn_group_banner 562 'aes128.at:34' \
+#AT_STOP_563
+#AT_START_564
+at_fn_group_banner 564 'aes128.at:34' \
   "NIST KAT ECBKeySbox128e vector 2" "               " 33
 at_xfail=no
 (
-  $as_echo "562. $at_setup_line: testing $at_desc ..."
+  $as_echo "564. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76745,13 +77170,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_562
-#AT_START_563
-at_fn_group_banner 563 'aes128.at:40' \
+#AT_STOP_564
+#AT_START_565
+at_fn_group_banner 565 'aes128.at:40' \
   "NIST KAT ECBKeySbox128e vector 3" "               " 33
 at_xfail=no
 (
-  $as_echo "563. $at_setup_line: testing $at_desc ..."
+  $as_echo "565. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76777,13 +77202,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_563
-#AT_START_564
-at_fn_group_banner 564 'aes128.at:46' \
+#AT_STOP_565
+#AT_START_566
+at_fn_group_banner 566 'aes128.at:46' \
   "NIST KAT ECBKeySbox128e vector 4" "               " 33
 at_xfail=no
 (
-  $as_echo "564. $at_setup_line: testing $at_desc ..."
+  $as_echo "566. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76809,13 +77234,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_564
-#AT_START_565
-at_fn_group_banner 565 'aes128.at:52' \
+#AT_STOP_566
+#AT_START_567
+at_fn_group_banner 567 'aes128.at:52' \
   "NIST KAT ECBKeySbox128e vector 5" "               " 33
 at_xfail=no
 (
-  $as_echo "565. $at_setup_line: testing $at_desc ..."
+  $as_echo "567. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76841,13 +77266,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_565
-#AT_START_566
-at_fn_group_banner 566 'aes128.at:58' \
+#AT_STOP_567
+#AT_START_568
+at_fn_group_banner 568 'aes128.at:58' \
   "NIST KAT ECBKeySbox128e vector 6" "               " 33
 at_xfail=no
 (
-  $as_echo "566. $at_setup_line: testing $at_desc ..."
+  $as_echo "568. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76873,13 +77298,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_566
-#AT_START_567
-at_fn_group_banner 567 'aes128.at:64' \
+#AT_STOP_568
+#AT_START_569
+at_fn_group_banner 569 'aes128.at:64' \
   "NIST KAT ECBKeySbox128e vector 7" "               " 33
 at_xfail=no
 (
-  $as_echo "567. $at_setup_line: testing $at_desc ..."
+  $as_echo "569. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76905,13 +77330,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_567
-#AT_START_568
-at_fn_group_banner 568 'aes128.at:70' \
+#AT_STOP_569
+#AT_START_570
+at_fn_group_banner 570 'aes128.at:70' \
   "NIST KAT ECBKeySbox128e vector 8" "               " 33
 at_xfail=no
 (
-  $as_echo "568. $at_setup_line: testing $at_desc ..."
+  $as_echo "570. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76937,13 +77362,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_568
-#AT_START_569
-at_fn_group_banner 569 'aes128.at:76' \
+#AT_STOP_570
+#AT_START_571
+at_fn_group_banner 571 'aes128.at:76' \
   "NIST KAT ECBKeySbox128e vector 9" "               " 33
 at_xfail=no
 (
-  $as_echo "569. $at_setup_line: testing $at_desc ..."
+  $as_echo "571. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -76969,13 +77394,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_569
-#AT_START_570
-at_fn_group_banner 570 'aes128.at:82' \
+#AT_STOP_571
+#AT_START_572
+at_fn_group_banner 572 'aes128.at:82' \
   "NIST KAT ECBKeySbox128e vector 10" "              " 33
 at_xfail=no
 (
-  $as_echo "570. $at_setup_line: testing $at_desc ..."
+  $as_echo "572. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77001,13 +77426,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_570
-#AT_START_571
-at_fn_group_banner 571 'aes128.at:88' \
+#AT_STOP_572
+#AT_START_573
+at_fn_group_banner 573 'aes128.at:88' \
   "NIST KAT ECBKeySbox128e vector 11" "              " 33
 at_xfail=no
 (
-  $as_echo "571. $at_setup_line: testing $at_desc ..."
+  $as_echo "573. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77033,13 +77458,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_571
-#AT_START_572
-at_fn_group_banner 572 'aes128.at:94' \
+#AT_STOP_573
+#AT_START_574
+at_fn_group_banner 574 'aes128.at:94' \
   "NIST KAT ECBKeySbox128e vector 12" "              " 33
 at_xfail=no
 (
-  $as_echo "572. $at_setup_line: testing $at_desc ..."
+  $as_echo "574. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77065,13 +77490,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_572
-#AT_START_573
-at_fn_group_banner 573 'aes128.at:100' \
+#AT_STOP_574
+#AT_START_575
+at_fn_group_banner 575 'aes128.at:100' \
   "NIST KAT ECBKeySbox128e vector 13" "              " 33
 at_xfail=no
 (
-  $as_echo "573. $at_setup_line: testing $at_desc ..."
+  $as_echo "575. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77097,13 +77522,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_573
-#AT_START_574
-at_fn_group_banner 574 'aes128.at:106' \
+#AT_STOP_575
+#AT_START_576
+at_fn_group_banner 576 'aes128.at:106' \
   "NIST KAT ECBKeySbox128e vector 14" "              " 33
 at_xfail=no
 (
-  $as_echo "574. $at_setup_line: testing $at_desc ..."
+  $as_echo "576. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77129,13 +77554,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_574
-#AT_START_575
-at_fn_group_banner 575 'aes128.at:112' \
+#AT_STOP_576
+#AT_START_577
+at_fn_group_banner 577 'aes128.at:112' \
   "NIST KAT ECBKeySbox128e vector 15" "              " 33
 at_xfail=no
 (
-  $as_echo "575. $at_setup_line: testing $at_desc ..."
+  $as_echo "577. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77161,13 +77586,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_575
-#AT_START_576
-at_fn_group_banner 576 'aes128.at:118' \
+#AT_STOP_577
+#AT_START_578
+at_fn_group_banner 578 'aes128.at:118' \
   "NIST KAT ECBKeySbox128e vector 16" "              " 33
 at_xfail=no
 (
-  $as_echo "576. $at_setup_line: testing $at_desc ..."
+  $as_echo "578. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77193,13 +77618,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_576
-#AT_START_577
-at_fn_group_banner 577 'aes128.at:124' \
+#AT_STOP_578
+#AT_START_579
+at_fn_group_banner 579 'aes128.at:124' \
   "NIST KAT ECBKeySbox128e vector 17" "              " 33
 at_xfail=no
 (
-  $as_echo "577. $at_setup_line: testing $at_desc ..."
+  $as_echo "579. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77225,13 +77650,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_577
-#AT_START_578
-at_fn_group_banner 578 'aes128.at:130' \
+#AT_STOP_579
+#AT_START_580
+at_fn_group_banner 580 'aes128.at:130' \
   "NIST KAT ECBKeySbox128e vector 18" "              " 33
 at_xfail=no
 (
-  $as_echo "578. $at_setup_line: testing $at_desc ..."
+  $as_echo "580. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77257,13 +77682,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_578
-#AT_START_579
-at_fn_group_banner 579 'aes128.at:136' \
+#AT_STOP_580
+#AT_START_581
+at_fn_group_banner 581 'aes128.at:136' \
   "NIST KAT ECBKeySbox128e vector 19" "              " 33
 at_xfail=no
 (
-  $as_echo "579. $at_setup_line: testing $at_desc ..."
+  $as_echo "581. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77289,13 +77714,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_579
-#AT_START_580
-at_fn_group_banner 580 'aes128.at:142' \
+#AT_STOP_581
+#AT_START_582
+at_fn_group_banner 582 'aes128.at:142' \
   "NIST KAT ECBKeySbox128e vector 20" "              " 33
 at_xfail=no
 (
-  $as_echo "580. $at_setup_line: testing $at_desc ..."
+  $as_echo "582. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77321,13 +77746,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_580
-#AT_START_581
-at_fn_group_banner 581 'unixctl-py.at:6' \
+#AT_STOP_582
+#AT_START_583
+at_fn_group_banner 583 'unixctl-py.at:6' \
   "unixctl ovs-vswitchd exit - Python3" "            " 34
 at_xfail=no
 (
-  $as_echo "581. $at_setup_line: testing $at_desc ..."
+  $as_echo "583. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77523,13 +77948,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_581
-#AT_START_582
-at_fn_group_banner 582 'unixctl-py.at:17' \
+#AT_STOP_583
+#AT_START_584
+at_fn_group_banner 584 'unixctl-py.at:17' \
   "unixctl ovs-vswitchd list-commands - Python3" "   " 34
 at_xfail=no
 (
-  $as_echo "582. $at_setup_line: testing $at_desc ..."
+  $as_echo "584. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -77819,13 +78244,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_582
-#AT_START_583
-at_fn_group_banner 583 'unixctl-py.at:30' \
+#AT_STOP_584
+#AT_START_585
+at_fn_group_banner 585 'unixctl-py.at:30' \
   "unixctl ovs-vswitchd arguments - Python3" "       " 34
 at_xfail=no
 (
-  $as_echo "583. $at_setup_line: testing $at_desc ..."
+  $as_echo "585. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -78311,13 +78736,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_583
-#AT_START_584
-at_fn_group_banner 584 'unixctl-py.at:71' \
+#AT_STOP_585
+#AT_START_586
+at_fn_group_banner 586 'unixctl-py.at:71' \
   "unixctl bad target - Python3" "                   " 34
 at_xfail=no
 (
-  $as_echo "584. $at_setup_line: testing $at_desc ..."
+  $as_echo "586. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -78414,13 +78839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_584
-#AT_START_585
-at_fn_group_banner 585 'unixctl-py.at:89' \
+#AT_STOP_586
+#AT_START_587
+at_fn_group_banner 587 'unixctl-py.at:89' \
   "unixctl server - Python3" "                       " 34
 at_xfail=no
 (
-  $as_echo "585. $at_setup_line: testing $at_desc ..."
+  $as_echo "587. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -78795,13 +79220,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_585
-#AT_START_586
-at_fn_group_banner 586 'unixctl-py.at:158' \
+#AT_STOP_587
+#AT_START_588
+at_fn_group_banner 588 'unixctl-py.at:158' \
   "unixctl server errors - Python3" "                " 34
 at_xfail=no
 (
-  $as_echo "586. $at_setup_line: testing $at_desc ..."
+  $as_echo "588. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -78824,13 +79249,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_586
-#AT_START_587
-at_fn_group_banner 587 'uuid.at:15' \
+#AT_STOP_588
+#AT_START_589
+at_fn_group_banner 589 'uuid.at:15' \
   "UUID generation, parsing, serialization" "        " 35
 at_xfail=no
 (
-  $as_echo "587. $at_setup_line: testing $at_desc ..."
+  $as_echo "589. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -78908,13 +79333,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_587
-#AT_START_588
-at_fn_group_banner 588 'json.at:55' \
+#AT_STOP_589
+#AT_START_590
+at_fn_group_banner 590 'json.at:55' \
   "empty array - C" "                                " 36
 at_xfail=no
 (
-  $as_echo "588. $at_setup_line: testing $at_desc ..."
+  $as_echo "590. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -78969,13 +79394,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_588
-#AT_START_589
-at_fn_group_banner 589 'json.at:55' \
+#AT_STOP_590
+#AT_START_591
+at_fn_group_banner 591 'json.at:55' \
   "empty array - Python3" "                          " 36
 at_xfail=no
 (
-  $as_echo "589. $at_setup_line: testing $at_desc ..."
+  $as_echo "591. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79030,13 +79455,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_589
-#AT_START_590
-at_fn_group_banner 590 'json.at:56' \
+#AT_STOP_591
+#AT_START_592
+at_fn_group_banner 592 'json.at:56' \
   "single-element array - C" "                       " 36
 at_xfail=no
 (
-  $as_echo "590. $at_setup_line: testing $at_desc ..."
+  $as_echo "592. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79091,13 +79516,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_590
-#AT_START_591
-at_fn_group_banner 591 'json.at:56' \
+#AT_STOP_592
+#AT_START_593
+at_fn_group_banner 593 'json.at:56' \
   "single-element array - Python3" "                 " 36
 at_xfail=no
 (
-  $as_echo "591. $at_setup_line: testing $at_desc ..."
+  $as_echo "593. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79152,13 +79577,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_591
-#AT_START_592
-at_fn_group_banner 592 'json.at:57' \
+#AT_STOP_593
+#AT_START_594
+at_fn_group_banner 594 'json.at:57' \
   "2-element array - C" "                            " 36
 at_xfail=no
 (
-  $as_echo "592. $at_setup_line: testing $at_desc ..."
+  $as_echo "594. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79213,13 +79638,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_592
-#AT_START_593
-at_fn_group_banner 593 'json.at:57' \
+#AT_STOP_594
+#AT_START_595
+at_fn_group_banner 595 'json.at:57' \
   "2-element array - Python3" "                      " 36
 at_xfail=no
 (
-  $as_echo "593. $at_setup_line: testing $at_desc ..."
+  $as_echo "595. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79274,13 +79699,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_593
-#AT_START_594
-at_fn_group_banner 594 'json.at:58' \
+#AT_STOP_595
+#AT_START_596
+at_fn_group_banner 596 'json.at:58' \
   "many-element array - C" "                         " 36
 at_xfail=no
 (
-  $as_echo "594. $at_setup_line: testing $at_desc ..."
+  $as_echo "596. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79335,13 +79760,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_594
-#AT_START_595
-at_fn_group_banner 595 'json.at:58' \
+#AT_STOP_596
+#AT_START_597
+at_fn_group_banner 597 'json.at:58' \
   "many-element array - Python3" "                   " 36
 at_xfail=no
 (
-  $as_echo "595. $at_setup_line: testing $at_desc ..."
+  $as_echo "597. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79396,13 +79821,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_595
-#AT_START_596
-at_fn_group_banner 596 'json.at:61' \
+#AT_STOP_597
+#AT_START_598
+at_fn_group_banner 598 'json.at:61' \
   "missing comma - C" "                              " 36
 at_xfail=no
 (
-  $as_echo "596. $at_setup_line: testing $at_desc ..."
+  $as_echo "598. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79457,13 +79882,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_596
-#AT_START_597
-at_fn_group_banner 597 'json.at:61' \
+#AT_STOP_598
+#AT_START_599
+at_fn_group_banner 599 'json.at:61' \
   "missing comma - Python3" "                        " 36
 at_xfail=no
 (
-  $as_echo "597. $at_setup_line: testing $at_desc ..."
+  $as_echo "599. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79518,13 +79943,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_597
-#AT_START_598
-at_fn_group_banner 598 'json.at:63' \
+#AT_STOP_599
+#AT_START_600
+at_fn_group_banner 600 'json.at:63' \
   "trailing comma not allowed - C" "                 " 36
 at_xfail=no
 (
-  $as_echo "598. $at_setup_line: testing $at_desc ..."
+  $as_echo "600. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79579,13 +80004,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_598
-#AT_START_599
-at_fn_group_banner 599 'json.at:63' \
+#AT_STOP_600
+#AT_START_601
+at_fn_group_banner 601 'json.at:63' \
   "trailing comma not allowed - Python3" "           " 36
 at_xfail=no
 (
-  $as_echo "599. $at_setup_line: testing $at_desc ..."
+  $as_echo "601. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79640,13 +80065,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_599
-#AT_START_600
-at_fn_group_banner 600 'json.at:65' \
+#AT_STOP_601
+#AT_START_602
+at_fn_group_banner 602 'json.at:65' \
   "doubled comma not allowed - C" "                  " 36
 at_xfail=no
 (
-  $as_echo "600. $at_setup_line: testing $at_desc ..."
+  $as_echo "602. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79701,13 +80126,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_600
-#AT_START_601
-at_fn_group_banner 601 'json.at:65' \
+#AT_STOP_602
+#AT_START_603
+at_fn_group_banner 603 'json.at:65' \
   "doubled comma not allowed - Python3" "            " 36
 at_xfail=no
 (
-  $as_echo "601. $at_setup_line: testing $at_desc ..."
+  $as_echo "603. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79762,13 +80187,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_601
-#AT_START_602
-at_fn_group_banner 602 'json.at:70' \
+#AT_STOP_603
+#AT_START_604
+at_fn_group_banner 604 'json.at:70' \
   "empty string - C" "                               " 37
 at_xfail=no
 (
-  $as_echo "602. $at_setup_line: testing $at_desc ..."
+  $as_echo "604. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79823,13 +80248,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_602
-#AT_START_603
-at_fn_group_banner 603 'json.at:70' \
+#AT_STOP_604
+#AT_START_605
+at_fn_group_banner 605 'json.at:70' \
   "empty string - Python3" "                         " 37
 at_xfail=no
 (
-  $as_echo "603. $at_setup_line: testing $at_desc ..."
+  $as_echo "605. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79884,13 +80309,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_603
-#AT_START_604
-at_fn_group_banner 604 'json.at:71' \
+#AT_STOP_605
+#AT_START_606
+at_fn_group_banner 606 'json.at:71' \
   "1-character strings - C" "                        " 37
 at_xfail=no
 (
-  $as_echo "604. $at_setup_line: testing $at_desc ..."
+  $as_echo "606. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -79945,13 +80370,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_604
-#AT_START_605
-at_fn_group_banner 605 'json.at:71' \
+#AT_STOP_606
+#AT_START_607
+at_fn_group_banner 607 'json.at:71' \
   "1-character strings - Python3" "                  " 37
 at_xfail=no
 (
-  $as_echo "605. $at_setup_line: testing $at_desc ..."
+  $as_echo "607. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80006,13 +80431,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_605
-#AT_START_606
-at_fn_group_banner 606 'json.at:74' \
+#AT_STOP_607
+#AT_START_608
+at_fn_group_banner 608 'json.at:74' \
   "escape sequences - C" "                           " 37
 at_xfail=no
 (
-  $as_echo "606. $at_setup_line: testing $at_desc ..."
+  $as_echo "608. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80067,13 +80492,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_606
-#AT_START_607
-at_fn_group_banner 607 'json.at:74' \
+#AT_STOP_608
+#AT_START_609
+at_fn_group_banner 609 'json.at:74' \
   "escape sequences - Python3" "                     " 37
 at_xfail=no
 (
-  $as_echo "607. $at_setup_line: testing $at_desc ..."
+  $as_echo "609. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80128,13 +80553,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_607
-#AT_START_608
-at_fn_group_banner 608 'json.at:77' \
+#AT_STOP_609
+#AT_START_610
+at_fn_group_banner 610 'json.at:77' \
   "Unicode escape sequences - C" "                   " 37
 at_xfail=no
 (
-  $as_echo "608. $at_setup_line: testing $at_desc ..."
+  $as_echo "610. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80189,13 +80614,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_608
-#AT_START_609
-at_fn_group_banner 609 'json.at:77' \
+#AT_STOP_610
+#AT_START_611
+at_fn_group_banner 611 'json.at:77' \
   "Unicode escape sequences - Python3" "             " 37
 at_xfail=no
 (
-  $as_echo "609. $at_setup_line: testing $at_desc ..."
+  $as_echo "611. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80250,13 +80675,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_609
-#AT_START_610
-at_fn_group_banner 610 'json.at:80' \
+#AT_STOP_611
+#AT_START_612
+at_fn_group_banner 612 'json.at:80' \
   "surrogate pairs - C" "                            " 37
 at_xfail=no
 (
-  $as_echo "610. $at_setup_line: testing $at_desc ..."
+  $as_echo "612. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80311,13 +80736,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_610
-#AT_START_611
-at_fn_group_banner 611 'json.at:83' \
+#AT_STOP_612
+#AT_START_613
+at_fn_group_banner 613 'json.at:83' \
   "a string by itself is not valid JSON - C" "       " 37
 at_xfail=no
 (
-  $as_echo "611. $at_setup_line: testing $at_desc ..."
+  $as_echo "613. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80372,13 +80797,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_611
-#AT_START_612
-at_fn_group_banner 612 'json.at:83' \
+#AT_STOP_613
+#AT_START_614
+at_fn_group_banner 614 'json.at:83' \
   "a string by itself is not valid JSON - Python3" " " 37
 at_xfail=no
 (
-  $as_echo "612. $at_setup_line: testing $at_desc ..."
+  $as_echo "614. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80433,13 +80858,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_612
-#AT_START_613
-at_fn_group_banner 613 'json.at:85' \
+#AT_STOP_614
+#AT_START_615
+at_fn_group_banner 615 'json.at:85' \
   "end of line in quoted string - C" "               " 37
 at_xfail=no
 (
-  $as_echo "613. $at_setup_line: testing $at_desc ..."
+  $as_echo "615. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80496,13 +80921,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_613
-#AT_START_614
-at_fn_group_banner 614 'json.at:85' \
+#AT_STOP_615
+#AT_START_616
+at_fn_group_banner 616 'json.at:85' \
   "end of line in quoted string - Python3" "         " 37
 at_xfail=no
 (
-  $as_echo "614. $at_setup_line: testing $at_desc ..."
+  $as_echo "616. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80559,13 +80984,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_614
-#AT_START_615
-at_fn_group_banner 615 'json.at:89' \
+#AT_STOP_616
+#AT_START_617
+at_fn_group_banner 617 'json.at:89' \
   "formfeed in quoted string - C" "                  " 37
 at_xfail=no
 (
-  $as_echo "615. $at_setup_line: testing $at_desc ..."
+  $as_echo "617. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80620,13 +81045,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_615
-#AT_START_616
-at_fn_group_banner 616 'json.at:89' \
+#AT_STOP_617
+#AT_START_618
+at_fn_group_banner 618 'json.at:89' \
   "formfeed in quoted string - Python3" "            " 37
 at_xfail=no
 (
-  $as_echo "616. $at_setup_line: testing $at_desc ..."
+  $as_echo "618. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80681,13 +81106,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_616
-#AT_START_617
-at_fn_group_banner 617 'json.at:92' \
+#AT_STOP_618
+#AT_START_619
+at_fn_group_banner 619 'json.at:92' \
   "bad escape in quoted string - C" "                " 37
 at_xfail=no
 (
-  $as_echo "617. $at_setup_line: testing $at_desc ..."
+  $as_echo "619. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80742,13 +81167,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_617
-#AT_START_618
-at_fn_group_banner 618 'json.at:92' \
+#AT_STOP_619
+#AT_START_620
+at_fn_group_banner 620 'json.at:92' \
   "bad escape in quoted string - Python3" "          " 37
 at_xfail=no
 (
-  $as_echo "618. $at_setup_line: testing $at_desc ..."
+  $as_echo "620. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80803,13 +81228,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_618
-#AT_START_619
-at_fn_group_banner 619 'json.at:95' \
+#AT_STOP_620
+#AT_START_621
+at_fn_group_banner 621 'json.at:95' \
   "\\u must be followed by 4 hex digits (1) - C" "    " 37
 at_xfail=no
 (
-  $as_echo "619. $at_setup_line: testing $at_desc ..."
+  $as_echo "621. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80864,13 +81289,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_619
-#AT_START_620
-at_fn_group_banner 620 'json.at:95' \
+#AT_STOP_621
+#AT_START_622
+at_fn_group_banner 622 'json.at:95' \
   "\\u must be followed by 4 hex digits (1) - Python3" "" 37
 at_xfail=no
 (
-  $as_echo "620. $at_setup_line: testing $at_desc ..."
+  $as_echo "622. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80925,13 +81350,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_620
-#AT_START_621
-at_fn_group_banner 621 'json.at:98' \
+#AT_STOP_622
+#AT_START_623
+at_fn_group_banner 623 'json.at:98' \
   "\\u must be followed by 4 hex digits (2) - C" "    " 37
 at_xfail=no
 (
-  $as_echo "621. $at_setup_line: testing $at_desc ..."
+  $as_echo "623. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -80986,13 +81411,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_621
-#AT_START_622
-at_fn_group_banner 622 'json.at:98' \
+#AT_STOP_623
+#AT_START_624
+at_fn_group_banner 624 'json.at:98' \
   "\\u must be followed by 4 hex digits (2) - Python3" "" 37
 at_xfail=no
 (
-  $as_echo "622. $at_setup_line: testing $at_desc ..."
+  $as_echo "624. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81047,13 +81472,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_622
-#AT_START_623
-at_fn_group_banner 623 'json.at:101' \
+#AT_STOP_624
+#AT_START_625
+at_fn_group_banner 625 'json.at:101' \
   "isolated leading surrogate not allowed - C" "     " 37
 at_xfail=no
 (
-  $as_echo "623. $at_setup_line: testing $at_desc ..."
+  $as_echo "625. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81108,13 +81533,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_623
-#AT_START_624
-at_fn_group_banner 624 'json.at:101' \
+#AT_STOP_625
+#AT_START_626
+at_fn_group_banner 626 'json.at:101' \
   "isolated leading surrogate not allowed - Python3" "" 37
 at_xfail=no
 (
-  $as_echo "624. $at_setup_line: testing $at_desc ..."
+  $as_echo "626. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81169,13 +81594,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_624
-#AT_START_625
-at_fn_group_banner 625 'json.at:104' \
+#AT_STOP_626
+#AT_START_627
+at_fn_group_banner 627 'json.at:104' \
   "surrogatess must paired properly - C" "           " 37
 at_xfail=no
 (
-  $as_echo "625. $at_setup_line: testing $at_desc ..."
+  $as_echo "627. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81230,13 +81655,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_625
-#AT_START_626
-at_fn_group_banner 626 'json.at:104' \
+#AT_STOP_627
+#AT_START_628
+at_fn_group_banner 628 'json.at:104' \
   "surrogatess must paired properly - Python3" "     " 37
 at_xfail=no
 (
-  $as_echo "626. $at_setup_line: testing $at_desc ..."
+  $as_echo "628. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81291,13 +81716,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_626
-#AT_START_627
-at_fn_group_banner 627 'json.at:107' \
+#AT_STOP_628
+#AT_START_629
+at_fn_group_banner 629 'json.at:107' \
   "null bytes not allowed - C" "                     " 37
 at_xfail=no
 (
-  $as_echo "627. $at_setup_line: testing $at_desc ..."
+  $as_echo "629. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81352,13 +81777,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_627
-#AT_START_628
-at_fn_group_banner 628 'json.at:107' \
+#AT_STOP_629
+#AT_START_630
+at_fn_group_banner 630 'json.at:107' \
   "null bytes not allowed - Python3" "               " 37
 at_xfail=no
 (
-  $as_echo "628. $at_setup_line: testing $at_desc ..."
+  $as_echo "630. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81413,13 +81838,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_628
-#AT_START_629
-at_fn_group_banner 629 'json.at:111' \
+#AT_STOP_630
+#AT_START_631
+at_fn_group_banner 631 'json.at:111' \
   "properly quoted backslash at end of string - C" " " 37
 at_xfail=no
 (
-  $as_echo "629. $at_setup_line: testing $at_desc ..."
+  $as_echo "631. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81474,13 +81899,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_629
-#AT_START_630
-at_fn_group_banner 630 'json.at:111' \
+#AT_STOP_631
+#AT_START_632
+at_fn_group_banner 632 'json.at:111' \
   "properly quoted backslash at end of string - Python3" "" 37
 at_xfail=no
 (
-  $as_echo "630. $at_setup_line: testing $at_desc ..."
+  $as_echo "632. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81535,13 +81960,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_630
-#AT_START_631
-at_fn_group_banner 631 'json.at:114' \
+#AT_STOP_632
+#AT_START_633
+at_fn_group_banner 633 'json.at:114' \
   "stray backslash at end of string - C" "           " 37
 at_xfail=no
 (
-  $as_echo "631. $at_setup_line: testing $at_desc ..."
+  $as_echo "633. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81596,13 +82021,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_631
-#AT_START_632
-at_fn_group_banner 632 'json.at:114' \
+#AT_STOP_633
+#AT_START_634
+at_fn_group_banner 634 'json.at:114' \
   "stray backslash at end of string - Python3" "     " 37
 at_xfail=no
 (
-  $as_echo "632. $at_setup_line: testing $at_desc ..."
+  $as_echo "634. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81657,13 +82082,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_632
-#AT_START_633
-at_fn_group_banner 633 'json.at:118' \
+#AT_STOP_634
+#AT_START_635
+at_fn_group_banner 635 'json.at:118' \
   "end of input in quoted string - C" "              " 37
 at_xfail=no
 (
-  $as_echo "633. $at_setup_line: testing $at_desc ..."
+  $as_echo "635. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81689,13 +82114,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_633
-#AT_START_634
-at_fn_group_banner 634 'json.at:127' \
+#AT_STOP_635
+#AT_START_636
+at_fn_group_banner 636 'json.at:127' \
   "empty object - C" "                               " 38
 at_xfail=no
 (
-  $as_echo "634. $at_setup_line: testing $at_desc ..."
+  $as_echo "636. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81750,13 +82175,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_634
-#AT_START_635
-at_fn_group_banner 635 'json.at:127' \
+#AT_STOP_636
+#AT_START_637
+at_fn_group_banner 637 'json.at:127' \
   "empty object - Python3" "                         " 38
 at_xfail=no
 (
-  $as_echo "635. $at_setup_line: testing $at_desc ..."
+  $as_echo "637. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81811,13 +82236,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_635
-#AT_START_636
-at_fn_group_banner 636 'json.at:128' \
+#AT_STOP_637
+#AT_START_638
+at_fn_group_banner 638 'json.at:128' \
   "simple object - C" "                              " 38
 at_xfail=no
 (
-  $as_echo "636. $at_setup_line: testing $at_desc ..."
+  $as_echo "638. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81872,13 +82297,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_636
-#AT_START_637
-at_fn_group_banner 637 'json.at:128' \
+#AT_STOP_638
+#AT_START_639
+at_fn_group_banner 639 'json.at:128' \
   "simple object - Python3" "                        " 38
 at_xfail=no
 (
-  $as_echo "637. $at_setup_line: testing $at_desc ..."
+  $as_echo "639. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81933,13 +82358,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_637
-#AT_START_638
-at_fn_group_banner 638 'json.at:131' \
+#AT_STOP_639
+#AT_START_640
+at_fn_group_banner 640 'json.at:131' \
   "bad value - C" "                                  " 38
 at_xfail=no
 (
-  $as_echo "638. $at_setup_line: testing $at_desc ..."
+  $as_echo "640. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -81994,13 +82419,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_638
-#AT_START_639
-at_fn_group_banner 639 'json.at:131' \
+#AT_STOP_640
+#AT_START_641
+at_fn_group_banner 641 'json.at:131' \
   "bad value - Python3" "                            " 38
 at_xfail=no
 (
-  $as_echo "639. $at_setup_line: testing $at_desc ..."
+  $as_echo "641. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82055,13 +82480,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_639
-#AT_START_640
-at_fn_group_banner 640 'json.at:133' \
+#AT_STOP_641
+#AT_START_642
+at_fn_group_banner 642 'json.at:133' \
   "missing colon - C" "                              " 38
 at_xfail=no
 (
-  $as_echo "640. $at_setup_line: testing $at_desc ..."
+  $as_echo "642. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82116,13 +82541,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_640
-#AT_START_641
-at_fn_group_banner 641 'json.at:133' \
+#AT_STOP_642
+#AT_START_643
+at_fn_group_banner 643 'json.at:133' \
   "missing colon - Python3" "                        " 38
 at_xfail=no
 (
-  $as_echo "641. $at_setup_line: testing $at_desc ..."
+  $as_echo "643. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82177,13 +82602,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_641
-#AT_START_642
-at_fn_group_banner 642 'json.at:135' \
+#AT_STOP_643
+#AT_START_644
+at_fn_group_banner 644 'json.at:135' \
   "missing comma - C" "                              " 38
 at_xfail=no
 (
-  $as_echo "642. $at_setup_line: testing $at_desc ..."
+  $as_echo "644. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82238,13 +82663,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_642
-#AT_START_643
-at_fn_group_banner 643 'json.at:135' \
+#AT_STOP_644
+#AT_START_645
+at_fn_group_banner 645 'json.at:135' \
   "missing comma - Python3" "                        " 38
 at_xfail=no
 (
-  $as_echo "643. $at_setup_line: testing $at_desc ..."
+  $as_echo "645. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82299,13 +82724,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_643
-#AT_START_644
-at_fn_group_banner 644 'json.at:137' \
+#AT_STOP_645
+#AT_START_646
+at_fn_group_banner 646 'json.at:137' \
   "trailing comma not allowed - C" "                 " 38
 at_xfail=no
 (
-  $as_echo "644. $at_setup_line: testing $at_desc ..."
+  $as_echo "646. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82360,13 +82785,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_644
-#AT_START_645
-at_fn_group_banner 645 'json.at:137' \
+#AT_STOP_646
+#AT_START_647
+at_fn_group_banner 647 'json.at:137' \
   "trailing comma not allowed - Python3" "           " 38
 at_xfail=no
 (
-  $as_echo "645. $at_setup_line: testing $at_desc ..."
+  $as_echo "647. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82421,13 +82846,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_645
-#AT_START_646
-at_fn_group_banner 646 'json.at:140' \
+#AT_STOP_647
+#AT_START_648
+at_fn_group_banner 648 'json.at:140' \
   "doubled comma not allowed - C" "                  " 38
 at_xfail=no
 (
-  $as_echo "646. $at_setup_line: testing $at_desc ..."
+  $as_echo "648. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82482,13 +82907,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_646
-#AT_START_647
-at_fn_group_banner 647 'json.at:140' \
+#AT_STOP_648
+#AT_START_649
+at_fn_group_banner 649 'json.at:140' \
   "doubled comma not allowed - Python3" "            " 38
 at_xfail=no
 (
-  $as_echo "647. $at_setup_line: testing $at_desc ..."
+  $as_echo "649. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82543,13 +82968,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_647
-#AT_START_648
-at_fn_group_banner 648 'json.at:143' \
+#AT_STOP_649
+#AT_START_650
+at_fn_group_banner 650 'json.at:143' \
   "names must be strings - C" "                      " 38
 at_xfail=no
 (
-  $as_echo "648. $at_setup_line: testing $at_desc ..."
+  $as_echo "650. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82604,13 +83029,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_648
-#AT_START_649
-at_fn_group_banner 649 'json.at:143' \
+#AT_STOP_650
+#AT_START_651
+at_fn_group_banner 651 'json.at:143' \
   "names must be strings - Python3" "                " 38
 at_xfail=no
 (
-  $as_echo "649. $at_setup_line: testing $at_desc ..."
+  $as_echo "651. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82665,13 +83090,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_649
-#AT_START_650
-at_fn_group_banner 650 'json.at:149' \
+#AT_STOP_651
+#AT_START_652
+at_fn_group_banner 652 'json.at:149' \
   "null - C" "                                       " 39
 at_xfail=no
 (
-  $as_echo "650. $at_setup_line: testing $at_desc ..."
+  $as_echo "652. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82726,13 +83151,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_650
-#AT_START_651
-at_fn_group_banner 651 'json.at:149' \
+#AT_STOP_652
+#AT_START_653
+at_fn_group_banner 653 'json.at:149' \
   "null - Python3" "                                 " 39
 at_xfail=no
 (
-  $as_echo "651. $at_setup_line: testing $at_desc ..."
+  $as_echo "653. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82787,13 +83212,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_651
-#AT_START_652
-at_fn_group_banner 652 'json.at:150' \
+#AT_STOP_653
+#AT_START_654
+at_fn_group_banner 654 'json.at:150' \
   "false - C" "                                      " 39
 at_xfail=no
 (
-  $as_echo "652. $at_setup_line: testing $at_desc ..."
+  $as_echo "654. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82848,13 +83273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_652
-#AT_START_653
-at_fn_group_banner 653 'json.at:150' \
+#AT_STOP_654
+#AT_START_655
+at_fn_group_banner 655 'json.at:150' \
   "false - Python3" "                                " 39
 at_xfail=no
 (
-  $as_echo "653. $at_setup_line: testing $at_desc ..."
+  $as_echo "655. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82909,13 +83334,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_653
-#AT_START_654
-at_fn_group_banner 654 'json.at:151' \
+#AT_STOP_655
+#AT_START_656
+at_fn_group_banner 656 'json.at:151' \
   "true - C" "                                       " 39
 at_xfail=no
 (
-  $as_echo "654. $at_setup_line: testing $at_desc ..."
+  $as_echo "656. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -82970,13 +83395,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_654
-#AT_START_655
-at_fn_group_banner 655 'json.at:151' \
+#AT_STOP_656
+#AT_START_657
+at_fn_group_banner 657 'json.at:151' \
   "true - Python3" "                                 " 39
 at_xfail=no
 (
-  $as_echo "655. $at_setup_line: testing $at_desc ..."
+  $as_echo "657. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83031,13 +83456,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_655
-#AT_START_656
-at_fn_group_banner 656 'json.at:152' \
+#AT_STOP_657
+#AT_START_658
+at_fn_group_banner 658 'json.at:152' \
   "a literal by itself is not valid JSON - C" "      " 39
 at_xfail=no
 (
-  $as_echo "656. $at_setup_line: testing $at_desc ..."
+  $as_echo "658. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83092,13 +83517,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_656
-#AT_START_657
-at_fn_group_banner 657 'json.at:152' \
+#AT_STOP_658
+#AT_START_659
+at_fn_group_banner 659 'json.at:152' \
   "a literal by itself is not valid JSON - Python3" "" 39
 at_xfail=no
 (
-  $as_echo "657. $at_setup_line: testing $at_desc ..."
+  $as_echo "659. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83153,13 +83578,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_657
-#AT_START_658
-at_fn_group_banner 658 'json.at:154' \
+#AT_STOP_659
+#AT_START_660
+at_fn_group_banner 660 'json.at:154' \
   "nullify is invalid - C" "                         " 39
 at_xfail=no
 (
-  $as_echo "658. $at_setup_line: testing $at_desc ..."
+  $as_echo "660. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83214,13 +83639,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_658
-#AT_START_659
-at_fn_group_banner 659 'json.at:154' \
+#AT_STOP_660
+#AT_START_661
+at_fn_group_banner 661 'json.at:154' \
   "nullify is invalid - Python3" "                   " 39
 at_xfail=no
 (
-  $as_echo "659. $at_setup_line: testing $at_desc ..."
+  $as_echo "661. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83275,13 +83700,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_659
-#AT_START_660
-at_fn_group_banner 660 'json.at:156' \
+#AT_STOP_661
+#AT_START_662
+at_fn_group_banner 662 'json.at:156' \
   "nubs is invalid - C" "                            " 39
 at_xfail=no
 (
-  $as_echo "660. $at_setup_line: testing $at_desc ..."
+  $as_echo "662. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83336,13 +83761,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_660
-#AT_START_661
-at_fn_group_banner 661 'json.at:156' \
+#AT_STOP_662
+#AT_START_663
+at_fn_group_banner 663 'json.at:156' \
   "nubs is invalid - Python3" "                      " 39
 at_xfail=no
 (
-  $as_echo "661. $at_setup_line: testing $at_desc ..."
+  $as_echo "663. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83397,13 +83822,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_661
-#AT_START_662
-at_fn_group_banner 662 'json.at:158' \
+#AT_STOP_663
+#AT_START_664
+at_fn_group_banner 664 'json.at:158' \
   "xxx is invalid - C" "                             " 39
 at_xfail=no
 (
-  $as_echo "662. $at_setup_line: testing $at_desc ..."
+  $as_echo "664. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83458,13 +83883,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_662
-#AT_START_663
-at_fn_group_banner 663 'json.at:158' \
+#AT_STOP_664
+#AT_START_665
+at_fn_group_banner 665 'json.at:158' \
   "xxx is invalid - Python3" "                       " 39
 at_xfail=no
 (
-  $as_echo "663. $at_setup_line: testing $at_desc ..."
+  $as_echo "665. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83519,13 +83944,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_663
-#AT_START_664
-at_fn_group_banner 664 'json.at:163' \
+#AT_STOP_665
+#AT_START_666
+at_fn_group_banner 666 'json.at:163' \
   "integers expressed as reals - C" "                " 40
 at_xfail=no
 (
-  $as_echo "664. $at_setup_line: testing $at_desc ..."
+  $as_echo "666. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83592,13 +84017,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_664
-#AT_START_665
-at_fn_group_banner 665 'json.at:163' \
+#AT_STOP_666
+#AT_START_667
+at_fn_group_banner 667 'json.at:163' \
   "integers expressed as reals - Python3" "          " 40
 at_xfail=no
 (
-  $as_echo "665. $at_setup_line: testing $at_desc ..."
+  $as_echo "667. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83665,13 +84090,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_665
-#AT_START_666
-at_fn_group_banner 666 'json.at:173' \
+#AT_STOP_667
+#AT_START_668
+at_fn_group_banner 668 'json.at:173' \
   "large integers - C" "                             " 40
 at_xfail=no
 (
-  $as_echo "666. $at_setup_line: testing $at_desc ..."
+  $as_echo "668. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83726,13 +84151,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_666
-#AT_START_667
-at_fn_group_banner 667 'json.at:173' \
+#AT_STOP_668
+#AT_START_669
+at_fn_group_banner 669 'json.at:173' \
   "large integers - Python3" "                       " 40
 at_xfail=no
 (
-  $as_echo "667. $at_setup_line: testing $at_desc ..."
+  $as_echo "669. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83787,13 +84212,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_667
-#AT_START_668
-at_fn_group_banner 668 'json.at:177' \
+#AT_STOP_669
+#AT_START_670
+at_fn_group_banner 670 'json.at:177' \
   "large integers expressed as reals - C" "          " 40
 at_xfail=no
 (
-  $as_echo "668. $at_setup_line: testing $at_desc ..."
+  $as_echo "670. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83850,13 +84275,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_668
-#AT_START_669
-at_fn_group_banner 669 'json.at:177' \
+#AT_STOP_670
+#AT_START_671
+at_fn_group_banner 671 'json.at:177' \
   "large integers expressed as reals - Python3" "    " 40
 at_xfail=no
 (
-  $as_echo "669. $at_setup_line: testing $at_desc ..."
+  $as_echo "671. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83913,13 +84338,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_669
-#AT_START_670
-at_fn_group_banner 670 'json.at:185' \
+#AT_STOP_671
+#AT_START_672
+at_fn_group_banner 672 'json.at:185' \
   "C - large integers that overflow to reals" "      " 40
 at_xfail=no
 (
-  $as_echo "670. $at_setup_line: testing $at_desc ..."
+  $as_echo "672. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -83974,13 +84399,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_670
-#AT_START_671
-at_fn_group_banner 671 'json.at:189' \
+#AT_STOP_672
+#AT_START_673
+at_fn_group_banner 673 'json.at:189' \
   "large integers that overflow to reals" "          " 40
 at_xfail=no
 (
-  $as_echo "671. $at_setup_line: testing $at_desc ..."
+  $as_echo "673. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84035,13 +84460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_671
-#AT_START_672
-at_fn_group_banner 672 'json.at:194' \
+#AT_STOP_673
+#AT_START_674
+at_fn_group_banner 674 'json.at:194' \
   "negative zero - C" "                              " 40
 at_xfail=no
 (
-  $as_echo "672. $at_setup_line: testing $at_desc ..."
+  $as_echo "674. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84096,13 +84521,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_672
-#AT_START_673
-at_fn_group_banner 673 'json.at:194' \
+#AT_STOP_674
+#AT_START_675
+at_fn_group_banner 675 'json.at:194' \
   "negative zero - Python3" "                        " 40
 at_xfail=no
 (
-  $as_echo "673. $at_setup_line: testing $at_desc ..."
+  $as_echo "675. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84157,13 +84582,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_673
-#AT_START_674
-at_fn_group_banner 674 'json.at:199' \
+#AT_STOP_675
+#AT_START_676
+at_fn_group_banner 676 'json.at:199' \
   "reals - C" "                                      " 40
 at_xfail=no
 (
-  $as_echo "674. $at_setup_line: testing $at_desc ..."
+  $as_echo "676. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84218,13 +84643,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_674
-#AT_START_675
-at_fn_group_banner 675 'json.at:199' \
+#AT_STOP_676
+#AT_START_677
+at_fn_group_banner 677 'json.at:199' \
   "reals - Python3" "                                " 40
 at_xfail=no
 (
-  $as_echo "675. $at_setup_line: testing $at_desc ..."
+  $as_echo "677. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84279,13 +84704,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_675
-#AT_START_676
-at_fn_group_banner 676 'json.at:203' \
+#AT_STOP_677
+#AT_START_678
+at_fn_group_banner 678 'json.at:203' \
   "scientific notation - C" "                        " 40
 at_xfail=no
 (
-  $as_echo "676. $at_setup_line: testing $at_desc ..."
+  $as_echo "678. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84340,13 +84765,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_676
-#AT_START_677
-at_fn_group_banner 677 'json.at:203' \
+#AT_STOP_678
+#AT_START_679
+at_fn_group_banner 679 'json.at:203' \
   "scientific notation - Python3" "                  " 40
 at_xfail=no
 (
-  $as_echo "677. $at_setup_line: testing $at_desc ..."
+  $as_echo "679. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84401,13 +84826,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_677
-#AT_START_678
-at_fn_group_banner 678 'json.at:210' \
+#AT_STOP_679
+#AT_START_680
+at_fn_group_banner 680 'json.at:210' \
   "C - +/- DBL_MAX" "                                " 40
 at_xfail=no
 (
-  $as_echo "678. $at_setup_line: testing $at_desc ..."
+  $as_echo "680. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84462,13 +84887,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_678
-#AT_START_679
-at_fn_group_banner 679 'json.at:214' \
+#AT_STOP_680
+#AT_START_681
+at_fn_group_banner 681 'json.at:214' \
   "+/- DBL_MAX" "                                    " 40
 at_xfail=no
 (
-  $as_echo "679. $at_setup_line: testing $at_desc ..."
+  $as_echo "681. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84523,13 +84948,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_679
-#AT_START_680
-at_fn_group_banner 680 'json.at:219' \
+#AT_STOP_681
+#AT_START_682
+at_fn_group_banner 682 'json.at:219' \
   "negative reals - C" "                             " 40
 at_xfail=no
 (
-  $as_echo "680. $at_setup_line: testing $at_desc ..."
+  $as_echo "682. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84584,13 +85009,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_680
-#AT_START_681
-at_fn_group_banner 681 'json.at:219' \
+#AT_STOP_682
+#AT_START_683
+at_fn_group_banner 683 'json.at:219' \
   "negative reals - Python3" "                       " 40
 at_xfail=no
 (
-  $as_echo "681. $at_setup_line: testing $at_desc ..."
+  $as_echo "683. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84645,13 +85070,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_681
-#AT_START_682
-at_fn_group_banner 682 'json.at:223' \
+#AT_STOP_683
+#AT_START_684
+at_fn_group_banner 684 'json.at:223' \
   "negative scientific notation - C" "               " 40
 at_xfail=no
 (
-  $as_echo "682. $at_setup_line: testing $at_desc ..."
+  $as_echo "684. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84706,13 +85131,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_682
-#AT_START_683
-at_fn_group_banner 683 'json.at:223' \
+#AT_STOP_684
+#AT_START_685
+at_fn_group_banner 685 'json.at:223' \
   "negative scientific notation - Python3" "         " 40
 at_xfail=no
 (
-  $as_echo "683. $at_setup_line: testing $at_desc ..."
+  $as_echo "685. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84767,13 +85192,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_683
-#AT_START_684
-at_fn_group_banner 684 'json.at:227' \
+#AT_STOP_685
+#AT_START_686
+at_fn_group_banner 686 'json.at:227' \
   "1e-9999 underflows to 0 - C" "                    " 40
 at_xfail=no
 (
-  $as_echo "684. $at_setup_line: testing $at_desc ..."
+  $as_echo "686. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84828,13 +85253,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_684
-#AT_START_685
-at_fn_group_banner 685 'json.at:227' \
+#AT_STOP_686
+#AT_START_687
+at_fn_group_banner 687 'json.at:227' \
   "1e-9999 underflows to 0 - Python3" "              " 40
 at_xfail=no
 (
-  $as_echo "685. $at_setup_line: testing $at_desc ..."
+  $as_echo "687. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84889,13 +85314,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_685
-#AT_START_686
-at_fn_group_banner 686 'json.at:231' \
+#AT_STOP_687
+#AT_START_688
+at_fn_group_banner 688 'json.at:231' \
   "a number by itself is not valid JSON - C" "       " 40
 at_xfail=no
 (
-  $as_echo "686. $at_setup_line: testing $at_desc ..."
+  $as_echo "688. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -84950,13 +85375,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_686
-#AT_START_687
-at_fn_group_banner 687 'json.at:231' \
+#AT_STOP_688
+#AT_START_689
+at_fn_group_banner 689 'json.at:231' \
   "a number by itself is not valid JSON - Python3" " " 40
 at_xfail=no
 (
-  $as_echo "687. $at_setup_line: testing $at_desc ..."
+  $as_echo "689. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85011,13 +85436,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_687
-#AT_START_688
-at_fn_group_banner 688 'json.at:233' \
+#AT_STOP_689
+#AT_START_690
+at_fn_group_banner 690 'json.at:233' \
   "leading zeros not allowed - C" "                  " 40
 at_xfail=no
 (
-  $as_echo "688. $at_setup_line: testing $at_desc ..."
+  $as_echo "690. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85072,13 +85497,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_688
-#AT_START_689
-at_fn_group_banner 689 'json.at:233' \
+#AT_STOP_690
+#AT_START_691
+at_fn_group_banner 691 'json.at:233' \
   "leading zeros not allowed - Python3" "            " 40
 at_xfail=no
 (
-  $as_echo "689. $at_setup_line: testing $at_desc ..."
+  $as_echo "691. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85133,13 +85558,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_689
-#AT_START_690
-at_fn_group_banner 690 'json.at:237' \
+#AT_STOP_691
+#AT_START_692
+at_fn_group_banner 692 'json.at:237' \
   "1e9999 is too big - C" "                          " 40
 at_xfail=no
 (
-  $as_echo "690. $at_setup_line: testing $at_desc ..."
+  $as_echo "692. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85194,13 +85619,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_690
-#AT_START_691
-at_fn_group_banner 691 'json.at:237' \
+#AT_STOP_692
+#AT_START_693
+at_fn_group_banner 693 'json.at:237' \
   "1e9999 is too big - Python3" "                    " 40
 at_xfail=no
 (
-  $as_echo "691. $at_setup_line: testing $at_desc ..."
+  $as_echo "693. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85255,13 +85680,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_691
-#AT_START_692
-at_fn_group_banner 692 'json.at:241' \
+#AT_STOP_693
+#AT_START_694
+at_fn_group_banner 694 'json.at:241' \
   "exponent bigger than INT_MAX" "                   " 40
 at_xfail=no
 (
-  $as_echo "692. $at_setup_line: testing $at_desc ..."
+  $as_echo "694. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85316,13 +85741,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_692
-#AT_START_693
-at_fn_group_banner 693 'json.at:245' \
+#AT_STOP_694
+#AT_START_695
+at_fn_group_banner 695 'json.at:245' \
   "exponent smaller than INT_MIN" "                  " 40
 at_xfail=no
 (
-  $as_echo "693. $at_setup_line: testing $at_desc ..."
+  $as_echo "695. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85377,13 +85802,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_693
-#AT_START_694
-at_fn_group_banner 694 'json.at:249' \
+#AT_STOP_695
+#AT_START_696
+at_fn_group_banner 696 'json.at:249' \
   "accumulated exponent bigger than INT_MAX" "       " 40
 at_xfail=no
 (
-  $as_echo "694. $at_setup_line: testing $at_desc ..."
+  $as_echo "696. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85438,13 +85863,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_694
-#AT_START_695
-at_fn_group_banner 695 'json.at:253' \
+#AT_STOP_696
+#AT_START_697
+at_fn_group_banner 697 'json.at:253' \
   "accumulated exponent smaller than INT_MIN" "      " 40
 at_xfail=no
 (
-  $as_echo "695. $at_setup_line: testing $at_desc ..."
+  $as_echo "697. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85499,13 +85924,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_695
-#AT_START_696
-at_fn_group_banner 696 'json.at:257' \
+#AT_STOP_697
+#AT_START_698
+at_fn_group_banner 698 'json.at:257' \
   "decimal point must be followed by digit - C" "    " 40
 at_xfail=no
 (
-  $as_echo "696. $at_setup_line: testing $at_desc ..."
+  $as_echo "698. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85560,13 +85985,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_696
-#AT_START_697
-at_fn_group_banner 697 'json.at:257' \
+#AT_STOP_698
+#AT_START_699
+at_fn_group_banner 699 'json.at:257' \
   "decimal point must be followed by digit - Python3" "" 40
 at_xfail=no
 (
-  $as_echo "697. $at_setup_line: testing $at_desc ..."
+  $as_echo "699. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85621,13 +86046,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_697
-#AT_START_698
-at_fn_group_banner 698 'json.at:261' \
+#AT_STOP_699
+#AT_START_700
+at_fn_group_banner 700 'json.at:261' \
   "exponent must contain at least one digit (1) - C" "" 40
 at_xfail=no
 (
-  $as_echo "698. $at_setup_line: testing $at_desc ..."
+  $as_echo "700. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85682,13 +86107,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_698
-#AT_START_699
-at_fn_group_banner 699 'json.at:261' \
+#AT_STOP_700
+#AT_START_701
+at_fn_group_banner 701 'json.at:261' \
   "exponent must contain at least one digit (1) - Python3" "" 40
 at_xfail=no
 (
-  $as_echo "699. $at_setup_line: testing $at_desc ..."
+  $as_echo "701. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85743,13 +86168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_699
-#AT_START_700
-at_fn_group_banner 700 'json.at:265' \
+#AT_STOP_701
+#AT_START_702
+at_fn_group_banner 702 'json.at:265' \
   "exponent must contain at least one digit (2) - C" "" 40
 at_xfail=no
 (
-  $as_echo "700. $at_setup_line: testing $at_desc ..."
+  $as_echo "702. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85804,13 +86229,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_700
-#AT_START_701
-at_fn_group_banner 701 'json.at:265' \
+#AT_STOP_702
+#AT_START_703
+at_fn_group_banner 703 'json.at:265' \
   "exponent must contain at least one digit (2) - Python3" "" 40
 at_xfail=no
 (
-  $as_echo "701. $at_setup_line: testing $at_desc ..."
+  $as_echo "703. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85865,13 +86290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_701
-#AT_START_702
-at_fn_group_banner 702 'json.at:269' \
+#AT_STOP_703
+#AT_START_704
+at_fn_group_banner 704 'json.at:269' \
   "exponent must contain at least one digit (3) - C" "" 40
 at_xfail=no
 (
-  $as_echo "702. $at_setup_line: testing $at_desc ..."
+  $as_echo "704. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85926,13 +86351,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_702
-#AT_START_703
-at_fn_group_banner 703 'json.at:269' \
+#AT_STOP_704
+#AT_START_705
+at_fn_group_banner 705 'json.at:269' \
   "exponent must contain at least one digit (3) - Python3" "" 40
 at_xfail=no
 (
-  $as_echo "703. $at_setup_line: testing $at_desc ..."
+  $as_echo "705. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -85987,13 +86412,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_703
-#AT_START_704
-at_fn_group_banner 704 'json.at:276' \
+#AT_STOP_705
+#AT_START_706
+at_fn_group_banner 706 'json.at:276' \
   "RFC 4267 object example - C" "                    " 41
 at_xfail=no
 (
-  $as_echo "704. $at_setup_line: testing $at_desc ..."
+  $as_echo "706. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86072,13 +86497,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_704
-#AT_START_705
-at_fn_group_banner 705 'json.at:276' \
+#AT_STOP_706
+#AT_START_707
+at_fn_group_banner 707 'json.at:276' \
   "RFC 4267 object example - Python3" "              " 41
 at_xfail=no
 (
-  $as_echo "705. $at_setup_line: testing $at_desc ..."
+  $as_echo "707. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86157,13 +86582,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_705
-#AT_START_706
-at_fn_group_banner 706 'json.at:292' \
+#AT_STOP_707
+#AT_START_708
+at_fn_group_banner 708 'json.at:292' \
   "RFC 4267 array example - C" "                     " 41
 at_xfail=no
 (
-  $as_echo "706. $at_setup_line: testing $at_desc ..."
+  $as_echo "708. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86260,13 +86685,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_706
-#AT_START_707
-at_fn_group_banner 707 'json.at:292' \
+#AT_STOP_708
+#AT_START_709
+at_fn_group_banner 709 'json.at:292' \
   "RFC 4267 array example - Python3" "               " 41
 at_xfail=no
 (
-  $as_echo "707. $at_setup_line: testing $at_desc ..."
+  $as_echo "709. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86363,13 +86788,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_707
-#AT_START_708
-at_fn_group_banner 708 'json.at:319' \
+#AT_STOP_709
+#AT_START_710
+at_fn_group_banner 710 'json.at:319' \
   "trailing garbage - C" "                           " 42
 at_xfail=no
 (
-  $as_echo "708. $at_setup_line: testing $at_desc ..."
+  $as_echo "710. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86424,13 +86849,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_708
-#AT_START_709
-at_fn_group_banner 709 'json.at:319' \
+#AT_STOP_710
+#AT_START_711
+at_fn_group_banner 711 'json.at:319' \
   "trailing garbage - Python3" "                     " 42
 at_xfail=no
 (
-  $as_echo "709. $at_setup_line: testing $at_desc ..."
+  $as_echo "711. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86485,13 +86910,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_709
-#AT_START_710
-at_fn_group_banner 710 'json.at:321' \
+#AT_STOP_711
+#AT_START_712
+at_fn_group_banner 712 'json.at:321' \
   "formfeeds are not valid white space - C" "        " 42
 at_xfail=no
 (
-  $as_echo "710. $at_setup_line: testing $at_desc ..."
+  $as_echo "712. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86546,13 +86971,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_710
-#AT_START_711
-at_fn_group_banner 711 'json.at:321' \
+#AT_STOP_712
+#AT_START_713
+at_fn_group_banner 713 'json.at:321' \
   "formfeeds are not valid white space - Python3" "  " 42
 at_xfail=no
 (
-  $as_echo "711. $at_setup_line: testing $at_desc ..."
+  $as_echo "713. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86607,13 +87032,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_711
-#AT_START_712
-at_fn_group_banner 712 'json.at:323' \
+#AT_STOP_713
+#AT_START_714
+at_fn_group_banner 714 'json.at:323' \
   "';' is not a valid token - C" "                   " 42
 at_xfail=no
 (
-  $as_echo "712. $at_setup_line: testing $at_desc ..."
+  $as_echo "714. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86668,13 +87093,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_712
-#AT_START_713
-at_fn_group_banner 713 'json.at:323' \
+#AT_STOP_714
+#AT_START_715
+at_fn_group_banner 715 'json.at:323' \
   "';' is not a valid token - Python3" "             " 42
 at_xfail=no
 (
-  $as_echo "713. $at_setup_line: testing $at_desc ..."
+  $as_echo "715. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86729,13 +87154,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_713
-#AT_START_714
-at_fn_group_banner 714 'json.at:325' \
+#AT_STOP_715
+#AT_START_716
+at_fn_group_banner 716 'json.at:325' \
   "arrays nesting too deep - C" "                    " 42
 at_xfail=no
 (
-  $as_echo "714. $at_setup_line: testing $at_desc ..."
+  $as_echo "716. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86790,13 +87215,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_714
-#AT_START_715
-at_fn_group_banner 715 'json.at:325' \
+#AT_STOP_716
+#AT_START_717
+at_fn_group_banner 717 'json.at:325' \
   "arrays nesting too deep - Python3" "              " 42
 at_xfail=no
 (
-  $as_echo "715. $at_setup_line: testing $at_desc ..."
+  $as_echo "717. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86851,13 +87276,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_715
-#AT_START_716
-at_fn_group_banner 716 'json.at:329' \
+#AT_STOP_717
+#AT_START_718
+at_fn_group_banner 718 'json.at:329' \
   "objects nesting too deep - C" "                   " 42
 at_xfail=no
 (
-  $as_echo "716. $at_setup_line: testing $at_desc ..."
+  $as_echo "718. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86912,13 +87337,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_716
-#AT_START_717
-at_fn_group_banner 717 'json.at:329' \
+#AT_STOP_718
+#AT_START_719
+at_fn_group_banner 719 'json.at:329' \
   "objects nesting too deep - Python3" "             " 42
 at_xfail=no
 (
-  $as_echo "717. $at_setup_line: testing $at_desc ..."
+  $as_echo "719. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -86973,13 +87398,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_717
-#AT_START_718
-at_fn_group_banner 718 'json.at:334' \
+#AT_STOP_719
+#AT_START_720
+at_fn_group_banner 720 'json.at:334' \
   "input may not be empty" "                         " 42
 at_xfail=no
 (
-  $as_echo "718. $at_setup_line: testing $at_desc ..."
+  $as_echo "720. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87005,13 +87430,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_718
-#AT_START_719
-at_fn_group_banner 719 'json.at:342' \
+#AT_STOP_720
+#AT_START_721
+at_fn_group_banner 721 'json.at:342' \
   "multiple adjacent objects - C" "                  " 43
 at_xfail=no
 (
-  $as_echo "719. $at_setup_line: testing $at_desc ..."
+  $as_echo "721. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87068,13 +87493,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_719
-#AT_START_720
-at_fn_group_banner 720 'json.at:342' \
+#AT_STOP_721
+#AT_START_722
+at_fn_group_banner 722 'json.at:342' \
   "multiple adjacent objects - Python3" "            " 43
 at_xfail=no
 (
-  $as_echo "720. $at_setup_line: testing $at_desc ..."
+  $as_echo "722. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87131,13 +87556,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_720
-#AT_START_721
-at_fn_group_banner 721 'json.at:347' \
+#AT_STOP_722
+#AT_START_723
+at_fn_group_banner 723 'json.at:347' \
   "multiple space-separated objects - C" "           " 43
 at_xfail=no
 (
-  $as_echo "721. $at_setup_line: testing $at_desc ..."
+  $as_echo "723. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87194,13 +87619,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_721
-#AT_START_722
-at_fn_group_banner 722 'json.at:347' \
+#AT_STOP_723
+#AT_START_724
+at_fn_group_banner 724 'json.at:347' \
   "multiple space-separated objects - Python3" "     " 43
 at_xfail=no
 (
-  $as_echo "722. $at_setup_line: testing $at_desc ..."
+  $as_echo "724. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87257,13 +87682,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_722
-#AT_START_723
-at_fn_group_banner 723 'json.at:352' \
+#AT_STOP_724
+#AT_START_725
+at_fn_group_banner 725 'json.at:352' \
   "multiple objects on separate lines - C" "         " 43
 at_xfail=no
 (
-  $as_echo "723. $at_setup_line: testing $at_desc ..."
+  $as_echo "725. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87324,13 +87749,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_723
-#AT_START_724
-at_fn_group_banner 724 'json.at:352' \
+#AT_STOP_725
+#AT_START_726
+at_fn_group_banner 726 'json.at:352' \
   "multiple objects on separate lines - Python3" "   " 43
 at_xfail=no
 (
-  $as_echo "724. $at_setup_line: testing $at_desc ..."
+  $as_echo "726. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87391,13 +87816,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_724
-#AT_START_725
-at_fn_group_banner 725 'json.at:359' \
+#AT_STOP_726
+#AT_START_727
+at_fn_group_banner 727 'json.at:359' \
   "multiple objects and arrays - C" "                " 43
 at_xfail=no
 (
-  $as_echo "725. $at_setup_line: testing $at_desc ..."
+  $as_echo "727. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87455,13 +87880,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_725
-#AT_START_726
-at_fn_group_banner 726 'json.at:359' \
+#AT_STOP_727
+#AT_START_728
+at_fn_group_banner 728 'json.at:359' \
   "multiple objects and arrays - Python3" "          " 43
 at_xfail=no
 (
-  $as_echo "726. $at_setup_line: testing $at_desc ..."
+  $as_echo "728. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87519,13 +87944,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_726
-#AT_START_727
-at_fn_group_banner 727 'json.at:365' \
+#AT_STOP_728
+#AT_START_729
+at_fn_group_banner 729 'json.at:365' \
   "garbage between multiple objects - C" "           " 43
 at_xfail=no
 (
-  $as_echo "727. $at_setup_line: testing $at_desc ..."
+  $as_echo "729. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87582,13 +88007,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_727
-#AT_START_728
-at_fn_group_banner 728 'json.at:365' \
+#AT_STOP_729
+#AT_START_730
+at_fn_group_banner 730 'json.at:365' \
   "garbage between multiple objects - Python3" "     " 43
 at_xfail=no
 (
-  $as_echo "728. $at_setup_line: testing $at_desc ..."
+  $as_echo "730. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87645,13 +88070,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_728
-#AT_START_729
-at_fn_group_banner 729 'json.at:369' \
-  "garbage after multiple objects - C" "             " 43
+#AT_STOP_730
+#AT_START_731
+at_fn_group_banner 731 'json.at:369' \
+  "garbage after multiple objects - C" "             " 43
 at_xfail=no
 (
-  $as_echo "729. $at_setup_line: testing $at_desc ..."
+  $as_echo "731. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87708,13 +88133,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_729
-#AT_START_730
-at_fn_group_banner 730 'json.at:369' \
+#AT_STOP_731
+#AT_START_732
+at_fn_group_banner 732 'json.at:369' \
   "garbage after multiple objects - Python3" "       " 43
 at_xfail=no
 (
-  $as_echo "730. $at_setup_line: testing $at_desc ..."
+  $as_echo "732. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87771,13 +88196,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_730
-#AT_START_731
-at_fn_group_banner 731 'jsonrpc.at:3' \
+#AT_STOP_732
+#AT_START_733
+at_fn_group_banner 733 'jsonrpc.at:3' \
   "JSON-RPC request and successful reply" "          " 44
 at_xfail=no
 (
-  $as_echo "731. $at_setup_line: testing $at_desc ..."
+  $as_echo "733. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87816,13 +88241,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_731
-#AT_START_732
-at_fn_group_banner 732 'jsonrpc.at:12' \
+#AT_STOP_733
+#AT_START_734
+at_fn_group_banner 734 'jsonrpc.at:12' \
   "JSON-RPC request and error reply" "               " 44
 at_xfail=no
 (
-  $as_echo "732. $at_setup_line: testing $at_desc ..."
+  $as_echo "734. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87861,13 +88286,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_732
-#AT_START_733
-at_fn_group_banner 733 'jsonrpc.at:21' \
+#AT_STOP_734
+#AT_START_735
+at_fn_group_banner 735 'jsonrpc.at:21' \
   "JSON-RPC notification" "                          " 44
 at_xfail=no
 (
-  $as_echo "733. $at_setup_line: testing $at_desc ..."
+  $as_echo "735. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87928,13 +88353,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_733
-#AT_START_734
-at_fn_group_banner 734 'jsonrpc-py.at:3' \
+#AT_STOP_735
+#AT_START_736
+at_fn_group_banner 736 'jsonrpc-py.at:3' \
   "JSON-RPC request and successful reply - Python3" "" 45
 at_xfail=no
 (
-  $as_echo "734. $at_setup_line: testing $at_desc ..."
+  $as_echo "736. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -87974,13 +88399,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_734
-#AT_START_735
-at_fn_group_banner 735 'jsonrpc-py.at:13' \
+#AT_STOP_736
+#AT_START_737
+at_fn_group_banner 737 'jsonrpc-py.at:13' \
   "JSON-RPC request and error reply - Python3" "     " 45
 at_xfail=no
 (
-  $as_echo "735. $at_setup_line: testing $at_desc ..."
+  $as_echo "737. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -88020,13 +88445,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_735
-#AT_START_736
-at_fn_group_banner 736 'jsonrpc-py.at:23' \
+#AT_STOP_737
+#AT_START_738
+at_fn_group_banner 738 'jsonrpc-py.at:23' \
   "JSON-RPC notification - Python3" "                " 45
 at_xfail=no
 (
-  $as_echo "736. $at_setup_line: testing $at_desc ..."
+  $as_echo "738. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -88087,13 +88512,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_736
-#AT_START_737
-at_fn_group_banner 737 'tunnel.at:3' \
+#AT_STOP_738
+#AT_START_739
+at_fn_group_banner 739 'tunnel.at:3' \
   "tunnel - input" "                                 " 46
 at_xfail=no
 (
-  $as_echo "737. $at_setup_line: testing $at_desc ..."
+  $as_echo "739. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -88592,13 +89017,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_737
-#AT_START_738
-at_fn_group_banner 738 'tunnel.at:65' \
+#AT_STOP_739
+#AT_START_740
+at_fn_group_banner 740 'tunnel.at:65' \
   "tunnel - ECN decapsulation" "                     " 46
 at_xfail=no
 (
-  $as_echo "738. $at_setup_line: testing $at_desc ..."
+  $as_echo "740. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -89021,13 +89446,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_738
-#AT_START_739
-at_fn_group_banner 739 'tunnel.at:113' \
-  "tunnel - output" "                                " 46
+#AT_STOP_740
+#AT_START_741
+at_fn_group_banner 741 'tunnel.at:113' \
+  "tunnel - too long nested attributes" "            " 46
 at_xfail=no
 (
-  $as_echo "739. $at_setup_line: testing $at_desc ..."
+  $as_echo "741. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -89152,12 +89577,308 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:114: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
+$as_echo "$at_srcdir/tunnel.at:114: add_of_br 0 add-port br0 p1 \\
+    -- set Interface p1 type=gre options:remote_ip=1.1.1.1 ofport_request=1 \\
+    -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2 "
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:114"
+( $at_check_trace; add_of_br 0 add-port br0 p1 \
+    -- set Interface p1 type=gre options:remote_ip=1.1.1.1 ofport_request=1 \
+    -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:114"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+{ set +x
+$as_echo "$at_srcdir/tunnel.at:118: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:118"
+( $at_check_trace; ovs-appctl dpif/show | tail -n +3
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "    br0 65534/100: (dummy-internal)
+    p1 1/1: (gre: remote_ip=1.1.1.1)
+    p2 2/2: (dummy)
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:118"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+dst_single="dst=1.1.1.1"
+dst_rep=${dst_single}
+for i in `seq 1 8192` ; do
+    dst_rep="${dst_rep},${dst_single}"
+done
+
+{ set +x
+$as_echo "$at_srcdir/tunnel.at:133: ovs-appctl dpctl/add-flow \"tunnel(\${dst_rep})\" \"2\" 2>&1 |           sed \"s/\${dst_single},//g\""
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "tunnel.at:133"
+( $at_check_trace; ovs-appctl dpctl/add-flow "tunnel(${dst_rep})" "2" 2>&1 |           sed "s/${dst_single},//g"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "ovs-vswitchd: parsing flow key (syntax error at tunnel(dst=1.1.1.1)) (Argument list too long)
+ovs-appctl: ovs-vswitchd: server returned an error
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:133"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/tunnel.at:139: check_logs "
+at_fn_check_prepare_trace "tunnel.at:139"
+( $at_check_trace; check_logs
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:139"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/tunnel.at:139: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:139"
+( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:139"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
+   { set +x
+$as_echo "$at_srcdir/tunnel.at:139: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:139"
+( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:139"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "tunnel.at:139" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/tunnel.at:139: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:139"
+( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:139"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/tunnel.at:139: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:139"
+( $at_check_trace; ovs-appctl -t ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:139"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "tunnel.at:139" "while kill -0 \$TMPPID 2>/dev/null"
+
+ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_741
+#AT_START_742
+at_fn_group_banner 742 'tunnel.at:142' \
+  "tunnel - output" "                                " 46
+at_xfail=no
+(
+  $as_echo "742. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+   touch .conf.db.~lock~
+   { set +x
+$as_echo "$at_srcdir/tunnel.at:143: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:143"
+( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/tunnel.at:143: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:143"
+( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   on_exit "kill `cat ovsdb-server.pid`"
+   { set +x
+$as_echo "$at_srcdir/tunnel.at:143: sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:143"
+( $at_check_trace; sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/tunnel.at:143: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:143"
+( $at_check_trace; ovs-vsctl --no-wait init
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/tunnel.at:143: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:143"
+( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+   on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
+   { set +x
+$as_echo "$at_srcdir/tunnel.at:143: sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:143"
+( $at_check_trace; sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+   { set +x
+$as_echo "$at_srcdir/tunnel.at:143: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \\
                     options:key=5 ofport_request=1\\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                     ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:114"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:143"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \
                     options:key=5 ofport_request=1\
@@ -89168,7 +89889,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:114"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89181,15 +89902,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:123: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:123"
+$as_echo "$at_srcdir/tunnel.at:152: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:152"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:123"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:152"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89197,15 +89918,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:124: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:124"
+$as_echo "$at_srcdir/tunnel.at:153: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:153"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:124"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:153"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89213,8 +89934,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:126: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:126"
+$as_echo "$at_srcdir/tunnel.at:155: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:155"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -89225,7 +89946,7 @@
     p2 2/2: (dummy)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:126"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:155"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89233,23 +89954,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:133: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:133"
+$as_echo "$at_srcdir/tunnel.at:162: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:162"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:133"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:162"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:134: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:134"
+$as_echo "$at_srcdir/tunnel.at:163: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:163"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -89258,7 +89979,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x5,src=2.2.2.2,dst=1.1.1.1,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:134"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:163"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89266,23 +89987,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:139: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=1,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:139"
+$as_echo "$at_srcdir/tunnel.at:168: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=1,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:168"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=1,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:139"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:168"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:140: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:140"
+$as_echo "$at_srcdir/tunnel.at:169: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:169"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -89291,37 +90012,37 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x5,src=2.2.2.2,dst=1.1.1.1,tos=0x1,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:140"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:169"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:143: check_logs "
-at_fn_check_prepare_trace "tunnel.at:143"
+$as_echo "$at_srcdir/tunnel.at:172: check_logs "
+at_fn_check_prepare_trace "tunnel.at:172"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:172"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:143: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:143"
+$as_echo "$at_srcdir/tunnel.at:172: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:172"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:172"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89329,15 +90050,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:143: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:143"
+$as_echo "$at_srcdir/tunnel.at:172: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:172"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:172"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89350,18 +90071,18 @@
     :
 
 }
-ovs_wait "tunnel.at:143" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:172" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:143: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:143"
+$as_echo "$at_srcdir/tunnel.at:172: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:172"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:172"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89369,15 +90090,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:143: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:143"
+$as_echo "$at_srcdir/tunnel.at:172: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:172"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:143"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:172"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89390,58 +90111,58 @@
     :
 
 }
-ovs_wait "tunnel.at:143" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:172" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_739
-#AT_START_740
-at_fn_group_banner 740 'tunnel.at:146' \
+#AT_STOP_742
+#AT_START_743
+at_fn_group_banner 743 'tunnel.at:175' \
   "tunnel - unencrypted tunnel and not setting skb_mark" "" 46
 at_xfail=no
 (
-  $as_echo "740. $at_setup_line: testing $at_desc ..."
+  $as_echo "743. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:147: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:147"
+$as_echo "$at_srcdir/tunnel.at:176: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:176"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:147"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:176"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:147: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:147"
+$as_echo "$at_srcdir/tunnel.at:176: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:176"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:147"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:176"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:147: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:176: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:147"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:176"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -89450,37 +90171,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:147"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:176"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:147: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:147"
+$as_echo "$at_srcdir/tunnel.at:176: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:176"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:147"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:147: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:147"
+$as_echo "$at_srcdir/tunnel.at:176: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:176"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:147"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -89488,7 +90209,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:147: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:176: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -89501,7 +90222,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:147"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:176"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -89520,7 +90241,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:147"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89528,12 +90249,12 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:147: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
+$as_echo "$at_srcdir/tunnel.at:176: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \\
                     options:key=5 ofport_request=1\\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                     ofport_request=2 ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:147"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:176"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \
                     options:key=5 ofport_request=1\
@@ -89544,7 +90265,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:147"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:176"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89556,15 +90277,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:155: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:155"
+$as_echo "$at_srcdir/tunnel.at:184: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:184"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:155"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:184"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89572,38 +90293,38 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:156: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:156"
+$as_echo "$at_srcdir/tunnel.at:185: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:185"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:156"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:185"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:157: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:157"
+$as_echo "$at_srcdir/tunnel.at:186: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:186"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:157"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:186"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:158: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:158"
+$as_echo "$at_srcdir/tunnel.at:187: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:187"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -89612,37 +90333,37 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x5,src=2.2.2.2,dst=1.1.1.1,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:158"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:187"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:161: check_logs "
-at_fn_check_prepare_trace "tunnel.at:161"
+$as_echo "$at_srcdir/tunnel.at:190: check_logs "
+at_fn_check_prepare_trace "tunnel.at:190"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:161"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:190"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:161: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:161"
+$as_echo "$at_srcdir/tunnel.at:190: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:190"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:161"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:190"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89650,15 +90371,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:161: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:161"
+$as_echo "$at_srcdir/tunnel.at:190: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:190"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:161"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:190"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89671,18 +90392,18 @@
     :
 
 }
-ovs_wait "tunnel.at:161" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:190" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:161: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:161"
+$as_echo "$at_srcdir/tunnel.at:190: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:190"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:161"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:190"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89690,15 +90411,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:161: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:161"
+$as_echo "$at_srcdir/tunnel.at:190: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:190"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:161"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:190"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89711,58 +90432,58 @@
     :
 
 }
-ovs_wait "tunnel.at:161" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:190" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_740
-#AT_START_741
-at_fn_group_banner 741 'tunnel.at:164' \
+#AT_STOP_743
+#AT_START_744
+at_fn_group_banner 744 'tunnel.at:193' \
   "tunnel - unencrypted tunnel and setting skb_mark to 1" "" 46
 at_xfail=no
 (
-  $as_echo "741. $at_setup_line: testing $at_desc ..."
+  $as_echo "744. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:165: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:165"
+$as_echo "$at_srcdir/tunnel.at:194: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:194"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:165"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:194"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:165: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:165"
+$as_echo "$at_srcdir/tunnel.at:194: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:194"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:165"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:194"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:165: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:194: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:165"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:194"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -89771,37 +90492,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:165"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:194"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:165: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:165"
+$as_echo "$at_srcdir/tunnel.at:194: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:194"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:165"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:194"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:165: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:165"
+$as_echo "$at_srcdir/tunnel.at:194: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:194"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:165"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:194"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -89809,7 +90530,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:165: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:194: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -89822,7 +90543,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:165"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:194"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -89841,7 +90562,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:165"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:194"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89849,12 +90570,12 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:165: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
+$as_echo "$at_srcdir/tunnel.at:194: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \\
                     options:key=5 ofport_request=1\\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                     ofport_request=2 ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:165"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:194"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \
                     options:key=5 ofport_request=1\
@@ -89865,7 +90586,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:165"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:194"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89877,15 +90598,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:173: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:173"
+$as_echo "$at_srcdir/tunnel.at:202: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:202"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:173"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:202"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89893,38 +90614,38 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:174: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:174"
+$as_echo "$at_srcdir/tunnel.at:203: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:203"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:174"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:203"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:175: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:175"
+$as_echo "$at_srcdir/tunnel.at:204: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:204"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:175"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:204"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:176: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:176"
+$as_echo "$at_srcdir/tunnel.at:205: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:205"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -89933,37 +90654,37 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x5,src=2.2.2.2,dst=1.1.1.1,ttl=64,flags(df|key))),set(skb_mark(0x1)),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:176"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:205"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:179: check_logs "
-at_fn_check_prepare_trace "tunnel.at:179"
+$as_echo "$at_srcdir/tunnel.at:208: check_logs "
+at_fn_check_prepare_trace "tunnel.at:208"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:179"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:179: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:179"
+$as_echo "$at_srcdir/tunnel.at:208: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:208"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:179"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89971,15 +90692,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:179: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:179"
+$as_echo "$at_srcdir/tunnel.at:208: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:208"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:179"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -89992,18 +90713,18 @@
     :
 
 }
-ovs_wait "tunnel.at:179" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:208" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:179: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:179"
+$as_echo "$at_srcdir/tunnel.at:208: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:208"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:179"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90011,15 +90732,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:179: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:179"
+$as_echo "$at_srcdir/tunnel.at:208: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:208"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:179"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90032,58 +90753,58 @@
     :
 
 }
-ovs_wait "tunnel.at:179" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:208" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_741
-#AT_START_742
-at_fn_group_banner 742 'tunnel.at:182' \
+#AT_STOP_744
+#AT_START_745
+at_fn_group_banner 745 'tunnel.at:211' \
   "tunnel - unencrypted tunnel and setting skb_mark to 2" "" 46
 at_xfail=no
 (
-  $as_echo "742. $at_setup_line: testing $at_desc ..."
+  $as_echo "745. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:183: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:183"
+$as_echo "$at_srcdir/tunnel.at:212: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:212"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:183"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:183: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:183"
+$as_echo "$at_srcdir/tunnel.at:212: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:212"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:183"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:183: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:212: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:183"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:212"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -90092,37 +90813,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:183"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:183: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:183"
+$as_echo "$at_srcdir/tunnel.at:212: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:212"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:183"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:183: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:183"
+$as_echo "$at_srcdir/tunnel.at:212: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:212"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:183"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -90130,7 +90851,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:183: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:212: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -90143,7 +90864,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:183"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:212"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -90162,7 +90883,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:183"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90170,12 +90891,12 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:183: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
+$as_echo "$at_srcdir/tunnel.at:212: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \\
                     options:key=5 ofport_request=1\\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                     ofport_request=2 ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:183"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:212"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \
                     options:key=5 ofport_request=1\
@@ -90186,7 +90907,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:183"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90198,15 +90919,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:191: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:191"
+$as_echo "$at_srcdir/tunnel.at:220: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:220"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:191"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:220"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90214,38 +90935,38 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:192: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:192"
+$as_echo "$at_srcdir/tunnel.at:221: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:221"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:192"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:221"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:193: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:193"
+$as_echo "$at_srcdir/tunnel.at:222: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:222"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:193"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:222"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:194: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:194"
+$as_echo "$at_srcdir/tunnel.at:223: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:223"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -90254,7 +90975,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x5,src=2.2.2.2,dst=1.1.1.1,ttl=64,flags(df|key))),set(skb_mark(0x2)),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:194"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:223"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90262,15 +90983,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:198: ovs-appctl netdev-dummy/receive p2 'aa55aa550001f8bc124434b6080045000054ba20000040018486010103580101037001004227e75400030af3195500000000f265010000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637'"
-at_fn_check_prepare_trace "tunnel.at:198"
+$as_echo "$at_srcdir/tunnel.at:227: ovs-appctl netdev-dummy/receive p2 'aa55aa550001f8bc124434b6080045000054ba20000040018486010103580101037001004227e75400030af3195500000000f265010000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637'"
+at_fn_check_prepare_trace "tunnel.at:227"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive p2 'aa55aa550001f8bc124434b6080045000054ba20000040018486010103580101037001004227e75400030af3195500000000f265010000000000101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f3031323334353637'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:198"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:227"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90280,10 +91001,10 @@
 ovs-appctl time/warp 5000
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:202:
+$as_echo "$at_srcdir/tunnel.at:231:
 ovs-appctl coverage/read-counter datapath_drop_invalid_port
 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:202"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:231"
 ( $at_check_trace;
 ovs-appctl coverage/read-counter datapath_drop_invalid_port
 
@@ -90294,7 +91015,7 @@
 echo >>"$at_stdout"; $as_echo "1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:202"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:231"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90302,30 +91023,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:208: check_logs "
-at_fn_check_prepare_trace "tunnel.at:208"
+$as_echo "$at_srcdir/tunnel.at:237: check_logs "
+at_fn_check_prepare_trace "tunnel.at:237"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:237"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:208: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:208"
+$as_echo "$at_srcdir/tunnel.at:237: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:237"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:237"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90333,15 +91054,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:208: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:208"
+$as_echo "$at_srcdir/tunnel.at:237: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:237"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:237"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90354,18 +91075,18 @@
     :
 
 }
-ovs_wait "tunnel.at:208" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:237" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:208: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:208"
+$as_echo "$at_srcdir/tunnel.at:237: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:237"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:237"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90373,15 +91094,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:208: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:208"
+$as_echo "$at_srcdir/tunnel.at:237: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:237"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:208"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:237"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90394,58 +91115,58 @@
     :
 
 }
-ovs_wait "tunnel.at:208" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:237" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_742
-#AT_START_743
-at_fn_group_banner 743 'tunnel.at:211' \
+#AT_STOP_745
+#AT_START_746
+at_fn_group_banner 746 'tunnel.at:240' \
   "tunnel - ToS and TTL inheritance" "               " 46
 at_xfail=no
 (
-  $as_echo "743. $at_setup_line: testing $at_desc ..."
+  $as_echo "746. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:212: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:212"
+$as_echo "$at_srcdir/tunnel.at:241: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:241"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:241"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:212: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:212"
+$as_echo "$at_srcdir/tunnel.at:241: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:241"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:241"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:212: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:241: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:212"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:241"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -90454,37 +91175,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:241"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:212: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:212"
+$as_echo "$at_srcdir/tunnel.at:241: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:241"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:212: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:212"
+$as_echo "$at_srcdir/tunnel.at:241: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:241"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -90492,7 +91213,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:212: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:241: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -90505,7 +91226,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:212"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:241"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -90524,7 +91245,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90532,12 +91253,12 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:212: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
+$as_echo "$at_srcdir/tunnel.at:241: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
                     options:remote_ip=1.1.1.1 options:tos=inherit \\
                     options:ttl=inherit ofport_request=1 \\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                     ofport_request=2 ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:212"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:241"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \
                     options:remote_ip=1.1.1.1 options:tos=inherit \
                     options:ttl=inherit ofport_request=1 \
@@ -90548,7 +91269,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:212"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:241"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90561,15 +91282,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:221: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:221"
+$as_echo "$at_srcdir/tunnel.at:250: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:250"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:221"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:250"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90577,15 +91298,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:222: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:222"
+$as_echo "$at_srcdir/tunnel.at:251: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:251"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:222"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:251"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90593,8 +91314,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:224: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:224"
+$as_echo "$at_srcdir/tunnel.at:253: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:253"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -90605,7 +91326,7 @@
     p2 2/2: (dummy)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:224"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:253"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90613,23 +91334,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:231: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:231"
+$as_echo "$at_srcdir/tunnel.at:260: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:260"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=4,ttl=128,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:231"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:260"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:232: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:232"
+$as_echo "$at_srcdir/tunnel.at:261: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:261"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -90638,7 +91359,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(dst=1.1.1.1,tos=0x4,ttl=128,flags(df))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:232"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:261"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90646,23 +91367,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:237: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=5,ttl=128,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:237"
+$as_echo "$at_srcdir/tunnel.at:266: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=5,ttl=128,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:266"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=5,ttl=128,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:237"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:266"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:238: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:238"
+$as_echo "$at_srcdir/tunnel.at:267: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:267"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -90671,7 +91392,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(dst=1.1.1.1,tos=0x5,ttl=128,flags(df))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:238"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:267"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90679,23 +91400,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:243: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0806),arp(sip=1.2.3.4,tip=5.6.7.8,op=1,sha=00:0f:10:11:12:13,tha=00:14:15:16:17:18)'"
-at_fn_check_prepare_trace "tunnel.at:243"
+$as_echo "$at_srcdir/tunnel.at:272: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0806),arp(sip=1.2.3.4,tip=5.6.7.8,op=1,sha=00:0f:10:11:12:13,tha=00:14:15:16:17:18)'"
+at_fn_check_prepare_trace "tunnel.at:272"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0806),arp(sip=1.2.3.4,tip=5.6.7.8,op=1,sha=00:0f:10:11:12:13,tha=00:14:15:16:17:18)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:243"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:272"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:244: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:244"
+$as_echo "$at_srcdir/tunnel.at:273: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:273"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -90704,37 +91425,37 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(dst=1.1.1.1,ttl=64,flags(df))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:244"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:273"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:247: check_logs "
-at_fn_check_prepare_trace "tunnel.at:247"
+$as_echo "$at_srcdir/tunnel.at:276: check_logs "
+at_fn_check_prepare_trace "tunnel.at:276"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:247"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:247: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:247"
+$as_echo "$at_srcdir/tunnel.at:276: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:276"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:247"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90742,15 +91463,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:247: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:247"
+$as_echo "$at_srcdir/tunnel.at:276: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:276"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:247"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90763,18 +91484,18 @@
     :
 
 }
-ovs_wait "tunnel.at:247" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:276" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:247: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:247"
+$as_echo "$at_srcdir/tunnel.at:276: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:276"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:247"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90782,15 +91503,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:247: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:247"
+$as_echo "$at_srcdir/tunnel.at:276: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:276"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:247"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:276"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90803,58 +91524,58 @@
     :
 
 }
-ovs_wait "tunnel.at:247" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:276" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_743
-#AT_START_744
-at_fn_group_banner 744 'tunnel.at:250' \
+#AT_STOP_746
+#AT_START_747
+at_fn_group_banner 747 'tunnel.at:279' \
   "tunnel - set_tunnel" "                            " 46
 at_xfail=no
 (
-  $as_echo "744. $at_setup_line: testing $at_desc ..."
+  $as_echo "747. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:251: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:251"
+$as_echo "$at_srcdir/tunnel.at:280: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:280"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:251"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:280"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:251: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:251"
+$as_echo "$at_srcdir/tunnel.at:280: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:280"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:251"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:280"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:251: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:280: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:251"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:280"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -90863,37 +91584,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:251"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:280"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:251: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:251"
+$as_echo "$at_srcdir/tunnel.at:280: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:280"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:251"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:251: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:251"
+$as_echo "$at_srcdir/tunnel.at:280: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:280"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:251"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -90901,7 +91622,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:251: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:280: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -90914,7 +91635,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:251"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:280"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -90933,7 +91654,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:251"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90941,7 +91662,7 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:251: add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \\
+$as_echo "$at_srcdir/tunnel.at:280: add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \\
         options:remote_ip=1.1.1.1 ofport_request=1 \\
     -- add-port br0 p2 -- set Interface p2 type=gre options:key=flow \\
         options:remote_ip=2.2.2.2 ofport_request=2 \\
@@ -90949,7 +91670,7 @@
         options:remote_ip=3.3.3.3 ofport_request=3 \\
     -- add-port br0 p4 -- set Interface p4 type=gre options:key=flow \\
         options:remote_ip=4.4.4.4 ofport_request=4 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:251"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:280"
 ( $at_check_trace; add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \
         options:remote_ip=1.1.1.1 ofport_request=1 \
     -- add-port br0 p2 -- set Interface p2 type=gre options:key=flow \
@@ -90963,7 +91684,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:251"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:280"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90976,15 +91697,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:264: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:264"
+$as_echo "$at_srcdir/tunnel.at:293: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:293"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:264"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:293"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -90992,15 +91713,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:265: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:265"
+$as_echo "$at_srcdir/tunnel.at:294: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:294"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:265"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:294"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91008,8 +91729,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:267: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:267"
+$as_echo "$at_srcdir/tunnel.at:296: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:296"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91022,7 +91743,7 @@
     p4 4/1: (gre: key=flow, remote_ip=4.4.4.4)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:267"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:296"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91030,23 +91751,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:275: ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "tunnel.at:275"
+$as_echo "$at_srcdir/tunnel.at:304: ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "tunnel.at:304"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(100),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:275"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:304"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:276: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:276"
+$as_echo "$at_srcdir/tunnel.at:305: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:305"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91055,37 +91776,37 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x1,dst=1.1.1.1,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x2,dst=2.2.2.2,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x3,dst=3.3.3.3,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x5,dst=4.4.4.4,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:276"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:305"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:282: check_logs "
-at_fn_check_prepare_trace "tunnel.at:282"
+$as_echo "$at_srcdir/tunnel.at:311: check_logs "
+at_fn_check_prepare_trace "tunnel.at:311"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:282: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:282"
+$as_echo "$at_srcdir/tunnel.at:311: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:311"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91093,15 +91814,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:282: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:282"
+$as_echo "$at_srcdir/tunnel.at:311: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:311"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91114,18 +91835,18 @@
     :
 
 }
-ovs_wait "tunnel.at:282" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:311" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:282: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:282"
+$as_echo "$at_srcdir/tunnel.at:311: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:311"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91133,15 +91854,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:282: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:282"
+$as_echo "$at_srcdir/tunnel.at:311: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:311"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:282"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:311"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91154,58 +91875,58 @@
     :
 
 }
-ovs_wait "tunnel.at:282" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:311" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_744
-#AT_START_745
-at_fn_group_banner 745 'tunnel.at:285' \
+#AT_STOP_747
+#AT_START_748
+at_fn_group_banner 748 'tunnel.at:314' \
   "tunnel - key" "                                   " 46
 at_xfail=no
 (
-  $as_echo "745. $at_setup_line: testing $at_desc ..."
+  $as_echo "748. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:286: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:286"
+$as_echo "$at_srcdir/tunnel.at:315: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:315"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:286"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:315"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:286: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:286"
+$as_echo "$at_srcdir/tunnel.at:315: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:315"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:286"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:315"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:286: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:315: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:286"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:315"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -91214,37 +91935,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:286"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:315"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:286: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:286"
+$as_echo "$at_srcdir/tunnel.at:315: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:315"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:286"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:315"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:286: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:286"
+$as_echo "$at_srcdir/tunnel.at:315: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:315"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:286"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:315"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -91252,7 +91973,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:286: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:315: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -91265,7 +91986,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:286"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:315"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -91284,7 +92005,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:286"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:315"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91292,13 +92013,13 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:286: add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=1 \\
+$as_echo "$at_srcdir/tunnel.at:315: add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=1 \\
         options:remote_ip=1.1.1.1 ofport_request=1 \\
     -- add-port br0 p2 -- set Interface p2 type=gre options:in_key=2 \\
         options:out_key=3 options:remote_ip=1.1.1.1 ofport_request=2 \\
     -- add-port br0 p3 -- set Interface p3 type=gre options:out_key=5 \\
         options:remote_ip=1.1.1.1 ofport_request=3 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:286"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:315"
 ( $at_check_trace; add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=1 \
         options:remote_ip=1.1.1.1 ofport_request=1 \
     -- add-port br0 p2 -- set Interface p2 type=gre options:in_key=2 \
@@ -91310,7 +92031,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:286"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:315"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91323,15 +92044,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:297: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:297"
+$as_echo "$at_srcdir/tunnel.at:326: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:326"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:297"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:326"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91339,15 +92060,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:298: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:298"
+$as_echo "$at_srcdir/tunnel.at:327: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:327"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:298"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:327"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91355,8 +92076,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:300: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:300"
+$as_echo "$at_srcdir/tunnel.at:329: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:329"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91368,7 +92089,7 @@
     p3 3/1: (gre: out_key=5, remote_ip=1.1.1.1)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:300"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:329"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91376,23 +92097,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:307: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:307"
+$as_echo "$at_srcdir/tunnel.at:336: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:336"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:307"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:336"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:308: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:308"
+$as_echo "$at_srcdir/tunnel.at:337: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:337"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91401,7 +92122,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x1,dst=1.1.1.1,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x3,dst=1.1.1.1,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x5,dst=1.1.1.1,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:308"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:337"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91409,23 +92130,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:314: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:314"
+$as_echo "$at_srcdir/tunnel.at:343: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:343"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:314"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:343"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:315: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:315"
+$as_echo "$at_srcdir/tunnel.at:344: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:344"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91434,7 +92155,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x3,dst=1.1.1.1,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x1,dst=1.1.1.1,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x5,dst=1.1.1.1,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:315"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:344"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91442,23 +92163,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:321: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:321"
+$as_echo "$at_srcdir/tunnel.at:350: ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:350"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(src=1.1.1.1,dst=2.2.2.2,ttl=64,flags()),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:321"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:350"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:322: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:322"
+$as_echo "$at_srcdir/tunnel.at:351: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:351"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91467,7 +92188,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x5,dst=1.1.1.1,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x1,dst=1.1.1.1,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x3,dst=1.1.1.1,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:322"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:351"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91475,8 +92196,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:328: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0xf,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:328"
+$as_echo "$at_srcdir/tunnel.at:357: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0xf,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:357"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0xf,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91486,37 +92207,37 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 2 $at_status "$at_srcdir/tunnel.at:328"
+at_fn_check_status 2 $at_status "$at_srcdir/tunnel.at:357"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:332: check_logs \"/receive tunnel port not found/d\""
-at_fn_check_prepare_trace "tunnel.at:332"
+$as_echo "$at_srcdir/tunnel.at:361: check_logs \"/receive tunnel port not found/d\""
+at_fn_check_prepare_trace "tunnel.at:361"
 ( $at_check_trace; check_logs "/receive tunnel port not found/d"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:332"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:361"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:332: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:332"
+$as_echo "$at_srcdir/tunnel.at:361: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:361"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:332"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:361"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91524,15 +92245,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:332: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:332"
+$as_echo "$at_srcdir/tunnel.at:361: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:361"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:332"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:361"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91545,18 +92266,18 @@
     :
 
 }
-ovs_wait "tunnel.at:332" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:361" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:332: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:332"
+$as_echo "$at_srcdir/tunnel.at:361: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:361"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:332"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:361"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91564,15 +92285,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:332: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:332"
+$as_echo "$at_srcdir/tunnel.at:361: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:361"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:332"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:361"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91585,58 +92306,58 @@
     :
 
 }
-ovs_wait "tunnel.at:332" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:361" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_745
-#AT_START_746
-at_fn_group_banner 746 'tunnel.at:335' \
+#AT_STOP_748
+#AT_START_749
+at_fn_group_banner 749 'tunnel.at:364' \
   "tunnel - key match" "                             " 46
 at_xfail=no
 (
-  $as_echo "746. $at_setup_line: testing $at_desc ..."
+  $as_echo "749. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:336: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:336"
+$as_echo "$at_srcdir/tunnel.at:365: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:365"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:365"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:336: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:336"
+$as_echo "$at_srcdir/tunnel.at:365: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:365"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:365"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:336: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:365: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:336"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:365"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -91645,37 +92366,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:365"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:336: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:336"
+$as_echo "$at_srcdir/tunnel.at:365: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:365"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:365"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:336: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:336"
+$as_echo "$at_srcdir/tunnel.at:365: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:365"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:365"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -91683,7 +92404,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:336: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:365: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -91696,7 +92417,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:336"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:365"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -91715,7 +92436,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:365"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91723,14 +92444,14 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:336: add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \\
+$as_echo "$at_srcdir/tunnel.at:365: add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \\
         options:remote_ip=1.1.1.1 ofport_request=1 \\
     -- add-port br0 p2 -- set Interface p2 type=gre options:key=3 \\
         options:remote_ip=3.3.3.3 ofport_request=2 \\
     -- add-port br0 p3 -- set Interface p3 type=dummy ofport_request=3 \\
     -- add-port br0 p4 -- set Interface p4 type=dummy ofport_request=4 \\
     -- add-port br0 p5 -- set Interface p5 type=dummy ofport_request=5 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:336"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:365"
 ( $at_check_trace; add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \
         options:remote_ip=1.1.1.1 ofport_request=1 \
     -- add-port br0 p2 -- set Interface p2 type=gre options:key=3 \
@@ -91743,7 +92464,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:336"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:365"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91758,15 +92479,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:350: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:350"
+$as_echo "$at_srcdir/tunnel.at:379: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:379"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:350"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:379"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91774,15 +92495,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:351: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:351"
+$as_echo "$at_srcdir/tunnel.at:380: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:380"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:351"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:380"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91790,8 +92511,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:353: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:353"
+$as_echo "$at_srcdir/tunnel.at:382: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:382"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91805,7 +92526,7 @@
     p5 5/5: (dummy)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:353"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:382"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91813,23 +92534,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:362: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:362"
+$as_echo "$at_srcdir/tunnel.at:391: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:391"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x2,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:362"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:391"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:363: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:363"
+$as_echo "$at_srcdir/tunnel.at:392: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:392"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91838,7 +92559,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: 3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:363"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:392"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91846,23 +92567,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:367: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:367"
+$as_echo "$at_srcdir/tunnel.at:396: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:396"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:367"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:396"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:368: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:368"
+$as_echo "$at_srcdir/tunnel.at:397: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:397"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91871,7 +92592,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: 4,3,set(tunnel(tun_id=0x3,dst=3.3.3.3,ttl=64,flags(df|key))),1,5
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:368"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:397"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91879,23 +92600,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:372: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=3.3.3.3,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:372"
+$as_echo "$at_srcdir/tunnel.at:401: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=3.3.3.3,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:401"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x3,src=3.3.3.3,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:372"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:401"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:373: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:373"
+$as_echo "$at_srcdir/tunnel.at:402: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:402"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91904,7 +92625,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: 4,3,5
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:402"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91912,23 +92633,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:377: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
-at_fn_check_prepare_trace "tunnel.at:377"
+$as_echo "$at_srcdir/tunnel.at:406: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'"
+at_fn_check_prepare_trace "tunnel.at:406"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,src=1.1.1.1,dst=2.2.2.2,ttl=64,flags(key)),in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=6,tos=0,ttl=64,frag=no),tcp(src=8,dst=9)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:377"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:406"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:378: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:378"
+$as_echo "$at_srcdir/tunnel.at:407: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:407"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -91937,7 +92658,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:378"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:407"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91945,30 +92666,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:382: check_logs "
-at_fn_check_prepare_trace "tunnel.at:382"
+$as_echo "$at_srcdir/tunnel.at:411: check_logs "
+at_fn_check_prepare_trace "tunnel.at:411"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:382"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:382: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:382"
+$as_echo "$at_srcdir/tunnel.at:411: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:411"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:382"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91976,15 +92697,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:382: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:382"
+$as_echo "$at_srcdir/tunnel.at:411: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:411"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:382"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -91997,18 +92718,18 @@
     :
 
 }
-ovs_wait "tunnel.at:382" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:411" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:382: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:382"
+$as_echo "$at_srcdir/tunnel.at:411: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:411"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:382"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92016,15 +92737,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:382: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:382"
+$as_echo "$at_srcdir/tunnel.at:411: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:411"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:382"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:411"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92037,58 +92758,58 @@
     :
 
 }
-ovs_wait "tunnel.at:382" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:411" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_746
-#AT_START_747
-at_fn_group_banner 747 'tunnel.at:385' \
+#AT_STOP_749
+#AT_START_750
+at_fn_group_banner 750 'tunnel.at:414' \
   "tunnel - Geneve" "                                " 46
 at_xfail=no
 (
-  $as_echo "747. $at_setup_line: testing $at_desc ..."
+  $as_echo "750. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:386: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:386"
+$as_echo "$at_srcdir/tunnel.at:415: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:415"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:386"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:415"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:386: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:386"
+$as_echo "$at_srcdir/tunnel.at:415: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:415"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:386"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:415"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:386: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:415: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:386"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:415"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -92097,37 +92818,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:386"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:415"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:386: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:386"
+$as_echo "$at_srcdir/tunnel.at:415: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:415"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:386"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:386: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:386"
+$as_echo "$at_srcdir/tunnel.at:415: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:415"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:386"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -92135,7 +92856,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:386: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:415: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -92148,7 +92869,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:386"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:415"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -92167,7 +92888,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:386"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92175,9 +92896,9 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:386: add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \\
+$as_echo "$at_srcdir/tunnel.at:415: add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \\
                     options:remote_ip=1.1.1.1 ofport_request=1 options:dst_port=5000 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:386"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:415"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \
                     options:remote_ip=1.1.1.1 ofport_request=1 options:dst_port=5000
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -92185,7 +92906,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:386"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:415"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92194,8 +92915,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:389: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:389"
+$as_echo "$at_srcdir/tunnel.at:418: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:418"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -92205,7 +92926,7 @@
     p1 1/5000: (geneve: dst_port=5000, remote_ip=1.1.1.1)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:389"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:418"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92213,30 +92934,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:394: check_logs "
-at_fn_check_prepare_trace "tunnel.at:394"
+$as_echo "$at_srcdir/tunnel.at:423: check_logs "
+at_fn_check_prepare_trace "tunnel.at:423"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:394"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:394: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:394"
+$as_echo "$at_srcdir/tunnel.at:423: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:423"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:394"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92244,15 +92965,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:394: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:394"
+$as_echo "$at_srcdir/tunnel.at:423: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:423"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:394"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92265,18 +92986,18 @@
     :
 
 }
-ovs_wait "tunnel.at:394" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:423" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:394: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:394"
+$as_echo "$at_srcdir/tunnel.at:423: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:423"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:394"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92284,15 +93005,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:394: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:394"
+$as_echo "$at_srcdir/tunnel.at:423: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:423"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:394"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:423"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92305,58 +93026,58 @@
     :
 
 }
-ovs_wait "tunnel.at:394" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:423" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_747
-#AT_START_748
-at_fn_group_banner 748 'tunnel.at:397' \
+#AT_STOP_750
+#AT_START_751
+at_fn_group_banner 751 'tunnel.at:426' \
   "tunnel - VXLAN" "                                 " 46
 at_xfail=no
 (
-  $as_echo "748. $at_setup_line: testing $at_desc ..."
+  $as_echo "751. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:398: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:398"
+$as_echo "$at_srcdir/tunnel.at:427: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:427"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:398"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:427"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:398: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:398"
+$as_echo "$at_srcdir/tunnel.at:427: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:427"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:398"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:427"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:398: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:427: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:398"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:427"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -92365,37 +93086,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:398"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:427"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:398: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:398"
+$as_echo "$at_srcdir/tunnel.at:427: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:427"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:398"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:398: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:398"
+$as_echo "$at_srcdir/tunnel.at:427: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:427"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:398"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -92403,7 +93124,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:398: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:427: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -92416,7 +93137,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:398"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:427"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -92435,7 +93156,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:398"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92443,9 +93164,9 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:398: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
+$as_echo "$at_srcdir/tunnel.at:427: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
                     options:remote_ip=1.1.1.1 ofport_request=1 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:398"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:427"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \
                     options:remote_ip=1.1.1.1 ofport_request=1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -92453,7 +93174,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:398"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:427"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92462,8 +93183,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:401: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:401"
+$as_echo "$at_srcdir/tunnel.at:430: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:430"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -92473,7 +93194,7 @@
     p1 1/4789: (vxlan: remote_ip=1.1.1.1)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:401"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:430"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92481,30 +93202,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:406: check_logs "
-at_fn_check_prepare_trace "tunnel.at:406"
+$as_echo "$at_srcdir/tunnel.at:435: check_logs "
+at_fn_check_prepare_trace "tunnel.at:435"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:406"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:435"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:406: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:406"
+$as_echo "$at_srcdir/tunnel.at:435: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:435"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:406"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:435"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92512,15 +93233,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:406: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:406"
+$as_echo "$at_srcdir/tunnel.at:435: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:435"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:406"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:435"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92533,18 +93254,18 @@
     :
 
 }
-ovs_wait "tunnel.at:406" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:435" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:406: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:406"
+$as_echo "$at_srcdir/tunnel.at:435: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:435"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:406"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:435"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92552,15 +93273,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:406: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:406"
+$as_echo "$at_srcdir/tunnel.at:435: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:435"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:406"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:435"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92573,58 +93294,58 @@
     :
 
 }
-ovs_wait "tunnel.at:406" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:435" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_748
-#AT_START_749
-at_fn_group_banner 749 'tunnel.at:409' \
+#AT_STOP_751
+#AT_START_752
+at_fn_group_banner 752 'tunnel.at:438' \
   "tunnel - table version" "                         " 46
 at_xfail=no
 (
-  $as_echo "749. $at_setup_line: testing $at_desc ..."
+  $as_echo "752. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:412: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:412"
+$as_echo "$at_srcdir/tunnel.at:441: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:441"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:441"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:412: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:412"
+$as_echo "$at_srcdir/tunnel.at:441: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:441"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:441"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:412: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:441: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:412"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:441"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -92633,37 +93354,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:441"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:412: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:412"
+$as_echo "$at_srcdir/tunnel.at:441: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:441"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:441"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:412: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:412"
+$as_echo "$at_srcdir/tunnel.at:441: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:441"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:441"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -92671,7 +93392,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:412: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:441: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -92684,7 +93405,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:412"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:441"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -92703,7 +93424,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:441"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92711,15 +93432,15 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:412: add_of_br 0 add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00 "
-at_fn_check_prepare_trace "tunnel.at:412"
+$as_echo "$at_srcdir/tunnel.at:441: add_of_br 0 add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00 "
+at_fn_check_prepare_trace "tunnel.at:441"
 ( $at_check_trace; add_of_br 0 add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:412"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:441"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92727,28 +93448,28 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:413: ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy"
-at_fn_check_prepare_trace "tunnel.at:413"
+$as_echo "$at_srcdir/tunnel.at:442: ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy"
+at_fn_check_prepare_trace "tunnel.at:442"
 ( $at_check_trace; ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:413"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:442"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:414: ovs-vsctl add-port int-br v1 -- set Interface v1 type=vxlan \\
+$as_echo "$at_srcdir/tunnel.at:443: ovs-vsctl add-port int-br v1 -- set Interface v1 type=vxlan \\
                        options:remote_ip=172.31.1.2 options:key=123 \\
                        ofport_request=2 \\
                  -- add-port int-br v2 -- set Interface v2 type=internal \\
                        ofport_request=3 \\
                        "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:414"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:443"
 ( $at_check_trace; ovs-vsctl add-port int-br v1 -- set Interface v1 type=vxlan \
                        options:remote_ip=172.31.1.2 options:key=123 \
                        ofport_request=2 \
@@ -92760,7 +93481,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:414"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:443"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92768,8 +93489,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:421: ovs-appctl dpif/show"
-at_fn_check_prepare_trace "tunnel.at:421"
+$as_echo "$at_srcdir/tunnel.at:450: ovs-appctl dpif/show"
+at_fn_check_prepare_trace "tunnel.at:450"
 ( $at_check_trace; ovs-appctl dpif/show
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -92785,7 +93506,7 @@
     v2 3/3: (dummy-internal)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:421"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:450"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92793,8 +93514,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:434: ovs-appctl netdev-dummy/ip4addr br0 172.31.1.1/24"
-at_fn_check_prepare_trace "tunnel.at:434"
+$as_echo "$at_srcdir/tunnel.at:463: ovs-appctl netdev-dummy/ip4addr br0 172.31.1.1/24"
+at_fn_check_prepare_trace "tunnel.at:463"
 ( $at_check_trace; ovs-appctl netdev-dummy/ip4addr br0 172.31.1.1/24
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -92803,15 +93524,15 @@
 echo >>"$at_stdout"; $as_echo "OK
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:434"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:463"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:436: ovs-appctl ovs/route/add 172.31.1.0/24 br0"
-at_fn_check_prepare_trace "tunnel.at:436"
+$as_echo "$at_srcdir/tunnel.at:465: ovs-appctl ovs/route/add 172.31.1.0/24 br0"
+at_fn_check_prepare_trace "tunnel.at:465"
 ( $at_check_trace; ovs-appctl ovs/route/add 172.31.1.0/24 br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -92820,7 +93541,7 @@
 echo >>"$at_stdout"; $as_echo "OK
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:436"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:465"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -92828,240 +93549,240 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:440: ovs-ofctl add-flow int-br action=normal"
-at_fn_check_prepare_trace "tunnel.at:440"
+$as_echo "$at_srcdir/tunnel.at:469: ovs-ofctl add-flow int-br action=normal"
+at_fn_check_prepare_trace "tunnel.at:469"
 ( $at_check_trace; ovs-ofctl add-flow int-br action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:440"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:469"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:441: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "tunnel.at:441"
+$as_echo "$at_srcdir/tunnel.at:470: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "tunnel.at:470"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:441"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:470"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:442: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:442"
+$as_echo "$at_srcdir/tunnel.at:471: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:471"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:442"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:471"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:443: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "tunnel.at:443"
+$as_echo "$at_srcdir/tunnel.at:472: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "tunnel.at:472"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:443"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:472"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:444: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:444"
+$as_echo "$at_srcdir/tunnel.at:473: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:473"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:444"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:473"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:445: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "tunnel.at:445"
+$as_echo "$at_srcdir/tunnel.at:474: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "tunnel.at:474"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:445"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:474"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:446: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:446"
+$as_echo "$at_srcdir/tunnel.at:475: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:475"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:446"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:475"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:447: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "tunnel.at:447"
+$as_echo "$at_srcdir/tunnel.at:476: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "tunnel.at:476"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:447"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:476"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:448: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:448"
+$as_echo "$at_srcdir/tunnel.at:477: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:477"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:448"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:477"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:449: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "tunnel.at:449"
+$as_echo "$at_srcdir/tunnel.at:478: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "tunnel.at:478"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:449"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:478"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:450: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:450"
+$as_echo "$at_srcdir/tunnel.at:479: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:479"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:450"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:479"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:451: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "tunnel.at:451"
+$as_echo "$at_srcdir/tunnel.at:480: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "tunnel.at:480"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:451"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:480"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:452: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:452"
+$as_echo "$at_srcdir/tunnel.at:481: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:481"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:452"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:481"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:453: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "tunnel.at:453"
+$as_echo "$at_srcdir/tunnel.at:482: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "tunnel.at:482"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:453"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:482"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:454: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:454"
+$as_echo "$at_srcdir/tunnel.at:483: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:483"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:454"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:483"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:455: ovs-ofctl add-flow br0 action=normal"
-at_fn_check_prepare_trace "tunnel.at:455"
+$as_echo "$at_srcdir/tunnel.at:484: ovs-ofctl add-flow br0 action=normal"
+at_fn_check_prepare_trace "tunnel.at:484"
 ( $at_check_trace; ovs-ofctl add-flow br0 action=normal
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:455"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:484"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93069,15 +93790,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:458: ovs-vsctl -- set Interface p0 options:pcap=p0.pcap"
-at_fn_check_prepare_trace "tunnel.at:458"
+$as_echo "$at_srcdir/tunnel.at:487: ovs-vsctl -- set Interface p0 options:pcap=p0.pcap"
+at_fn_check_prepare_trace "tunnel.at:487"
 ( $at_check_trace; ovs-vsctl -- set Interface p0 options:pcap=p0.pcap
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:458"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:487"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93085,30 +93806,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:460: ovs-appctl netdev-dummy/receive int-br 'in_port(2),eth(src=aa:55:aa:55:00:00,dst=f8:bc:12:ff:ff:ff),eth_type(0x0800),ipv4(src=1.1.3.92,dst=1.1.3.88,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)'"
-at_fn_check_prepare_trace "tunnel.at:460"
+$as_echo "$at_srcdir/tunnel.at:489: ovs-appctl netdev-dummy/receive int-br 'in_port(2),eth(src=aa:55:aa:55:00:00,dst=f8:bc:12:ff:ff:ff),eth_type(0x0800),ipv4(src=1.1.3.92,dst=1.1.3.88,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)'"
+at_fn_check_prepare_trace "tunnel.at:489"
 ( $at_check_trace; ovs-appctl netdev-dummy/receive int-br 'in_port(2),eth(src=aa:55:aa:55:00:00,dst=f8:bc:12:ff:ff:ff),eth_type(0x0800),ipv4(src=1.1.3.92,dst=1.1.3.88,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:460"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:489"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:461: ovs-pcap p0.pcap > p0.pcap.txt 2>&1"
-at_fn_check_prepare_trace "tunnel.at:461"
+$as_echo "$at_srcdir/tunnel.at:490: ovs-pcap p0.pcap > p0.pcap.txt 2>&1"
+at_fn_check_prepare_trace "tunnel.at:490"
 ( $at_check_trace; ovs-pcap p0.pcap > p0.pcap.txt 2>&1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:461"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:490"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93116,8 +93837,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:465: cat p0.pcap.txt | grep ffffffffffffaa55aa55000008060001080006040001aa55aa550000ac1f0101000000000000ac1f0102 | uniq"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:465"
+$as_echo "$at_srcdir/tunnel.at:494: cat p0.pcap.txt | grep ffffffffffffaa55aa55000008060001080006040001aa55aa550000ac1f0101000000000000ac1f0102 | uniq"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:494"
 ( $at_check_trace; cat p0.pcap.txt | grep ffffffffffffaa55aa55000008060001080006040001aa55aa550000ac1f0101000000000000ac1f0102 | uniq
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -93126,37 +93847,37 @@
 echo >>"$at_stdout"; $as_echo "ffffffffffffaa55aa55000008060001080006040001aa55aa550000ac1f0101000000000000ac1f0102
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:465"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:494"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:468: check_logs "
-at_fn_check_prepare_trace "tunnel.at:468"
+$as_echo "$at_srcdir/tunnel.at:497: check_logs "
+at_fn_check_prepare_trace "tunnel.at:497"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:468"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:497"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:468: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:468"
+$as_echo "$at_srcdir/tunnel.at:497: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:497"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:468"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:497"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93164,15 +93885,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:468: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:468"
+$as_echo "$at_srcdir/tunnel.at:497: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:497"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:468"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:497"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93185,18 +93906,18 @@
     :
 
 }
-ovs_wait "tunnel.at:468" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:497" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:468: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:468"
+$as_echo "$at_srcdir/tunnel.at:497: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:497"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:468"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:497"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93204,15 +93925,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:468: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:468"
+$as_echo "$at_srcdir/tunnel.at:497: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:497"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:468"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:497"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93225,58 +93946,58 @@
     :
 
 }
-ovs_wait "tunnel.at:468" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:497" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_749
-#AT_START_750
-at_fn_group_banner 750 'tunnel.at:471' \
+#AT_STOP_752
+#AT_START_753
+at_fn_group_banner 753 'tunnel.at:500' \
   "tunnel - LISP" "                                  " 46
 at_xfail=no
 (
-  $as_echo "750. $at_setup_line: testing $at_desc ..."
+  $as_echo "753. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:472: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:472"
+$as_echo "$at_srcdir/tunnel.at:501: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:501"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:472"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:501"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:472: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:472"
+$as_echo "$at_srcdir/tunnel.at:501: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:501"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:472"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:501"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:472: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:501: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:472"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:501"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -93285,37 +94006,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:472"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:501"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:472: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:472"
+$as_echo "$at_srcdir/tunnel.at:501: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:501"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:472"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:501"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:472: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:472"
+$as_echo "$at_srcdir/tunnel.at:501: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:501"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:472"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:501"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -93323,7 +94044,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:472: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:501: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -93336,7 +94057,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:472"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:501"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -93355,7 +94076,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:472"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:501"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93363,9 +94084,9 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:472: add_of_br 0 add-port br0 p1 -- set Interface p1 type=lisp \\
+$as_echo "$at_srcdir/tunnel.at:501: add_of_br 0 add-port br0 p1 -- set Interface p1 type=lisp \\
                     options:remote_ip=1.1.1.1 ofport_request=1 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:472"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:501"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=lisp \
                     options:remote_ip=1.1.1.1 ofport_request=1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -93373,7 +94094,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:472"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:501"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93382,8 +94103,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:475: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:475"
+$as_echo "$at_srcdir/tunnel.at:504: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:504"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -93393,7 +94114,7 @@
     p1 1/4341: (lisp: remote_ip=1.1.1.1)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:475"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:504"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93401,30 +94122,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:480: check_logs "
-at_fn_check_prepare_trace "tunnel.at:480"
+$as_echo "$at_srcdir/tunnel.at:509: check_logs "
+at_fn_check_prepare_trace "tunnel.at:509"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:480"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:509"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:480: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:480"
+$as_echo "$at_srcdir/tunnel.at:509: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:509"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:480"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:509"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93432,15 +94153,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:480: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:480"
+$as_echo "$at_srcdir/tunnel.at:509: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:509"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:480"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:509"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93453,18 +94174,18 @@
     :
 
 }
-ovs_wait "tunnel.at:480" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:509" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:480: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:480"
+$as_echo "$at_srcdir/tunnel.at:509: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:509"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:480"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:509"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93472,15 +94193,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:480: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:480"
+$as_echo "$at_srcdir/tunnel.at:509: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:509"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:480"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:509"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93493,58 +94214,58 @@
     :
 
 }
-ovs_wait "tunnel.at:480" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:509" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_750
-#AT_START_751
-at_fn_group_banner 751 'tunnel.at:483' \
+#AT_STOP_753
+#AT_START_754
+at_fn_group_banner 754 'tunnel.at:512' \
   "tunnel - ERSPAN" "                                " 46
 at_xfail=no
 (
-  $as_echo "751. $at_setup_line: testing $at_desc ..."
+  $as_echo "754. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:484: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:484"
+$as_echo "$at_srcdir/tunnel.at:513: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:513"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:484"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:513"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:484: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:484"
+$as_echo "$at_srcdir/tunnel.at:513: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:513"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:484"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:513"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:484: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:513: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:484"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:513"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -93553,37 +94274,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:484"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:513"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:484: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:484"
+$as_echo "$at_srcdir/tunnel.at:513: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:513"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:484"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:513"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:484: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:484"
+$as_echo "$at_srcdir/tunnel.at:513: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:513"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:484"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:513"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -93591,7 +94312,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:484: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:513: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -93604,7 +94325,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:484"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:513"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -93623,7 +94344,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:484"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:513"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93631,7 +94352,7 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:484: add_of_br 0 add-port br0 p1 -- set Interface p1 type=erspan \\
+$as_echo "$at_srcdir/tunnel.at:513: add_of_br 0 add-port br0 p1 -- set Interface p1 type=erspan \\
                     options:remote_ip=1.1.1.1 options:key=1 options:erspan_ver=1 \\
                     options:erspan_idx=0x0 ofport_request=1 \\
                  -- add-port br0 p2 -- set Interface p2 type=erspan \\
@@ -93645,7 +94366,7 @@
                     options:remote_ip=1.2.3.4 ofport_request=4 \\
                     options:key=flow options:erspan_ver=flow\\
                   "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:484"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:513"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=erspan \
                     options:remote_ip=1.1.1.1 options:key=1 options:erspan_ver=1 \
                     options:erspan_idx=0x0 ofport_request=1 \
@@ -93665,7 +94386,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:484"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:513"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93674,8 +94395,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:499: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:499"
+$as_echo "$at_srcdir/tunnel.at:528: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:528"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -93688,7 +94409,7 @@
     p4 4/1: (erspan: erspan_dir=flow, erspan_hwid=flow, erspan_idx=flow, erspan_ver=flow, key=flow, remote_ip=1.2.3.4)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:499"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:528"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93696,15 +94417,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:508: ovs-ofctl add-flow br0 \"in_port=1, actions=set_tunnel:11,set_field:0x1->tun_erspan_idx,2\""
-at_fn_check_prepare_trace "tunnel.at:508"
+$as_echo "$at_srcdir/tunnel.at:537: ovs-ofctl add-flow br0 \"in_port=1, actions=set_tunnel:11,set_field:0x1->tun_erspan_idx,2\""
+at_fn_check_prepare_trace "tunnel.at:537"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=1, actions=set_tunnel:11,set_field:0x1->tun_erspan_idx,2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:508"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:537"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93712,15 +94433,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:511: ovs-ofctl add-flow br0 \"in_port=2, actions=set_field:1->tun_erspan_dir,set_field:0x0->tun_erspan_hwid,3\""
-at_fn_check_prepare_trace "tunnel.at:511"
+$as_echo "$at_srcdir/tunnel.at:540: ovs-ofctl add-flow br0 \"in_port=2, actions=set_field:1->tun_erspan_dir,set_field:0x0->tun_erspan_hwid,3\""
+at_fn_check_prepare_trace "tunnel.at:540"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=2, actions=set_field:1->tun_erspan_dir,set_field:0x0->tun_erspan_hwid,3"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:511"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:540"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93728,15 +94449,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:513: ovs-ofctl add-flow br0 \"in_port=3, actions=set_field:2->tun_erspan_ver,set_field:1->tun_erspan_dir,set_field:0x0->tun_erspan_hwid,4\""
-at_fn_check_prepare_trace "tunnel.at:513"
+$as_echo "$at_srcdir/tunnel.at:542: ovs-ofctl add-flow br0 \"in_port=3, actions=set_field:2->tun_erspan_ver,set_field:1->tun_erspan_dir,set_field:0x0->tun_erspan_hwid,4\""
+at_fn_check_prepare_trace "tunnel.at:542"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=3, actions=set_field:2->tun_erspan_ver,set_field:1->tun_erspan_dir,set_field:0x0->tun_erspan_hwid,4"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:513"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:542"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93744,8 +94465,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:515: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:515"
+$as_echo "$at_srcdir/tunnel.at:544: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:544"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -93757,7 +94478,7 @@
  in_port=3 actions=set_field:2->tun_erspan_ver,set_field:1->tun_erspan_dir,set_field:0->tun_erspan_hwid,output:4
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:515"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:544"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93765,30 +94486,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:523: check_logs "
-at_fn_check_prepare_trace "tunnel.at:523"
+$as_echo "$at_srcdir/tunnel.at:552: check_logs "
+at_fn_check_prepare_trace "tunnel.at:552"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:523"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:523: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:523"
+$as_echo "$at_srcdir/tunnel.at:552: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:552"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:523"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93796,15 +94517,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:523: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:523"
+$as_echo "$at_srcdir/tunnel.at:552: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:552"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:523"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93817,18 +94538,18 @@
     :
 
 }
-ovs_wait "tunnel.at:523" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:552" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:523: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:523"
+$as_echo "$at_srcdir/tunnel.at:552: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:552"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:523"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93836,15 +94557,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:523: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:523"
+$as_echo "$at_srcdir/tunnel.at:552: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:552"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:523"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93857,58 +94578,58 @@
     :
 
 }
-ovs_wait "tunnel.at:523" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:552" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_751
-#AT_START_752
-at_fn_group_banner 752 'tunnel.at:526' \
+#AT_STOP_754
+#AT_START_755
+at_fn_group_banner 755 'tunnel.at:555' \
   "tunnel - different VXLAN UDP port" "              " 46
 at_xfail=no
 (
-  $as_echo "752. $at_setup_line: testing $at_desc ..."
+  $as_echo "755. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:527: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:527"
+$as_echo "$at_srcdir/tunnel.at:556: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:556"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:527: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:527"
+$as_echo "$at_srcdir/tunnel.at:556: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:556"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:527: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:556: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:527"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:556"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -93917,37 +94638,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:527: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:527"
+$as_echo "$at_srcdir/tunnel.at:556: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:556"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:527: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:527"
+$as_echo "$at_srcdir/tunnel.at:556: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:556"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -93955,7 +94676,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:527: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:556: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -93968,7 +94689,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:527"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:556"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -93987,7 +94708,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -93995,9 +94716,9 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:527: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
+$as_echo "$at_srcdir/tunnel.at:556: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
                     options:remote_ip=1.1.1.1 ofport_request=1 options:dst_port=4341 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:527"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:556"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \
                     options:remote_ip=1.1.1.1 ofport_request=1 options:dst_port=4341
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -94005,7 +94726,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:527"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94014,8 +94735,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:530: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:530"
+$as_echo "$at_srcdir/tunnel.at:559: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:559"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94025,7 +94746,7 @@
     p1 1/4341: (vxlan: dst_port=4341, remote_ip=1.1.1.1)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:530"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:559"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94034,15 +94755,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:537: ovs-vsctl -- set Interface p1 options:dst_port=5000"
-at_fn_check_prepare_trace "tunnel.at:537"
+$as_echo "$at_srcdir/tunnel.at:566: ovs-vsctl -- set Interface p1 options:dst_port=5000"
+at_fn_check_prepare_trace "tunnel.at:566"
 ( $at_check_trace; ovs-vsctl -- set Interface p1 options:dst_port=5000
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:537"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:566"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94050,8 +94771,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:539: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:539"
+$as_echo "$at_srcdir/tunnel.at:568: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:568"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94061,7 +94782,7 @@
     p1 1/5000: (vxlan: dst_port=5000, remote_ip=1.1.1.1)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:539"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:568"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94070,15 +94791,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:546: ovs-vsctl -- set Interface p1 options:dst_port=4789"
-at_fn_check_prepare_trace "tunnel.at:546"
+$as_echo "$at_srcdir/tunnel.at:575: ovs-vsctl -- set Interface p1 options:dst_port=4789"
+at_fn_check_prepare_trace "tunnel.at:575"
 ( $at_check_trace; ovs-vsctl -- set Interface p1 options:dst_port=4789
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:546"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:575"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94086,8 +94807,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:548: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:548"
+$as_echo "$at_srcdir/tunnel.at:577: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:577"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94097,37 +94818,37 @@
     p1 1/4789: (vxlan: remote_ip=1.1.1.1)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:548"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:577"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:552: check_logs "
-at_fn_check_prepare_trace "tunnel.at:552"
+$as_echo "$at_srcdir/tunnel.at:581: check_logs "
+at_fn_check_prepare_trace "tunnel.at:581"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:581"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:552: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:552"
+$as_echo "$at_srcdir/tunnel.at:581: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:581"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:581"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94135,15 +94856,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:552: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:552"
+$as_echo "$at_srcdir/tunnel.at:581: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:581"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:581"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94156,18 +94877,18 @@
     :
 
 }
-ovs_wait "tunnel.at:552" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:581" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:552: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:552"
+$as_echo "$at_srcdir/tunnel.at:581: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:581"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:581"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94175,15 +94896,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:552: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:552"
+$as_echo "$at_srcdir/tunnel.at:581: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:581"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:552"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:581"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94196,58 +94917,58 @@
     :
 
 }
-ovs_wait "tunnel.at:552" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:581" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_752
-#AT_START_753
-at_fn_group_banner 753 'tunnel.at:555' \
+#AT_STOP_755
+#AT_START_756
+at_fn_group_banner 756 'tunnel.at:584' \
   "ofproto-dpif - set_field - tun_src/tun_dst/tun_id" "" 46
 at_xfail=no
 (
-  $as_echo "753. $at_setup_line: testing $at_desc ..."
+  $as_echo "756. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:556: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:556"
+$as_echo "$at_srcdir/tunnel.at:585: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:585"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:585"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:556: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:556"
+$as_echo "$at_srcdir/tunnel.at:585: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:585"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:585"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:556: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:585: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:556"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:585"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -94256,37 +94977,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:585"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:556: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:556"
+$as_echo "$at_srcdir/tunnel.at:585: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:585"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:585"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:556: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:556"
+$as_echo "$at_srcdir/tunnel.at:585: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:585"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:585"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -94294,7 +95015,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:556: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:585: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -94307,7 +95028,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:556"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:585"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -94326,7 +95047,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:585"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94334,7 +95055,7 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:556: add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \\
+$as_echo "$at_srcdir/tunnel.at:585: add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \\
         options:remote_ip=1.1.1.1 ofport_request=1 \\
     -- add-port br0 p2 -- set Interface p2 type=gre options:key=flow \\
         options:remote_ip=flow ofport_request=2 \\
@@ -94344,7 +95065,7 @@
         options:remote_ip=flow ofport_request=4 \\
     -- add-port br0 p5 -- set Interface p5 type=gre options:key=flow \\
         options:remote_ip=5.5.5.5 ofport_request=5 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:556"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:585"
 ( $at_check_trace; add_of_br 0     add-port br0 p1 -- set Interface p1 type=gre options:key=flow \
         options:remote_ip=1.1.1.1 ofport_request=1 \
     -- add-port br0 p2 -- set Interface p2 type=gre options:key=flow \
@@ -94360,7 +95081,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:556"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:585"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94369,15 +95090,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:568: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:568"
+$as_echo "$at_srcdir/tunnel.at:597: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:597"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:568"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:597"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94395,38 +95116,38 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:578: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:578"
+$as_echo "$at_srcdir/tunnel.at:607: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:607"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:578"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:607"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:579: ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "tunnel.at:579"
+$as_echo "$at_srcdir/tunnel.at:608: ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "tunnel.at:608"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(90),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:579"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:608"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:580: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:580"
+$as_echo "$at_srcdir/tunnel.at:609: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:609"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94435,37 +95156,37 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x2a,dst=1.1.1.1,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x2a,dst=3.3.3.3,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x2a,src=1.1.1.1,dst=4.4.4.4,ttl=64,flags(df|key))),1,set(tunnel(tun_id=0x3,dst=2.2.2.2,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:580"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:609"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:583: check_logs "
-at_fn_check_prepare_trace "tunnel.at:583"
+$as_echo "$at_srcdir/tunnel.at:612: check_logs "
+at_fn_check_prepare_trace "tunnel.at:612"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:583"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:583: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:583"
+$as_echo "$at_srcdir/tunnel.at:612: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:612"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:583"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94473,15 +95194,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:583: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:583"
+$as_echo "$at_srcdir/tunnel.at:612: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:612"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:583"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94494,18 +95215,18 @@
     :
 
 }
-ovs_wait "tunnel.at:583" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:612" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:583: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:583"
+$as_echo "$at_srcdir/tunnel.at:612: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:612"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:583"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94513,15 +95234,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:583: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:583"
+$as_echo "$at_srcdir/tunnel.at:612: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:612"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:583"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:612"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94534,58 +95255,58 @@
     :
 
 }
-ovs_wait "tunnel.at:583" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:612" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_753
-#AT_START_754
-at_fn_group_banner 754 'tunnel.at:586' \
+#AT_STOP_756
+#AT_START_757
+at_fn_group_banner 757 'tunnel.at:615' \
   "tunnel - ERSPAN v1/v2 metadata" "                 " 46
 at_xfail=no
 (
-  $as_echo "754. $at_setup_line: testing $at_desc ..."
+  $as_echo "757. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:587: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:587"
+$as_echo "$at_srcdir/tunnel.at:616: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:616"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:587: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:587"
+$as_echo "$at_srcdir/tunnel.at:616: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:616"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:587: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:616: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:587"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:616"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -94594,37 +95315,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:587: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:587"
+$as_echo "$at_srcdir/tunnel.at:616: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:616"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:616"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:587: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:587"
+$as_echo "$at_srcdir/tunnel.at:616: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:616"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:616"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -94632,7 +95353,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:587: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:616: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -94645,7 +95366,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:587"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:616"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -94664,7 +95385,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:616"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94672,11 +95393,11 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:587: add_of_br 0 add-port br0 p1 -- set Interface p1 type=dummy \\
+$as_echo "$at_srcdir/tunnel.at:616: add_of_br 0 add-port br0 p1 -- set Interface p1 type=dummy \\
                         ofport_request=1 \\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                         ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:587"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:616"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=dummy \
                         ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=dummy \
@@ -94686,7 +95407,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:587"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:616"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94710,15 +95431,15 @@
                               options:erspan_dir=1 \
                               options:erspan_hwid=7
 { set +x
-$as_echo "$at_srcdir/tunnel.at:607: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:607"
+$as_echo "$at_srcdir/tunnel.at:636: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:636"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:607"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:636"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94727,8 +95448,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:609: ovs-appctl dpif/show | tail -n +3"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:609"
+$as_echo "$at_srcdir/tunnel.at:638: ovs-appctl dpif/show | tail -n +3"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:638"
 ( $at_check_trace; ovs-appctl dpif/show | tail -n +3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94741,7 +95462,7 @@
     p4 4/3: (erspan: erspan_dir=1, erspan_hwid=0x7, erspan_ver=2, key=2, remote_ip=1.1.1.2)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:609"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:638"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94756,15 +95477,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:623: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:623"
+$as_echo "$at_srcdir/tunnel.at:652: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:652"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:623"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:652"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94772,23 +95493,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:626: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "tunnel.at:626"
+$as_echo "$at_srcdir/tunnel.at:655: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "tunnel.at:655"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:626"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:655"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:627: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:627"
+$as_echo "$at_srcdir/tunnel.at:656: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:656"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94797,7 +95518,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x1,dst=1.1.1.1,ttl=64,erspan(ver=1,idx=0x7),flags(df|key))),3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:627"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:656"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94805,23 +95526,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:632: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "tunnel.at:632"
+$as_echo "$at_srcdir/tunnel.at:661: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "tunnel.at:661"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:632"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:661"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:633: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:633"
+$as_echo "$at_srcdir/tunnel.at:662: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:662"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94830,7 +95551,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0x2,dst=1.1.1.2,ttl=64,erspan(ver=2,dir=1,hwid=0x7),flags(df|key))),3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:633"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:662"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94838,23 +95559,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:638: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,erspan(ver=1,idx=0x7),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:638"
+$as_echo "$at_srcdir/tunnel.at:667: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,erspan(ver=1,idx=0x7),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:667"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,erspan(ver=1,idx=0x7),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:638"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:667"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:639: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:639"
+$as_echo "$at_srcdir/tunnel.at:668: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:668"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94864,7 +95585,7 @@
 Datapath actions: 1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:639"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:668"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94872,23 +95593,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:645: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,erspan(ver=1,idx=0xabcd),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:645"
+$as_echo "$at_srcdir/tunnel.at:674: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,erspan(ver=1,idx=0xabcd),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:674"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x1,src=1.1.1.1,dst=2.2.2.2,ttl=64,erspan(ver=1,idx=0xabcd),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:645"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:674"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:646: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:646"
+$as_echo "$at_srcdir/tunnel.at:675: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:675"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94898,7 +95619,7 @@
 Datapath actions: drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:646"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:675"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94906,23 +95627,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:652: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=1,hwid=0x7),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:652"
+$as_echo "$at_srcdir/tunnel.at:681: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=1,hwid=0x7),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:681"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=1,hwid=0x7),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:652"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:681"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:653: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:653"
+$as_echo "$at_srcdir/tunnel.at:682: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:682"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94932,7 +95653,7 @@
 Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:653"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:682"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94940,23 +95661,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:659: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=0,hwid=0x17),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:659"
+$as_echo "$at_srcdir/tunnel.at:688: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=0,hwid=0x17),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:688"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=0,hwid=0x17),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:659"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:688"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:660: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:660"
+$as_echo "$at_srcdir/tunnel.at:689: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:689"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -94966,7 +95687,7 @@
 Datapath actions: drop
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:660"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:689"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -94974,30 +95695,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:666: ovs-ofctl del-flows br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=1,tun_erspan_hwid=0xf/0x1"
-at_fn_check_prepare_trace "tunnel.at:666"
+$as_echo "$at_srcdir/tunnel.at:695: ovs-ofctl del-flows br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=1,tun_erspan_hwid=0xf/0x1"
+at_fn_check_prepare_trace "tunnel.at:695"
 ( $at_check_trace; ovs-ofctl del-flows br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=1,tun_erspan_hwid=0xf/0x1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:666"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:695"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:667: ovs-ofctl add-flow br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=0/0,tun_erspan_hwid=0x0/0x0,actions=2"
-at_fn_check_prepare_trace "tunnel.at:667"
+$as_echo "$at_srcdir/tunnel.at:696: ovs-ofctl add-flow br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=0/0,tun_erspan_hwid=0x0/0x0,actions=2"
+at_fn_check_prepare_trace "tunnel.at:696"
 ( $at_check_trace; ovs-ofctl add-flow br0 in_port=4,tun_erspan_ver=2,tun_erspan_dir=0/0,tun_erspan_hwid=0x0/0x0,actions=2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:667"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:696"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95005,8 +95726,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:669: ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:669"
+$as_echo "$at_srcdir/tunnel.at:698: ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:698"
 ( $at_check_trace; ovs-ofctl --sort=in_port dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95018,7 +95739,7 @@
  tun_erspan_ver=2,in_port=4 actions=output:2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:669"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:698"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95026,23 +95747,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:678: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=0,hwid=0x17),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:678"
+$as_echo "$at_srcdir/tunnel.at:707: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=0,hwid=0x17),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:707"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x2,src=1.1.1.2,dst=2.2.2.2,ttl=64,erspan(ver=2,dir=0,hwid=0x17),flags(df|key)),in_port(3),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:678"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:707"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:679: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:679"
+$as_echo "$at_srcdir/tunnel.at:708: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:708"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95052,7 +95773,7 @@
 Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:679"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:708"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95060,10 +95781,10 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:685: ovs-vsctl add-port br0 p5 -- set Interface p5 type=erspan \\
+$as_echo "$at_srcdir/tunnel.at:714: ovs-vsctl add-port br0 p5 -- set Interface p5 type=erspan \\
           options:remote_ip=1.1.1.2 ofport_request=5 \\
           options:key=flow options:erspan_ver=1 options:erspan_idx=flow"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:685"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:714"
 ( $at_check_trace; ovs-vsctl add-port br0 p5 -- set Interface p5 type=erspan \
           options:remote_ip=1.1.1.2 ofport_request=5 \
           options:key=flow options:erspan_ver=1 options:erspan_idx=flow
@@ -95072,7 +95793,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:685"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:714"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95080,30 +95801,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:689: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:689"
+$as_echo "$at_srcdir/tunnel.at:718: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:718"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:689"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:718"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:690: ovs-ofctl add-flow br0 \"in_port=1, actions=set_tunnel:11,set_field:0x7->tun_erspan_idx,5\""
-at_fn_check_prepare_trace "tunnel.at:690"
+$as_echo "$at_srcdir/tunnel.at:719: ovs-ofctl add-flow br0 \"in_port=1, actions=set_tunnel:11,set_field:0x7->tun_erspan_idx,5\""
+at_fn_check_prepare_trace "tunnel.at:719"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=1, actions=set_tunnel:11,set_field:0x7->tun_erspan_idx,5"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:690"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:719"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95111,8 +95832,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:692: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:692"
+$as_echo "$at_srcdir/tunnel.at:721: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:721"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95122,7 +95843,7 @@
  in_port=1 actions=set_tunnel:0xb,set_field:0x7->tun_erspan_idx,output:5
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:692"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:721"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95130,23 +95851,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:698: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "tunnel.at:698"
+$as_echo "$at_srcdir/tunnel.at:727: ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "tunnel.at:727"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(1),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:698"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:727"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:699: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:699"
+$as_echo "$at_srcdir/tunnel.at:728: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:728"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95155,7 +95876,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(tun_id=0xb,dst=1.1.1.2,ttl=64,erspan(ver=1,idx=0x7),flags(df|key))),3
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:699"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:728"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95163,30 +95884,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:703: check_logs "
-at_fn_check_prepare_trace "tunnel.at:703"
+$as_echo "$at_srcdir/tunnel.at:732: check_logs "
+at_fn_check_prepare_trace "tunnel.at:732"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:703"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:703: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:703"
+$as_echo "$at_srcdir/tunnel.at:732: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:732"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:703"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95194,15 +95915,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:703: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:703"
+$as_echo "$at_srcdir/tunnel.at:732: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:732"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:703"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95215,18 +95936,18 @@
     :
 
 }
-ovs_wait "tunnel.at:703" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:732" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:703: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:703"
+$as_echo "$at_srcdir/tunnel.at:732: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:732"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:703"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95234,15 +95955,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:703: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:703"
+$as_echo "$at_srcdir/tunnel.at:732: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:732"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:703"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:732"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95255,58 +95976,58 @@
     :
 
 }
-ovs_wait "tunnel.at:703" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:732" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_754
-#AT_START_755
-at_fn_group_banner 755 'tunnel.at:706' \
+#AT_STOP_757
+#AT_START_758
+at_fn_group_banner 758 'tunnel.at:735' \
   "tunnel - Geneve metadata" "                       " 46
 at_xfail=no
 (
-  $as_echo "755. $at_setup_line: testing $at_desc ..."
+  $as_echo "758. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:707: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:707"
+$as_echo "$at_srcdir/tunnel.at:736: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:736"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:707"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:736"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:707: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:707"
+$as_echo "$at_srcdir/tunnel.at:736: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:736"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:707"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:736"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:707: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:736: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:707"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:736"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -95315,37 +96036,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:707"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:736"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:707: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:707"
+$as_echo "$at_srcdir/tunnel.at:736: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:736"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:707"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:707: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:707"
+$as_echo "$at_srcdir/tunnel.at:736: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:736"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:707"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -95353,7 +96074,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:707: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:736: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -95366,7 +96087,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:707"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:736"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -95385,7 +96106,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:707"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95393,11 +96114,11 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:707: add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \\
+$as_echo "$at_srcdir/tunnel.at:736: add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \\
                     options:remote_ip=1.1.1.1 ofport_request=1 \\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                     ofport_request=2 ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:707"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:736"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \
                     options:remote_ip=1.1.1.1 ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=dummy \
@@ -95407,7 +96128,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:707"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:736"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95415,15 +96136,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:711: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:711"
+$as_echo "$at_srcdir/tunnel.at:740: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:740"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:711"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:740"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95432,15 +96153,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:713: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=8}->tun_metadata1\""
-at_fn_check_prepare_trace "tunnel.at:713"
+$as_echo "$at_srcdir/tunnel.at:742: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=8}->tun_metadata1\""
+at_fn_check_prepare_trace "tunnel.at:742"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=8}->tun_metadata1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:713"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:742"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95453,15 +96174,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:719: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:719"
+$as_echo "$at_srcdir/tunnel.at:748: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:748"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:719"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:748"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95469,23 +96190,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:722: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
-at_fn_check_prepare_trace "tunnel.at:722"
+$as_echo "$at_srcdir/tunnel.at:751: ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'"
+at_fn_check_prepare_trace "tunnel.at:751"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'in_port(2),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no),icmp(type=8,code=0)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:722"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:751"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:723: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:723"
+$as_echo "$at_srcdir/tunnel.at:752: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:752"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95494,7 +96215,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(dst=1.1.1.1,ttl=64,tp_dst=6081,geneve({class=0xffff,type=0,len=4,0xa}{class=0xffff,type=0x1,len=8,0x1234567890abcdef}),flags(df))),6081
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:723"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:752"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95502,23 +96223,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:728: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0xb}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:728"
+$as_echo "$at_srcdir/tunnel.at:757: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0xb}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:757"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0xb}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:728"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:757"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:729: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:729"
+$as_echo "$at_srcdir/tunnel.at:758: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:758"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95528,7 +96249,7 @@
 Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:729"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:758"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95536,23 +96257,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:735: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0xb}{class=0xffff,type=2,len=4,0xc}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:735"
+$as_echo "$at_srcdir/tunnel.at:764: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0xb}{class=0xffff,type=2,len=4,0xc}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:764"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0xb}{class=0xffff,type=2,len=4,0xc}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:735"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:764"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:736: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:736"
+$as_echo "$at_srcdir/tunnel.at:765: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:765"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95562,7 +96283,7 @@
 Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:736"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:765"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95570,23 +96291,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:742: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:742"
+$as_echo "$at_srcdir/tunnel.at:771: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:771"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:742"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:771"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:743: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=2,len=124}->tun_metadata2,{class=0xffff,type=3,len=124}->tun_metadata3\""
-at_fn_check_prepare_trace "tunnel.at:743"
+$as_echo "$at_srcdir/tunnel.at:772: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=2,len=124}->tun_metadata2,{class=0xffff,type=3,len=124}->tun_metadata3\""
+at_fn_check_prepare_trace "tunnel.at:772"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=2,len=124}->tun_metadata2,{class=0xffff,type=3,len=124}->tun_metadata3"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95601,7 +96322,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:743"
+at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:772"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95609,8 +96330,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:753: ovs-ofctl add-flow br0 \"tun_metadata0,tun_metadata0,actions=drop\""
-at_fn_check_prepare_trace "tunnel.at:753"
+$as_echo "$at_srcdir/tunnel.at:782: ovs-ofctl add-flow br0 \"tun_metadata0,tun_metadata0,actions=drop\""
+at_fn_check_prepare_trace "tunnel.at:782"
 ( $at_check_trace; ovs-ofctl add-flow br0 "tun_metadata0,tun_metadata0,actions=drop"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95619,7 +96340,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:753"
+at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:782"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95627,8 +96348,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:757: ovs-ofctl add-flow br0 \"tun_metadata0=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata1=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata2=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata3=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata4=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,actions=drop\""
-at_fn_check_prepare_trace "tunnel.at:757"
+$as_echo "$at_srcdir/tunnel.at:786: ovs-ofctl add-flow br0 \"tun_metadata0=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata1=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata2=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata3=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata4=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,actions=drop\""
+at_fn_check_prepare_trace "tunnel.at:786"
 ( $at_check_trace; ovs-ofctl add-flow br0 "tun_metadata0=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata1=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata2=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata3=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,tun_metadata4=0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef,actions=drop"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95637,7 +96358,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:757"
+at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:786"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95645,75 +96366,75 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:762: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=2,len=124}->tun_metadata2\""
-at_fn_check_prepare_trace "tunnel.at:762"
+$as_echo "$at_srcdir/tunnel.at:791: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=2,len=124}->tun_metadata2\""
+at_fn_check_prepare_trace "tunnel.at:791"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=2,len=124}->tun_metadata2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:762"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:791"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:763: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata3\""
-at_fn_check_prepare_trace "tunnel.at:763"
+$as_echo "$at_srcdir/tunnel.at:792: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata3\""
+at_fn_check_prepare_trace "tunnel.at:792"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=3,len=4}->tun_metadata3"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:763"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:792"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:764: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=4,len=112}->tun_metadata4\""
-at_fn_check_prepare_trace "tunnel.at:764"
+$as_echo "$at_srcdir/tunnel.at:793: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=4,len=112}->tun_metadata4\""
+at_fn_check_prepare_trace "tunnel.at:793"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=4,len=112}->tun_metadata4"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:764"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:793"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:765: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata3\""
-at_fn_check_prepare_trace "tunnel.at:765"
+$as_echo "$at_srcdir/tunnel.at:794: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata3\""
+at_fn_check_prepare_trace "tunnel.at:794"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0 "{class=0xffff,type=3,len=4}->tun_metadata3"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:765"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:794"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:766: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=3,len=8}->tun_metadata3\""
-at_fn_check_prepare_trace "tunnel.at:766"
+$as_echo "$at_srcdir/tunnel.at:795: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=3,len=8}->tun_metadata3\""
+at_fn_check_prepare_trace "tunnel.at:795"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=3,len=8}->tun_metadata3"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:766"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:795"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95721,38 +96442,38 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:768: ovs-ofctl add-flow br0 tun_metadata3=0x1234567890abcdef,actions=2"
-at_fn_check_prepare_trace "tunnel.at:768"
+$as_echo "$at_srcdir/tunnel.at:797: ovs-ofctl add-flow br0 tun_metadata3=0x1234567890abcdef,actions=2"
+at_fn_check_prepare_trace "tunnel.at:797"
 ( $at_check_trace; ovs-ofctl add-flow br0 tun_metadata3=0x1234567890abcdef,actions=2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:768"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:797"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:769: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=3,len=8,0x1234567890abcdef}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:769"
+$as_echo "$at_srcdir/tunnel.at:798: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=3,len=8,0x1234567890abcdef}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:798"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=3,len=8,0x1234567890abcdef}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:769"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:798"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:770: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:770"
+$as_echo "$at_srcdir/tunnel.at:799: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:799"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95762,7 +96483,7 @@
 Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:770"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:799"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95770,8 +96491,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:775: ovs-ofctl dump-flows br0 | ofctl_strip"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:775"
+$as_echo "$at_srcdir/tunnel.at:804: ovs-ofctl dump-flows br0 | ofctl_strip"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:804"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95781,7 +96502,7 @@
  tun_metadata3=0x1234567890abcdef actions=output:2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:775"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:804"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95789,8 +96510,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:782: ovs-ofctl del-tlv-map br0"
-at_fn_check_prepare_trace "tunnel.at:782"
+$as_echo "$at_srcdir/tunnel.at:811: ovs-ofctl del-tlv-map br0"
+at_fn_check_prepare_trace "tunnel.at:811"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95801,7 +96522,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:782"
+at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:811"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95809,30 +96530,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:788: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:788"
+$as_echo "$at_srcdir/tunnel.at:817: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:817"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:788"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:817"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:789: ovs-ofctl del-tlv-map br0"
-at_fn_check_prepare_trace "tunnel.at:789"
+$as_echo "$at_srcdir/tunnel.at:818: ovs-ofctl del-tlv-map br0"
+at_fn_check_prepare_trace "tunnel.at:818"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:789"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:818"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95840,45 +96561,45 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:792: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=1,len=4}->tun_metadata0\""
-at_fn_check_prepare_trace "tunnel.at:792"
+$as_echo "$at_srcdir/tunnel.at:821: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=1,len=4}->tun_metadata0\""
+at_fn_check_prepare_trace "tunnel.at:821"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=1,len=4}->tun_metadata0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:792"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:821"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:793: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=2,len=4}->tun_metadata1\""
-at_fn_check_prepare_trace "tunnel.at:793"
+$as_echo "$at_srcdir/tunnel.at:822: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=2,len=4}->tun_metadata1\""
+at_fn_check_prepare_trace "tunnel.at:822"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=2,len=4}->tun_metadata1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:793"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:822"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:794: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata2\""
-at_fn_check_prepare_trace "tunnel.at:794"
+$as_echo "$at_srcdir/tunnel.at:823: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata2\""
+at_fn_check_prepare_trace "tunnel.at:823"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=3,len=4}->tun_metadata2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:794"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:823"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95886,30 +96607,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:796: ovs-ofctl add-flow br0 \"in_port=1 actions=multipath(eth_src,50,modulo_n,1,0,tun_metadata0[0..31])\""
-at_fn_check_prepare_trace "tunnel.at:796"
+$as_echo "$at_srcdir/tunnel.at:825: ovs-ofctl add-flow br0 \"in_port=1 actions=multipath(eth_src,50,modulo_n,1,0,tun_metadata0[0..31])\""
+at_fn_check_prepare_trace "tunnel.at:825"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=1 actions=multipath(eth_src,50,modulo_n,1,0,tun_metadata0[0..31])"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:796"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:825"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:797: ovs-ofctl add-flow br0 \"in_port=2 actions=push:tun_metadata1[0..31],clone(move:tun_metadata2[0..31]->reg0[0..31])\""
-at_fn_check_prepare_trace "tunnel.at:797"
+$as_echo "$at_srcdir/tunnel.at:826: ovs-ofctl add-flow br0 \"in_port=2 actions=push:tun_metadata1[0..31],clone(move:tun_metadata2[0..31]->reg0[0..31])\""
+at_fn_check_prepare_trace "tunnel.at:826"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=2 actions=push:tun_metadata1[0..31],clone(move:tun_metadata2[0..31]->reg0[0..31])"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:797"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:826"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95917,30 +96638,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:799: ovs-ofctl add-flow br0 \"in_port=1 actions=output:4\""
-at_fn_check_prepare_trace "tunnel.at:799"
+$as_echo "$at_srcdir/tunnel.at:828: ovs-ofctl add-flow br0 \"in_port=1 actions=output:4\""
+at_fn_check_prepare_trace "tunnel.at:828"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=1 actions=output:4"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:799"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:828"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:800: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata0\""
-at_fn_check_prepare_trace "tunnel.at:800"
+$as_echo "$at_srcdir/tunnel.at:829: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata0\""
+at_fn_check_prepare_trace "tunnel.at:829"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0 "{class=0xffff,type=3,len=4}->tun_metadata0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:800"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:829"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -95948,38 +96669,38 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:802: ovs-ofctl add-flow br0 \"in_port=2 actions=push:tun_metadata2[0..31]\""
-at_fn_check_prepare_trace "tunnel.at:802"
+$as_echo "$at_srcdir/tunnel.at:831: ovs-ofctl add-flow br0 \"in_port=2 actions=push:tun_metadata2[0..31]\""
+at_fn_check_prepare_trace "tunnel.at:831"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=2 actions=push:tun_metadata2[0..31]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:802"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:831"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:803: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=2,len=4}->tun_metadata1\""
-at_fn_check_prepare_trace "tunnel.at:803"
+$as_echo "$at_srcdir/tunnel.at:832: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=2,len=4}->tun_metadata1\""
+at_fn_check_prepare_trace "tunnel.at:832"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0 "{class=0xffff,type=2,len=4}->tun_metadata1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:803"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:832"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:804: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata2\""
-at_fn_check_prepare_trace "tunnel.at:804"
+$as_echo "$at_srcdir/tunnel.at:833: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=3,len=4}->tun_metadata2\""
+at_fn_check_prepare_trace "tunnel.at:833"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0 "{class=0xffff,type=3,len=4}->tun_metadata2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -95993,7 +96714,7 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:804"
+at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:833"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96001,30 +96722,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:813: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:813"
+$as_echo "$at_srcdir/tunnel.at:842: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:842"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:813"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:842"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:814: ovs-ofctl del-tlv-map br0"
-at_fn_check_prepare_trace "tunnel.at:814"
+$as_echo "$at_srcdir/tunnel.at:843: ovs-ofctl del-tlv-map br0"
+at_fn_check_prepare_trace "tunnel.at:843"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:814"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:843"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96032,60 +96753,60 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:817: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=1,len=4}->tun_metadata1\""
-at_fn_check_prepare_trace "tunnel.at:817"
+$as_echo "$at_srcdir/tunnel.at:846: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=1,len=4}->tun_metadata1\""
+at_fn_check_prepare_trace "tunnel.at:846"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=1,len=4}->tun_metadata1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:817"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:846"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:818: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=2,len=4}->tun_metadata2\""
-at_fn_check_prepare_trace "tunnel.at:818"
+$as_echo "$at_srcdir/tunnel.at:847: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=2,len=4}->tun_metadata2\""
+at_fn_check_prepare_trace "tunnel.at:847"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=2,len=4}->tun_metadata2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:818"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:847"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:819: ovs-ofctl add-flow br0 \"in_port=2, eth_src=00:00:00:00:00:01 actions=learn(tun_metadata1[0..31]=reg1, output:NXM_OF_IN_PORT[])\""
-at_fn_check_prepare_trace "tunnel.at:819"
+$as_echo "$at_srcdir/tunnel.at:848: ovs-ofctl add-flow br0 \"in_port=2, eth_src=00:00:00:00:00:01 actions=learn(tun_metadata1[0..31]=reg1, output:NXM_OF_IN_PORT[])\""
+at_fn_check_prepare_trace "tunnel.at:848"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=2, eth_src=00:00:00:00:00:01 actions=learn(tun_metadata1[0..31]=reg1, output:NXM_OF_IN_PORT[])"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:819"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:848"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:820: ovs-ofctl add-flow br0 \"in_port=2, eth_src=00:00:00:00:00:02 actions=learn(reg1[0..31]=0xFF, load:reg1[0..31]->tun_metadata2[0..31])\""
-at_fn_check_prepare_trace "tunnel.at:820"
+$as_echo "$at_srcdir/tunnel.at:849: ovs-ofctl add-flow br0 \"in_port=2, eth_src=00:00:00:00:00:02 actions=learn(reg1[0..31]=0xFF, load:reg1[0..31]->tun_metadata2[0..31])\""
+at_fn_check_prepare_trace "tunnel.at:849"
 ( $at_check_trace; ovs-ofctl add-flow br0 "in_port=2, eth_src=00:00:00:00:00:02 actions=learn(reg1[0..31]=0xFF, load:reg1[0..31]->tun_metadata2[0..31])"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:820"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:849"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96094,30 +96815,30 @@
 flow1="in_port(2),eth(src=00:00:00:00:00:01,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0800)"
 flow2="in_port(2),eth(src=00:00:00:00:00:02,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0800)"
 { set +x
-$as_echo "$at_srcdir/tunnel.at:823: ovs-appctl ofproto/trace ovs-dummy \"\$flow1\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow1\" -generate" "tunnel.at:823"
+$as_echo "$at_srcdir/tunnel.at:852: ovs-appctl ofproto/trace ovs-dummy \"\$flow1\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow1\" -generate" "tunnel.at:852"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow1" -generate
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:852"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:824: ovs-appctl ofproto/trace ovs-dummy \"\$flow2\" -generate"
-at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow2\" -generate" "tunnel.at:824"
+$as_echo "$at_srcdir/tunnel.at:853: ovs-appctl ofproto/trace ovs-dummy \"\$flow2\" -generate"
+at_fn_check_prepare_dynamic "ovs-appctl ofproto/trace ovs-dummy \"$flow2\" -generate" "tunnel.at:853"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy "$flow2" -generate
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:824"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:853"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96125,15 +96846,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:827: ovs-ofctl del-flows br0 \"in_port=2\""
-at_fn_check_prepare_trace "tunnel.at:827"
+$as_echo "$at_srcdir/tunnel.at:856: ovs-ofctl del-flows br0 \"in_port=2\""
+at_fn_check_prepare_trace "tunnel.at:856"
 ( $at_check_trace; ovs-ofctl del-flows br0 "in_port=2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:827"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:856"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96141,8 +96862,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:829: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=1,len=4}->tun_metadata1\""
-at_fn_check_prepare_trace "tunnel.at:829"
+$as_echo "$at_srcdir/tunnel.at:858: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=1,len=4}->tun_metadata1\""
+at_fn_check_prepare_trace "tunnel.at:858"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0 "{class=0xffff,type=1,len=4}->tun_metadata1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -96156,37 +96877,37 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:829"
+at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:858"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:837: ovs-ofctl del-flows br0 \"tun_metadata1\""
-at_fn_check_prepare_trace "tunnel.at:837"
+$as_echo "$at_srcdir/tunnel.at:866: ovs-ofctl del-flows br0 \"tun_metadata1\""
+at_fn_check_prepare_trace "tunnel.at:866"
 ( $at_check_trace; ovs-ofctl del-flows br0 "tun_metadata1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:837"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:866"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:838: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=1,len=4}->tun_metadata1\""
-at_fn_check_prepare_trace "tunnel.at:838"
+$as_echo "$at_srcdir/tunnel.at:867: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=1,len=4}->tun_metadata1\""
+at_fn_check_prepare_trace "tunnel.at:867"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0 "{class=0xffff,type=1,len=4}->tun_metadata1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:838"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:867"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96194,8 +96915,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:840: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=2,len=4}->tun_metadata2\""
-at_fn_check_prepare_trace "tunnel.at:840"
+$as_echo "$at_srcdir/tunnel.at:869: ovs-ofctl del-tlv-map br0 \"{class=0xffff,type=2,len=4}->tun_metadata2\""
+at_fn_check_prepare_trace "tunnel.at:869"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0 "{class=0xffff,type=2,len=4}->tun_metadata2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -96209,37 +96930,37 @@
 " | \
   $at_diff - "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:840"
+at_fn_check_status 1 $at_status "$at_srcdir/tunnel.at:869"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:848: ovs-ofctl del-flows br0 \"reg1=0xFF\""
-at_fn_check_prepare_trace "tunnel.at:848"
+$as_echo "$at_srcdir/tunnel.at:877: ovs-ofctl del-flows br0 \"reg1=0xFF\""
+at_fn_check_prepare_trace "tunnel.at:877"
 ( $at_check_trace; ovs-ofctl del-flows br0 "reg1=0xFF"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:848"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:877"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:849: ovs-ofctl del-tlv-map br0"
-at_fn_check_prepare_trace "tunnel.at:849"
+$as_echo "$at_srcdir/tunnel.at:878: ovs-ofctl del-tlv-map br0"
+at_fn_check_prepare_trace "tunnel.at:878"
 ( $at_check_trace; ovs-ofctl del-tlv-map br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:849"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:878"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96247,30 +96968,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:851: check_logs "
-at_fn_check_prepare_trace "tunnel.at:851"
+$as_echo "$at_srcdir/tunnel.at:880: check_logs "
+at_fn_check_prepare_trace "tunnel.at:880"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:851: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:851"
+$as_echo "$at_srcdir/tunnel.at:880: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:880"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96278,15 +96999,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:851: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:851"
+$as_echo "$at_srcdir/tunnel.at:880: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:880"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96299,18 +97020,18 @@
     :
 
 }
-ovs_wait "tunnel.at:851" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:880" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:851: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:851"
+$as_echo "$at_srcdir/tunnel.at:880: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:880"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96318,15 +97039,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:851: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:851"
+$as_echo "$at_srcdir/tunnel.at:880: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:880"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:851"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:880"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96339,58 +97060,58 @@
     :
 
 }
-ovs_wait "tunnel.at:851" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:880" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_755
-#AT_START_756
-at_fn_group_banner 756 'tunnel.at:854' \
+#AT_STOP_758
+#AT_START_759
+at_fn_group_banner 759 'tunnel.at:883' \
   "tunnel - Geneve option present" "                 " 46
 at_xfail=no
 (
-  $as_echo "756. $at_setup_line: testing $at_desc ..."
+  $as_echo "759. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:855: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:855"
+$as_echo "$at_srcdir/tunnel.at:884: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:884"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:855"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:884"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:855: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:855"
+$as_echo "$at_srcdir/tunnel.at:884: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:884"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:855"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:884"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:855: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:884: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:855"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:884"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -96399,37 +97120,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:855"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:884"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:855: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:855"
+$as_echo "$at_srcdir/tunnel.at:884: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:884"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:855"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:855: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:855"
+$as_echo "$at_srcdir/tunnel.at:884: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:884"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:855"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -96437,7 +97158,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:855: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:884: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -96450,7 +97171,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:855"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:884"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -96469,7 +97190,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:855"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96477,11 +97198,11 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:855: add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \\
+$as_echo "$at_srcdir/tunnel.at:884: add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \\
                     options:remote_ip=1.1.1.1 ofport_request=1 \\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                     ofport_request=2 ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:855"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:884"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \
                     options:remote_ip=1.1.1.1 ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=dummy \
@@ -96491,7 +97212,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:855"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:884"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96499,15 +97220,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:859: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:859"
+$as_echo "$at_srcdir/tunnel.at:888: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:888"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:859"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:888"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96516,15 +97237,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:861: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=0}->tun_metadata1,{class=0xffff,type=2,len=4}->tun_metadata2\""
-at_fn_check_prepare_trace "tunnel.at:861"
+$as_echo "$at_srcdir/tunnel.at:890: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=0}->tun_metadata1,{class=0xffff,type=2,len=4}->tun_metadata2\""
+at_fn_check_prepare_trace "tunnel.at:890"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=0,len=4}->tun_metadata0,{class=0xffff,type=1,len=0}->tun_metadata1,{class=0xffff,type=2,len=4}->tun_metadata2"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:861"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:890"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96538,15 +97259,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:868: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:868"
+$as_echo "$at_srcdir/tunnel.at:897: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:897"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:868"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:897"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96554,8 +97275,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:870: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:870"
+$as_echo "$at_srcdir/tunnel.at:899: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:899"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -96567,7 +97288,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:870"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:899"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96575,23 +97296,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:878: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x12345678}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:878"
+$as_echo "$at_srcdir/tunnel.at:907: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x12345678}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:907"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x12345678}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:878"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:907"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:879: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:879"
+$as_echo "$at_srcdir/tunnel.at:908: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:908"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -96601,7 +97322,7 @@
 Datapath actions: 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:879"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:908"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96609,23 +97330,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:884: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=1,len=0}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:884"
+$as_echo "$at_srcdir/tunnel.at:913: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=1,len=0}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:913"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=1,len=0}),flags(df|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:884"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:913"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:885: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:885"
+$as_echo "$at_srcdir/tunnel.at:914: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:914"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -96635,7 +97356,7 @@
 Datapath actions: set(tunnel(dst=1.1.1.1,ttl=64,tp_dst=6081,geneve({class=0xffff,type=0x1,len=0}),flags(df))),6081
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:885"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:914"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96643,30 +97364,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:890: check_logs "
-at_fn_check_prepare_trace "tunnel.at:890"
+$as_echo "$at_srcdir/tunnel.at:919: check_logs "
+at_fn_check_prepare_trace "tunnel.at:919"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:890"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:890: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:890"
+$as_echo "$at_srcdir/tunnel.at:919: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:919"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:890"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96674,15 +97395,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:890: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:890"
+$as_echo "$at_srcdir/tunnel.at:919: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:919"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:890"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96695,18 +97416,18 @@
     :
 
 }
-ovs_wait "tunnel.at:890" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:919" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:890: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:890"
+$as_echo "$at_srcdir/tunnel.at:919: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:919"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:890"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96714,15 +97435,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:890: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:890"
+$as_echo "$at_srcdir/tunnel.at:919: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:919"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:890"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:919"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96735,58 +97456,58 @@
     :
 
 }
-ovs_wait "tunnel.at:890" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:919" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_756
-#AT_START_757
-at_fn_group_banner 757 'tunnel.at:893' \
+#AT_STOP_759
+#AT_START_760
+at_fn_group_banner 760 'tunnel.at:922' \
   "tunnel - concomitant IPv6 and IPv4 tunnels" "     " 46
 at_xfail=no
 (
-  $as_echo "757. $at_setup_line: testing $at_desc ..."
+  $as_echo "760. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:894: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:894"
+$as_echo "$at_srcdir/tunnel.at:923: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:923"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:894"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:923"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:894: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:894"
+$as_echo "$at_srcdir/tunnel.at:923: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:923"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:894"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:923"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:894: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:923: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:894"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:923"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -96795,37 +97516,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:894"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:923"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:894: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:894"
+$as_echo "$at_srcdir/tunnel.at:923: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:923"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:894"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:923"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:894: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:894"
+$as_echo "$at_srcdir/tunnel.at:923: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:923"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:894"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:923"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -96833,7 +97554,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:894: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:923: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -96846,7 +97567,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:894"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:923"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -96865,7 +97586,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:894"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:923"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96873,11 +97594,11 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:894: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
+$as_echo "$at_srcdir/tunnel.at:923: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
                     options:remote_ip=1.1.1.1 ofport_request=1 \\
                     -- add-port br0 p2 -- set Interface p2 type=vxlan \\
                     options:remote_ip=2001:cafe::1 ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:894"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:923"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \
                     options:remote_ip=1.1.1.1 ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=vxlan \
@@ -96887,7 +97608,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:894"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:923"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96900,15 +97621,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:902: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:902"
+$as_echo "$at_srcdir/tunnel.at:931: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:931"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:902"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:931"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96917,15 +97638,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:904: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:904"
+$as_echo "$at_srcdir/tunnel.at:933: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:933"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:904"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:933"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96933,23 +97654,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:906: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0,src=1.1.1.1,dst=1.1.1.2,ttl=64),in_port(4789)'"
-at_fn_check_prepare_trace "tunnel.at:906"
+$as_echo "$at_srcdir/tunnel.at:935: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0,src=1.1.1.1,dst=1.1.1.2,ttl=64),in_port(4789)'"
+at_fn_check_prepare_trace "tunnel.at:935"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0,src=1.1.1.1,dst=1.1.1.2,ttl=64),in_port(4789)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:906"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:935"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:907: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:907"
+$as_echo "$at_srcdir/tunnel.at:936: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:936"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -96958,7 +97679,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(ipv6_dst=2001:cafe::1,ttl=64,tp_dst=4789,flags(df))),4789
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:907"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:936"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96966,23 +97687,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:911: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,ipv6_src=2001:cafe::1,ipv6_dst=2001:cafe::2,ttl=64),in_port(4789)'"
-at_fn_check_prepare_trace "tunnel.at:911"
+$as_echo "$at_srcdir/tunnel.at:940: ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,ipv6_src=2001:cafe::1,ipv6_dst=2001:cafe::2,ttl=64),in_port(4789)'"
+at_fn_check_prepare_trace "tunnel.at:940"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'tunnel(tun_id=0x0,ipv6_src=2001:cafe::1,ipv6_dst=2001:cafe::2,ttl=64),in_port(4789)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:911"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:940"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:912: tail -1 stdout"
-at_fn_check_prepare_trace "tunnel.at:912"
+$as_echo "$at_srcdir/tunnel.at:941: tail -1 stdout"
+at_fn_check_prepare_trace "tunnel.at:941"
 ( $at_check_trace; tail -1 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -96991,7 +97712,7 @@
 echo >>"$at_stdout"; $as_echo "Datapath actions: set(tunnel(dst=1.1.1.1,ttl=64,tp_dst=4789,flags(df))),4789
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:912"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:941"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -96999,30 +97720,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:916: check_logs "
-at_fn_check_prepare_trace "tunnel.at:916"
+$as_echo "$at_srcdir/tunnel.at:945: check_logs "
+at_fn_check_prepare_trace "tunnel.at:945"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:916"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:916: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:916"
+$as_echo "$at_srcdir/tunnel.at:945: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:945"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:916"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97030,15 +97751,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:916: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:916"
+$as_echo "$at_srcdir/tunnel.at:945: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:945"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:916"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97051,18 +97772,18 @@
     :
 
 }
-ovs_wait "tunnel.at:916" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:945" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:916: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:916"
+$as_echo "$at_srcdir/tunnel.at:945: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:945"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:916"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97070,15 +97791,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:916: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:916"
+$as_echo "$at_srcdir/tunnel.at:945: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:945"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:916"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:945"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97091,58 +97812,58 @@
     :
 
 }
-ovs_wait "tunnel.at:916" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:945" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_757
-#AT_START_758
-at_fn_group_banner 758 'tunnel.at:919' \
+#AT_STOP_760
+#AT_START_761
+at_fn_group_banner 761 'tunnel.at:948' \
   "tunnel - concomitant incompatible tunnels on the same port" "" 46
 at_xfail=no
 (
-  $as_echo "758. $at_setup_line: testing $at_desc ..."
+  $as_echo "761. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:920: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:920"
+$as_echo "$at_srcdir/tunnel.at:949: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:949"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:920"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:949"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:920: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:920"
+$as_echo "$at_srcdir/tunnel.at:949: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:949"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:920"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:949"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:920: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:949: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:920"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:949"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -97151,37 +97872,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:920"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:949"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:920: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:920"
+$as_echo "$at_srcdir/tunnel.at:949: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:949"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:920"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:920: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:920"
+$as_echo "$at_srcdir/tunnel.at:949: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:949"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:920"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -97189,7 +97910,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:920: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:949: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -97202,7 +97923,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:920"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:949"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -97221,7 +97942,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:920"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97229,9 +97950,9 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:920: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
+$as_echo "$at_srcdir/tunnel.at:949: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
                     options:remote_ip=flow ofport_request=1 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:920"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:949"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \
                     options:remote_ip=flow ofport_request=1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -97239,7 +97960,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:920"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:949"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97248,9 +97969,9 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:923: ovs-vsctl add-port br0 p2 -- set Interface p2 type=vxlan \\
+$as_echo "$at_srcdir/tunnel.at:952: ovs-vsctl add-port br0 p2 -- set Interface p2 type=vxlan \\
                     options:remote_ip=flow options:exts=gbp options:key=1 ofport_request=2"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:923"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:952"
 ( $at_check_trace; ovs-vsctl add-port br0 p2 -- set Interface p2 type=vxlan \
                     options:remote_ip=flow options:exts=gbp options:key=1 ofport_request=2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -97258,7 +97979,7 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:923"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:952"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97266,8 +97987,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:927: grep 'p2: could not set configuration (File exists)' ovs-vswitchd.log | sed \"s/^.*\\(p2:.*\\)\$/\\1/\""
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:927"
+$as_echo "$at_srcdir/tunnel.at:956: grep 'p2: could not set configuration (File exists)' ovs-vswitchd.log | sed \"s/^.*\\(p2:.*\\)\$/\\1/\""
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:956"
 ( $at_check_trace; grep 'p2: could not set configuration (File exists)' ovs-vswitchd.log | sed "s/^.*\(p2:.*\)$/\1/"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -97276,7 +97997,7 @@
 echo >>"$at_stdout"; $as_echo "p2: could not set configuration (File exists)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:927"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:956"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97284,9 +98005,9 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:931: check_logs \"/p2: VXLAN-GBP, and non-VXLAN-GBP tunnels can't be configured on the same dst_port/d
+$as_echo "$at_srcdir/tunnel.at:960: check_logs \"/p2: VXLAN-GBP, and non-VXLAN-GBP tunnels can't be configured on the same dst_port/d
 /p2: could not set configuration (File exists)/d\""
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:931"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:960"
 ( $at_check_trace; check_logs "/p2: VXLAN-GBP, and non-VXLAN-GBP tunnels can't be configured on the same dst_port/d
 /p2: could not set configuration (File exists)/d"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -97294,22 +98015,22 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:931"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:931: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:931"
+$as_echo "$at_srcdir/tunnel.at:960: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:960"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:931"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97317,15 +98038,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:931: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:931"
+$as_echo "$at_srcdir/tunnel.at:960: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:960"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:931"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97338,18 +98059,18 @@
     :
 
 }
-ovs_wait "tunnel.at:931" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:960" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:931: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:931"
+$as_echo "$at_srcdir/tunnel.at:960: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:960"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:931"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97357,15 +98078,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:931: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:931"
+$as_echo "$at_srcdir/tunnel.at:960: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:960"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:931"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:960"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97378,58 +98099,58 @@
     :
 
 }
-ovs_wait "tunnel.at:931" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:960" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_758
-#AT_START_759
-at_fn_group_banner 759 'tunnel.at:935' \
+#AT_STOP_761
+#AT_START_762
+at_fn_group_banner 762 'tunnel.at:964' \
   "tunnel - concomitant incompatible tunnels on different ports" "" 46
 at_xfail=no
 (
-  $as_echo "759. $at_setup_line: testing $at_desc ..."
+  $as_echo "762. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:936: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:936"
+$as_echo "$at_srcdir/tunnel.at:965: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:965"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:965"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:936: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:936"
+$as_echo "$at_srcdir/tunnel.at:965: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:965"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:965"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:936: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:965: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:936"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:965"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -97438,37 +98159,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:965"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:936: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:936"
+$as_echo "$at_srcdir/tunnel.at:965: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:965"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:965"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:936: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:936"
+$as_echo "$at_srcdir/tunnel.at:965: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:965"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:965"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -97476,7 +98197,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:936: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:965: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -97489,7 +98210,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:936"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:965"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -97508,7 +98229,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:965"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97516,9 +98237,9 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:936: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
+$as_echo "$at_srcdir/tunnel.at:965: add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \\
                     options:remote_ip=flow ofport_request=1 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:936"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:965"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=vxlan \
                     options:remote_ip=flow ofport_request=1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -97526,7 +98247,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:965"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97535,9 +98256,9 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:939: ovs-vsctl add-port br0 p2 -- set Interface p2 type=vxlan options:dst_port=9000 \\
+$as_echo "$at_srcdir/tunnel.at:968: ovs-vsctl add-port br0 p2 -- set Interface p2 type=vxlan options:dst_port=9000 \\
                     options:remote_ip=flow options:exts=gbp ofport_request=2"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:939"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:968"
 ( $at_check_trace; ovs-vsctl add-port br0 p2 -- set Interface p2 type=vxlan options:dst_port=9000 \
                     options:remote_ip=flow options:exts=gbp ofport_request=2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -97545,7 +98266,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:939"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:968"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97553,8 +98274,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:942: grep p2 ovs-vswitchd.log | sed \"s/^.*\\(bridge br0:.*\\)\$/\\1/\""
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:942"
+$as_echo "$at_srcdir/tunnel.at:971: grep p2 ovs-vswitchd.log | sed \"s/^.*\\(bridge br0:.*\\)\$/\\1/\""
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:971"
 ( $at_check_trace; grep p2 ovs-vswitchd.log | sed "s/^.*\(bridge br0:.*\)$/\1/"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -97563,7 +98284,7 @@
 echo >>"$at_stdout"; $as_echo "bridge br0: added interface p2 on port 2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:942"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:971"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97571,30 +98292,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:946: check_logs "
-at_fn_check_prepare_trace "tunnel.at:946"
+$as_echo "$at_srcdir/tunnel.at:975: check_logs "
+at_fn_check_prepare_trace "tunnel.at:975"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:946"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:975"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:946: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:946"
+$as_echo "$at_srcdir/tunnel.at:975: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:975"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:946"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:975"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97602,15 +98323,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:946: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:946"
+$as_echo "$at_srcdir/tunnel.at:975: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:975"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:946"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:975"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97623,18 +98344,18 @@
     :
 
 }
-ovs_wait "tunnel.at:946" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:975" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:946: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:946"
+$as_echo "$at_srcdir/tunnel.at:975: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:975"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:946"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:975"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97642,15 +98363,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:946: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:946"
+$as_echo "$at_srcdir/tunnel.at:975: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:975"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:946"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:975"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97663,58 +98384,58 @@
     :
 
 }
-ovs_wait "tunnel.at:946" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:975" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_759
-#AT_START_760
-at_fn_group_banner 760 'tunnel.at:949' \
+#AT_STOP_762
+#AT_START_763
+at_fn_group_banner 763 'tunnel.at:978' \
   "tunnel - Mix Geneve/GRE options" "                " 46
 at_xfail=no
 (
-  $as_echo "760. $at_setup_line: testing $at_desc ..."
+  $as_echo "763. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:950: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:950"
+$as_echo "$at_srcdir/tunnel.at:979: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:979"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:950"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:979"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:950: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:950"
+$as_echo "$at_srcdir/tunnel.at:979: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:979"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:950"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:979"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:950: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:979: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:950"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:979"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -97723,37 +98444,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:950"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:979"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:950: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:950"
+$as_echo "$at_srcdir/tunnel.at:979: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:979"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:950"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:950: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:950"
+$as_echo "$at_srcdir/tunnel.at:979: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:979"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:950"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -97761,7 +98482,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:950: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:979: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -97774,7 +98495,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:950"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:979"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -97793,7 +98514,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:950"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97801,13 +98522,13 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:950: add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \\
+$as_echo "$at_srcdir/tunnel.at:979: add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \\
                     options:remote_ip=1.1.1.1 options:csum=true ofport_request=1 \\
                     -- add-port br0 p2 -- set Interface p2 type=dummy \\
                     ofport_request=2 ofport_request=2 \\
                     -- add-port br0 p3 -- set Interface p3 type=gre \\
                     options:remote_ip=2.2.2.2 options:csum=false options:key=123 ofport_request=3 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:950"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:979"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=geneve \
                     options:remote_ip=1.1.1.1 options:csum=true ofport_request=1 \
                     -- add-port br0 p2 -- set Interface p2 type=dummy \
@@ -97819,7 +98540,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:950"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:979"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97827,15 +98548,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:956: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
-at_fn_check_prepare_trace "tunnel.at:956"
+$as_echo "$at_srcdir/tunnel.at:985: ovs-appctl dpif/set-dp-features br0 tnl_push_pop false"
+at_fn_check_prepare_trace "tunnel.at:985"
 ( $at_check_trace; ovs-appctl dpif/set-dp-features br0 tnl_push_pop false
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:956"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:985"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97848,15 +98569,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:961: ovs-ofctl add-flows br0 flows.txt"
-at_fn_check_prepare_trace "tunnel.at:961"
+$as_echo "$at_srcdir/tunnel.at:990: ovs-ofctl add-flows br0 flows.txt"
+at_fn_check_prepare_trace "tunnel.at:990"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:961"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:990"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97864,8 +98585,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:963: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:963"
+$as_echo "$at_srcdir/tunnel.at:992: ovs-ofctl dump-flows br0 | ofctl_strip | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:992"
 ( $at_check_trace; ovs-ofctl dump-flows br0 | ofctl_strip | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -97875,7 +98596,7 @@
 NXST_FLOW reply:
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:963"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:992"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97883,23 +98604,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:971: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x12345678}),flags(csum|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:971"
+$as_echo "$at_srcdir/tunnel.at:1000: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x12345678}),flags(csum|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1000"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x12345678}),flags(csum|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:971"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1000"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:972: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:972"
+$as_echo "$at_srcdir/tunnel.at:1001: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:1001"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -97909,7 +98630,7 @@
 Datapath actions: set(tunnel(tun_id=0x7b,dst=2.2.2.2,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:972"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1001"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97917,30 +98638,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:977: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0\""
-at_fn_check_prepare_trace "tunnel.at:977"
+$as_echo "$at_srcdir/tunnel.at:1006: ovs-ofctl add-tlv-map br0 \"{class=0xffff,type=0,len=4}->tun_metadata0\""
+at_fn_check_prepare_trace "tunnel.at:1006"
 ( $at_check_trace; ovs-ofctl add-tlv-map br0 "{class=0xffff,type=0,len=4}->tun_metadata0"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:977"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1006"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:978: ovs-ofctl del-flows br0"
-at_fn_check_prepare_trace "tunnel.at:978"
+$as_echo "$at_srcdir/tunnel.at:1007: ovs-ofctl del-flows br0"
+at_fn_check_prepare_trace "tunnel.at:1007"
 ( $at_check_trace; ovs-ofctl del-flows br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:978"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1007"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97952,15 +98673,15 @@
 _ATEOF
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:983: ovs-ofctl add-flows br0 flows2.txt"
-at_fn_check_prepare_trace "tunnel.at:983"
+$as_echo "$at_srcdir/tunnel.at:1012: ovs-ofctl add-flows br0 flows2.txt"
+at_fn_check_prepare_trace "tunnel.at:1012"
 ( $at_check_trace; ovs-ofctl add-flows br0 flows2.txt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:983"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1012"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -97968,23 +98689,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:985: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x123}),flags(csum|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:985"
+$as_echo "$at_srcdir/tunnel.at:1014: ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x123}),flags(csum|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1014"
 ( $at_check_trace; ovs-appctl ofproto/trace ovs-dummy 'recirc_id(0),tunnel(tun_id=0x0,src=1.1.1.1,dst=1.1.1.2,ttl=64,geneve({class=0xffff,type=0,len=4,0x123}),flags(csum|key)),in_port(6081),skb_mark(0),eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800),ipv4(frag=no)'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:985"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1014"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:986: tail -2 stdout"
-at_fn_check_prepare_trace "tunnel.at:986"
+$as_echo "$at_srcdir/tunnel.at:1015: tail -2 stdout"
+at_fn_check_prepare_trace "tunnel.at:1015"
 ( $at_check_trace; tail -2 stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -97994,7 +98715,7 @@
 Datapath actions: set(tunnel(tun_id=0x7b,dst=2.2.2.2,ttl=64,flags(df|key))),1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:986"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1015"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98003,30 +98724,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:995: check_logs "
-at_fn_check_prepare_trace "tunnel.at:995"
+$as_echo "$at_srcdir/tunnel.at:1024: check_logs "
+at_fn_check_prepare_trace "tunnel.at:1024"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:995"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:995: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:995"
+$as_echo "$at_srcdir/tunnel.at:1024: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:1024"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:995"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98034,15 +98755,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:995: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:995"
+$as_echo "$at_srcdir/tunnel.at:1024: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:1024"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:995"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98055,18 +98776,18 @@
     :
 
 }
-ovs_wait "tunnel.at:995" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:1024" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:995: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:995"
+$as_echo "$at_srcdir/tunnel.at:1024: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:1024"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:995"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98074,15 +98795,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:995: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:995"
+$as_echo "$at_srcdir/tunnel.at:1024: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:1024"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:995"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1024"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98095,58 +98816,58 @@
     :
 
 }
-ovs_wait "tunnel.at:995" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:1024" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_760
-#AT_START_761
-at_fn_group_banner 761 'tunnel.at:998' \
+#AT_STOP_763
+#AT_START_764
+at_fn_group_banner 764 'tunnel.at:1027' \
   "tunnel - neighbor entry add and deletion" "       " 46
 at_xfail=no
 (
-  $as_echo "761. $at_setup_line: testing $at_desc ..."
+  $as_echo "764. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
    touch .conf.db.~lock~
    { set +x
-$as_echo "$at_srcdir/tunnel.at:999: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:999"
+$as_echo "$at_srcdir/tunnel.at:1028: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "tunnel.at:1028"
 ( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:999"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1028"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:999: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
-at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:999"
+$as_echo "$at_srcdir/tunnel.at:1028: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "tunnel.at:1028"
 ( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:999"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1028"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    on_exit "kill `cat ovsdb-server.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:999: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:1028: sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:999"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:1028"
 ( $at_check_trace; sed < stderr '
 /vlog|INFO|opened log file/d
 /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
@@ -98155,37 +98876,37 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:999"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1028"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:999: ovs-vsctl --no-wait init "
-at_fn_check_prepare_trace "tunnel.at:999"
+$as_echo "$at_srcdir/tunnel.at:1028: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "tunnel.at:1028"
 ( $at_check_trace; ovs-vsctl --no-wait init
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:999"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1028"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
 
 
       { set +x
-$as_echo "$at_srcdir/tunnel.at:999: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
-at_fn_check_prepare_trace "tunnel.at:999"
+$as_echo "$at_srcdir/tunnel.at:1028: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "tunnel.at:1028"
 ( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:999"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1028"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log"
 $at_traceon; }
@@ -98193,7 +98914,7 @@
 
    on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
    { set +x
-$as_echo "$at_srcdir/tunnel.at:999: sed < stderr '
+$as_echo "$at_srcdir/tunnel.at:1028: sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
 /vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
@@ -98206,7 +98927,7 @@
 /netlink_socket|INFO|netlink: could not enable listening to all nsid/d
 /probe tc:/d
 /tc: Using policy/d'"
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:999"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:1028"
 ( $at_check_trace; sed < stderr '
 /ovs_numa|INFO|Discovered /d
 /vlog|INFO|opened log file/d
@@ -98225,7 +98946,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:999"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1028"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98233,13 +98954,13 @@
 
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:999: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
+$as_echo "$at_srcdir/tunnel.at:1028: add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \\
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \\
                     options:key=5 ofport_request=1 \\
                     -- add-port br0 p2 -- set Interface p2 type=gre \\
                     options:local_ip=3.3.3.3 options:remote_ip=4.4.4.4 \\
                     ofport_request=2 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:999"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:1028"
 ( $at_check_trace; add_of_br 0 add-port br0 p1 -- set Interface p1 type=gre \
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \
                     options:key=5 ofport_request=1 \
@@ -98251,7 +98972,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:999"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1028"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98259,15 +98980,15 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1005: ovs-vsctl add-br br1 -- set bridge br1 datapath_type=dummy"
-at_fn_check_prepare_trace "tunnel.at:1005"
+$as_echo "$at_srcdir/tunnel.at:1034: ovs-vsctl add-br br1 -- set bridge br1 datapath_type=dummy"
+at_fn_check_prepare_trace "tunnel.at:1034"
 ( $at_check_trace; ovs-vsctl add-br br1 -- set bridge br1 datapath_type=dummy
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1005"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1034"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98275,7 +98996,7 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1008:
+$as_echo "$at_srcdir/tunnel.at:1037:
     ovs-appctl tnl/arp/set p1 10.0.0.1 00:00:10:00:00:01
     ovs-appctl tnl/arp/set p1 10.0.0.2 00:00:10:00:00:02
     ovs-appctl tnl/arp/set p2 10.0.1.1 00:00:10:00:01:01
@@ -98283,7 +99004,7 @@
     ovs-appctl tnl/arp/set br0 10.0.2.2 00:00:10:00:02:02
     ovs-appctl tnl/arp/set br1 20.0.0.1 00:00:20:00:00:01
 "
-at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:1008"
+at_fn_check_prepare_notrace 'an embedded newline' "tunnel.at:1037"
 ( $at_check_trace;
     ovs-appctl tnl/arp/set p1 10.0.0.1 00:00:10:00:00:01
     ovs-appctl tnl/arp/set p1 10.0.0.2 00:00:10:00:00:02
@@ -98297,7 +99018,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1008"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1037"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98305,8 +99026,8 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1017: ovs-appctl tnl/neigh/show | tail -n+3 | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1017"
+$as_echo "$at_srcdir/tunnel.at:1046: ovs-appctl tnl/neigh/show | tail -n+3 | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1046"
 ( $at_check_trace; ovs-appctl tnl/neigh/show | tail -n+3 | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -98320,7 +99041,7 @@
 20.0.0.1                                      00:00:20:00:00:01   br1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1017"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1046"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98328,30 +99049,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1027: ovs-vsctl del-port br0 p1"
-at_fn_check_prepare_trace "tunnel.at:1027"
+$as_echo "$at_srcdir/tunnel.at:1056: ovs-vsctl del-port br0 p1"
+at_fn_check_prepare_trace "tunnel.at:1056"
 ( $at_check_trace; ovs-vsctl del-port br0 p1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1027"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1056"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1028: ovs-appctl tnl/neigh/show | tail -n+3 | grep -w p1 | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1028"
+$as_echo "$at_srcdir/tunnel.at:1057: ovs-appctl tnl/neigh/show | tail -n+3 | grep -w p1 | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1057"
 ( $at_check_trace; ovs-appctl tnl/neigh/show | tail -n+3 | grep -w p1 | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1028"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1057"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98359,23 +99080,23 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1032: ovs-vsctl del-br br0"
-at_fn_check_prepare_trace "tunnel.at:1032"
+$as_echo "$at_srcdir/tunnel.at:1061: ovs-vsctl del-br br0"
+at_fn_check_prepare_trace "tunnel.at:1061"
 ( $at_check_trace; ovs-vsctl del-br br0
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1032"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1061"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1033: ovs-appctl tnl/neigh/show | tail -n+3 | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1033"
+$as_echo "$at_srcdir/tunnel.at:1062: ovs-appctl tnl/neigh/show | tail -n+3 | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1062"
 ( $at_check_trace; ovs-appctl tnl/neigh/show | tail -n+3 | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -98384,7 +99105,7 @@
 echo >>"$at_stdout"; $as_echo "20.0.0.1                                      00:00:20:00:00:01   br1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1033"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1062"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98392,30 +99113,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1038: ovs-vsctl del-br br1"
-at_fn_check_prepare_trace "tunnel.at:1038"
+$as_echo "$at_srcdir/tunnel.at:1067: ovs-vsctl del-br br1"
+at_fn_check_prepare_trace "tunnel.at:1067"
 ( $at_check_trace; ovs-vsctl del-br br1
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1038"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1067"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1039: ovs-appctl tnl/neigh/show | tail -n+3 | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1039"
+$as_echo "$at_srcdir/tunnel.at:1068: ovs-appctl tnl/neigh/show | tail -n+3 | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "tunnel.at:1068"
 ( $at_check_trace; ovs-appctl tnl/neigh/show | tail -n+3 | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1039"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1068"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98423,30 +99144,30 @@
 
 
 { set +x
-$as_echo "$at_srcdir/tunnel.at:1042: check_logs "
-at_fn_check_prepare_trace "tunnel.at:1042"
+$as_echo "$at_srcdir/tunnel.at:1071: check_logs "
+at_fn_check_prepare_trace "tunnel.at:1071"
 ( $at_check_trace; check_logs
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1042"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:1042: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:1042"
+$as_echo "$at_srcdir/tunnel.at:1071: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "tunnel.at:1071"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1042"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98454,15 +99175,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:1042: ovs-appctl -t ovs-vswitchd exit --cleanup"
-at_fn_check_prepare_trace "tunnel.at:1042"
+$as_echo "$at_srcdir/tunnel.at:1071: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "tunnel.at:1071"
 ( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1042"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98475,18 +99196,18 @@
     :
 
 }
-ovs_wait "tunnel.at:1042" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:1071" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/tunnel.at:1042: test -e \$OVS_RUNDIR/ovsdb-server.pid"
-at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:1042"
+$as_echo "$at_srcdir/tunnel.at:1071: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "tunnel.at:1071"
 ( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1042"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98494,15 +99215,15 @@
 
    TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/tunnel.at:1042: ovs-appctl -t ovsdb-server exit"
-at_fn_check_prepare_trace "tunnel.at:1042"
+$as_echo "$at_srcdir/tunnel.at:1071: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "tunnel.at:1071"
 ( $at_check_trace; ovs-appctl -t ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1042"
+at_fn_check_status 0 $at_status "$at_srcdir/tunnel.at:1071"
 $at_failed && at_fn_log_failure  \
 "ovsdb-server.log" \
 "ovs-vswitchd.log"
@@ -98515,20 +99236,20 @@
     :
 
 }
-ovs_wait "tunnel.at:1042" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "tunnel.at:1071" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_761
-#AT_START_762
-at_fn_group_banner 762 'tunnel-push-pop.at:3' \
+#AT_STOP_764
+#AT_START_765
+at_fn_group_banner 765 'tunnel-push-pop.at:3' \
   "tunnel_push_pop - erspan" "                       " 47
 at_xfail=no
 (
-  $as_echo "762. $at_setup_line: testing $at_desc ..."
+  $as_echo "765. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -99895,13 +100616,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_762
-#AT_START_763
-at_fn_group_banner 763 'tunnel-push-pop.at:201' \
+#AT_STOP_765
+#AT_START_766
+at_fn_group_banner 766 'tunnel-push-pop.at:201' \
   "tunnel_push_pop - action" "                       " 47
 at_xfail=no
 (
-  $as_echo "763. $at_setup_line: testing $at_desc ..."
+  $as_echo "766. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -101796,13 +102517,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_763
-#AT_START_764
-at_fn_group_banner 764 'tunnel-push-pop.at:538' \
+#AT_STOP_766
+#AT_START_767
+at_fn_group_banner 767 'tunnel-push-pop.at:538' \
   "tunnel_push_pop - packet_out" "                   " 47
 at_xfail=no
 (
-  $as_echo "764. $at_setup_line: testing $at_desc ..."
+  $as_echo "767. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -102242,13 +102963,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_764
-#AT_START_765
-at_fn_group_banner 765 'tunnel-push-pop.at:576' \
+#AT_STOP_767
+#AT_START_768
+at_fn_group_banner 768 'tunnel-push-pop.at:576' \
   "tunnel_push_pop - underlay bridge match" "        " 47
 at_xfail=no
 (
-  $as_echo "765. $at_setup_line: testing $at_desc ..."
+  $as_echo "768. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -102730,13 +103451,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_765
-#AT_START_766
-at_fn_group_banner 766 'tunnel-push-pop-ipv6.at:3' \
+#AT_STOP_768
+#AT_START_769
+at_fn_group_banner 769 'tunnel-push-pop-ipv6.at:3' \
   "tunnel_push_pop_ipv6 - ip6gre" "                  " 48
 at_xfail=no
 (
-  $as_echo "766. $at_setup_line: testing $at_desc ..."
+  $as_echo "769. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -103306,13 +104027,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_766
-#AT_START_767
-at_fn_group_banner 767 'tunnel-push-pop-ipv6.at:72' \
+#AT_STOP_769
+#AT_START_770
+at_fn_group_banner 770 'tunnel-push-pop-ipv6.at:72' \
   "tunnel_push_pop_ipv6 - ip6erspan" "               " 48
 at_xfail=no
 (
-  $as_echo "767. $at_setup_line: testing $at_desc ..."
+  $as_echo "770. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -104065,13 +104786,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_767
-#AT_START_768
-at_fn_group_banner 768 'tunnel-push-pop-ipv6.at:191' \
+#AT_STOP_770
+#AT_START_771
+at_fn_group_banner 771 'tunnel-push-pop-ipv6.at:191' \
   "tunnel_push_pop_ipv6 - action" "                  " 48
 at_xfail=no
 (
-  $as_echo "768. $at_setup_line: testing $at_desc ..."
+  $as_echo "771. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -105644,13 +106365,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_768
-#AT_START_769
-at_fn_group_banner 769 'ovs-router.at:3' \
+#AT_STOP_771
+#AT_START_772
+at_fn_group_banner 772 'ovs-router.at:3' \
   "appctl - route/add with gateway" "                " 49
 at_xfail=no
 (
-  $as_echo "769. $at_setup_line: testing $at_desc ..."
+  $as_echo "772. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -105929,13 +106650,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_769
-#AT_START_770
-at_fn_group_banner 770 'ovs-router.at:15' \
+#AT_STOP_772
+#AT_START_773
+at_fn_group_banner 773 'ovs-router.at:15' \
   "appctl - route/lookup" "                          " 49
 at_xfail=no
 (
-  $as_echo "770. $at_setup_line: testing $at_desc ..."
+  $as_echo "773. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -106341,13 +107062,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_770
-#AT_START_771
-at_fn_group_banner 771 'ovs-router.at:51' \
+#AT_STOP_773
+#AT_START_774
+at_fn_group_banner 774 'ovs-router.at:51' \
   "appctl - route/lookup6" "                         " 49
 at_xfail=no
 (
-  $as_echo "771. $at_setup_line: testing $at_desc ..."
+  $as_echo "774. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -106734,13 +107455,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_771
-#AT_START_772
-at_fn_group_banner 772 'lockfile.at:15' \
+#AT_STOP_774
+#AT_START_775
+at_fn_group_banner 775 'lockfile.at:15' \
   "lock and unlock" "                                " 50
 at_xfail=no
 (
-  $as_echo "772. $at_setup_line: testing $at_desc ..."
+  $as_echo "775. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -106780,13 +107501,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_772
-#AT_START_773
-at_fn_group_banner 773 'lockfile.at:17' \
+#AT_STOP_775
+#AT_START_776
+at_fn_group_banner 776 'lockfile.at:17' \
   "lock and unlock twice" "                          " 50
 at_xfail=no
 (
-  $as_echo "773. $at_setup_line: testing $at_desc ..."
+  $as_echo "776. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -106826,13 +107547,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_773
-#AT_START_774
-at_fn_group_banner 774 'lockfile.at:19' \
+#AT_STOP_776
+#AT_START_777
+at_fn_group_banner 777 'lockfile.at:19' \
   "lock blocks same process" "                       " 50
 at_xfail=no
 (
-  $as_echo "774. $at_setup_line: testing $at_desc ..."
+  $as_echo "777. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -106874,13 +107595,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_774
-#AT_START_775
-at_fn_group_banner 775 'lockfile.at:23' \
+#AT_STOP_777
+#AT_START_778
+at_fn_group_banner 778 'lockfile.at:23' \
   "lock blocks same process twice" "                 " 50
 at_xfail=no
 (
-  $as_echo "775. $at_setup_line: testing $at_desc ..."
+  $as_echo "778. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -106923,13 +107644,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_775
-#AT_START_776
-at_fn_group_banner 776 'lockfile.at:28' \
+#AT_STOP_778
+#AT_START_779
+at_fn_group_banner 779 'lockfile.at:28' \
   "lock blocks other process" "                      " 50
 at_xfail=no
 (
-  $as_echo "776. $at_setup_line: testing $at_desc ..."
+  $as_echo "779. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -106974,13 +107695,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_776
-#AT_START_777
-at_fn_group_banner 777 'lockfile.at:33' \
+#AT_STOP_779
+#AT_START_780
+at_fn_group_banner 780 'lockfile.at:33' \
   "lock twice blocks other process" "                " 50
 at_xfail=no
 (
-  $as_echo "777. $at_setup_line: testing $at_desc ..."
+  $as_echo "780. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107026,13 +107747,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_777
-#AT_START_778
-at_fn_group_banner 778 'lockfile.at:39' \
+#AT_STOP_780
+#AT_START_781
+at_fn_group_banner 781 'lockfile.at:39' \
   "lock and unlock allows other process" "           " 50
 at_xfail=no
 (
-  $as_echo "778. $at_setup_line: testing $at_desc ..."
+  $as_echo "781. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107074,13 +107795,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_778
-#AT_START_779
-at_fn_group_banner 779 'lockfile.at:41' \
+#AT_STOP_781
+#AT_START_782
+at_fn_group_banner 782 'lockfile.at:41' \
   "lock multiple" "                                  " 50
 at_xfail=no
 (
-  $as_echo "779. $at_setup_line: testing $at_desc ..."
+  $as_echo "782. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107122,13 +107843,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_779
-#AT_START_780
-at_fn_group_banner 780 'lockfile.at:45' \
+#AT_STOP_782
+#AT_START_783
+at_fn_group_banner 783 'lockfile.at:45' \
   "lock symlink" "                                   " 50
 at_xfail=no
 (
-  $as_echo "780. $at_setup_line: testing $at_desc ..."
+  $as_echo "783. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107175,13 +107896,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_780
-#AT_START_781
-at_fn_group_banner 781 'lockfile.at:52' \
+#AT_STOP_783
+#AT_START_784
+at_fn_group_banner 784 'lockfile.at:52' \
   "lock symlink to dir" "                            " 50
 at_xfail=no
 (
-  $as_echo "781. $at_setup_line: testing $at_desc ..."
+  $as_echo "784. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107225,13 +107946,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_781
-#AT_START_782
-at_fn_group_banner 782 'reconnect.at:23' \
+#AT_STOP_784
+#AT_START_785
+at_fn_group_banner 785 'reconnect.at:23' \
   "nothing happens if not enabled - C" "             " 51
 at_xfail=no
 (
-  $as_echo "782. $at_setup_line: testing $at_desc ..."
+  $as_echo "785. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107265,13 +107986,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_782
-#AT_START_783
-at_fn_group_banner 783 'reconnect.at:23' \
+#AT_STOP_785
+#AT_START_786
+at_fn_group_banner 786 'reconnect.at:23' \
   "nothing happens if not enabled - Python3" "       " 51
 at_xfail=no
 (
-  $as_echo "783. $at_setup_line: testing $at_desc ..."
+  $as_echo "786. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107305,13 +108026,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_783
-#AT_START_784
-at_fn_group_banner 784 'reconnect.at:34' \
+#AT_STOP_786
+#AT_START_787
+at_fn_group_banner 787 'reconnect.at:34' \
   "quick connect, idle disconnect - C" "             " 51
 at_xfail=no
 (
-  $as_echo "784. $at_setup_line: testing $at_desc ..."
+  $as_echo "787. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107390,13 +108111,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_784
-#AT_START_785
-at_fn_group_banner 785 'reconnect.at:34' \
+#AT_STOP_787
+#AT_START_788
+at_fn_group_banner 788 'reconnect.at:34' \
   "quick connect, idle disconnect - Python3" "       " 51
 at_xfail=no
 (
-  $as_echo "785. $at_setup_line: testing $at_desc ..."
+  $as_echo "788. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107475,13 +108196,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_785
-#AT_START_786
-at_fn_group_banner 786 'reconnect.at:90' \
+#AT_STOP_788
+#AT_START_789
+at_fn_group_banner 789 'reconnect.at:90' \
   "slow connect, idle disconnect - C" "              " 51
 at_xfail=no
 (
-  $as_echo "786. $at_setup_line: testing $at_desc ..."
+  $as_echo "789. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107574,13 +108295,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_786
-#AT_START_787
-at_fn_group_banner 787 'reconnect.at:90' \
+#AT_STOP_789
+#AT_START_790
+at_fn_group_banner 790 'reconnect.at:90' \
   "slow connect, idle disconnect - Python3" "        " 51
 at_xfail=no
 (
-  $as_echo "787. $at_setup_line: testing $at_desc ..."
+  $as_echo "790. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107673,13 +108394,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_787
-#AT_START_788
-at_fn_group_banner 788 'reconnect.at:160' \
+#AT_STOP_790
+#AT_START_791
+at_fn_group_banner 791 'reconnect.at:160' \
   "connect backs off - C" "                          " 51
 at_xfail=no
 (
-  $as_echo "788. $at_setup_line: testing $at_desc ..."
+  $as_echo "791. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -107901,13 +108622,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_788
-#AT_START_789
-at_fn_group_banner 789 'reconnect.at:160' \
+#AT_STOP_791
+#AT_START_792
+at_fn_group_banner 792 'reconnect.at:160' \
   "connect backs off - Python3" "                    " 51
 at_xfail=no
 (
-  $as_echo "789. $at_setup_line: testing $at_desc ..."
+  $as_echo "792. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -108129,13 +108850,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_789
-#AT_START_790
-at_fn_group_banner 790 'reconnect.at:359' \
+#AT_STOP_792
+#AT_START_793
+at_fn_group_banner 793 'reconnect.at:359' \
   "connections with no data preserve backoff - C" "  " 51
 at_xfail=no
 (
-  $as_echo "790. $at_setup_line: testing $at_desc ..."
+  $as_echo "793. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -108323,13 +109044,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_790
-#AT_START_791
-at_fn_group_banner 791 'reconnect.at:359' \
+#AT_STOP_793
+#AT_START_794
+at_fn_group_banner 794 'reconnect.at:359' \
   "connections with no data preserve backoff - Python3" "" 51
 at_xfail=no
 (
-  $as_echo "791. $at_setup_line: testing $at_desc ..."
+  $as_echo "794. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -108517,13 +109238,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_791
-#AT_START_792
-at_fn_group_banner 792 'reconnect.at:523' \
+#AT_STOP_794
+#AT_START_795
+at_fn_group_banner 795 'reconnect.at:523' \
   "brief connection preserves backoff - C" "         " 51
 at_xfail=no
 (
-  $as_echo "792. $at_setup_line: testing $at_desc ..."
+  $as_echo "795. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -108678,13 +109399,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_792
-#AT_START_793
-at_fn_group_banner 793 'reconnect.at:523' \
+#AT_STOP_795
+#AT_START_796
+at_fn_group_banner 796 'reconnect.at:523' \
   "brief connection preserves backoff - Python3" "   " 51
 at_xfail=no
 (
-  $as_echo "793. $at_setup_line: testing $at_desc ..."
+  $as_echo "796. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -108839,13 +109560,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_793
-#AT_START_794
-at_fn_group_banner 794 'reconnect.at:654' \
+#AT_STOP_796
+#AT_START_797
+at_fn_group_banner 797 'reconnect.at:654' \
   "brief connection with data preserves backoff - C" "" 51
 at_xfail=no
 (
-  $as_echo "794. $at_setup_line: testing $at_desc ..."
+  $as_echo "797. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109029,13 +109750,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_794
-#AT_START_795
-at_fn_group_banner 795 'reconnect.at:654' \
+#AT_STOP_797
+#AT_START_798
+at_fn_group_banner 798 'reconnect.at:654' \
   "brief connection with data preserves backoff - Python3" "" 51
 at_xfail=no
 (
-  $as_echo "795. $at_setup_line: testing $at_desc ..."
+  $as_echo "798. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109219,13 +109940,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_795
-#AT_START_796
-at_fn_group_banner 796 'reconnect.at:815' \
+#AT_STOP_798
+#AT_START_799
+at_fn_group_banner 799 'reconnect.at:815' \
   "long connection resets backoff - C" "             " 51
 at_xfail=no
 (
-  $as_echo "796. $at_setup_line: testing $at_desc ..."
+  $as_echo "799. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109409,13 +110130,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_796
-#AT_START_797
-at_fn_group_banner 797 'reconnect.at:815' \
+#AT_STOP_799
+#AT_START_800
+at_fn_group_banner 800 'reconnect.at:815' \
   "long connection resets backoff - Python3" "       " 51
 at_xfail=no
 (
-  $as_echo "797. $at_setup_line: testing $at_desc ..."
+  $as_echo "800. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109599,13 +110320,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_797
-#AT_START_798
-at_fn_group_banner 798 'reconnect.at:976' \
+#AT_STOP_800
+#AT_START_801
+at_fn_group_banner 801 'reconnect.at:976' \
   "connection attempt fails quickly - C" "           " 51
 at_xfail=no
 (
-  $as_echo "798. $at_setup_line: testing $at_desc ..."
+  $as_echo "801. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109683,13 +110404,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_798
-#AT_START_799
-at_fn_group_banner 799 'reconnect.at:976' \
+#AT_STOP_801
+#AT_START_802
+at_fn_group_banner 802 'reconnect.at:976' \
   "connection attempt fails quickly - Python3" "     " 51
 at_xfail=no
 (
-  $as_echo "799. $at_setup_line: testing $at_desc ..."
+  $as_echo "802. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109767,13 +110488,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_799
-#AT_START_800
-at_fn_group_banner 800 'reconnect.at:1031' \
+#AT_STOP_802
+#AT_START_803
+at_fn_group_banner 803 'reconnect.at:1031' \
   "backoff-free tries work - C" "                    " 51
 at_xfail=no
 (
-  $as_echo "800. $at_setup_line: testing $at_desc ..."
+  $as_echo "803. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109850,13 +110571,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_800
-#AT_START_801
-at_fn_group_banner 801 'reconnect.at:1031' \
+#AT_STOP_803
+#AT_START_804
+at_fn_group_banner 804 'reconnect.at:1031' \
   "backoff-free tries work - Python3" "              " 51
 at_xfail=no
 (
-  $as_echo "801. $at_setup_line: testing $at_desc ..."
+  $as_echo "804. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -109933,13 +110654,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_801
-#AT_START_802
-at_fn_group_banner 802 'reconnect.at:1085' \
+#AT_STOP_804
+#AT_START_805
+at_fn_group_banner 805 'reconnect.at:1085' \
   "max-tries of 1 honored - C" "                     " 51
 at_xfail=no
 (
-  $as_echo "802. $at_setup_line: testing $at_desc ..."
+  $as_echo "805. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -110022,13 +110743,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_802
-#AT_START_803
-at_fn_group_banner 803 'reconnect.at:1085' \
+#AT_STOP_805
+#AT_START_806
+at_fn_group_banner 806 'reconnect.at:1085' \
   "max-tries of 1 honored - Python3" "               " 51
 at_xfail=no
 (
-  $as_echo "803. $at_setup_line: testing $at_desc ..."
+  $as_echo "806. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -110111,13 +110832,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_803
-#AT_START_804
-at_fn_group_banner 804 'reconnect.at:1145' \
+#AT_STOP_806
+#AT_START_807
+at_fn_group_banner 807 'reconnect.at:1145' \
   "max-tries of 0 honored - C" "                     " 51
 at_xfail=no
 (
-  $as_echo "804. $at_setup_line: testing $at_desc ..."
+  $as_echo "807. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -110156,13 +110877,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_804
-#AT_START_805
-at_fn_group_banner 805 'reconnect.at:1145' \
+#AT_STOP_807
+#AT_START_808
+at_fn_group_banner 808 'reconnect.at:1145' \
   "max-tries of 0 honored - Python3" "               " 51
 at_xfail=no
 (
-  $as_echo "805. $at_setup_line: testing $at_desc ..."
+  $as_echo "808. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -110201,13 +110922,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_805
-#AT_START_806
-at_fn_group_banner 806 'reconnect.at:1161' \
+#AT_STOP_808
+#AT_START_809
+at_fn_group_banner 809 'reconnect.at:1161' \
   "passive mode - C" "                               " 51
 at_xfail=no
 (
-  $as_echo "806. $at_setup_line: testing $at_desc ..."
+  $as_echo "809. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -110346,13 +111067,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_806
-#AT_START_807
-at_fn_group_banner 807 'reconnect.at:1161' \
+#AT_STOP_809
+#AT_START_810
+at_fn_group_banner 810 'reconnect.at:1161' \
   "passive mode - Python3" "                         " 51
 at_xfail=no
 (
-  $as_echo "807. $at_setup_line: testing $at_desc ..."
+  $as_echo "810. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -110491,13 +111212,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_807
-#AT_START_808
-at_fn_group_banner 808 'ovs-vswitchd.at:7' \
+#AT_STOP_810
+#AT_START_811
+at_fn_group_banner 811 'ovs-vswitchd.at:7' \
   "ovs-vswitchd detaches correctly with empty db" "  " 52
 at_xfail=no
 (
-  $as_echo "808. $at_setup_line: testing $at_desc ..."
+  $as_echo "811. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -110635,13 +111356,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_808
-#AT_START_809
-at_fn_group_banner 809 'ovs-vswitchd.at:36' \
+#AT_STOP_811
+#AT_START_812
+at_fn_group_banner 812 'ovs-vswitchd.at:36' \
   "ovs-vswitchd -- stats-update-interval" "          " 52
 at_xfail=no
 (
-  $as_echo "809. $at_setup_line: testing $at_desc ..."
+  $as_echo "812. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -111064,13 +111785,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_809
-#AT_START_810
-at_fn_group_banner 810 'ovs-vswitchd.at:69' \
+#AT_STOP_812
+#AT_START_813
+at_fn_group_banner 813 'ovs-vswitchd.at:69' \
   "ovs-vswitchd -- start additional ovs-vswitchd process" "" 52
 at_xfail=no
 (
-  $as_echo "810. $at_setup_line: testing $at_desc ..."
+  $as_echo "813. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -111396,13 +112117,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_810
-#AT_START_811
-at_fn_group_banner 811 'ovs-vswitchd.at:94' \
+#AT_STOP_813
+#AT_START_814
+at_fn_group_banner 814 'ovs-vswitchd.at:94' \
   "ovs-vswitchd -- switch over to another ovs-vswitchd process" "" 52
 at_xfail=no
 (
-  $as_echo "811. $at_setup_line: testing $at_desc ..."
+  $as_echo "814. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -111655,13 +112376,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_811
-#AT_START_812
-at_fn_group_banner 812 'ovs-vswitchd.at:134' \
+#AT_STOP_814
+#AT_START_815
+at_fn_group_banner 815 'ovs-vswitchd.at:134' \
   "ovs-vswitchd -- invalid database path" "          " 52
 at_xfail=no
 (
-  $as_echo "812. $at_setup_line: testing $at_desc ..."
+  $as_echo "815. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -111755,13 +112476,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_812
-#AT_START_813
-at_fn_group_banner 813 'ovs-vswitchd.at:159' \
+#AT_STOP_815
+#AT_START_816
+at_fn_group_banner 816 'ovs-vswitchd.at:159' \
   "ovs-vswitchd -- set service controller" "         " 52
 at_xfail=no
 (
-  $as_echo "813. $at_setup_line: testing $at_desc ..."
+  $as_echo "816. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -112055,13 +112776,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_813
-#AT_START_814
-at_fn_group_banner 814 'ovs-vswitchd.at:176' \
+#AT_STOP_816
+#AT_START_817
+at_fn_group_banner 817 'ovs-vswitchd.at:176' \
   "ovs-vswitchd -- Compatible with OVSDB server - w/o monitor_cond" "" 52
 at_xfail=no
 (
-  $as_echo "814. $at_setup_line: testing $at_desc ..."
+  $as_echo "817. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -112370,13 +113091,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_814
-#AT_START_815
-at_fn_group_banner 815 'ovs-vswitchd.at:197' \
+#AT_STOP_817
+#AT_START_818
+at_fn_group_banner 818 'ovs-vswitchd.at:197' \
   "ovs-vswitchd - do not create sockets with unsafe names" "" 52
 at_xfail=no
 (
-  $as_echo "815. $at_setup_line: testing $at_desc ..."
+  $as_echo "818. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -112699,13 +113420,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_815
-#AT_START_816
-at_fn_group_banner 816 'ovs-vswitchd.at:230' \
+#AT_STOP_818
+#AT_START_819
+at_fn_group_banner 819 'ovs-vswitchd.at:230' \
   "ovs-vswitchd - set datapath IDs" "                " 52
 at_xfail=no
 (
-  $as_echo "816. $at_setup_line: testing $at_desc ..."
+  $as_echo "819. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -113160,13 +113881,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_816
-#AT_START_817
-at_fn_group_banner 817 'ofproto.at:3' \
+#AT_STOP_819
+#AT_START_820
+at_fn_group_banner 820 'ofproto.at:3' \
   "ofproto - echo request" "                         " 53
 at_xfail=no
 (
-  $as_echo "817. $at_setup_line: testing $at_desc ..."
+  $as_echo "820. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -113421,13 +114142,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_817
-#AT_START_818
-at_fn_group_banner 818 'ofproto.at:9' \
+#AT_STOP_820
+#AT_START_821
+at_fn_group_banner 821 'ofproto.at:9' \
   "ofproto - handling messages with bad version" "   " 53
 at_xfail=no
 (
-  $as_echo "818. $at_setup_line: testing $at_desc ..."
+  $as_echo "821. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -113762,13 +114483,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_818
-#AT_START_819
-at_fn_group_banner 819 'ofproto.at:33' \
+#AT_STOP_821
+#AT_START_822
+at_fn_group_banner 822 'ofproto.at:33' \
   "ofproto - feature request, config request" "      " 53
 at_xfail=no
 (
-  $as_echo "819. $at_setup_line: testing $at_desc ..."
+  $as_echo "822. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -114048,13 +114769,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_819
-#AT_START_820
-at_fn_group_banner 820 'ofproto.at:50' \
+#AT_STOP_822
+#AT_START_823
+at_fn_group_banner 823 'ofproto.at:50' \
   "ofproto - set OpenFlow port number" "             " 53
 at_xfail=no
 (
-  $as_echo "820. $at_setup_line: testing $at_desc ..."
+  $as_echo "823. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -114349,13 +115070,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_820
-#AT_START_821
-at_fn_group_banner 821 'ofproto.at:83' \
+#AT_STOP_823
+#AT_START_824
+at_fn_group_banner 824 'ofproto.at:83' \
   "ofproto - port stats - (OpenFlow 1.0)" "          " 53
 at_xfail=no
 (
-  $as_echo "821. $at_setup_line: testing $at_desc ..."
+  $as_echo "824. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -114629,13 +115350,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_821
-#AT_START_822
-at_fn_group_banner 822 'ofproto.at:94' \
+#AT_STOP_824
+#AT_START_825
+at_fn_group_banner 825 'ofproto.at:94' \
   "ofproto - port stats - (OpenFlow 1.2)" "          " 53
 at_xfail=no
 (
-  $as_echo "822. $at_setup_line: testing $at_desc ..."
+  $as_echo "825. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -114909,13 +115630,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_822
-#AT_START_823
-at_fn_group_banner 823 'ofproto.at:105' \
+#AT_STOP_825
+#AT_START_826
+at_fn_group_banner 826 'ofproto.at:105' \
   "ofproto - port stats - (OpenFlow 1.4)" "          " 53
 at_xfail=no
 (
-  $as_echo "823. $at_setup_line: testing $at_desc ..."
+  $as_echo "826. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -115192,13 +115913,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_823
-#AT_START_824
-at_fn_group_banner 824 'ofproto.at:122' \
+#AT_STOP_826
+#AT_START_827
+at_fn_group_banner 827 'ofproto.at:122' \
   "ofproto - port-desc stats (OpenFlow 1.0)" "       " 53
 at_xfail=no
 (
-  $as_echo "824. $at_setup_line: testing $at_desc ..."
+  $as_echo "827. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -115474,13 +116195,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_824
-#AT_START_825
-at_fn_group_banner 825 'ofproto.at:137' \
+#AT_STOP_827
+#AT_START_828
+at_fn_group_banner 828 'ofproto.at:137' \
   "ofproto - port-desc stats (OpenFlow 1.2)" "       " 53
 at_xfail=no
 (
-  $as_echo "825. $at_setup_line: testing $at_desc ..."
+  $as_echo "828. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -115756,13 +116477,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_825
-#AT_START_826
-at_fn_group_banner 826 'ofproto.at:150' \
+#AT_STOP_828
+#AT_START_829
+at_fn_group_banner 829 'ofproto.at:150' \
   "ofproto - port-desc stats (OpenFlow 1.5)" "       " 53
 at_xfail=no
 (
-  $as_echo "826. $at_setup_line: testing $at_desc ..."
+  $as_echo "829. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -116087,13 +116808,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_826
-#AT_START_827
-at_fn_group_banner 827 'ofproto.at:226' \
+#AT_STOP_829
+#AT_START_830
+at_fn_group_banner 830 'ofproto.at:226' \
   "ofproto - queue stats - (OpenFlow 1.0)" "         " 53
 at_xfail=no
 (
-  $as_echo "827. $at_setup_line: testing $at_desc ..."
+  $as_echo "830. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -116466,13 +117187,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_827
-#AT_START_828
-at_fn_group_banner 828 'ofproto.at:227' \
+#AT_STOP_830
+#AT_START_831
+at_fn_group_banner 831 'ofproto.at:227' \
   "ofproto - queue stats - (OpenFlow 1.1)" "         " 53
 at_xfail=no
 (
-  $as_echo "828. $at_setup_line: testing $at_desc ..."
+  $as_echo "831. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -116845,13 +117566,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_828
-#AT_START_829
-at_fn_group_banner 829 'ofproto.at:228' \
+#AT_STOP_831
+#AT_START_832
+at_fn_group_banner 832 'ofproto.at:228' \
   "ofproto - queue stats - (OpenFlow 1.2)" "         " 53
 at_xfail=no
 (
-  $as_echo "829. $at_setup_line: testing $at_desc ..."
+  $as_echo "832. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -117224,13 +117945,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_829
-#AT_START_830
-at_fn_group_banner 830 'ofproto.at:229' \
+#AT_STOP_832
+#AT_START_833
+at_fn_group_banner 833 'ofproto.at:229' \
   "ofproto - queue stats - (OpenFlow 1.3)" "         " 53
 at_xfail=no
 (
-  $as_echo "830. $at_setup_line: testing $at_desc ..."
+  $as_echo "833. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -117603,13 +118324,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_830
-#AT_START_831
-at_fn_group_banner 831 'ofproto.at:230' \
+#AT_STOP_833
+#AT_START_834
+at_fn_group_banner 834 'ofproto.at:230' \
   "ofproto - queue stats - (OpenFlow 1.4)" "         " 53
 at_xfail=no
 (
-  $as_echo "831. $at_setup_line: testing $at_desc ..."
+  $as_echo "834. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -117982,13 +118703,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_831
-#AT_START_832
-at_fn_group_banner 832 'ofproto.at:234' \
+#AT_STOP_834
+#AT_START_835
+at_fn_group_banner 835 'ofproto.at:234' \
   "ofproto - queue configuration - (OpenFlow 1.0)" " " 53
 at_xfail=no
 (
-  $as_echo "832. $at_setup_line: testing $at_desc ..."
+  $as_echo "835. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -118315,13 +119036,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_832
-#AT_START_833
-at_fn_group_banner 833 'ofproto.at:256' \
+#AT_STOP_835
+#AT_START_836
+at_fn_group_banner 836 'ofproto.at:256' \
   "ofproto - queue configuration - (OpenFlow 1.1)" " " 53
 at_xfail=no
 (
-  $as_echo "833. $at_setup_line: testing $at_desc ..."
+  $as_echo "836. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -118613,13 +119334,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_833
-#AT_START_834
-at_fn_group_banner 834 'ofproto.at:271' \
+#AT_STOP_836
+#AT_START_837
+at_fn_group_banner 837 'ofproto.at:271' \
   "ofproto - queue configuration - (OpenFlow 1.2)" " " 53
 at_xfail=no
 (
-  $as_echo "834. $at_setup_line: testing $at_desc ..."
+  $as_echo "837. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -118946,13 +119667,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_834
-#AT_START_835
-at_fn_group_banner 835 'ofproto.at:293' \
+#AT_STOP_837
+#AT_START_838
+at_fn_group_banner 838 'ofproto.at:293' \
   "ofproto - queue configuration - (OpenFlow 1.4)" " " 53
 at_xfail=no
 (
-  $as_echo "835. $at_setup_line: testing $at_desc ..."
+  $as_echo "838. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -119273,13 +119994,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_835
-#AT_START_836
-at_fn_group_banner 836 'ofproto.at:326' \
+#AT_STOP_838
+#AT_START_839
+at_fn_group_banner 839 'ofproto.at:326' \
   "ofproto - del group (OpenFlow 1.0 extension)" "   " 53
 at_xfail=no
 (
-  $as_echo "836. $at_setup_line: testing $at_desc ..."
+  $as_echo "839. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -119721,13 +120442,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_836
-#AT_START_837
-at_fn_group_banner 837 'ofproto.at:367' \
+#AT_STOP_839
+#AT_START_840
+at_fn_group_banner 840 'ofproto.at:367' \
   "ofproto - del group (OpenFlow 1.1)" "             " 53
 at_xfail=no
 (
-  $as_echo "837. $at_setup_line: testing $at_desc ..."
+  $as_echo "840. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -120183,13 +120904,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_837
-#AT_START_838
-at_fn_group_banner 838 'ofproto.at:408' \
+#AT_STOP_840
+#AT_START_841
+at_fn_group_banner 841 'ofproto.at:408' \
   "ofproto - add indirect group" "                   " 53
 at_xfail=no
 (
-  $as_echo "838. $at_setup_line: testing $at_desc ..."
+  $as_echo "841. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -120479,13 +121200,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_838
-#AT_START_839
-at_fn_group_banner 839 'ofproto.at:421' \
+#AT_STOP_841
+#AT_START_842
+at_fn_group_banner 842 'ofproto.at:421' \
   "ofproto - group mod with mod and add_or_mod command" "" 53
 at_xfail=no
 (
-  $as_echo "839. $at_setup_line: testing $at_desc ..."
+  $as_echo "842. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -120842,13 +121563,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_839
-#AT_START_840
-at_fn_group_banner 840 'ofproto.at:450' \
+#AT_STOP_842
+#AT_START_843
+at_fn_group_banner 843 'ofproto.at:450' \
   "ofproto - del group (OpenFlow 1.5)" "             " 53
 at_xfail=no
 (
-  $as_echo "840. $at_setup_line: testing $at_desc ..."
+  $as_echo "843. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -121290,13 +122011,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_840
-#AT_START_841
-at_fn_group_banner 841 'ofproto.at:490' \
+#AT_STOP_843
+#AT_START_844
+at_fn_group_banner 844 'ofproto.at:490' \
   "ofproto - del group deletes flows" "              " 53
 at_xfail=no
 (
-  $as_echo "841. $at_setup_line: testing $at_desc ..."
+  $as_echo "844. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -121693,13 +122414,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_841
-#AT_START_842
-at_fn_group_banner 842 'ofproto.at:531' \
+#AT_STOP_844
+#AT_START_845
+at_fn_group_banner 845 'ofproto.at:531' \
   "ofproto - insert group buckets" "                 " 53
 at_xfail=no
 (
-  $as_echo "842. $at_setup_line: testing $at_desc ..."
+  $as_echo "845. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -122686,13 +123407,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_842
-#AT_START_843
-at_fn_group_banner 843 'ofproto.at:667' \
+#AT_STOP_845
+#AT_START_846
+at_fn_group_banner 846 'ofproto.at:667' \
   "ofproto - remove group buckets" "                 " 53
 at_xfail=no
 (
-  $as_echo "843. $at_setup_line: testing $at_desc ..."
+  $as_echo "846. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -123277,13 +123998,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_843
-#AT_START_844
-at_fn_group_banner 844 'ofproto.at:721' \
+#AT_STOP_846
+#AT_START_847
+at_fn_group_banner 847 'ofproto.at:721' \
   "ofproto - bundle del group (OpenFlow 1.3)" "      " 53
 at_xfail=no
 (
-  $as_echo "844. $at_setup_line: testing $at_desc ..."
+  $as_echo "847. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -123739,13 +124460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_844
-#AT_START_845
-at_fn_group_banner 845 'ofproto.at:759' \
+#AT_STOP_847
+#AT_START_848
+at_fn_group_banner 848 'ofproto.at:759' \
   "ofproto - bundle add indirect group" "            " 53
 at_xfail=no
 (
-  $as_echo "845. $at_setup_line: testing $at_desc ..."
+  $as_echo "848. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -124037,13 +124758,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_845
-#AT_START_846
-at_fn_group_banner 846 'ofproto.at:774' \
+#AT_STOP_848
+#AT_START_849
+at_fn_group_banner 849 'ofproto.at:774' \
   "ofproto - bundle group mod with mod and add_or_mod command" "" 53
 at_xfail=no
 (
-  $as_echo "846. $at_setup_line: testing $at_desc ..."
+  $as_echo "849. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -124400,13 +125121,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_846
-#AT_START_847
-at_fn_group_banner 847 'ofproto.at:800' \
+#AT_STOP_849
+#AT_START_850
+at_fn_group_banner 850 'ofproto.at:800' \
   "ofproto - bundle del group (OpenFlow 1.5)" "      " 53
 at_xfail=no
 (
-  $as_echo "847. $at_setup_line: testing $at_desc ..."
+  $as_echo "850. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -124845,13 +125566,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_847
-#AT_START_848
-at_fn_group_banner 848 'ofproto.at:835' \
+#AT_STOP_850
+#AT_START_851
+at_fn_group_banner 851 'ofproto.at:835' \
   "ofproto - bundle del group deletes flows" "       " 53
 at_xfail=no
 (
-  $as_echo "848. $at_setup_line: testing $at_desc ..."
+  $as_echo "851. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -125248,13 +125969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_848
-#AT_START_849
-at_fn_group_banner 849 'ofproto.at:876' \
+#AT_STOP_851
+#AT_START_852
+at_fn_group_banner 852 'ofproto.at:876' \
   "ofproto - bundle insert group buckets" "          " 53
 at_xfail=no
 (
-  $as_echo "849. $at_setup_line: testing $at_desc ..."
+  $as_echo "852. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -125981,13 +126702,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_849
-#AT_START_850
-at_fn_group_banner 850 'ofproto.at:973' \
+#AT_STOP_852
+#AT_START_853
+at_fn_group_banner 853 'ofproto.at:973' \
   "ofproto - bundle remove group buckets" "          " 53
 at_xfail=no
 (
-  $as_echo "850. $at_setup_line: testing $at_desc ..."
+  $as_echo "853. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -126573,13 +127294,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_850
-#AT_START_851
-at_fn_group_banner 851 'ofproto.at:1030' \
+#AT_STOP_853
+#AT_START_854
+at_fn_group_banner 854 'ofproto.at:1030' \
   "ofproto - flow mod checks group availability" "   " 53
 at_xfail=no
 (
-  $as_echo "851. $at_setup_line: testing $at_desc ..."
+  $as_echo "854. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -126888,13 +127609,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_851
-#AT_START_852
-at_fn_group_banner 852 'ofproto.at:1047' \
+#AT_STOP_854
+#AT_START_855
+at_fn_group_banner 855 'ofproto.at:1047' \
   "ofproto - bundle flow mod checks group availability" "" 53
 at_xfail=no
 (
-  $as_echo "852. $at_setup_line: testing $at_desc ..."
+  $as_echo "855. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -127175,13 +127896,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_852
-#AT_START_853
-at_fn_group_banner 853 'ofproto.at:1067' \
+#AT_STOP_855
+#AT_START_856
+at_fn_group_banner 856 'ofproto.at:1067' \
   "ofproto - group description" "                    " 53
 at_xfail=no
 (
-  $as_echo "853. $at_setup_line: testing $at_desc ..."
+  $as_echo "856. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -127469,13 +128190,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_853
-#AT_START_854
-at_fn_group_banner 854 'ofproto.at:1080' \
+#AT_STOP_856
+#AT_START_857
+at_fn_group_banner 857 'ofproto.at:1080' \
   "ofproto - group features (OpenFlow 1.0 extension)" "" 53
 at_xfail=no
 (
-  $as_echo "854. $at_setup_line: testing $at_desc ..."
+  $as_echo "857. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -127762,13 +128483,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_854
-#AT_START_855
-at_fn_group_banner 855 'ofproto.at:1106' \
+#AT_STOP_857
+#AT_START_858
+at_fn_group_banner 858 'ofproto.at:1106' \
   "ofproto - group features (OpenFlow 1.2)" "        " 53
 at_xfail=no
 (
-  $as_echo "855. $at_setup_line: testing $at_desc ..."
+  $as_echo "858. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -128055,13 +128776,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_855
-#AT_START_856
-at_fn_group_banner 856 'ofproto.at:1132' \
+#AT_STOP_858
+#AT_START_859
+at_fn_group_banner 859 'ofproto.at:1132' \
   "ofproto - group stats (OpenFlow 1.0 extension)" " " 53
 at_xfail=no
 (
-  $as_echo "856. $at_setup_line: testing $at_desc ..."
+  $as_echo "859. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -128403,13 +129124,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_856
-#AT_START_857
-at_fn_group_banner 857 'ofproto.at:1156' \
+#AT_STOP_859
+#AT_START_860
+at_fn_group_banner 860 'ofproto.at:1156' \
   "ofproto - group stats (OpenFlow 1.1)" "           " 53
 at_xfail=no
 (
-  $as_echo "857. $at_setup_line: testing $at_desc ..."
+  $as_echo "860. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -128751,13 +129472,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_857
-#AT_START_858
-at_fn_group_banner 858 'ofproto.at:1180' \
+#AT_STOP_860
+#AT_START_861
+at_fn_group_banner 861 'ofproto.at:1180' \
   "ofproto - group stats (OpenFlow 1.3)" "           " 53
 at_xfail=no
 (
-  $as_echo "858. $at_setup_line: testing $at_desc ..."
+  $as_echo "861. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -129099,13 +129820,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_858
-#AT_START_859
-at_fn_group_banner 859 'ofproto.at:1204' \
+#AT_STOP_861
+#AT_START_862
+at_fn_group_banner 862 'ofproto.at:1204' \
   "ofproto - group stats (OpenFlow 1.5)" "           " 53
 at_xfail=no
 (
-  $as_echo "859. $at_setup_line: testing $at_desc ..."
+  $as_echo "862. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -129447,13 +130168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_859
-#AT_START_860
-at_fn_group_banner 860 'ofproto.at:1227' \
+#AT_STOP_862
+#AT_START_863
+at_fn_group_banner 863 'ofproto.at:1227' \
   "ofproto - group stats after insert a new bucket (OpenFlow 1.5)" "" 53
 at_xfail=no
 (
-  $as_echo "860. $at_setup_line: testing $at_desc ..."
+  $as_echo "863. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -129760,13 +130481,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_860
-#AT_START_861
-at_fn_group_banner 861 'ofproto.at:1244' \
+#AT_STOP_863
+#AT_START_864
+at_fn_group_banner 864 'ofproto.at:1244' \
   "ofproto - group add then bridge delete (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "861. $at_setup_line: testing $at_desc ..."
+  $as_echo "864. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -130043,13 +130764,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_861
-#AT_START_862
-at_fn_group_banner 862 'ofproto.at:1259' \
+#AT_STOP_864
+#AT_START_865
+at_fn_group_banner 865 'ofproto.at:1259' \
   "ofproto - mod-port (OpenFlow 1.0)" "              " 53
 at_xfail=no
 (
-  $as_echo "862. $at_setup_line: testing $at_desc ..."
+  $as_echo "865. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -130361,13 +131082,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_862
-#AT_START_863
-at_fn_group_banner 863 'ofproto.at:1294' \
+#AT_STOP_865
+#AT_START_866
+at_fn_group_banner 866 'ofproto.at:1294' \
   "ofproto - mod-port (OpenFlow 1.2)" "              " 53
 at_xfail=no
 (
-  $as_echo "863. $at_setup_line: testing $at_desc ..."
+  $as_echo "866. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -130676,13 +131397,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_863
-#AT_START_864
-at_fn_group_banner 864 'ofproto.at:1326' \
+#AT_STOP_866
+#AT_START_867
+at_fn_group_banner 867 'ofproto.at:1326' \
   "ofproto - mod-port (OpenFlow 1.4)" "              " 53
 at_xfail=no
 (
-  $as_echo "864. $at_setup_line: testing $at_desc ..."
+  $as_echo "867. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -130992,13 +131713,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_864
-#AT_START_865
-at_fn_group_banner 865 'ofproto.at:1359' \
+#AT_STOP_867
+#AT_START_868
+at_fn_group_banner 868 'ofproto.at:1359' \
   "ofproto - basic flow_mod commands (NXM)" "        " 53
 at_xfail=no
 (
-  $as_echo "865. $at_setup_line: testing $at_desc ..."
+  $as_echo "868. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -131369,13 +132090,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_865
-#AT_START_866
-at_fn_group_banner 866 'ofproto.at:1381' \
+#AT_STOP_868
+#AT_START_869
+at_fn_group_banner 869 'ofproto.at:1381' \
   "ofproto - basic flow_mod commands (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "866. $at_setup_line: testing $at_desc ..."
+  $as_echo "869. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -131746,13 +132467,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_866
-#AT_START_867
-at_fn_group_banner 867 'ofproto.at:1406' \
+#AT_STOP_869
+#AT_START_870
+at_fn_group_banner 870 'ofproto.at:1406' \
   "ofproto - add-flow and flags" "                   " 53
 at_xfail=no
 (
-  $as_echo "867. $at_setup_line: testing $at_desc ..."
+  $as_echo "870. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -132118,13 +132839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_867
-#AT_START_868
-at_fn_group_banner 868 'ofproto.at:1439' \
+#AT_STOP_870
+#AT_START_871
+at_fn_group_banner 871 'ofproto.at:1439' \
   "ofproto - basic flow_mod commands (OpenFlow 1.1)" "" 53
 at_xfail=no
 (
-  $as_echo "868. $at_setup_line: testing $at_desc ..."
+  $as_echo "871. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -132496,13 +133217,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_868
-#AT_START_869
-at_fn_group_banner 869 'ofproto.at:1462' \
+#AT_STOP_871
+#AT_START_872
+at_fn_group_banner 872 'ofproto.at:1462' \
   "ofproto - flow_mod negative test (OpenFlow 1.1)" "" 53
 at_xfail=no
 (
-  $as_echo "869. $at_setup_line: testing $at_desc ..."
+  $as_echo "872. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -132777,13 +133498,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_869
-#AT_START_870
-at_fn_group_banner 870 'ofproto.at:1476' \
+#AT_STOP_872
+#AT_START_873
+at_fn_group_banner 873 'ofproto.at:1476' \
   "ofproto - set-field flow_mod commands (NXM)" "    " 53
 at_xfail=no
 (
-  $as_echo "870. $at_setup_line: testing $at_desc ..."
+  $as_echo "873. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -133087,13 +133808,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_870
-#AT_START_871
-at_fn_group_banner 871 'ofproto.at:1489' \
+#AT_STOP_873
+#AT_START_874
+at_fn_group_banner 874 'ofproto.at:1489' \
   "ofproto - basic flow_mod commands (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "871. $at_setup_line: testing $at_desc ..."
+  $as_echo "874. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -133447,13 +134168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_871
-#AT_START_872
-at_fn_group_banner 872 'ofproto.at:1508' \
+#AT_STOP_874
+#AT_START_875
+at_fn_group_banner 875 'ofproto.at:1508' \
   "ofproto - set-field flow_mod commands (OF1.2)" "  " 53
 at_xfail=no
 (
-  $as_echo "872. $at_setup_line: testing $at_desc ..."
+  $as_echo "875. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -133757,13 +134478,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_872
-#AT_START_873
-at_fn_group_banner 873 'ofproto.at:1521' \
+#AT_STOP_875
+#AT_START_876
+at_fn_group_banner 876 'ofproto.at:1521' \
   "ofproto - dump flows with cookie" "               " 53
 at_xfail=no
 (
-  $as_echo "873. $at_setup_line: testing $at_desc ..."
+  $as_echo "876. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -134120,13 +134841,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_873
-#AT_START_874
-at_fn_group_banner 874 'ofproto.at:1545' \
+#AT_STOP_876
+#AT_START_877
+at_fn_group_banner 877 'ofproto.at:1545' \
   "ofproto - mod flow with cookie change (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "874. $at_setup_line: testing $at_desc ..."
+  $as_echo "877. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -134433,13 +135154,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_874
-#AT_START_875
-at_fn_group_banner 875 'ofproto.at:1561' \
+#AT_STOP_877
+#AT_START_878
+at_fn_group_banner 878 'ofproto.at:1561' \
   "ofproto - mod flow with cookie change (NXM)" "    " 53
 at_xfail=no
 (
-  $as_echo "875. $at_setup_line: testing $at_desc ..."
+  $as_echo "878. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -134746,13 +135467,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_875
-#AT_START_876
-at_fn_group_banner 876 'ofproto.at:1577' \
+#AT_STOP_878
+#AT_START_879
+at_fn_group_banner 879 'ofproto.at:1577' \
   "ofproto - no mod flow with cookie change (OpenFlow 1.1)" "" 53
 at_xfail=no
 (
-  $as_echo "876. $at_setup_line: testing $at_desc ..."
+  $as_echo "879. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -135058,13 +135779,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_876
-#AT_START_877
-at_fn_group_banner 877 'ofproto.at:1593' \
+#AT_STOP_879
+#AT_START_880
+at_fn_group_banner 880 'ofproto.at:1593' \
   "ofproto - no mod flow with cookie change (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "877. $at_setup_line: testing $at_desc ..."
+  $as_echo "880. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -135371,13 +136092,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_877
-#AT_START_878
-at_fn_group_banner 878 'ofproto.at:1609' \
+#AT_STOP_880
+#AT_START_881
+at_fn_group_banner 881 'ofproto.at:1609' \
   "ofproto - mod flows based on cookie mask (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "878. $at_setup_line: testing $at_desc ..."
+  $as_echo "881. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -135718,13 +136439,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_878
-#AT_START_879
-at_fn_group_banner 879 'ofproto.at:1631' \
+#AT_STOP_881
+#AT_START_882
+at_fn_group_banner 882 'ofproto.at:1631' \
   "ofproto - mod flows based on cookie mask (OpenFlow 1.1)" "" 53
 at_xfail=no
 (
-  $as_echo "879. $at_setup_line: testing $at_desc ..."
+  $as_echo "882. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -136065,13 +136786,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_879
-#AT_START_880
-at_fn_group_banner 880 'ofproto.at:1653' \
+#AT_STOP_882
+#AT_START_883
+at_fn_group_banner 883 'ofproto.at:1653' \
   "ofproto - mod flows based on cookie mask (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "880. $at_setup_line: testing $at_desc ..."
+  $as_echo "883. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -136412,13 +137133,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_880
-#AT_START_881
-at_fn_group_banner 881 'ofproto.at:1676' \
+#AT_STOP_883
+#AT_START_884
+at_fn_group_banner 884 'ofproto.at:1676' \
   "ofproto - mod flows based on cookie mask with cookie change" "" 53
 at_xfail=no
 (
-  $as_echo "881. $at_setup_line: testing $at_desc ..."
+  $as_echo "884. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -136759,13 +137480,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_881
-#AT_START_882
-at_fn_group_banner 882 'ofproto.at:1698' \
+#AT_STOP_884
+#AT_START_885
+at_fn_group_banner 885 'ofproto.at:1698' \
   "ofproto - mod flow with cookie miss (mask==0) - NXM" "" 53
 at_xfail=no
 (
-  $as_echo "882. $at_setup_line: testing $at_desc ..."
+  $as_echo "885. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -137038,13 +137759,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_882
-#AT_START_883
-at_fn_group_banner 883 'ofproto.at:1708' \
+#AT_STOP_885
+#AT_START_886
+at_fn_group_banner 886 'ofproto.at:1708' \
   "ofproto - mod flow with cookie miss (mask==0) - OF1.1" "" 53
 at_xfail=no
 (
-  $as_echo "883. $at_setup_line: testing $at_desc ..."
+  $as_echo "886. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -137317,13 +138038,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_883
-#AT_START_884
-at_fn_group_banner 884 'ofproto.at:1718' \
+#AT_STOP_886
+#AT_START_887
+at_fn_group_banner 887 'ofproto.at:1718' \
   "ofproto - mod flow with cookie miss (mask==0) - OF1.2" "" 53
 at_xfail=no
 (
-  $as_echo "884. $at_setup_line: testing $at_desc ..."
+  $as_echo "887. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -137595,13 +138316,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_884
-#AT_START_885
-at_fn_group_banner 885 'ofproto.at:1727' \
+#AT_STOP_887
+#AT_START_888
+at_fn_group_banner 888 'ofproto.at:1727' \
   "ofproto - mod flow with cookie miss (mask!=0) - NXM" "" 53
 at_xfail=no
 (
-  $as_echo "885. $at_setup_line: testing $at_desc ..."
+  $as_echo "888. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -137873,13 +138594,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_885
-#AT_START_886
-at_fn_group_banner 886 'ofproto.at:1736' \
+#AT_STOP_888
+#AT_START_889
+at_fn_group_banner 889 'ofproto.at:1736' \
   "ofproto - mod flow with cookie miss (mask!=0) - OF1.1" "" 53
 at_xfail=no
 (
-  $as_echo "886. $at_setup_line: testing $at_desc ..."
+  $as_echo "889. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -138151,13 +138872,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_886
-#AT_START_887
-at_fn_group_banner 887 'ofproto.at:1745' \
+#AT_STOP_889
+#AT_START_890
+at_fn_group_banner 890 'ofproto.at:1745' \
   "ofproto - mod flow with cookie miss (mask!=0) - OF1.2" "" 53
 at_xfail=no
 (
-  $as_echo "887. $at_setup_line: testing $at_desc ..."
+  $as_echo "890. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -138429,13 +139150,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_887
-#AT_START_888
-at_fn_group_banner 888 'ofproto.at:1754' \
+#AT_STOP_890
+#AT_START_891
+at_fn_group_banner 891 'ofproto.at:1754' \
   "ofproto - del flows with cookies" "               " 53
 at_xfail=no
 (
-  $as_echo "888. $at_setup_line: testing $at_desc ..."
+  $as_echo "891. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -138773,13 +139494,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_888
-#AT_START_889
-at_fn_group_banner 889 'ofproto.at:1773' \
+#AT_STOP_891
+#AT_START_892
+at_fn_group_banner 892 'ofproto.at:1773' \
   "ofproto - del flows based on cookie" "            " 53
 at_xfail=no
 (
-  $as_echo "889. $at_setup_line: testing $at_desc ..."
+  $as_echo "892. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -139119,13 +139840,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_889
-#AT_START_890
-at_fn_group_banner 890 'ofproto.at:1794' \
+#AT_STOP_892
+#AT_START_893
+at_fn_group_banner 893 'ofproto.at:1794' \
   "ofproto - del flows based on cookie mask" "       " 53
 at_xfail=no
 (
-  $as_echo "890. $at_setup_line: testing $at_desc ..."
+  $as_echo "893. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -139463,13 +140184,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_890
-#AT_START_891
-at_fn_group_banner 891 'ofproto.at:1813' \
+#AT_STOP_893
+#AT_START_894
+at_fn_group_banner 894 'ofproto.at:1813' \
   "ofproto - del flows based on table id (NXM)" "    " 53
 at_xfail=no
 (
-  $as_echo "891. $at_setup_line: testing $at_desc ..."
+  $as_echo "894. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -139904,13 +140625,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_891
-#AT_START_892
-at_fn_group_banner 892 'ofproto.at:1845' \
+#AT_STOP_894
+#AT_START_895
+at_fn_group_banner 895 'ofproto.at:1845' \
   "ofproto - del flows based on table id (OpenFlow 1.1)" "" 53
 at_xfail=no
 (
-  $as_echo "892. $at_setup_line: testing $at_desc ..."
+  $as_echo "895. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -140346,13 +141067,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_892
-#AT_START_893
-at_fn_group_banner 893 'ofproto.at:1878' \
+#AT_STOP_895
+#AT_START_896
+at_fn_group_banner 896 'ofproto.at:1878' \
   "ofproto - del flows based on table id (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "893. $at_setup_line: testing $at_desc ..."
+  $as_echo "896. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -140787,13 +141508,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_893
-#AT_START_894
-at_fn_group_banner 894 'ofproto.at:1910' \
+#AT_STOP_896
+#AT_START_897
+at_fn_group_banner 897 'ofproto.at:1910' \
   "ofproto - flow_mod with out_port matching (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "894. $at_setup_line: testing $at_desc ..."
+  $as_echo "897. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -141187,13 +141908,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_894
-#AT_START_895
-at_fn_group_banner 895 'ofproto.at:1946' \
+#AT_STOP_897
+#AT_START_898
+at_fn_group_banner 898 'ofproto.at:1946' \
   "ofproto - flow_mod with out_port matching (OpenFlow 1.1)" "" 53
 at_xfail=no
 (
-  $as_echo "895. $at_setup_line: testing $at_desc ..."
+  $as_echo "898. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -141587,13 +142308,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_895
-#AT_START_896
-at_fn_group_banner 896 'ofproto.at:1982' \
+#AT_STOP_898
+#AT_START_899
+at_fn_group_banner 899 'ofproto.at:1982' \
   "ofproto - flow_mod with out_group matching (OpenFlow 1.1)" "" 53
 at_xfail=no
 (
-  $as_echo "896. $at_setup_line: testing $at_desc ..."
+  $as_echo "899. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -142008,13 +142729,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_896
-#AT_START_897
-at_fn_group_banner 897 'ofproto.at:2024' \
+#AT_STOP_899
+#AT_START_900
+at_fn_group_banner 900 'ofproto.at:2024' \
   "ofproto - bundle flow_mod with out group matching (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "897. $at_setup_line: testing $at_desc ..."
+  $as_echo "900. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -142423,13 +143144,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_897
-#AT_START_898
-at_fn_group_banner 898 'ofproto.at:2074' \
+#AT_STOP_900
+#AT_START_901
+at_fn_group_banner 901 'ofproto.at:2074' \
   "ofproto - bundle packet-out (OpenFlow 1.4)" "     " 53
 at_xfail=no
 (
-  $as_echo "898. $at_setup_line: testing $at_desc ..."
+  $as_echo "901. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -142771,13 +143492,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_898
-#AT_START_899
-at_fn_group_banner 899 'ofproto.at:2116' \
+#AT_STOP_901
+#AT_START_902
+at_fn_group_banner 902 'ofproto.at:2116' \
   "ofproto - bundle packet-out, failing bundle commit (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "899. $at_setup_line: testing $at_desc ..."
+  $as_echo "902. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -143118,13 +143839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_899
-#AT_START_900
-at_fn_group_banner 900 'ofproto.at:2157' \
+#AT_STOP_902
+#AT_START_903
+at_fn_group_banner 903 'ofproto.at:2157' \
   "ofproto - bundle packet-out makes bundle commit to fail(OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "900. $at_setup_line: testing $at_desc ..."
+  $as_echo "903. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -143466,13 +144187,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_900
-#AT_START_901
-at_fn_group_banner 901 'ofproto.at:2199' \
+#AT_STOP_903
+#AT_START_904
+at_fn_group_banner 904 'ofproto.at:2199' \
   "ofproto - flow table configuration (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "901. $at_setup_line: testing $at_desc ..."
+  $as_echo "904. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -143792,13 +144513,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_901
-#AT_START_902
-at_fn_group_banner 902 'ofproto.at:2242' \
+#AT_STOP_904
+#AT_START_905
+at_fn_group_banner 905 'ofproto.at:2242' \
   "ofproto - hidden rules not in table stats" "      " 53
 at_xfail=no
 (
-  $as_echo "902. $at_setup_line: testing $at_desc ..."
+  $as_echo "905. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -144125,13 +144846,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_902
-#AT_START_903
-at_fn_group_banner 903 'ofproto.at:2277' \
+#AT_STOP_905
+#AT_START_906
+at_fn_group_banner 906 'ofproto.at:2277' \
   "ofproto - flow table configuration (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "903. $at_setup_line: testing $at_desc ..."
+  $as_echo "906. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -144476,13 +145197,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_903
-#AT_START_904
-at_fn_group_banner 904 'ofproto.at:2342' \
+#AT_STOP_906
+#AT_START_907
+at_fn_group_banner 907 'ofproto.at:2342' \
   "ofproto - table features (OpenFlow 1.3)" "        " 53
 at_xfail=no
 (
-  $as_echo "904. $at_setup_line: testing $at_desc ..."
+  $as_echo "907. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -144825,13 +145546,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_904
-#AT_START_905
-at_fn_group_banner 905 'ofproto.at:2405' \
+#AT_STOP_907
+#AT_START_908
+at_fn_group_banner 908 'ofproto.at:2405' \
   "ofproto - flow table names" "                     " 53
 at_xfail=no
 (
-  $as_echo "905. $at_setup_line: testing $at_desc ..."
+  $as_echo "908. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -145511,13 +146232,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_905
-#AT_START_906
-at_fn_group_banner 906 'ofproto.at:2528' \
+#AT_STOP_908
+#AT_START_909
+at_fn_group_banner 909 'ofproto.at:2528' \
   "ofproto - table description (OpenFlow 1.4)" "     " 53
 at_xfail=no
 (
-  $as_echo "906. $at_setup_line: testing $at_desc ..."
+  $as_echo "909. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -145855,13 +146576,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_906
-#AT_START_907
-at_fn_group_banner 907 'ofproto.at:2558' \
+#AT_STOP_909
+#AT_START_910
+at_fn_group_banner 910 'ofproto.at:2558' \
   "ofproto - hard limits on flow table size (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "907. $at_setup_line: testing $at_desc ..."
+  $as_echo "910. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -146270,13 +146991,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_907
-#AT_START_908
-at_fn_group_banner 908 'ofproto.at:2604' \
+#AT_STOP_910
+#AT_START_911
+at_fn_group_banner 911 'ofproto.at:2604' \
   "ofproto - hard limits on flow table size (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "908. $at_setup_line: testing $at_desc ..."
+  $as_echo "911. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -146651,13 +147372,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_908
-#AT_START_909
-at_fn_group_banner 909 'ofproto.at:2644' \
+#AT_STOP_911
+#AT_START_912
+at_fn_group_banner 912 'ofproto.at:2644' \
   "ofproto - eviction upon table overflow (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "909. $at_setup_line: testing $at_desc ..."
+  $as_echo "912. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -147121,13 +147842,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_909
-#AT_START_910
-at_fn_group_banner 910 'ofproto.at:2703' \
+#AT_STOP_912
+#AT_START_913
+at_fn_group_banner 913 'ofproto.at:2703' \
   "ofproto - eviction upon table overflow (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "910. $at_setup_line: testing $at_desc ..."
+  $as_echo "913. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -147606,13 +148327,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_910
-#AT_START_911
-at_fn_group_banner 911 'ofproto.at:2763' \
+#AT_STOP_913
+#AT_START_914
+at_fn_group_banner 914 'ofproto.at:2763' \
   "ofproto - eviction using importance upon table overflow (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "911. $at_setup_line: testing $at_desc ..."
+  $as_echo "914. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -148097,13 +148818,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_911
-#AT_START_912
-at_fn_group_banner 912 'ofproto.at:2829' \
+#AT_STOP_914
+#AT_START_915
+at_fn_group_banner 915 'ofproto.at:2829' \
   "ofproto - eviction upon table overflow, with fairness (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "912. $at_setup_line: testing $at_desc ..."
+  $as_echo "915. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -148564,13 +149285,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_912
-#AT_START_913
-at_fn_group_banner 913 'ofproto.at:2911' \
+#AT_STOP_915
+#AT_START_916
+at_fn_group_banner 916 'ofproto.at:2911' \
   "ofproto - eviction upon table overflow, with fairness (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "913. $at_setup_line: testing $at_desc ..."
+  $as_echo "916. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -149031,13 +149752,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_913
-#AT_START_914
-at_fn_group_banner 914 'ofproto.at:2993' \
+#AT_STOP_916
+#AT_START_917
+at_fn_group_banner 917 'ofproto.at:2993' \
   "ofproto - eviction upon table overflow, with modified hard timeout" "" 53
 at_xfail=no
 (
-  $as_echo "914. $at_setup_line: testing $at_desc ..."
+  $as_echo "917. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -149388,13 +150109,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_914
-#AT_START_915
-at_fn_group_banner 915 'ofproto.at:3037' \
+#AT_STOP_917
+#AT_START_918
+at_fn_group_banner 918 'ofproto.at:3037' \
   "ofproto - eviction upon table overflow, with modified idle timeout" "" 53
 at_xfail=no
 (
-  $as_echo "915. $at_setup_line: testing $at_desc ..."
+  $as_echo "918. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -149745,13 +150466,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_915
-#AT_START_916
-at_fn_group_banner 916 'ofproto.at:3081' \
+#AT_STOP_918
+#AT_START_919
+at_fn_group_banner 919 'ofproto.at:3081' \
   "ofproto - asynchronous message control (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "916. $at_setup_line: testing $at_desc ..."
+  $as_echo "919. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -150166,13 +150887,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_916
-#AT_START_917
-at_fn_group_banner 917 'ofproto.at:3183' \
+#AT_STOP_919
+#AT_START_920
+at_fn_group_banner 920 'ofproto.at:3183' \
   "ofproto - asynchronous message control (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "917. $at_setup_line: testing $at_desc ..."
+  $as_echo "920. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -150592,13 +151313,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_917
-#AT_START_918
-at_fn_group_banner 918 'ofproto.at:3290' \
+#AT_STOP_920
+#AT_START_921
+at_fn_group_banner 921 'ofproto.at:3290' \
   "ofproto - asynchronous message control (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "918. $at_setup_line: testing $at_desc ..."
+  $as_echo "921. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -151030,13 +151751,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_918
-#AT_START_919
-at_fn_group_banner 919 'ofproto.at:3409' \
+#AT_STOP_921
+#AT_START_922
+at_fn_group_banner 922 'ofproto.at:3409' \
   "ofproto - asynchronous message control (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "919. $at_setup_line: testing $at_desc ..."
+  $as_echo "922. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -151633,13 +152354,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_919
-#AT_START_920
-at_fn_group_banner 920 'ofproto.at:3641' \
+#AT_STOP_922
+#AT_START_923
+at_fn_group_banner 923 'ofproto.at:3641' \
   "ofproto - asynchronous message control (OpenFlow 1.5)" "" 53
 at_xfail=no
 (
-  $as_echo "920. $at_setup_line: testing $at_desc ..."
+  $as_echo "923. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -152028,13 +152749,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_920
-#AT_START_921
-at_fn_group_banner 921 'ofproto.at:3719' \
+#AT_STOP_923
+#AT_START_924
+at_fn_group_banner 924 'ofproto.at:3719' \
   "ofproto - controller role (OpenFlow 1.2)" "       " 53
 at_xfail=no
 (
-  $as_echo "921. $at_setup_line: testing $at_desc ..."
+  $as_echo "924. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -152420,13 +153141,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_921
-#AT_START_922
-at_fn_group_banner 922 'ofproto.at:3784' \
+#AT_STOP_924
+#AT_START_925
+at_fn_group_banner 925 'ofproto.at:3784' \
   "ofproto - controller role (OpenFlow 1.4)" "       " 53
 at_xfail=no
 (
-  $as_echo "922. $at_setup_line: testing $at_desc ..."
+  $as_echo "925. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -152813,13 +153534,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_922
-#AT_START_923
-at_fn_group_banner 923 'ofproto.at:3850' \
+#AT_STOP_925
+#AT_START_926
+at_fn_group_banner 926 'ofproto.at:3850' \
   "ofproto - controller role (OpenFlow 1.3)" "       " 53
 at_xfail=no
 (
-  $as_echo "923. $at_setup_line: testing $at_desc ..."
+  $as_echo "926. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -153206,13 +153927,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_923
-#AT_START_924
-at_fn_group_banner 924 'ofproto.at:3915' \
+#AT_STOP_926
+#AT_START_927
+at_fn_group_banner 927 'ofproto.at:3915' \
   "ofproto - requestforward (OpenFlow 1.4)" "        " 53
 at_xfail=no
 (
-  $as_echo "924. $at_setup_line: testing $at_desc ..."
+  $as_echo "927. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -153584,13 +154305,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_924
-#AT_START_925
-at_fn_group_banner 925 'ofproto.at:4007' \
+#AT_STOP_927
+#AT_START_928
+at_fn_group_banner 928 'ofproto.at:4007' \
   "ofproto - NXT requestforward (OpenFlow 1.0)" "    " 53
 at_xfail=no
 (
-  $as_echo "925. $at_setup_line: testing $at_desc ..."
+  $as_echo "928. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -153969,13 +154690,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_925
-#AT_START_926
-at_fn_group_banner 926 'ofproto.at:4105' \
+#AT_STOP_928
+#AT_START_929
+at_fn_group_banner 929 'ofproto.at:4105' \
   "ofproto - ONF requestforward (OpenFlow 1.3)" "    " 53
 at_xfail=no
 (
-  $as_echo "926. $at_setup_line: testing $at_desc ..."
+  $as_echo "929. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -154354,13 +155075,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_926
-#AT_START_927
-at_fn_group_banner 927 'ofproto.at:4206' \
+#AT_STOP_929
+#AT_START_930
+at_fn_group_banner 930 'ofproto.at:4206' \
   "ofproto - packet-out from controller (OpenFlow 1.0)" "" 53
 at_xfail=no
 (
-  $as_echo "927. $at_setup_line: testing $at_desc ..."
+  $as_echo "930. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -154732,13 +155453,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_927
-#AT_START_928
-at_fn_group_banner 928 'ofproto.at:4242' \
+#AT_STOP_930
+#AT_START_931
+at_fn_group_banner 931 'ofproto.at:4242' \
   "ofproto - packet-out from controller (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "928. $at_setup_line: testing $at_desc ..."
+  $as_echo "931. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -155107,13 +155828,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_928
-#AT_START_929
-at_fn_group_banner 929 'ofproto.at:4275' \
+#AT_STOP_931
+#AT_START_932
+at_fn_group_banner 932 'ofproto.at:4275' \
   "ofproto - packet-out from controller (OpenFlow 1.1)" "" 53
 at_xfail=no
 (
-  $as_echo "929. $at_setup_line: testing $at_desc ..."
+  $as_echo "932. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -155484,13 +156205,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_929
-#AT_START_930
-at_fn_group_banner 930 'ofproto.at:4305' \
+#AT_STOP_932
+#AT_START_933
+at_fn_group_banner 933 'ofproto.at:4305' \
   "ofproto - packet-out from controller (OpenFlow 1.5)" "" 53
 at_xfail=no
 (
-  $as_echo "930. $at_setup_line: testing $at_desc ..."
+  $as_echo "933. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -155859,13 +156580,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_930
-#AT_START_931
-at_fn_group_banner 931 'ofproto.at:4335' \
+#AT_STOP_933
+#AT_START_934
+at_fn_group_banner 934 'ofproto.at:4335' \
   "ofproto - packet-out with metadata and userdata (NXT_PACKET_IN2)" "" 53
 at_xfail=no
 (
-  $as_echo "931. $at_setup_line: testing $at_desc ..."
+  $as_echo "934. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -156217,13 +156938,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_931
-#AT_START_932
-at_fn_group_banner 932 'ofproto.at:4363' \
+#AT_STOP_934
+#AT_START_935
+at_fn_group_banner 935 'ofproto.at:4363' \
   "ofproto - packet-out with set_field metadata (OpenFlow 1.5)" "" 53
 at_xfail=no
 (
-  $as_echo "932. $at_setup_line: testing $at_desc ..."
+  $as_echo "935. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -156533,13 +157254,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_932
-#AT_START_933
-at_fn_group_banner 933 'ofproto.at:4390' \
+#AT_STOP_935
+#AT_START_936
+at_fn_group_banner 936 'ofproto.at:4390' \
   "ofproto - packet-out with set_field metadata with packet_type PT_ETH (OpenFlow 1.5)" "" 53
 at_xfail=no
 (
-  $as_echo "933. $at_setup_line: testing $at_desc ..."
+  $as_echo "936. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -156849,13 +157570,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_933
-#AT_START_934
-at_fn_group_banner 934 'ofproto.at:4417' \
+#AT_STOP_936
+#AT_START_937
+at_fn_group_banner 937 'ofproto.at:4417' \
   "ofproto - packet-out with set_field metadata with packet_type PT_IPV4 on PTAP bridge (OpenFlow 1.5)" "" 53
 at_xfail=no
 (
-  $as_echo "934. $at_setup_line: testing $at_desc ..."
+  $as_echo "937. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -157165,13 +157886,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_934
-#AT_START_935
-at_fn_group_banner 935 'ofproto.at:4445' \
+#AT_STOP_937
+#AT_START_938
+at_fn_group_banner 938 'ofproto.at:4445' \
   "ofproto - packet-out with metadata (NXM)" "       " 53
 at_xfail=no
 (
-  $as_echo "935. $at_setup_line: testing $at_desc ..."
+  $as_echo "938. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -157522,13 +158243,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_935
-#AT_START_936
-at_fn_group_banner 936 'ofproto.at:4473' \
+#AT_STOP_938
+#AT_START_939
+at_fn_group_banner 939 'ofproto.at:4473' \
   "ofproto - packet-out with metadata (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "936. $at_setup_line: testing $at_desc ..."
+  $as_echo "939. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -157879,13 +158600,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_936
-#AT_START_937
-at_fn_group_banner 937 'ofproto.at:4501' \
+#AT_STOP_939
+#AT_START_940
+at_fn_group_banner 940 'ofproto.at:4501' \
   "ofproto - packet-out with metadata and dual set_field (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "937. $at_setup_line: testing $at_desc ..."
+  $as_echo "940. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -158236,13 +158957,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_937
-#AT_START_938
-at_fn_group_banner 938 'ofproto.at:4528' \
+#AT_STOP_940
+#AT_START_941
+at_fn_group_banner 941 'ofproto.at:4528' \
   "ofproto - packet-out with tunnel metadata (OpenFlow 1.2)" "" 53
 at_xfail=no
 (
-  $as_echo "938. $at_setup_line: testing $at_desc ..."
+  $as_echo "941. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -158593,13 +159314,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_938
-#AT_START_939
-at_fn_group_banner 939 'ofproto.at:4579' \
-  "ofproto - flow monitoring" "                      " 53
+#AT_STOP_941
+#AT_START_942
+at_fn_group_banner 942 'ofproto.at:4579' \
+  "ofproto - flow monitoring" "                      " 53
 at_xfail=no
 (
-  $as_echo "939. $at_setup_line: testing $at_desc ..."
+  $as_echo "942. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -159078,13 +159799,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_939
-#AT_START_940
-at_fn_group_banner 940 'ofproto.at:4716' \
+#AT_STOP_942
+#AT_START_943
+at_fn_group_banner 943 'ofproto.at:4716' \
   "ofproto - flow monitoring with !own" "            " 53
 at_xfail=no
 (
-  $as_echo "940. $at_setup_line: testing $at_desc ..."
+  $as_echo "943. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -159452,13 +160173,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_940
-#AT_START_941
-at_fn_group_banner 941 'ofproto.at:4757' \
+#AT_STOP_943
+#AT_START_944
+at_fn_group_banner 944 'ofproto.at:4757' \
   "ofproto - flow monitoring with out_port" "        " 53
 at_xfail=no
 (
-  $as_echo "941. $at_setup_line: testing $at_desc ..."
+  $as_echo "944. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -159821,13 +160542,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_941
-#AT_START_942
-at_fn_group_banner 942 'ofproto.at:4809' \
+#AT_STOP_944
+#AT_START_945
+at_fn_group_banner 945 'ofproto.at:4809' \
   "ofproto - flow monitoring pause and resume" "     " 53
 at_xfail=no
 (
-  $as_echo "942. $at_setup_line: testing $at_desc ..."
+  $as_echo "945. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -160379,13 +161100,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_942
-#AT_START_943
-at_fn_group_banner 943 'ofproto.at:4914' \
+#AT_STOP_945
+#AT_START_946
+at_fn_group_banner 946 'ofproto.at:4914' \
   "ofproto - flow monitoring usable protocols" "     " 53
 at_xfail=no
 (
-  $as_echo "943. $at_setup_line: testing $at_desc ..."
+  $as_echo "946. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -160661,13 +161382,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_943
-#AT_START_944
-at_fn_group_banner 944 'ofproto.at:4935' \
+#AT_STOP_946
+#AT_START_947
+at_fn_group_banner 947 'ofproto.at:4935' \
   "ofproto - event filtering (OpenFlow 1.3)" "       " 53
 at_xfail=no
 (
-  $as_echo "944. $at_setup_line: testing $at_desc ..."
+  $as_echo "947. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -160962,13 +161683,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_944
-#AT_START_945
-at_fn_group_banner 945 'ofproto.at:4975' \
+#AT_STOP_947
+#AT_START_948
+at_fn_group_banner 948 'ofproto.at:4975' \
   "ofproto - ofport_request" "                       " 53
 at_xfail=no
 (
-  $as_echo "945. $at_setup_line: testing $at_desc ..."
+  $as_echo "948. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -161329,13 +162050,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_945
-#AT_START_946
-at_fn_group_banner 946 'ofproto.at:5031' \
+#AT_STOP_948
+#AT_START_949
+at_fn_group_banner 949 'ofproto.at:5031' \
   "ofproto - bundle open (OpenFlow 1.4)" "           " 53
 at_xfail=no
 (
-  $as_echo "946. $at_setup_line: testing $at_desc ..."
+  $as_echo "949. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -161655,13 +162376,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_946
-#AT_START_947
-at_fn_group_banner 947 'ofproto.at:5055' \
+#AT_STOP_949
+#AT_START_950
+at_fn_group_banner 950 'ofproto.at:5055' \
   "ofproto - bundle double open (OpenFlow 1.4)" "    " 53
 at_xfail=no
 (
-  $as_echo "947. $at_setup_line: testing $at_desc ..."
+  $as_echo "950. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -161989,13 +162710,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_947
-#AT_START_948
-at_fn_group_banner 948 'ofproto.at:5087' \
+#AT_STOP_950
+#AT_START_951
+at_fn_group_banner 951 'ofproto.at:5087' \
   "ofproto - bundle close without open (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "948. $at_setup_line: testing $at_desc ..."
+  $as_echo "951. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -162315,13 +163036,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_948
-#AT_START_949
-at_fn_group_banner 949 'ofproto.at:5111' \
+#AT_STOP_951
+#AT_START_952
+at_fn_group_banner 952 'ofproto.at:5111' \
   "ofproto - bundle double close (OpenFlow 1.4)" "   " 53
 at_xfail=no
 (
-  $as_echo "949. $at_setup_line: testing $at_desc ..."
+  $as_echo "952. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -162656,13 +163377,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_949
-#AT_START_950
-at_fn_group_banner 950 'ofproto.at:5150' \
+#AT_STOP_952
+#AT_START_953
+at_fn_group_banner 953 'ofproto.at:5150' \
   "ofproto - bundle close, different flags (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "950. $at_setup_line: testing $at_desc ..."
+  $as_echo "953. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -162990,13 +163711,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_950
-#AT_START_951
-at_fn_group_banner 951 'ofproto.at:5182' \
+#AT_STOP_953
+#AT_START_954
+at_fn_group_banner 954 'ofproto.at:5182' \
   "ofproto - bundle commit without open (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "951. $at_setup_line: testing $at_desc ..."
+  $as_echo "954. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -163317,13 +164038,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_951
-#AT_START_952
-at_fn_group_banner 952 'ofproto.at:5207' \
+#AT_STOP_954
+#AT_START_955
+at_fn_group_banner 955 'ofproto.at:5207' \
   "ofproto - bundle commit, different flags (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "952. $at_setup_line: testing $at_desc ..."
+  $as_echo "955. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -163651,13 +164372,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_952
-#AT_START_953
-at_fn_group_banner 953 'ofproto.at:5239' \
+#AT_STOP_955
+#AT_START_956
+at_fn_group_banner 956 'ofproto.at:5239' \
   "ofproto - bundle discard without open (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "953. $at_setup_line: testing $at_desc ..."
+  $as_echo "956. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -163978,13 +164699,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_953
-#AT_START_954
-at_fn_group_banner 954 'ofproto.at:5265' \
+#AT_STOP_956
+#AT_START_957
+at_fn_group_banner 957 'ofproto.at:5265' \
   "ofproto - bundle with multiple flow mods (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "954. $at_setup_line: testing $at_desc ..."
+  $as_echo "957. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -164571,13 +165292,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_954
-#AT_START_955
-at_fn_group_banner 955 'ofproto.at:5468' \
+#AT_STOP_957
+#AT_START_958
+at_fn_group_banner 958 'ofproto.at:5468' \
   "ofproto - failing bundle commit (OpenFlow 1.4)" " " 53
 at_xfail=no
 (
-  $as_echo "955. $at_setup_line: testing $at_desc ..."
+  $as_echo "958. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -164914,13 +165635,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_955
-#AT_START_956
-at_fn_group_banner 956 'ofproto.at:5515' \
+#AT_STOP_958
+#AT_START_959
+at_fn_group_banner 959 'ofproto.at:5515' \
   "ofproto - bundle timeout (OpenFlow 1.4)" "        " 53
 at_xfail=no
 (
-  $as_echo "956. $at_setup_line: testing $at_desc ..."
+  $as_echo "959. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -165278,13 +165999,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_956
-#AT_START_957
-at_fn_group_banner 957 'ofproto.at:5577' \
+#AT_STOP_959
+#AT_START_960
+at_fn_group_banner 960 'ofproto.at:5577' \
   "ofproto - bundle custom timeout (OpenFlow 1.4)" " " 53
 at_xfail=no
 (
-  $as_echo "957. $at_setup_line: testing $at_desc ..."
+  $as_echo "960. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -165659,13 +166380,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_957
-#AT_START_958
-at_fn_group_banner 958 'ofproto.at:5642' \
+#AT_STOP_960
+#AT_START_961
+at_fn_group_banner 961 'ofproto.at:5642' \
   "ofproto - bundle reset timeout to default (OpenFlow 1.4)" "" 53
 at_xfail=no
 (
-  $as_echo "958. $at_setup_line: testing $at_desc ..."
+  $as_echo "961. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -166054,13 +166775,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_958
-#AT_START_959
-at_fn_group_banner 959 'ofproto.at:5707' \
+#AT_STOP_961
+#AT_START_962
+at_fn_group_banner 962 'ofproto.at:5707' \
   "ofproto - bundle open (OpenFlow 1.3)" "           " 53
 at_xfail=no
 (
-  $as_echo "959. $at_setup_line: testing $at_desc ..."
+  $as_echo "962. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -166383,13 +167104,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_959
-#AT_START_960
-at_fn_group_banner 960 'ofproto.at:5734' \
+#AT_STOP_962
+#AT_START_963
+at_fn_group_banner 963 'ofproto.at:5734' \
   "ofproto - bundle double open (OpenFlow 1.3)" "    " 53
 at_xfail=no
 (
-  $as_echo "960. $at_setup_line: testing $at_desc ..."
+  $as_echo "963. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -166720,13 +167441,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_960
-#AT_START_961
-at_fn_group_banner 961 'ofproto.at:5769' \
+#AT_STOP_963
+#AT_START_964
+at_fn_group_banner 964 'ofproto.at:5769' \
   "ofproto - bundle close without open (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "961. $at_setup_line: testing $at_desc ..."
+  $as_echo "964. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -167046,13 +167767,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_961
-#AT_START_962
-at_fn_group_banner 962 'ofproto.at:5793' \
+#AT_STOP_964
+#AT_START_965
+at_fn_group_banner 965 'ofproto.at:5793' \
   "ofproto - bundle double close (OpenFlow 1.3)" "   " 53
 at_xfail=no
 (
-  $as_echo "962. $at_setup_line: testing $at_desc ..."
+  $as_echo "965. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -167387,13 +168108,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_962
-#AT_START_963
-at_fn_group_banner 963 'ofproto.at:5832' \
+#AT_STOP_965
+#AT_START_966
+at_fn_group_banner 966 'ofproto.at:5832' \
   "ofproto - bundle close, different flags (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "963. $at_setup_line: testing $at_desc ..."
+  $as_echo "966. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -167721,13 +168442,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_963
-#AT_START_964
-at_fn_group_banner 964 'ofproto.at:5864' \
+#AT_STOP_966
+#AT_START_967
+at_fn_group_banner 967 'ofproto.at:5864' \
   "ofproto - bundle commit without open (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "964. $at_setup_line: testing $at_desc ..."
+  $as_echo "967. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -168048,13 +168769,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_964
-#AT_START_965
-at_fn_group_banner 965 'ofproto.at:5889' \
+#AT_STOP_967
+#AT_START_968
+at_fn_group_banner 968 'ofproto.at:5889' \
   "ofproto - bundle commit, different flags (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "965. $at_setup_line: testing $at_desc ..."
+  $as_echo "968. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -168382,13 +169103,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_965
-#AT_START_966
-at_fn_group_banner 966 'ofproto.at:5921' \
+#AT_STOP_968
+#AT_START_969
+at_fn_group_banner 969 'ofproto.at:5921' \
   "ofproto - bundle discard without open (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "966. $at_setup_line: testing $at_desc ..."
+  $as_echo "969. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -168709,13 +169430,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_966
-#AT_START_967
-at_fn_group_banner 967 'ofproto.at:5947' \
+#AT_STOP_969
+#AT_START_970
+at_fn_group_banner 970 'ofproto.at:5947' \
   "ofproto - bundle with multiple flow mods (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "967. $at_setup_line: testing $at_desc ..."
+  $as_echo "970. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -169281,13 +170002,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_967
-#AT_START_968
-at_fn_group_banner 968 'ofproto.at:6143' \
+#AT_STOP_970
+#AT_START_971
+at_fn_group_banner 971 'ofproto.at:6143' \
   "ofproto - failing bundle add message (OpenFlow 1.3)" "" 53
 at_xfail=no
 (
-  $as_echo "968. $at_setup_line: testing $at_desc ..."
+  $as_echo "971. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -169624,13 +170345,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_968
-#AT_START_969
-at_fn_group_banner 969 'ofproto.at:6190' \
+#AT_STOP_971
+#AT_START_972
+at_fn_group_banner 972 'ofproto.at:6190' \
   "ofproto - failing bundle commit (OpenFlow 1.3)" " " 53
 at_xfail=no
 (
-  $as_echo "969. $at_setup_line: testing $at_desc ..."
+  $as_echo "972. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -169933,13 +170654,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_969
-#AT_START_970
-at_fn_group_banner 970 'ofproto.at:6216' \
+#AT_STOP_972
+#AT_START_973
+at_fn_group_banner 973 'ofproto.at:6216' \
   "ofproto - monitor flows with tun_md" "            " 53
 at_xfail=no
 (
-  $as_echo "970. $at_setup_line: testing $at_desc ..."
+  $as_echo "973. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -170394,13 +171115,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_970
-#AT_START_971
-at_fn_group_banner 971 'ofproto.at:6261' \
+#AT_STOP_973
+#AT_START_974
+at_fn_group_banner 974 'ofproto.at:6261' \
   "ofproto - flow mod with tunnel metadata" "        " 53
 at_xfail=no
 (
-  $as_echo "971. $at_setup_line: testing $at_desc ..."
+  $as_echo "974. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -171408,13 +172129,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_971
-#AT_START_972
-at_fn_group_banner 972 'ofproto.at:6393' \
+#AT_STOP_974
+#AT_START_975
+at_fn_group_banner 975 'ofproto.at:6393' \
   "ofproto - flush flows, groups, and meters for controller change" "" 53
 at_xfail=no
 (
-  $as_echo "972. $at_setup_line: testing $at_desc ..."
+  $as_echo "975. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -171891,13 +172612,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_972
-#AT_START_973
-at_fn_group_banner 973 'dpif-netdev.at:62' \
+#AT_STOP_975
+#AT_START_976
+at_fn_group_banner 976 'dpif-netdev.at:62' \
   "dpif-netdev - netdev-dummy/receive" "             " 54
 at_xfail=no
 (
-  $as_echo "973. $at_setup_line: testing $at_desc ..."
+  $as_echo "976. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -172236,13 +172957,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_973
-#AT_START_974
-at_fn_group_banner 974 'dpif-netdev.at:119' \
+#AT_STOP_976
+#AT_START_977
+at_fn_group_banner 977 'dpif-netdev.at:119' \
   "dpif-netdev - dummy interface" "                  " 54
 at_xfail=no
 (
-  $as_echo "974. $at_setup_line: testing $at_desc ..."
+  $as_echo "977. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -172601,13 +173322,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_974
-#AT_START_975
-at_fn_group_banner 975 'dpif-netdev.at:120' \
+#AT_STOP_977
+#AT_START_978
+at_fn_group_banner 978 'dpif-netdev.at:120' \
   "dpif-netdev - dummy-pmd interface" "              " 54
 at_xfail=no
 (
-  $as_echo "975. $at_setup_line: testing $at_desc ..."
+  $as_echo "978. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -172966,13 +173687,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_975
-#AT_START_976
-at_fn_group_banner 976 'dpif-netdev.at:161' \
+#AT_STOP_978
+#AT_START_979
+at_fn_group_banner 979 'dpif-netdev.at:161' \
   "dpif-netdev - miss upcall key matches flow_install - dummy" "" 54
 at_xfail=no
 (
-  $as_echo "976. $at_setup_line: testing $at_desc ..."
+  $as_echo "979. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -173373,13 +174094,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_976
-#AT_START_977
-at_fn_group_banner 977 'dpif-netdev.at:162' \
+#AT_STOP_979
+#AT_START_980
+at_fn_group_banner 980 'dpif-netdev.at:162' \
   "dpif-netdev - miss upcall key matches flow_install - dummy-pmd" "" 54
 at_xfail=no
 (
-  $as_echo "977. $at_setup_line: testing $at_desc ..."
+  $as_echo "980. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -173780,13 +174501,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_977
-#AT_START_978
-at_fn_group_banner 978 'dpif-netdev.at:214' \
+#AT_STOP_980
+#AT_START_981
+at_fn_group_banner 981 'dpif-netdev.at:214' \
   "dpif-netdev - datapath flow modification - dummy" "" 54
 at_xfail=no
 (
-  $as_echo "978. $at_setup_line: testing $at_desc ..."
+  $as_echo "981. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -174247,13 +174968,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_978
-#AT_START_979
-at_fn_group_banner 979 'dpif-netdev.at:215' \
+#AT_STOP_981
+#AT_START_982
+at_fn_group_banner 982 'dpif-netdev.at:215' \
   "dpif-netdev - datapath flow modification - dummy-pmd" "" 54
 at_xfail=no
 (
-  $as_echo "979. $at_setup_line: testing $at_desc ..."
+  $as_echo "982. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -174714,13 +175435,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_979
-#AT_START_980
-at_fn_group_banner 980 'dpif-netdev.at:260' \
+#AT_STOP_982
+#AT_START_983
+at_fn_group_banner 983 'dpif-netdev.at:260' \
   "dpif-netdev - miss upcall key matches flow_dump - dummy" "" 54
 at_xfail=no
 (
-  $as_echo "980. $at_setup_line: testing $at_desc ..."
+  $as_echo "983. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -175154,13 +175875,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_980
-#AT_START_981
-at_fn_group_banner 981 'dpif-netdev.at:261' \
+#AT_STOP_983
+#AT_START_984
+at_fn_group_banner 984 'dpif-netdev.at:261' \
   "dpif-netdev - miss upcall key matches flow_dump - dummy-pmd" "" 54
 at_xfail=no
 (
-  $as_echo "981. $at_setup_line: testing $at_desc ..."
+  $as_echo "984. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -175594,13 +176315,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_981
-#AT_START_982
-at_fn_group_banner 982 'dpif-netdev.at:263' \
+#AT_STOP_984
+#AT_START_985
+at_fn_group_banner 985 'dpif-netdev.at:263' \
   "dpif-netdev - meters" "                           " 54
 at_xfail=no
 (
-  $as_echo "982. $at_setup_line: testing $at_desc ..."
+  $as_echo "985. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -176398,13 +177119,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_982
-#AT_START_983
-at_fn_group_banner 983 'dpif-netdev.at:429' \
+#AT_STOP_985
+#AT_START_986
+at_fn_group_banner 986 'dpif-netdev.at:429' \
   "dpif-netdev - partial hw offload - dummy" "       " 54
 at_xfail=no
 (
-  $as_echo "983. $at_setup_line: testing $at_desc ..."
+  $as_echo "986. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -176898,13 +177619,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_983
-#AT_START_984
-at_fn_group_banner 984 'dpif-netdev.at:430' \
+#AT_STOP_986
+#AT_START_987
+at_fn_group_banner 987 'dpif-netdev.at:430' \
   "dpif-netdev - partial hw offload - dummy-pmd" "   " 54
 at_xfail=no
 (
-  $as_echo "984. $at_setup_line: testing $at_desc ..."
+  $as_echo "987. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -177398,13 +178119,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_984
-#AT_START_985
-at_fn_group_banner 985 'dpif-netdev.at:507' \
+#AT_STOP_987
+#AT_START_988
+at_fn_group_banner 988 'dpif-netdev.at:507' \
   "dpif-netdev - partial hw offload with packet modifications - dummy" "" 54
 at_xfail=no
 (
-  $as_echo "985. $at_setup_line: testing $at_desc ..."
+  $as_echo "988. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -177924,13 +178645,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_985
-#AT_START_986
-at_fn_group_banner 986 'dpif-netdev.at:508' \
+#AT_STOP_988
+#AT_START_989
+at_fn_group_banner 989 'dpif-netdev.at:508' \
   "dpif-netdev - partial hw offload with packet modifications - dummy-pmd" "" 54
 at_xfail=no
 (
-  $as_echo "986. $at_setup_line: testing $at_desc ..."
+  $as_echo "989. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -178450,13 +179171,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_986
-#AT_START_987
-at_fn_group_banner 987 'pmd.at:66' \
+#AT_STOP_989
+#AT_START_990
+at_fn_group_banner 990 'pmd.at:66' \
   "PMD - creating a thread/add-port" "               " 55
 at_xfail=no
 (
-  $as_echo "987. $at_setup_line: testing $at_desc ..."
+  $as_echo "990. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -178822,13 +179543,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_987
-#AT_START_988
-at_fn_group_banner 988 'pmd.at:88' \
+#AT_STOP_990
+#AT_START_991
+at_fn_group_banner 991 'pmd.at:88' \
   "PMD - multiqueue support" "                       " 55
 at_xfail=no
 (
-  $as_echo "988. $at_setup_line: testing $at_desc ..."
+  $as_echo "991. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -179217,13 +179938,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_988
-#AT_START_989
-at_fn_group_banner 989 'pmd.at:120' \
+#AT_STOP_991
+#AT_START_992
+at_fn_group_banner 992 'pmd.at:120' \
   "PMD - pmd-cpu-mask/distribution of rx queues" "   " 55
 at_xfail=no
 (
-  $as_echo "989. $at_setup_line: testing $at_desc ..."
+  $as_echo "992. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -179825,13 +180546,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_989
-#AT_START_990
-at_fn_group_banner 990 'pmd.at:184' \
+#AT_STOP_992
+#AT_START_993
+at_fn_group_banner 993 'pmd.at:184' \
   "PMD - stats" "                                    " 55
 at_xfail=no
 (
-  $as_echo "990. $at_setup_line: testing $at_desc ..."
+  $as_echo "993. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -180354,13 +181075,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_990
-#AT_START_991
-at_fn_group_banner 991 'pmd.at:254' \
+#AT_STOP_993
+#AT_START_994
+at_fn_group_banner 994 'pmd.at:254' \
   "PMD - reconfigure n_rxq" "                        " 55
 at_xfail=no
 (
-  $as_echo "991. $at_setup_line: testing $at_desc ..."
+  $as_echo "994. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -180884,13 +181605,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_991
-#AT_START_992
-at_fn_group_banner 992 'pmd.at:317' \
+#AT_STOP_994
+#AT_START_995
+at_fn_group_banner 995 'pmd.at:317' \
   "PMD - same flow multiple threads" "               " 55
 at_xfail=no
 (
-  $as_echo "992. $at_setup_line: testing $at_desc ..."
+  $as_echo "995. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -181303,13 +182024,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_992
-#AT_START_993
-at_fn_group_banner 993 'pmd.at:360' \
+#AT_STOP_995
+#AT_START_996
+at_fn_group_banner 996 'pmd.at:360' \
   "PMD - change numa node" "                         " 55
 at_xfail=no
 (
-  $as_echo "993. $at_setup_line: testing $at_desc ..."
+  $as_echo "996. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -181945,13 +182666,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_993
-#AT_START_994
-at_fn_group_banner 994 'pmd.at:438' \
+#AT_STOP_996
+#AT_START_997
+at_fn_group_banner 997 'pmd.at:438' \
   "PMD - non pmd device" "                           " 55
 at_xfail=no
 (
-  $as_echo "994. $at_setup_line: testing $at_desc ..."
+  $as_echo "997. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -182423,13 +183144,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_994
-#AT_START_995
-at_fn_group_banner 995 'pmd.at:488' \
+#AT_STOP_997
+#AT_START_998
+at_fn_group_banner 998 'pmd.at:488' \
   "PMD - add remove ports" "                         " 55
 at_xfail=no
 (
-  $as_echo "995. $at_setup_line: testing $at_desc ..."
+  $as_echo "998. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -182920,13 +183641,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_995
-#AT_START_996
-at_fn_group_banner 996 'pmd.at:532' \
+#AT_STOP_998
+#AT_START_999
+at_fn_group_banner 999 'pmd.at:532' \
   "PMD - rxq affinity" "                             " 55
 at_xfail=no
 (
-  $as_echo "996. $at_setup_line: testing $at_desc ..."
+  $as_echo "999. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -183359,13 +184080,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_996
-#AT_START_997
-at_fn_group_banner 997 'pmd.at:585' \
+#AT_STOP_999
+#AT_START_1000
+at_fn_group_banner 1000 'pmd.at:585' \
   "PMD - rxq affinity - NUMA" "                      " 55
 at_xfail=no
 (
-  $as_echo "997. $at_setup_line: testing $at_desc ..."
+  $as_echo "1000. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -183828,13 +184549,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_997
-#AT_START_998
-at_fn_group_banner 998 'pmd.at:641' \
+#AT_STOP_1000
+#AT_START_1001
+at_fn_group_banner 1001 'pmd.at:641' \
   "PMD - monitor threads" "                          " 55
 at_xfail=no
 (
-  $as_echo "998. $at_setup_line: testing $at_desc ..."
+  $as_echo "1001. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -184241,13 +184962,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_998
-#AT_START_999
-at_fn_group_banner 999 'pmd.at:678' \
+#AT_STOP_1001
+#AT_START_1002
+at_fn_group_banner 1002 'pmd.at:678' \
   "PMD - dpctl" "                                    " 55
 at_xfail=no
 (
-  $as_echo "999. $at_setup_line: testing $at_desc ..."
+  $as_echo "1002. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -184675,13 +185396,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_999
-#AT_START_1000
-at_fn_group_banner 1000 'dpctl.at:3' \
+#AT_STOP_1002
+#AT_START_1003
+at_fn_group_banner 1003 'dpctl.at:3' \
   "dpctl - add-dp del-dp" "                          " 56
 at_xfail=no
 (
-  $as_echo "1000. $at_setup_line: testing $at_desc ..."
+  $as_echo "1003. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -185002,13 +185723,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1000
-#AT_START_1001
-at_fn_group_banner 1001 'dpctl.at:19' \
+#AT_STOP_1003
+#AT_START_1004
+at_fn_group_banner 1004 'dpctl.at:19' \
   "dpctl - add-if set-if del-if" "                   " 56
 at_xfail=no
 (
-  $as_echo "1001. $at_setup_line: testing $at_desc ..."
+  $as_echo "1004. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -185594,13 +186315,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1001
-#AT_START_1002
-at_fn_group_banner 1002 'ofproto-dpif.at:26' \
+#AT_STOP_1004
+#AT_START_1005
+at_fn_group_banner 1005 'ofproto-dpif.at:26' \
   "ofproto-dpif - revalidator/wait" "                " 57
 at_xfail=no
 (
-  $as_echo "1002. $at_setup_line: testing $at_desc ..."
+  $as_echo "1005. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -185855,13 +186576,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1002
-#AT_START_1003
-at_fn_group_banner 1003 'ofproto-dpif.at:32' \
+#AT_STOP_1005
+#AT_START_1006
+at_fn_group_banner 1006 'ofproto-dpif.at:32' \
   "ofproto-dpif - active-backup bonding" "           " 57
 at_xfail=no
 (
-  $as_echo "1003. $at_setup_line: testing $at_desc ..."
+  $as_echo "1006. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -186287,13 +187008,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1003
-#AT_START_1004
-at_fn_group_banner 1004 'ofproto-dpif.at:79' \
+#AT_STOP_1006
+#AT_START_1007
+at_fn_group_banner 1007 'ofproto-dpif.at:79' \
   "ofproto-dpif - balance-slb bonding" "             " 57
 at_xfail=no
 (
-  $as_echo "1004. $at_setup_line: testing $at_desc ..."
+  $as_echo "1007. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -186729,13 +187450,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1004
-#AT_START_1005
-at_fn_group_banner 1005 'ofproto-dpif.at:122' \
+#AT_STOP_1007
+#AT_START_1008
+at_fn_group_banner 1008 'ofproto-dpif.at:122' \
   "ofproto-dpif - balance-tcp bonding" "             " 57
 at_xfail=no
 (
-  $as_echo "1005. $at_setup_line: testing $at_desc ..."
+  $as_echo "1008. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -187186,13 +187907,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1005
-#AT_START_1006
-at_fn_group_banner 1006 'ofproto-dpif.at:175' \
+#AT_STOP_1008
+#AT_START_1009
+at_fn_group_banner 1009 'ofproto-dpif.at:175' \
   "ofproto-dpif - balance-tcp bonding, different recirc flow " "" 57
 at_xfail=no
 (
-  $as_echo "1006. $at_setup_line: testing $at_desc ..."
+  $as_echo "1009. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -187597,13 +188318,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1006
-#AT_START_1007
-at_fn_group_banner 1007 'ofproto-dpif.at:233' \
+#AT_STOP_1009
+#AT_START_1010
+at_fn_group_banner 1010 'ofproto-dpif.at:233' \
   "ofproto-dpif - resubmit" "                        " 57
 at_xfail=no
 (
-  $as_echo "1007. $at_setup_line: testing $at_desc ..."
+  $as_echo "1010. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -187900,13 +188621,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1007
-#AT_START_1008
-at_fn_group_banner 1008 'ofproto-dpif.at:252' \
+#AT_STOP_1010
+#AT_START_1011
+at_fn_group_banner 1011 'ofproto-dpif.at:252' \
   "ofproto-dpif - goto table" "                      " 57
 at_xfail=no
 (
-  $as_echo "1008. $at_setup_line: testing $at_desc ..."
+  $as_echo "1011. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -188197,13 +188918,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1008
-#AT_START_1009
-at_fn_group_banner 1009 'ofproto-dpif.at:266' \
+#AT_STOP_1011
+#AT_START_1012
+at_fn_group_banner 1012 'ofproto-dpif.at:266' \
   "ofproto-dpif - write actions" "                   " 57
 at_xfail=no
 (
-  $as_echo "1009. $at_setup_line: testing $at_desc ..."
+  $as_echo "1012. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -188498,13 +189219,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1009
-#AT_START_1010
-at_fn_group_banner 1010 'ofproto-dpif.at:283' \
+#AT_STOP_1012
+#AT_START_1013
+at_fn_group_banner 1013 'ofproto-dpif.at:283' \
   "ofproto-dpif - modify IPv6 Neighbor Solitication (ND)" "" 57
 at_xfail=no
 (
-  $as_echo "1010. $at_setup_line: testing $at_desc ..."
+  $as_echo "1013. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -188801,13 +189522,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1010
-#AT_START_1011
-at_fn_group_banner 1011 'ofproto-dpif.at:302' \
+#AT_STOP_1013
+#AT_START_1014
+at_fn_group_banner 1014 'ofproto-dpif.at:302' \
   "ofproto-dpif - clear actions" "                   " 57
 at_xfail=no
 (
-  $as_echo "1011. $at_setup_line: testing $at_desc ..."
+  $as_echo "1014. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -189101,13 +189822,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1011
-#AT_START_1012
-at_fn_group_banner 1012 'ofproto-dpif.at:318' \
+#AT_STOP_1014
+#AT_START_1015
+at_fn_group_banner 1015 'ofproto-dpif.at:318' \
   "ofproto-dpif - group chaining" "                  " 57
 at_xfail=no
 (
-  $as_echo "1012. $at_setup_line: testing $at_desc ..."
+  $as_echo "1015. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -189425,13 +190146,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1012
-#AT_START_1013
-at_fn_group_banner 1013 'ofproto-dpif.at:331' \
+#AT_STOP_1015
+#AT_START_1016
+at_fn_group_banner 1016 'ofproto-dpif.at:331' \
   "ofproto-dpif - all group in action list" "        " 57
 at_xfail=no
 (
-  $as_echo "1013. $at_setup_line: testing $at_desc ..."
+  $as_echo "1016. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -189737,13 +190458,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1013
-#AT_START_1014
-at_fn_group_banner 1014 'ofproto-dpif.at:346' \
+#AT_STOP_1016
+#AT_START_1017
+at_fn_group_banner 1017 'ofproto-dpif.at:346' \
   "ofproto-dpif - indirect group in action list" "   " 57
 at_xfail=no
 (
-  $as_echo "1014. $at_setup_line: testing $at_desc ..."
+  $as_echo "1017. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -190046,13 +190767,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1014
-#AT_START_1015
-at_fn_group_banner 1015 'ofproto-dpif.at:358' \
+#AT_STOP_1017
+#AT_START_1018
+at_fn_group_banner 1018 'ofproto-dpif.at:358' \
   "ofproto-dpif - group actions have no effect afterwards" "" 57
 at_xfail=no
 (
-  $as_echo "1015. $at_setup_line: testing $at_desc ..."
+  $as_echo "1018. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -190363,13 +191084,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1015
-#AT_START_1016
-at_fn_group_banner 1016 'ofproto-dpif.at:378' \
+#AT_STOP_1018
+#AT_START_1019
+at_fn_group_banner 1019 'ofproto-dpif.at:378' \
   "ofproto-dpif - all group in action set" "         " 57
 at_xfail=no
 (
-  $as_echo "1016. $at_setup_line: testing $at_desc ..."
+  $as_echo "1019. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -190675,13 +191396,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1016
-#AT_START_1017
-at_fn_group_banner 1017 'ofproto-dpif.at:393' \
+#AT_STOP_1019
+#AT_START_1020
+at_fn_group_banner 1020 'ofproto-dpif.at:393' \
   "ofproto-dpif - indirect group in action set" "    " 57
 at_xfail=no
 (
-  $as_echo "1017. $at_setup_line: testing $at_desc ..."
+  $as_echo "1020. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -190984,13 +191705,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1017
-#AT_START_1018
-at_fn_group_banner 1018 'ofproto-dpif.at:405' \
+#AT_STOP_1020
+#AT_START_1021
+at_fn_group_banner 1021 'ofproto-dpif.at:405' \
   "ofproto-dpif - patch port with action set" "      " 57
 at_xfail=no
 (
-  $as_echo "1018. $at_setup_line: testing $at_desc ..."
+  $as_echo "1021. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -191340,13 +192061,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1018
-#AT_START_1019
-at_fn_group_banner 1019 'ofproto-dpif.at:430' \
+#AT_STOP_1021
+#AT_START_1022
+at_fn_group_banner 1022 'ofproto-dpif.at:430' \
   "ofproto-dpif - select group" "                    " 57
 at_xfail=no
 (
-  $as_echo "1019. $at_setup_line: testing $at_desc ..."
+  $as_echo "1022. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -191686,13 +192407,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1019
-#AT_START_1020
-at_fn_group_banner 1020 'ofproto-dpif.at:465' \
+#AT_STOP_1022
+#AT_START_1023
+at_fn_group_banner 1023 'ofproto-dpif.at:465' \
   "ofproto-dpif - select group with watch port" "    " 57
 at_xfail=no
 (
-  $as_echo "1020. $at_setup_line: testing $at_desc ..."
+  $as_echo "1023. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -192004,13 +192725,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1020
-#AT_START_1021
-at_fn_group_banner 1021 'ofproto-dpif.at:486' \
+#AT_STOP_1023
+#AT_START_1024
+at_fn_group_banner 1024 'ofproto-dpif.at:486' \
   "ofproto-dpif - select group with weights" "       " 57
 at_xfail=no
 (
-  $as_echo "1021. $at_setup_line: testing $at_desc ..."
+  $as_echo "1024. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -192402,13 +193123,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1021
-#AT_START_1022
-at_fn_group_banner 1022 'ofproto-dpif.at:560' \
+#AT_STOP_1024
+#AT_START_1025
+at_fn_group_banner 1025 'ofproto-dpif.at:560' \
   "ofproto-dpif - select group with explicit dp_hash selection method" "" 57
 at_xfail=no
 (
-  $as_echo "1022. $at_setup_line: testing $at_desc ..."
+  $as_echo "1025. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -192766,13 +193487,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1022
-#AT_START_1023
-at_fn_group_banner 1023 'ofproto-dpif.at:599' \
+#AT_STOP_1025
+#AT_START_1026
+at_fn_group_banner 1026 'ofproto-dpif.at:599' \
   "ofproto-dpif - select group with legacy hash selection method" "" 57
 at_xfail=no
 (
-  $as_echo "1023. $at_setup_line: testing $at_desc ..."
+  $as_echo "1026. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -193109,13 +193830,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1023
-#AT_START_1024
-at_fn_group_banner 1024 'ofproto-dpif.at:631' \
+#AT_STOP_1026
+#AT_START_1027
+at_fn_group_banner 1027 'ofproto-dpif.at:631' \
   "ofproto-dpif - select group with custom hash selection method" "" 57
 at_xfail=no
 (
-  $as_echo "1024. $at_setup_line: testing $at_desc ..."
+  $as_echo "1027. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -193540,13 +194261,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1024
-#AT_START_1025
-at_fn_group_banner 1025 'ofproto-dpif.at:681' \
+#AT_STOP_1027
+#AT_START_1028
+at_fn_group_banner 1028 'ofproto-dpif.at:681' \
   "ofproto-dpif - fast failover group" "             " 57
 at_xfail=no
 (
-  $as_echo "1025. $at_setup_line: testing $at_desc ..."
+  $as_echo "1028. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -193849,13 +194570,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1025
-#AT_START_1026
-at_fn_group_banner 1026 'ofproto-dpif.at:693' \
+#AT_STOP_1028
+#AT_START_1029
+at_fn_group_banner 1029 'ofproto-dpif.at:693' \
   "ofproto-dpif - group stats single bucket" "       " 57
 at_xfail=no
 (
-  $as_echo "1026. $at_setup_line: testing $at_desc ..."
+  $as_echo "1029. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -194195,13 +194916,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1026
-#AT_START_1027
-at_fn_group_banner 1027 'ofproto-dpif.at:714' \
+#AT_STOP_1029
+#AT_START_1030
+at_fn_group_banner 1030 'ofproto-dpif.at:714' \
   "ofproto-dpif - group stats all buckets" "         " 57
 at_xfail=no
 (
-  $as_echo "1027. $at_setup_line: testing $at_desc ..."
+  $as_echo "1030. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -194541,13 +195262,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1027
-#AT_START_1028
-at_fn_group_banner 1028 'ofproto-dpif.at:735' \
+#AT_STOP_1030
+#AT_START_1031
+at_fn_group_banner 1031 'ofproto-dpif.at:735' \
   "ofproto-dpif - registers" "                       " 57
 at_xfail=no
 (
-  $as_echo "1028. $at_setup_line: testing $at_desc ..."
+  $as_echo "1031. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -194859,13 +195580,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1028
-#AT_START_1029
-at_fn_group_banner 1029 'ofproto-dpif.at:772' \
+#AT_STOP_1031
+#AT_START_1032
+at_fn_group_banner 1032 'ofproto-dpif.at:772' \
   "ofproto-dpif - extended registers" "              " 57
 at_xfail=no
 (
-  $as_echo "1029. $at_setup_line: testing $at_desc ..."
+  $as_echo "1032. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -195163,13 +195884,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1029
-#AT_START_1030
-at_fn_group_banner 1030 'ofproto-dpif.at:793' \
+#AT_STOP_1032
+#AT_START_1033
+at_fn_group_banner 1033 'ofproto-dpif.at:793' \
   "ofproto-dpif - extended-extended registers" "     " 57
 at_xfail=no
 (
-  $as_echo "1030. $at_setup_line: testing $at_desc ..."
+  $as_echo "1033. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -195467,13 +196188,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1030
-#AT_START_1031
-at_fn_group_banner 1031 'ofproto-dpif.at:812' \
+#AT_STOP_1033
+#AT_START_1034
+at_fn_group_banner 1034 'ofproto-dpif.at:812' \
   "ofproto-dpif - load and move order" "             " 57
 at_xfail=no
 (
-  $as_echo "1031. $at_setup_line: testing $at_desc ..."
+  $as_echo "1034. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -195777,13 +196498,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1031
-#AT_START_1032
-at_fn_group_banner 1032 'ofproto-dpif.at:826' \
+#AT_STOP_1034
+#AT_START_1035
+at_fn_group_banner 1035 'ofproto-dpif.at:826' \
   "ofproto-dpif - copy-field into extended registers" "" 57
 at_xfail=no
 (
-  $as_echo "1032. $at_setup_line: testing $at_desc ..."
+  $as_echo "1035. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -196081,13 +196802,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1032
-#AT_START_1033
-at_fn_group_banner 1033 'ofproto-dpif.at:846' \
+#AT_STOP_1035
+#AT_START_1036
+at_fn_group_banner 1036 'ofproto-dpif.at:846' \
   "ofproto-dpif - masked set-field into metadata" "  " 57
 at_xfail=no
 (
-  $as_echo "1033. $at_setup_line: testing $at_desc ..."
+  $as_echo "1036. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -196387,13 +197108,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1033
-#AT_START_1034
-at_fn_group_banner 1034 'ofproto-dpif.at:868' \
+#AT_STOP_1036
+#AT_START_1037
+at_fn_group_banner 1037 'ofproto-dpif.at:868' \
   "ofproto-dpif - actset_output" "                   " 57
 at_xfail=no
 (
-  $as_echo "1034. $at_setup_line: testing $at_desc ..."
+  $as_echo "1037. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -196731,13 +197452,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1034
-#AT_START_1035
-at_fn_group_banner 1035 'ofproto-dpif.at:913' \
+#AT_STOP_1037
+#AT_START_1038
+at_fn_group_banner 1038 'ofproto-dpif.at:913' \
   "ofproto-dpif - push-pop" "                        " 57
 at_xfail=no
 (
-  $as_echo "1035. $at_setup_line: testing $at_desc ..."
+  $as_echo "1038. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -197034,13 +197755,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1035
-#AT_START_1036
-at_fn_group_banner 1036 'ofproto-dpif.at:932' \
+#AT_STOP_1038
+#AT_START_1039
+at_fn_group_banner 1039 'ofproto-dpif.at:932' \
   "ofproto-dpif - output" "                          " 57
 at_xfail=no
 (
-  $as_echo "1036. $at_setup_line: testing $at_desc ..."
+  $as_echo "1039. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -197339,13 +198060,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1036
-#AT_START_1037
-at_fn_group_banner 1037 'ofproto-dpif.at:953' \
+#AT_STOP_1039
+#AT_START_1040
+at_fn_group_banner 1040 'ofproto-dpif.at:953' \
   "ofproto-dpif - dec_ttl" "                         " 57
 at_xfail=no
 (
-  $as_echo "1037. $at_setup_line: testing $at_desc ..."
+  $as_echo "1040. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -197794,13 +198515,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1037
-#AT_START_1038
-at_fn_group_banner 1038 'ofproto-dpif.at:998' \
+#AT_STOP_1040
+#AT_START_1041
+at_fn_group_banner 1041 'ofproto-dpif.at:998' \
   "ofproto-dpif - dec_ttl without arguments at offset 32 in ofpacts" "" 57
 at_xfail=no
 (
-  $as_echo "1038. $at_setup_line: testing $at_desc ..."
+  $as_echo "1041. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -198059,13 +198780,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1038
-#AT_START_1039
-at_fn_group_banner 1039 'ofproto-dpif.at:1015' \
+#AT_STOP_1041
+#AT_START_1042
+at_fn_group_banner 1042 'ofproto-dpif.at:1015' \
   "ofproto-dpif - dec_ttl with arguments at offset 32 in ofpacts" "" 57
 at_xfail=no
 (
-  $as_echo "1039. $at_setup_line: testing $at_desc ..."
+  $as_echo "1042. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -198324,13 +199045,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1039
-#AT_START_1040
-at_fn_group_banner 1040 'ofproto-dpif.at:1032' \
+#AT_STOP_1042
+#AT_START_1043
+at_fn_group_banner 1043 'ofproto-dpif.at:1032' \
   "ofproto-dpif - note at offset 24 in ofpacts" "    " 57
 at_xfail=no
 (
-  $as_echo "1040. $at_setup_line: testing $at_desc ..."
+  $as_echo "1043. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -198589,13 +199310,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1040
-#AT_START_1041
-at_fn_group_banner 1041 'ofproto-dpif.at:1046' \
+#AT_STOP_1043
+#AT_START_1044
+at_fn_group_banner 1044 'ofproto-dpif.at:1046' \
   "ofproto-dpif - note action deep inside ofpacts" " " 57
 at_xfail=no
 (
-  $as_echo "1041. $at_setup_line: testing $at_desc ..."
+  $as_echo "1044. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -198850,13 +199571,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1041
-#AT_START_1042
-at_fn_group_banner 1042 'ofproto-dpif.at:1052' \
+#AT_STOP_1044
+#AT_START_1045
+at_fn_group_banner 1045 'ofproto-dpif.at:1052' \
   "ofproto-dpif - output, OFPP_NONE ingress port" "  " 57
 at_xfail=no
 (
-  $as_echo "1042. $at_setup_line: testing $at_desc ..."
+  $as_echo "1045. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -199151,13 +199872,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1042
-#AT_START_1043
-at_fn_group_banner 1043 'ofproto-dpif.at:1070' \
+#AT_STOP_1045
+#AT_START_1046
+at_fn_group_banner 1046 'ofproto-dpif.at:1070' \
   "ofproto-dpif - DSCP" "                            " 57
 at_xfail=no
 (
-  $as_echo "1043. $at_setup_line: testing $at_desc ..."
+  $as_echo "1046. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -199473,13 +200194,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1043
-#AT_START_1044
-at_fn_group_banner 1044 'ofproto-dpif.at:1097' \
+#AT_STOP_1046
+#AT_START_1047
+at_fn_group_banner 1047 'ofproto-dpif.at:1097' \
   "ofproto-dpif - output/flood flags" "              " 57
 at_xfail=no
 (
-  $as_echo "1044. $at_setup_line: testing $at_desc ..."
+  $as_echo "1047. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -199958,13 +200679,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1044
-#AT_START_1045
-at_fn_group_banner 1045 'ofproto-dpif.at:1155' \
+#AT_STOP_1047
+#AT_START_1048
+at_fn_group_banner 1048 'ofproto-dpif.at:1155' \
   "ofproto-dpif - Default Table Miss - OF1.0 (OFPTC_TABLE_MISS_CONTROLLER)" "" 57
 at_xfail=no
 (
-  $as_echo "1045. $at_setup_line: testing $at_desc ..."
+  $as_echo "1048. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -200345,13 +201066,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1045
-#AT_START_1046
-at_fn_group_banner 1046 'ofproto-dpif.at:1189' \
+#AT_STOP_1048
+#AT_START_1049
+at_fn_group_banner 1049 'ofproto-dpif.at:1189' \
   "ofproto-dpif - Default Table Miss - OF1.3 (OFPTC_TABLE_MISS_DROP)" "" 57
 at_xfail=no
 (
-  $as_echo "1046. $at_setup_line: testing $at_desc ..."
+  $as_echo "1049. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -200733,13 +201454,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1046
-#AT_START_1047
-at_fn_group_banner 1047 'ofproto-dpif.at:1217' \
+#AT_STOP_1049
+#AT_START_1050
+at_fn_group_banner 1050 'ofproto-dpif.at:1217' \
   "ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTROLLER" "" 57
 at_xfail=no
 (
-  $as_echo "1047. $at_setup_line: testing $at_desc ..."
+  $as_echo "1050. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -201137,13 +201858,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1047
-#AT_START_1048
-at_fn_group_banner 1048 'ofproto-dpif.at:1253' \
+#AT_STOP_1050
+#AT_START_1051
+at_fn_group_banner 1051 'ofproto-dpif.at:1253' \
   "ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTROLLER" "" 57
 at_xfail=no
 (
-  $as_echo "1048. $at_setup_line: testing $at_desc ..."
+  $as_echo "1051. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -201526,13 +202247,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1048
-#AT_START_1049
-at_fn_group_banner 1049 'ofproto-dpif.at:1281' \
+#AT_STOP_1051
+#AT_START_1052
+at_fn_group_banner 1052 'ofproto-dpif.at:1281' \
   "ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_CONTINUE" "" 57
 at_xfail=no
 (
-  $as_echo "1049. $at_setup_line: testing $at_desc ..."
+  $as_echo "1052. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -202043,13 +202764,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1049
-#AT_START_1050
-at_fn_group_banner 1050 'ofproto-dpif.at:1340' \
+#AT_STOP_1052
+#AT_START_1053
+at_fn_group_banner 1053 'ofproto-dpif.at:1340' \
   "ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_CONTINUE" "" 57
 at_xfail=no
 (
-  $as_echo "1050. $at_setup_line: testing $at_desc ..."
+  $as_echo "1053. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -202566,13 +203287,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1050
-#AT_START_1051
-at_fn_group_banner 1051 'ofproto-dpif.at:1404' \
+#AT_STOP_1053
+#AT_START_1054
+at_fn_group_banner 1054 'ofproto-dpif.at:1404' \
   "ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_CONTINUE" "" 57
 at_xfail=no
 (
-  $as_echo "1051. $at_setup_line: testing $at_desc ..."
+  $as_echo "1054. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -203057,13 +203778,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1051
-#AT_START_1052
-at_fn_group_banner 1052 'ofproto-dpif.at:1450' \
+#AT_STOP_1054
+#AT_START_1055
+at_fn_group_banner 1055 'ofproto-dpif.at:1450' \
   "ofproto-dpif - Table Miss - OFPTC_TABLE_MISS_DROP" "" 57
 at_xfail=no
 (
-  $as_echo "1052. $at_setup_line: testing $at_desc ..."
+  $as_echo "1055. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -203445,13 +204166,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1052
-#AT_START_1053
-at_fn_group_banner 1053 'ofproto-dpif.at:1478' \
+#AT_STOP_1055
+#AT_START_1056
+at_fn_group_banner 1056 'ofproto-dpif.at:1478' \
   "ofproto-dpif - Table Miss - goto table and OFPTC_TABLE_MISS_DROP" "" 57
 at_xfail=no
 (
-  $as_echo "1053. $at_setup_line: testing $at_desc ..."
+  $as_echo "1056. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -203866,13 +204587,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1053
-#AT_START_1054
-at_fn_group_banner 1054 'ofproto-dpif.at:1509' \
+#AT_STOP_1056
+#AT_START_1057
+at_fn_group_banner 1057 'ofproto-dpif.at:1509' \
   "ofproto-dpif - Table Miss - resubmit and OFPTC_TABLE_MISS_DROP" "" 57
 at_xfail=no
 (
-  $as_echo "1054. $at_setup_line: testing $at_desc ..."
+  $as_echo "1057. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -204287,13 +205008,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1054
-#AT_START_1055
-at_fn_group_banner 1055 'ofproto-dpif.at:1540' \
+#AT_STOP_1057
+#AT_START_1058
+at_fn_group_banner 1058 'ofproto-dpif.at:1540' \
   "ofproto-dpif - controller" "                      " 57
 at_xfail=no
 (
-  $as_echo "1055. $at_setup_line: testing $at_desc ..."
+  $as_echo "1058. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -205456,13 +206177,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1055
-#AT_START_1056
-at_fn_group_banner 1056 'ofproto-dpif.at:1809' \
+#AT_STOP_1058
+#AT_START_1059
+at_fn_group_banner 1059 'ofproto-dpif.at:1809' \
   "ofproto-dpif - controller with slow-path action" "" 57
 at_xfail=no
 (
-  $as_echo "1056. $at_setup_line: testing $at_desc ..."
+  $as_echo "1059. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -205813,13 +206534,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1056
-#AT_START_1057
-at_fn_group_banner 1057 'ofproto-dpif.at:1839' \
+#AT_STOP_1059
+#AT_START_1060
+at_fn_group_banner 1060 'ofproto-dpif.at:1839' \
   "ofproto-dpif - controller action without megaflows" "" 57
 at_xfail=no
 (
-  $as_echo "1057. $at_setup_line: testing $at_desc ..."
+  $as_echo "1060. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -206371,13 +207092,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1057
-#AT_START_1058
-at_fn_group_banner 1058 'ofproto-dpif.at:1910' \
+#AT_STOP_1060
+#AT_START_1061
+at_fn_group_banner 1061 'ofproto-dpif.at:1910' \
   "ofproto-dpif - MPLS handling" "                   " 57
 at_xfail=no
 (
-  $as_echo "1058. $at_setup_line: testing $at_desc ..."
+  $as_echo "1061. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -210903,13 +211624,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1058
-#AT_START_1059
-at_fn_group_banner 1059 'ofproto-dpif.at:2960' \
+#AT_STOP_1061
+#AT_START_1062
+at_fn_group_banner 1062 'ofproto-dpif.at:2960' \
   "ofproto-dpif - MPLS handling with goto_table" "   " 57
 at_xfail=no
 (
-  $as_echo "1059. $at_setup_line: testing $at_desc ..."
+  $as_echo "1062. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -211315,13 +212036,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1059
-#AT_START_1060
-at_fn_group_banner 1060 'ofproto-dpif.at:3008' \
+#AT_STOP_1062
+#AT_START_1063
+at_fn_group_banner 1063 'ofproto-dpif.at:3008' \
   "ofproto-dpif - MPLS handling with write_actions" "" 57
 at_xfail=no
 (
-  $as_echo "1060. $at_setup_line: testing $at_desc ..."
+  $as_echo "1063. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -211724,13 +212445,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1060
-#AT_START_1061
-at_fn_group_banner 1061 'ofproto-dpif.at:3056' \
+#AT_STOP_1063
+#AT_START_1064
+at_fn_group_banner 1064 'ofproto-dpif.at:3056' \
   "ofproto-dpif - table-miss flow (OpenFlow 1.0)" "  " 57
 at_xfail=no
 (
-  $as_echo "1061. $at_setup_line: testing $at_desc ..."
+  $as_echo "1064. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -212130,13 +212851,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1061
-#AT_START_1062
-at_fn_group_banner 1062 'ofproto-dpif.at:3096' \
+#AT_STOP_1064
+#AT_START_1065
+at_fn_group_banner 1065 'ofproto-dpif.at:3096' \
   "ofproto-dpif - table-miss flow (OpenFlow 1.3)" "  " 57
 at_xfail=no
 (
-  $as_echo "1062. $at_setup_line: testing $at_desc ..."
+  $as_echo "1065. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -212553,13 +213274,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1062
-#AT_START_1063
-at_fn_group_banner 1063 'ofproto-dpif.at:3137' \
+#AT_STOP_1065
+#AT_START_1066
+at_fn_group_banner 1066 'ofproto-dpif.at:3137' \
   "ofproto-dpif - table-miss flow with async config (OpenFlow 1.3)" "" 57
 at_xfail=no
 (
-  $as_echo "1063. $at_setup_line: testing $at_desc ..."
+  $as_echo "1066. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -213006,13 +213727,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1063
-#AT_START_1064
-at_fn_group_banner 1064 'ofproto-dpif.at:3211' \
+#AT_STOP_1066
+#AT_START_1067
+at_fn_group_banner 1067 'ofproto-dpif.at:3211' \
   "ofproto-dpif - table-miss flow (OpenFlow 1.4)" "  " 57
 at_xfail=no
 (
-  $as_echo "1064. $at_setup_line: testing $at_desc ..."
+  $as_echo "1067. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -213429,13 +214150,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1064
-#AT_START_1065
-at_fn_group_banner 1065 'ofproto-dpif.at:3253' \
+#AT_STOP_1067
+#AT_START_1068
+at_fn_group_banner 1068 'ofproto-dpif.at:3253' \
   "ofproto-dpif - packet-in reasons (Openflow 1.3)" "" 57
 at_xfail=no
 (
-  $as_echo "1065. $at_setup_line: testing $at_desc ..."
+  $as_echo "1068. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -213906,13 +214627,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1065
-#AT_START_1066
-at_fn_group_banner 1066 'ofproto-dpif.at:3325' \
+#AT_STOP_1068
+#AT_START_1069
+at_fn_group_banner 1069 'ofproto-dpif.at:3325' \
   "ofproto-dpif - packet-in reasons (Openflow 1.4)" "" 57
 at_xfail=no
 (
-  $as_echo "1066. $at_setup_line: testing $at_desc ..."
+  $as_echo "1069. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -214383,13 +215104,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1066
-#AT_START_1067
-at_fn_group_banner 1067 'ofproto-dpif.at:3396' \
+#AT_STOP_1069
+#AT_START_1070
+at_fn_group_banner 1070 'ofproto-dpif.at:3396' \
   "ofproto-dpif - packet-in reasons (Openflow 1.3)" "" 57
 at_xfail=no
 (
-  $as_echo "1067. $at_setup_line: testing $at_desc ..."
+  $as_echo "1070. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -214778,13 +215499,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1067
-#AT_START_1068
-at_fn_group_banner 1068 'ofproto-dpif.at:3435' \
+#AT_STOP_1070
+#AT_START_1071
+at_fn_group_banner 1071 'ofproto-dpif.at:3435' \
   "ofproto-dpif - ARP modification slow-path" "      " 57
 at_xfail=no
 (
-  $as_echo "1068. $at_setup_line: testing $at_desc ..."
+  $as_echo "1071. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -215076,13 +215797,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1068
-#AT_START_1069
-at_fn_group_banner 1069 'ofproto-dpif.at:3464' \
+#AT_STOP_1071
+#AT_START_1072
+at_fn_group_banner 1072 'ofproto-dpif.at:3464' \
   "ofproto-dpif - VLAN handling" "                   " 57
 at_xfail=no
 (
-  $as_echo "1069. $at_setup_line: testing $at_desc ..."
+  $as_echo "1072. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -215534,13 +216255,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1069
-#AT_START_1070
-at_fn_group_banner 1070 'ofproto-dpif.at:3616' \
+#AT_STOP_1072
+#AT_START_1073
+at_fn_group_banner 1073 'ofproto-dpif.at:3616' \
   "ofproto-dpif - VLAN depth limit" "                " 57
 at_xfail=no
 (
-  $as_echo "1070. $at_setup_line: testing $at_desc ..."
+  $as_echo "1073. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -215891,13 +216612,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1070
-#AT_START_1071
-at_fn_group_banner 1071 'ofproto-dpif.at:3645' \
+#AT_STOP_1073
+#AT_START_1074
+at_fn_group_banner 1074 'ofproto-dpif.at:3645' \
   "ofproto-dpif - Multi-VLAN actions" "              " 57
 at_xfail=no
 (
-  $as_echo "1071. $at_setup_line: testing $at_desc ..."
+  $as_echo "1074. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -216248,13 +216969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1071
-#AT_START_1072
-at_fn_group_banner 1072 'ofproto-dpif.at:3702' \
+#AT_STOP_1074
+#AT_START_1075
+at_fn_group_banner 1075 'ofproto-dpif.at:3702' \
   "ofproto-dpif - MPLS handling" "                   " 57
 at_xfail=no
 (
-  $as_echo "1072. $at_setup_line: testing $at_desc ..."
+  $as_echo "1075. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -216851,13 +217572,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1072
-#AT_START_1073
-at_fn_group_banner 1073 'ofproto-dpif.at:3817' \
+#AT_STOP_1075
+#AT_START_1076
+at_fn_group_banner 1076 'ofproto-dpif.at:3817' \
   "ofproto-dpif - VLAN+MPLS handling" "              " 57
 at_xfail=no
 (
-  $as_echo "1073. $at_setup_line: testing $at_desc ..."
+  $as_echo "1076. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -218394,13 +219115,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1073
-#AT_START_1074
-at_fn_group_banner 1074 'ofproto-dpif.at:4308' \
+#AT_STOP_1076
+#AT_START_1077
+at_fn_group_banner 1077 'ofproto-dpif.at:4308' \
   "ofproto-dpif - fragment handling - trace" "       " 57
 at_xfail=no
 (
-  $as_echo "1074. $at_setup_line: testing $at_desc ..."
+  $as_echo "1077. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -218741,13 +219462,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1074
-#AT_START_1075
-at_fn_group_banner 1075 'ofproto-dpif.at:4357' \
+#AT_STOP_1077
+#AT_START_1078
+at_fn_group_banner 1078 'ofproto-dpif.at:4357' \
   "ofproto-dpif - fragment handling - upcall" "      " 57
 at_xfail=no
 (
-  $as_echo "1075. $at_setup_line: testing $at_desc ..."
+  $as_echo "1078. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -219240,13 +219961,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1075
-#AT_START_1076
-at_fn_group_banner 1076 'ofproto-dpif.at:4432' \
+#AT_STOP_1078
+#AT_START_1079
+at_fn_group_banner 1079 'ofproto-dpif.at:4432' \
   "ofproto-dpif - fragment handling - actions" "     " 57
 at_xfail=no
 (
-  $as_echo "1076. $at_setup_line: testing $at_desc ..."
+  $as_echo "1079. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -219962,13 +220683,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1076
-#AT_START_1077
-at_fn_group_banner 1077 'ofproto-dpif.at:4537' \
+#AT_STOP_1079
+#AT_START_1080
+at_fn_group_banner 1080 'ofproto-dpif.at:4537' \
   "ofproto-dpif - exit" "                            " 57
 at_xfail=no
 (
-  $as_echo "1077. $at_setup_line: testing $at_desc ..."
+  $as_echo "1080. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -220326,13 +221047,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1077
-#AT_START_1078
-at_fn_group_banner 1078 'ofproto-dpif.at:4562' \
+#AT_STOP_1080
+#AT_START_1081
+at_fn_group_banner 1081 'ofproto-dpif.at:4562' \
   "ofproto-dpif - mirroring, select_all" "           " 57
 at_xfail=no
 (
-  $as_echo "1078. $at_setup_line: testing $at_desc ..."
+  $as_echo "1081. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -220668,13 +221389,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1078
-#AT_START_1079
-at_fn_group_banner 1079 'ofproto-dpif.at:4593' \
+#AT_STOP_1081
+#AT_START_1082
+at_fn_group_banner 1082 'ofproto-dpif.at:4593' \
   "ofproto-dpif - mirroring, select_src" "           " 57
 at_xfail=no
 (
-  $as_echo "1079. $at_setup_line: testing $at_desc ..."
+  $as_echo "1082. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -221009,13 +221730,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1079
-#AT_START_1080
-at_fn_group_banner 1080 'ofproto-dpif.at:4622' \
+#AT_STOP_1082
+#AT_START_1083
+at_fn_group_banner 1083 'ofproto-dpif.at:4622' \
   "ofproto-dpif - mirroring, OFPP_NONE ingress port" "" 57
 at_xfail=no
 (
-  $as_echo "1080. $at_setup_line: testing $at_desc ..."
+  $as_echo "1083. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -221313,13 +222034,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1080
-#AT_START_1081
-at_fn_group_banner 1081 'ofproto-dpif.at:4644' \
+#AT_STOP_1083
+#AT_START_1084
+at_fn_group_banner 1084 'ofproto-dpif.at:4644' \
   "ofproto-dpif - mirroring, select_dst" "           " 57
 at_xfail=no
 (
-  $as_echo "1081. $at_setup_line: testing $at_desc ..."
+  $as_echo "1084. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -221655,13 +222376,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1081
-#AT_START_1082
-at_fn_group_banner 1082 'ofproto-dpif.at:4675' \
+#AT_STOP_1084
+#AT_START_1085
+at_fn_group_banner 1085 'ofproto-dpif.at:4675' \
   "ofproto-dpif - mirroring, select_vlan" "          " 57
 at_xfail=no
 (
-  $as_echo "1082. $at_setup_line: testing $at_desc ..."
+  $as_echo "1085. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -222030,13 +222751,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1082
-#AT_START_1083
-at_fn_group_banner 1083 'ofproto-dpif.at:4711' \
+#AT_STOP_1085
+#AT_START_1086
+at_fn_group_banner 1086 'ofproto-dpif.at:4711' \
   "ofproto-dpif - mirroring, output_port" "          " 57
 at_xfail=no
 (
-  $as_echo "1083. $at_setup_line: testing $at_desc ..."
+  $as_echo "1086. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -222372,13 +223093,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1083
-#AT_START_1084
-at_fn_group_banner 1084 'ofproto-dpif.at:4741' \
+#AT_STOP_1086
+#AT_START_1087
+at_fn_group_banner 1087 'ofproto-dpif.at:4741' \
   "ofproto-dpif - mirroring, output_vlan" "          " 57
 at_xfail=no
 (
-  $as_echo "1084. $at_setup_line: testing $at_desc ..."
+  $as_echo "1087. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -222747,13 +223468,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1084
-#AT_START_1085
-at_fn_group_banner 1085 'ofproto-dpif.at:4778' \
+#AT_STOP_1087
+#AT_START_1088
+at_fn_group_banner 1088 'ofproto-dpif.at:4778' \
   "ofproto-dpif - multiple VLAN output mirrors" "    " 57
 at_xfail=no
 (
-  $as_echo "1085. $at_setup_line: testing $at_desc ..."
+  $as_echo "1088. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -223044,13 +223765,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1085
-#AT_START_1086
-at_fn_group_banner 1086 'ofproto-dpif.at:4807' \
+#AT_STOP_1088
+#AT_START_1089
+at_fn_group_banner 1089 'ofproto-dpif.at:4807' \
   "ofproto-dpif - mirroring with recirculation" "    " 57
 at_xfail=no
 (
-  $as_echo "1086. $at_setup_line: testing $at_desc ..."
+  $as_echo "1089. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -223383,13 +224104,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1086
-#AT_START_1087
-at_fn_group_banner 1087 'ofproto-dpif.at:4833' \
+#AT_STOP_1089
+#AT_START_1090
+at_fn_group_banner 1090 'ofproto-dpif.at:4833' \
   "ofproto-dpif - mirroring, select_all with snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1087. $at_setup_line: testing $at_desc ..."
+  $as_echo "1090. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -223725,13 +224446,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1087
-#AT_START_1088
-at_fn_group_banner 1088 'ofproto-dpif.at:4863' \
+#AT_STOP_1090
+#AT_START_1091
+at_fn_group_banner 1091 'ofproto-dpif.at:4863' \
   "ofproto-dpif - mirroring, select_all with snaplen and reset snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1088. $at_setup_line: testing $at_desc ..."
+  $as_echo "1091. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -224105,13 +224826,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1088
-#AT_START_1089
-at_fn_group_banner 1089 'ofproto-dpif.at:4903' \
+#AT_STOP_1091
+#AT_START_1092
+at_fn_group_banner 1092 'ofproto-dpif.at:4903' \
   "ofproto-dpif - mirroring, select_src with snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1089. $at_setup_line: testing $at_desc ..."
+  $as_echo "1092. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -224446,13 +225167,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1089
-#AT_START_1090
-at_fn_group_banner 1090 'ofproto-dpif.at:4932' \
+#AT_STOP_1092
+#AT_START_1093
+at_fn_group_banner 1093 'ofproto-dpif.at:4932' \
   "ofproto-dpif - mirroring, OFPP_NONE ingress port with snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1090. $at_setup_line: testing $at_desc ..."
+  $as_echo "1093. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -224750,13 +225471,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1090
-#AT_START_1091
-at_fn_group_banner 1091 'ofproto-dpif.at:4953' \
+#AT_STOP_1093
+#AT_START_1094
+at_fn_group_banner 1094 'ofproto-dpif.at:4953' \
   "ofproto-dpif - mirroring, select_dst with snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1091. $at_setup_line: testing $at_desc ..."
+  $as_echo "1094. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -225092,13 +225813,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1091
-#AT_START_1092
-at_fn_group_banner 1092 'ofproto-dpif.at:4983' \
+#AT_STOP_1094
+#AT_START_1095
+at_fn_group_banner 1095 'ofproto-dpif.at:4983' \
   "ofproto-dpif - mirroring, select_vlan with snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1092. $at_setup_line: testing $at_desc ..."
+  $as_echo "1095. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -225467,13 +226188,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1092
-#AT_START_1093
-at_fn_group_banner 1093 'ofproto-dpif.at:5018' \
+#AT_STOP_1095
+#AT_START_1096
+at_fn_group_banner 1096 'ofproto-dpif.at:5018' \
   "ofproto-dpif - mirroring, output_port with snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1093. $at_setup_line: testing $at_desc ..."
+  $as_echo "1096. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -225809,13 +226530,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1093
-#AT_START_1094
-at_fn_group_banner 1094 'ofproto-dpif.at:5048' \
+#AT_STOP_1096
+#AT_START_1097
+at_fn_group_banner 1097 'ofproto-dpif.at:5048' \
   "ofproto-dpif - mirroring, output_vlan with snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1094. $at_setup_line: testing $at_desc ..."
+  $as_echo "1097. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -226148,13 +226869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1094
-#AT_START_1095
-at_fn_group_banner 1095 'ofproto-dpif.at:5076' \
+#AT_STOP_1097
+#AT_START_1098
+at_fn_group_banner 1098 'ofproto-dpif.at:5076' \
   "ofproto-dpif - multiple VLAN output mirrors with snaplen" "" 57
 at_xfail=no
 (
-  $as_echo "1095. $at_setup_line: testing $at_desc ..."
+  $as_echo "1098. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -226437,13 +227158,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1095
-#AT_START_1096
-at_fn_group_banner 1096 'ofproto-dpif.at:5099' \
+#AT_STOP_1098
+#AT_START_1099
+at_fn_group_banner 1099 'ofproto-dpif.at:5099' \
   "ofproto-dpif - resubmit with recirculation" "     " 57
 at_xfail=no
 (
-  $as_echo "1096. $at_setup_line: testing $at_desc ..."
+  $as_echo "1099. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -226773,13 +227494,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1096
-#AT_START_1097
-at_fn_group_banner 1097 'ofproto-dpif.at:5126' \
+#AT_STOP_1099
+#AT_START_1100
+at_fn_group_banner 1100 'ofproto-dpif.at:5126' \
   "ofproto-dpif - resubmit with tun_id" "            " 57
 at_xfail=no
 (
-  $as_echo "1097. $at_setup_line: testing $at_desc ..."
+  $as_echo "1100. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -227110,13 +227831,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1097
-#AT_START_1098
-at_fn_group_banner 1098 'ofproto-dpif.at:5153' \
+#AT_STOP_1100
+#AT_START_1101
+at_fn_group_banner 1101 'ofproto-dpif.at:5153' \
   "ofproto-dpif - recirculation after resubmit" "    " 57
 at_xfail=no
 (
-  $as_echo "1098. $at_setup_line: testing $at_desc ..."
+  $as_echo "1101. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -227445,13 +228166,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1098
-#AT_START_1099
-at_fn_group_banner 1099 'ofproto-dpif.at:5177' \
+#AT_STOP_1101
+#AT_START_1102
+at_fn_group_banner 1102 'ofproto-dpif.at:5177' \
   "ofproto-dpif - packet-out recirculation" "        " 57
 at_xfail=no
 (
-  $as_echo "1099. $at_setup_line: testing $at_desc ..."
+  $as_echo "1102. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -227751,13 +228472,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1099
-#AT_START_1100
-at_fn_group_banner 1100 'ofproto-dpif.at:5205' \
+#AT_STOP_1102
+#AT_START_1103
+at_fn_group_banner 1103 'ofproto-dpif.at:5205' \
   "ofproto-dpif - debug_slow action" "               " 57
 at_xfail=no
 (
-  $as_echo "1100. $at_setup_line: testing $at_desc ..."
+  $as_echo "1103. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -228052,13 +228773,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1100
-#AT_START_1101
-at_fn_group_banner 1101 'ofproto-dpif.at:5332' \
+#AT_STOP_1103
+#AT_START_1104
+at_fn_group_banner 1104 'ofproto-dpif.at:5332' \
   "ofproto-dpif - continuation - pause at end of pipeline" "" 57
 at_xfail=no
 (
-  $as_echo "1101. $at_setup_line: testing $at_desc ..."
+  $as_echo "1104. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -228450,13 +229171,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1101
-#AT_START_1102
-at_fn_group_banner 1102 'ofproto-dpif.at:5335' \
+#AT_STOP_1104
+#AT_START_1105
+at_fn_group_banner 1105 'ofproto-dpif.at:5335' \
   "ofproto-dpif - continuation - actions" "          " 57
 at_xfail=no
 (
-  $as_echo "1102. $at_setup_line: testing $at_desc ..."
+  $as_echo "1105. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -228848,13 +229569,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1102
-#AT_START_1103
-at_fn_group_banner 1103 'ofproto-dpif.at:5343' \
+#AT_STOP_1105
+#AT_START_1106
+at_fn_group_banner 1106 'ofproto-dpif.at:5343' \
   "ofproto-dpif - continuation - resubmit" "         " 57
 at_xfail=no
 (
-  $as_echo "1103. $at_setup_line: testing $at_desc ..."
+  $as_echo "1106. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -229250,13 +229971,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1103
-#AT_START_1104
-at_fn_group_banner 1104 'ofproto-dpif.at:5351' \
+#AT_STOP_1106
+#AT_START_1107
+at_fn_group_banner 1107 'ofproto-dpif.at:5351' \
   "ofproto-dpif - continuation - action set" "       " 57
 at_xfail=no
 (
-  $as_echo "1104. $at_setup_line: testing $at_desc ..."
+  $as_echo "1107. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -229649,13 +230370,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1104
-#AT_START_1105
-at_fn_group_banner 1105 'ofproto-dpif.at:5357' \
+#AT_STOP_1107
+#AT_START_1108
+at_fn_group_banner 1108 'ofproto-dpif.at:5357' \
   "ofproto-dpif - continuation - data stack" "       " 57
 at_xfail=no
 (
-  $as_echo "1105. $at_setup_line: testing $at_desc ..."
+  $as_echo "1108. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -230047,13 +230768,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1105
-#AT_START_1106
-at_fn_group_banner 1106 'ofproto-dpif.at:5375' \
+#AT_STOP_1108
+#AT_START_1109
+at_fn_group_banner 1109 'ofproto-dpif.at:5375' \
   "ofproto-dpif - continuation - mirroring" "        " 57
 at_xfail=no
 (
-  $as_echo "1106. $at_setup_line: testing $at_desc ..."
+  $as_echo "1109. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -230451,13 +231172,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1106
-#AT_START_1107
-at_fn_group_banner 1107 'ofproto-dpif.at:5386' \
+#AT_STOP_1109
+#AT_START_1110
+at_fn_group_banner 1110 'ofproto-dpif.at:5386' \
   "ofproto-dpif - continuation - patch ports" "      " 57
 at_xfail=no
 (
-  $as_echo "1107. $at_setup_line: testing $at_desc ..."
+  $as_echo "1110. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -230916,13 +231637,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1107
-#AT_START_1108
-at_fn_group_banner 1108 'ofproto-dpif.at:5398' \
+#AT_STOP_1110
+#AT_START_1111
+at_fn_group_banner 1111 'ofproto-dpif.at:5398' \
   "ofproto-dpif - continuation flow stats" "         " 57
 at_xfail=no
 (
-  $as_echo "1108. $at_setup_line: testing $at_desc ..."
+  $as_echo "1111. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -231271,13 +231992,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1108
-#AT_START_1109
-at_fn_group_banner 1109 'ofproto-dpif.at:5432' \
+#AT_STOP_1111
+#AT_START_1112
+at_fn_group_banner 1112 'ofproto-dpif.at:5432' \
   "ofproto-dpif - continuation with conntrack" "     " 57
 at_xfail=no
 (
-  $as_echo "1109. $at_setup_line: testing $at_desc ..."
+  $as_echo "1112. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -231627,13 +232348,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1109
-#AT_START_1110
-at_fn_group_banner 1110 'ofproto-dpif.at:5467' \
+#AT_STOP_1112
+#AT_START_1113
+at_fn_group_banner 1113 'ofproto-dpif.at:5467' \
   "ofproto-dpif - continuation with patch port" "    " 57
 at_xfail=no
 (
-  $as_echo "1110. $at_setup_line: testing $at_desc ..."
+  $as_echo "1113. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -232007,13 +232728,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1110
-#AT_START_1111
-at_fn_group_banner 1111 'ofproto-dpif.at:5509' \
+#AT_STOP_1113
+#AT_START_1114
+at_fn_group_banner 1114 'ofproto-dpif.at:5509' \
   "ofproto-dpif - continuation after clone" "        " 57
 at_xfail=no
 (
-  $as_echo "1111. $at_setup_line: testing $at_desc ..."
+  $as_echo "1114. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -232360,13 +233081,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1111
-#AT_START_1112
-at_fn_group_banner 1112 'ofproto-dpif.at:5552' \
+#AT_STOP_1114
+#AT_START_1115
+at_fn_group_banner 1115 'ofproto-dpif.at:5552' \
   "ofproto-dpif - ofproto/trace command 1" "         " 57
 at_xfail=no
 (
-  $as_echo "1112. $at_setup_line: testing $at_desc ..."
+  $as_echo "1115. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -233204,13 +233925,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1112
-#AT_START_1113
-at_fn_group_banner 1113 'ofproto-dpif.at:5696' \
+#AT_STOP_1115
+#AT_START_1116
+at_fn_group_banner 1116 'ofproto-dpif.at:5696' \
   "ofproto-dpif - ofproto/trace command 2" "         " 57
 at_xfail=no
 (
-  $as_echo "1113. $at_setup_line: testing $at_desc ..."
+  $as_echo "1116. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -234125,13 +234846,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1113
-#AT_START_1114
-at_fn_group_banner 1114 'ofproto-dpif.at:5805' \
+#AT_STOP_1116
+#AT_START_1117
+at_fn_group_banner 1117 'ofproto-dpif.at:5805' \
   "ofproto-dpif - ofproto/trace from dpctl output" " " 57
 at_xfail=no
 (
-  $as_echo "1114. $at_setup_line: testing $at_desc ..."
+  $as_echo "1117. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -234496,13 +235217,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1114
-#AT_START_1115
-at_fn_group_banner 1115 'ofproto-dpif.at:5852' \
+#AT_STOP_1117
+#AT_START_1118
+at_fn_group_banner 1118 'ofproto-dpif.at:5852' \
   "ofproto-dpif - ofproto/trace-packet-out" "        " 57
 at_xfail=no
 (
-  $as_echo "1115. $at_setup_line: testing $at_desc ..."
+  $as_echo "1118. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -234798,13 +235519,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1115
-#AT_START_1116
-at_fn_group_banner 1116 'ofproto-dpif.at:5882' \
+#AT_STOP_1118
+#AT_START_1119
+at_fn_group_banner 1119 'ofproto-dpif.at:5882' \
   "ofproto-dpif - MAC learning" "                    " 57
 at_xfail=no
 (
-  $as_echo "1116. $at_setup_line: testing $at_desc ..."
+  $as_echo "1119. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -235461,13 +236182,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1116
-#AT_START_1117
-at_fn_group_banner 1117 'ofproto-dpif.at:5971' \
+#AT_STOP_1119
+#AT_START_1120
+at_fn_group_banner 1120 'ofproto-dpif.at:5971' \
   "ofproto-dpif - MAC table overflow" "              " 57
 at_xfail=no
 (
-  $as_echo "1117. $at_setup_line: testing $at_desc ..."
+  $as_echo "1120. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -235889,13 +236610,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1117
-#AT_START_1118
-at_fn_group_banner 1118 'ofproto-dpif.at:6031' \
+#AT_STOP_1120
+#AT_START_1121
+at_fn_group_banner 1121 'ofproto-dpif.at:6031' \
   "ofproto-dpif - MAC table overflow fairness" "     " 57
 at_xfail=no
 (
-  $as_echo "1118. $at_setup_line: testing $at_desc ..."
+  $as_echo "1121. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -236235,13 +236956,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1118
-#AT_START_1119
-at_fn_group_banner 1119 'ofproto-dpif.at:6504' \
+#AT_STOP_1121
+#AT_START_1122
+at_fn_group_banner 1122 'ofproto-dpif.at:6504' \
   "ofproto-dpif - basic truncate action" "           " 57
 at_xfail=no
 (
-  $as_echo "1119. $at_setup_line: testing $at_desc ..."
+  $as_echo "1122. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -236852,13 +237573,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1119
-#AT_START_1120
-at_fn_group_banner 1120 'ofproto-dpif.at:6580' \
+#AT_STOP_1122
+#AT_START_1123
+at_fn_group_banner 1123 'ofproto-dpif.at:6580' \
   "ofproto-dpif - truncate and output to patch port" "" 57
 at_xfail=no
 (
-  $as_echo "1120. $at_setup_line: testing $at_desc ..."
+  $as_echo "1123. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -237186,13 +237907,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1120
-#AT_START_1121
-at_fn_group_banner 1121 'ofproto-dpif.at:6601' \
+#AT_STOP_1123
+#AT_START_1124
+at_fn_group_banner 1124 'ofproto-dpif.at:6601' \
   "ofproto-dpif - truncate and output to gre tunnel" "" 57
 at_xfail=no
 (
-  $as_echo "1121. $at_setup_line: testing $at_desc ..."
+  $as_echo "1124. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -237529,14 +238250,14 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1121
-#AT_START_1122
-at_fn_group_banner 1122 'ofproto-dpif.at:6628' \
+#AT_STOP_1124
+#AT_START_1125
+at_fn_group_banner 1125 'ofproto-dpif.at:6628' \
   "ofproto-dpif - sFlow packet sampling - IPv4 collector" "" 57
 at_xfail=no
       test "$IS_WIN32" = "yes" && at_xfail=yes
 (
-  $as_echo "1122. $at_setup_line: testing $at_desc ..."
+  $as_echo "1125. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -238265,14 +238986,14 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1122
-#AT_START_1123
-at_fn_group_banner 1123 'ofproto-dpif.at:6632' \
+#AT_STOP_1125
+#AT_START_1126
+at_fn_group_banner 1126 'ofproto-dpif.at:6632' \
   "ofproto-dpif - sFlow packet sampling - IPv6 collector" "" 57
 at_xfail=no
       test "$IS_WIN32" = "yes" && at_xfail=yes
 (
-  $as_echo "1123. $at_setup_line: testing $at_desc ..."
+  $as_echo "1126. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -239004,13 +239725,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1123
-#AT_START_1124
-at_fn_group_banner 1124 'ofproto-dpif.at:6638' \
+#AT_STOP_1126
+#AT_START_1127
+at_fn_group_banner 1127 'ofproto-dpif.at:6638' \
   "ofproto-dpif - sFlow packet sampling - LACP structures" "" 57
 at_xfail=no
 (
-  $as_echo "1124. $at_setup_line: testing $at_desc ..."
+  $as_echo "1127. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -239428,14 +240149,14 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1124
-#AT_START_1125
-at_fn_group_banner 1125 'ofproto-dpif.at:6695' \
+#AT_STOP_1127
+#AT_START_1128
+at_fn_group_banner 1128 'ofproto-dpif.at:6695' \
   "ofproto-dpif - sFlow packet sampling - tunnel set" "" 57
 at_xfail=no
       test "$IS_WIN32" = "yes" && at_xfail=yes
 (
-  $as_echo "1125. $at_setup_line: testing $at_desc ..."
+  $as_echo "1128. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -239896,14 +240617,14 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1125
-#AT_START_1126
-at_fn_group_banner 1126 'ofproto-dpif.at:6764' \
+#AT_STOP_1128
+#AT_START_1129
+at_fn_group_banner 1129 'ofproto-dpif.at:6764' \
   "ofproto-dpif - sFlow packet sampling - tunnel push" "" 57
 at_xfail=no
       test "$IS_WIN32" = "yes" && at_xfail=yes
 (
-  $as_echo "1126. $at_setup_line: testing $at_desc ..."
+  $as_echo "1129. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -240503,14 +241224,14 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1126
-#AT_START_1127
-at_fn_group_banner 1127 'ofproto-dpif.at:6866' \
+#AT_STOP_1129
+#AT_START_1130
+at_fn_group_banner 1130 'ofproto-dpif.at:6866' \
   "ofproto-dpif - sFlow packet sampling - MPLS" "    " 57
 at_xfail=no
       test "$IS_WIN32" = "yes" && at_xfail=yes
 (
-  $as_echo "1127. $at_setup_line: testing $at_desc ..."
+  $as_echo "1130. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -240977,13 +241698,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1127
-#AT_START_1128
-at_fn_group_banner 1128 'ofproto-dpif.at:7002' \
+#AT_STOP_1130
+#AT_START_1131
+at_fn_group_banner 1131 'ofproto-dpif.at:7002' \
   "ofproto-dpif - NetFlow flow expiration - IPv4 collector" "" 57
 at_xfail=no
 (
-  $as_echo "1128. $at_setup_line: testing $at_desc ..."
+  $as_echo "1131. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -241368,13 +242089,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1128
-#AT_START_1129
-at_fn_group_banner 1129 'ofproto-dpif.at:7006' \
+#AT_STOP_1131
+#AT_START_1132
+at_fn_group_banner 1132 'ofproto-dpif.at:7006' \
   "ofproto-dpif - NetFlow flow expiration - IPv6 collector" "" 57
 at_xfail=no
 (
-  $as_echo "1129. $at_setup_line: testing $at_desc ..."
+  $as_echo "1132. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -241762,13 +242483,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1129
-#AT_START_1130
-at_fn_group_banner 1130 'ofproto-dpif.at:7086' \
+#AT_STOP_1132
+#AT_START_1133
+at_fn_group_banner 1133 'ofproto-dpif.at:7086' \
   "ofproto-dpif - NetFlow active expiration - IPv4 collector" "" 57
 at_xfail=no
 (
-  $as_echo "1130. $at_setup_line: testing $at_desc ..."
+  $as_echo "1133. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -242175,13 +242896,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1130
-#AT_START_1131
-at_fn_group_banner 1131 'ofproto-dpif.at:7090' \
+#AT_STOP_1133
+#AT_START_1134
+at_fn_group_banner 1134 'ofproto-dpif.at:7090' \
   "ofproto-dpif - NetFlow active expiration - IPv6 collector" "" 57
 at_xfail=no
 (
-  $as_echo "1131. $at_setup_line: testing $at_desc ..."
+  $as_echo "1134. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -242591,13 +243312,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1131
-#AT_START_1132
-at_fn_group_banner 1132 'ofproto-dpif.at:7098' \
+#AT_STOP_1134
+#AT_START_1135
+at_fn_group_banner 1135 'ofproto-dpif.at:7098' \
   "ofproto-dpif - Bridge IPFIX sanity check" "       " 57
 at_xfail=no
 (
-  $as_echo "1132. $at_setup_line: testing $at_desc ..."
+  $as_echo "1135. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -243029,13 +243750,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1132
-#AT_START_1133
-at_fn_group_banner 1133 'ofproto-dpif.at:7147' \
+#AT_STOP_1135
+#AT_START_1136
+at_fn_group_banner 1136 'ofproto-dpif.at:7147' \
   "ofproto-dpif - Bridge IPFIX statistics check" "   " 57
 at_xfail=no
 (
-  $as_echo "1133. $at_setup_line: testing $at_desc ..."
+  $as_echo "1136. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -243421,13 +244142,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1133
-#AT_START_1134
-at_fn_group_banner 1134 'ofproto-dpif.at:7191' \
+#AT_STOP_1136
+#AT_START_1137
+at_fn_group_banner 1137 'ofproto-dpif.at:7191' \
   "ofproto-dpif - Flow IPFIX sanity check" "         " 57
 at_xfail=no
 (
-  $as_echo "1134. $at_setup_line: testing $at_desc ..."
+  $as_echo "1137. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -243839,13 +244560,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1134
-#AT_START_1135
-at_fn_group_banner 1135 'ofproto-dpif.at:7241' \
+#AT_STOP_1137
+#AT_START_1138
+at_fn_group_banner 1138 'ofproto-dpif.at:7241' \
   "ofproto-dpif - Flow IPFIX sanity check - tunnel set" "" 57
 at_xfail=no
 (
-  $as_echo "1135. $at_setup_line: testing $at_desc ..."
+  $as_echo "1138. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -244378,13 +245099,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1135
-#AT_START_1136
-at_fn_group_banner 1136 'ofproto-dpif.at:7313' \
+#AT_STOP_1138
+#AT_START_1139
+at_fn_group_banner 1139 'ofproto-dpif.at:7313' \
   "ofproto-dpif - clone action" "                    " 57
 at_xfail=no
 (
-  $as_echo "1136. $at_setup_line: testing $at_desc ..."
+  $as_echo "1139. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -244979,13 +245700,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1136
-#AT_START_1137
-at_fn_group_banner 1137 'ofproto-dpif.at:7383' \
+#AT_STOP_1139
+#AT_START_1140
+at_fn_group_banner 1140 'ofproto-dpif.at:7383' \
   "ofproto-dpif - Flow IPFIX statistics check" "     " 57
 at_xfail=no
 (
-  $as_echo "1137. $at_setup_line: testing $at_desc ..."
+  $as_echo "1140. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -245407,13 +246128,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1137
-#AT_START_1138
-at_fn_group_banner 1138 'ofproto-dpif.at:7433' \
+#AT_STOP_1140
+#AT_START_1141
+at_fn_group_banner 1141 'ofproto-dpif.at:7433' \
   "ofproto-dpif - flow stats" "                      " 57
 at_xfail=no
 (
-  $as_echo "1138. $at_setup_line: testing $at_desc ..."
+  $as_echo "1141. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -245753,13 +246474,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1138
-#AT_START_1139
-at_fn_group_banner 1139 'ofproto-dpif.at:7454' \
+#AT_STOP_1141
+#AT_START_1142
+at_fn_group_banner 1142 'ofproto-dpif.at:7454' \
   "ofproto-dpif - flow stats reset_counts" "         " 57
 at_xfail=no
 (
-  $as_echo "1139. $at_setup_line: testing $at_desc ..."
+  $as_echo "1142. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -246517,13 +247238,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1139
-#AT_START_1140
-at_fn_group_banner 1140 'ofproto-dpif.at:7627' \
+#AT_STOP_1142
+#AT_START_1143
+at_fn_group_banner 1143 'ofproto-dpif.at:7627' \
   "ofproto-dpif - flow stats reset_counts OpenFlow1.5" "" 57
 at_xfail=no
 (
-  $as_echo "1140. $at_setup_line: testing $at_desc ..."
+  $as_echo "1143. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -247025,13 +247746,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1140
-#AT_START_1141
-at_fn_group_banner 1141 'ofproto-dpif.at:7713' \
+#AT_STOP_1143
+#AT_START_1144
+at_fn_group_banner 1144 'ofproto-dpif.at:7713' \
   "ofproto-dpif - flow stats, set-n-threads" "       " 57
 at_xfail=no
 (
-  $as_echo "1141. $at_setup_line: testing $at_desc ..."
+  $as_echo "1144. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -247359,13 +248080,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1141
-#AT_START_1142
-at_fn_group_banner 1142 'ofproto-dpif.at:7736' \
+#AT_STOP_1144
+#AT_START_1145
+at_fn_group_banner 1145 'ofproto-dpif.at:7736' \
   "ofproto-dpif - idle_age and hard_age increase over time" "" 57
 at_xfail=no
 (
-  $as_echo "1142. $at_setup_line: testing $at_desc ..."
+  $as_echo "1145. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -248012,13 +248733,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1142
-#AT_START_1143
-at_fn_group_banner 1143 'ofproto-dpif.at:7826' \
+#AT_STOP_1145
+#AT_START_1146
+at_fn_group_banner 1146 'ofproto-dpif.at:7826' \
   "ofproto-dpif - fin_timeout" "                     " 57
 at_xfail=no
 (
-  $as_echo "1143. $at_setup_line: testing $at_desc ..."
+  $as_echo "1146. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -248415,13 +249136,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1143
-#AT_START_1144
-at_fn_group_banner 1144 'ofproto-dpif.at:7860' \
+#AT_STOP_1146
+#AT_START_1147
+at_fn_group_banner 1147 'ofproto-dpif.at:7860' \
   "ofproto-dpif - ovs-appctl dpif/dump-dps" "        " 57
 at_xfail=no
 (
-  $as_echo "1144. $at_setup_line: testing $at_desc ..."
+  $as_echo "1147. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -248682,13 +249403,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1144
-#AT_START_1145
-at_fn_group_banner 1145 'ofproto-dpif.at:7872' \
+#AT_STOP_1147
+#AT_START_1148
+at_fn_group_banner 1148 'ofproto-dpif.at:7872' \
   "ofproto-dpif - ovs-appctl dpif/show" "            " 57
 at_xfail=no
 (
-  $as_echo "1145. $at_setup_line: testing $at_desc ..."
+  $as_echo "1148. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -248955,13 +249676,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1145
-#AT_START_1146
-at_fn_group_banner 1146 'ofproto-dpif.at:7891' \
+#AT_STOP_1148
+#AT_START_1149
+at_fn_group_banner 1149 'ofproto-dpif.at:7891' \
   "ofproto-dpif - ovs-appctl dpif/dump-flows" "      " 57
 at_xfail=no
 (
-  $as_echo "1146. $at_setup_line: testing $at_desc ..."
+  $as_echo "1149. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -249330,13 +250051,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1146
-#AT_START_1147
-at_fn_group_banner 1147 'ofproto-dpif.at:7949' \
+#AT_STOP_1149
+#AT_START_1150
+at_fn_group_banner 1150 'ofproto-dpif.at:7949' \
   "ofproto-dpif - ovs-appctl dpif/get-flow" "        " 57
 at_xfail=no
 (
-  $as_echo "1147. $at_setup_line: testing $at_desc ..."
+  $as_echo "1150. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -249636,13 +250357,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1147
-#AT_START_1148
-at_fn_group_banner 1148 'ofproto-dpif.at:7950' \
+#AT_STOP_1150
+#AT_START_1151
+at_fn_group_banner 1151 'ofproto-dpif.at:7950' \
   "ofproto-dpif - ovs-appctl dpif/get-flow - pmd" "  " 57
 at_xfail=no
 (
-  $as_echo "1148. $at_setup_line: testing $at_desc ..."
+  $as_echo "1151. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -249942,13 +250663,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1148
-#AT_START_1149
-at_fn_group_banner 1149 'ofproto-dpif.at:7952' \
+#AT_STOP_1151
+#AT_START_1152
+at_fn_group_banner 1152 'ofproto-dpif.at:7952' \
   "ofproto-dpif - MPLS actions that result in a userspace action" "" 57
 at_xfail=no
 (
-  $as_echo "1149. $at_setup_line: testing $at_desc ..."
+  $as_echo "1152. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -250275,13 +250996,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1149
-#AT_START_1150
-at_fn_group_banner 1150 'ofproto-dpif.at:7988' \
+#AT_STOP_1152
+#AT_START_1153
+at_fn_group_banner 1153 'ofproto-dpif.at:7988' \
   "ofproto-dpif - MPLS actions that result in a drop" "" 57
 at_xfail=no
 (
-  $as_echo "1150. $at_setup_line: testing $at_desc ..."
+  $as_echo "1153. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -250608,13 +251329,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1150
-#AT_START_1151
-at_fn_group_banner 1151 'ofproto-dpif.at:8026' \
+#AT_STOP_1153
+#AT_START_1154
+at_fn_group_banner 1154 'ofproto-dpif.at:8026' \
   "ofproto-dpif - patch ports" "                     " 57
 at_xfail=no
 (
-  $as_echo "1151. $at_setup_line: testing $at_desc ..."
+  $as_echo "1154. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -251096,13 +251817,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1151
-#AT_START_1152
-at_fn_group_banner 1152 'ofproto-dpif.at:8101' \
+#AT_STOP_1154
+#AT_START_1155
+at_fn_group_banner 1155 'ofproto-dpif.at:8101' \
   "ofproto-dpif - patch ports - stack" "             " 57
 at_xfail=no
 (
-  $as_echo "1152. $at_setup_line: testing $at_desc ..."
+  $as_echo "1155. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -251524,13 +252245,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1152
-#AT_START_1153
-at_fn_group_banner 1153 'ofproto-dpif.at:8150' \
+#AT_STOP_1155
+#AT_START_1156
+at_fn_group_banner 1156 'ofproto-dpif.at:8150' \
   "ofproto-dpif - port duration" "                   " 57
 at_xfail=no
 (
-  $as_echo "1153. $at_setup_line: testing $at_desc ..."
+  $as_echo "1156. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -251809,13 +252530,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1153
-#AT_START_1154
-at_fn_group_banner 1154 'ofproto-dpif.at:8170' \
+#AT_STOP_1156
+#AT_START_1157
+at_fn_group_banner 1157 'ofproto-dpif.at:8170' \
   "ofproto-dpif megaflow - port classification" "    " 58
 at_xfail=no
 (
-  $as_echo "1154. $at_setup_line: testing $at_desc ..."
+  $as_echo "1157. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -252139,13 +252860,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1154
-#AT_START_1155
-at_fn_group_banner 1155 'ofproto-dpif.at:8188' \
+#AT_STOP_1157
+#AT_START_1158
+at_fn_group_banner 1158 'ofproto-dpif.at:8188' \
   "ofproto-dpif megaflow - L2 classification" "      " 58
 at_xfail=no
 (
-  $as_echo "1155. $at_setup_line: testing $at_desc ..."
+  $as_echo "1158. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -252469,13 +253190,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1155
-#AT_START_1156
-at_fn_group_banner 1156 'ofproto-dpif.at:8206' \
+#AT_STOP_1158
+#AT_START_1159
+at_fn_group_banner 1159 'ofproto-dpif.at:8206' \
   "ofproto-dpif megaflow - L3 classification" "      " 58
 at_xfail=no
 (
-  $as_echo "1156. $at_setup_line: testing $at_desc ..."
+  $as_echo "1159. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -252814,13 +253535,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1156
-#AT_START_1157
-at_fn_group_banner 1157 'ofproto-dpif.at:8225' \
+#AT_STOP_1159
+#AT_START_1160
+at_fn_group_banner 1160 'ofproto-dpif.at:8225' \
   "ofproto-dpif megaflow - IPv6 classification" "    " 58
 at_xfail=no
 (
-  $as_echo "1157. $at_setup_line: testing $at_desc ..."
+  $as_echo "1160. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -253159,13 +253880,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1157
-#AT_START_1158
-at_fn_group_banner 1158 'ofproto-dpif.at:8244' \
+#AT_STOP_1160
+#AT_START_1161
+at_fn_group_banner 1161 'ofproto-dpif.at:8244' \
   "ofproto-dpif megaflow - L4 classification" "      " 58
 at_xfail=no
 (
-  $as_echo "1158. $at_setup_line: testing $at_desc ..."
+  $as_echo "1161. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -253489,13 +254210,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1158
-#AT_START_1159
-at_fn_group_banner 1159 'ofproto-dpif.at:8279' \
+#AT_STOP_1161
+#AT_START_1162
+at_fn_group_banner 1162 'ofproto-dpif.at:8279' \
   "ofproto-dpif megaflow - normal" "                 " 58
 at_xfail=no
 (
-  $as_echo "1159. $at_setup_line: testing $at_desc ..."
+  $as_echo "1162. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -253816,13 +254537,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1159
-#AT_START_1160
-at_fn_group_banner 1160 'ofproto-dpif.at:8280' \
+#AT_STOP_1162
+#AT_START_1163
+at_fn_group_banner 1163 'ofproto-dpif.at:8280' \
   "ofproto-dpif megaflow - normal - pmd" "           " 58
 at_xfail=no
 (
-  $as_echo "1160. $at_setup_line: testing $at_desc ..."
+  $as_echo "1163. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -254143,13 +254864,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1160
-#AT_START_1161
-at_fn_group_banner 1161 'ofproto-dpif.at:8282' \
+#AT_STOP_1163
+#AT_START_1164
+at_fn_group_banner 1164 'ofproto-dpif.at:8282' \
   "ofproto-dpif megaflow - mpls" "                   " 58
 at_xfail=no
 (
-  $as_echo "1161. $at_setup_line: testing $at_desc ..."
+  $as_echo "1164. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -254474,13 +255195,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1161
-#AT_START_1162
-at_fn_group_banner 1162 'ofproto-dpif.at:8328' \
+#AT_STOP_1164
+#AT_START_1165
+at_fn_group_banner 1165 'ofproto-dpif.at:8328' \
   "ofproto-dpif megaflow - netflow - IPv4 collector" "" 58
 at_xfail=no
 (
-  $as_echo "1162. $at_setup_line: testing $at_desc ..."
+  $as_echo "1165. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -254883,13 +255604,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1162
-#AT_START_1163
-at_fn_group_banner 1163 'ofproto-dpif.at:8332' \
+#AT_STOP_1165
+#AT_START_1166
+at_fn_group_banner 1166 'ofproto-dpif.at:8332' \
   "ofproto-dpif megaflow - netflow - IPv6 collector" "" 58
 at_xfail=no
 (
-  $as_echo "1163. $at_setup_line: testing $at_desc ..."
+  $as_echo "1166. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -255295,13 +256016,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1163
-#AT_START_1164
-at_fn_group_banner 1164 'ofproto-dpif.at:8360' \
+#AT_STOP_1166
+#AT_START_1167
+at_fn_group_banner 1167 'ofproto-dpif.at:8360' \
   "ofproto-dpif megaflow - normal, active-backup bonding - dummy" "" 58
 at_xfail=no
 (
-  $as_echo "1164. $at_setup_line: testing $at_desc ..."
+  $as_echo "1167. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -255644,13 +256365,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1164
-#AT_START_1165
-at_fn_group_banner 1165 'ofproto-dpif.at:8361' \
+#AT_STOP_1167
+#AT_START_1168
+at_fn_group_banner 1168 'ofproto-dpif.at:8361' \
   "ofproto-dpif megaflow - normal, active-backup bonding - dummy-pmd" "" 58
 at_xfail=no
 (
-  $as_echo "1165. $at_setup_line: testing $at_desc ..."
+  $as_echo "1168. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -255993,13 +256714,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1165
-#AT_START_1166
-at_fn_group_banner 1166 'ofproto-dpif.at:8363' \
+#AT_STOP_1168
+#AT_START_1169
+at_fn_group_banner 1169 'ofproto-dpif.at:8363' \
   "ofproto-dpif megaflow - normal, balance-slb bonding" "" 58
 at_xfail=no
 (
-  $as_echo "1166. $at_setup_line: testing $at_desc ..."
+  $as_echo "1169. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -256342,13 +257063,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1166
-#AT_START_1167
-at_fn_group_banner 1167 'ofproto-dpif.at:8384' \
+#AT_STOP_1169
+#AT_START_1170
+at_fn_group_banner 1170 'ofproto-dpif.at:8384' \
   "ofproto-dpif megaflow - normal, balance-tcp bonding" "" 58
 at_xfail=no
 (
-  $as_echo "1167. $at_setup_line: testing $at_desc ..."
+  $as_echo "1170. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -256732,13 +257453,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1167
-#AT_START_1168
-at_fn_group_banner 1168 'ofproto-dpif.at:8422' \
+#AT_STOP_1170
+#AT_START_1171
+at_fn_group_banner 1171 'ofproto-dpif.at:8422' \
   "ofproto-dpif megaflow - resubmit port action" "   " 58
 at_xfail=no
 (
-  $as_echo "1168. $at_setup_line: testing $at_desc ..."
+  $as_echo "1171. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -257063,13 +257784,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1168
-#AT_START_1169
-at_fn_group_banner 1169 'ofproto-dpif.at:8441' \
+#AT_STOP_1171
+#AT_START_1172
+at_fn_group_banner 1172 'ofproto-dpif.at:8441' \
   "ofproto-dpif megaflow - resubmit table action" "  " 58
 at_xfail=no
 (
-  $as_echo "1169. $at_setup_line: testing $at_desc ..."
+  $as_echo "1172. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -257396,13 +258117,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1169
-#AT_START_1170
-at_fn_group_banner 1170 'ofproto-dpif.at:8461' \
+#AT_STOP_1172
+#AT_START_1173
+at_fn_group_banner 1173 'ofproto-dpif.at:8461' \
   "ofproto-dpif megaflow - goto_table action" "      " 58
 at_xfail=no
 (
-  $as_echo "1170. $at_setup_line: testing $at_desc ..."
+  $as_echo "1173. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -257727,13 +258448,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1170
-#AT_START_1171
-at_fn_group_banner 1171 'ofproto-dpif.at:8480' \
+#AT_STOP_1173
+#AT_START_1174
+at_fn_group_banner 1174 'ofproto-dpif.at:8480' \
   "ofproto-dpif megaflow - mirroring, select_all" "  " 58
 at_xfail=no
 (
-  $as_echo "1171. $at_setup_line: testing $at_desc ..."
+  $as_echo "1174. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -258063,13 +258784,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1171
-#AT_START_1172
-at_fn_group_banner 1172 'ofproto-dpif.at:8504' \
+#AT_STOP_1174
+#AT_START_1175
+at_fn_group_banner 1175 'ofproto-dpif.at:8504' \
   "ofproto-dpif megaflow - mirroring, select_vlan" " " 58
 at_xfail=no
 (
-  $as_echo "1172. $at_setup_line: testing $at_desc ..."
+  $as_echo "1175. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -258398,13 +259119,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1172
-#AT_START_1173
-at_fn_group_banner 1173 'ofproto-dpif.at:8527' \
+#AT_STOP_1175
+#AT_START_1176
+at_fn_group_banner 1176 'ofproto-dpif.at:8527' \
   "ofproto-dpif megaflow - move action" "            " 58
 at_xfail=no
 (
-  $as_echo "1173. $at_setup_line: testing $at_desc ..."
+  $as_echo "1176. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -258730,13 +259451,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1173
-#AT_START_1174
-at_fn_group_banner 1174 'ofproto-dpif.at:8547' \
+#AT_STOP_1176
+#AT_START_1177
+at_fn_group_banner 1177 'ofproto-dpif.at:8547' \
   "ofproto-dpif megaflow - push action" "            " 58
 at_xfail=no
 (
-  $as_echo "1174. $at_setup_line: testing $at_desc ..."
+  $as_echo "1177. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -259060,13 +259781,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1174
-#AT_START_1175
-at_fn_group_banner 1175 'ofproto-dpif.at:8565' \
+#AT_STOP_1177
+#AT_START_1178
+at_fn_group_banner 1178 'ofproto-dpif.at:8565' \
   "ofproto-dpif megaflow - learning" "               " 58
 at_xfail=no
 (
-  $as_echo "1175. $at_setup_line: testing $at_desc ..."
+  $as_echo "1178. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -259398,13 +260119,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1175
-#AT_START_1176
-at_fn_group_banner 1176 'ofproto-dpif.at:8592' \
+#AT_STOP_1178
+#AT_START_1179
+at_fn_group_banner 1179 'ofproto-dpif.at:8592' \
   "ofproto-dpif megaflow - tunnels" "                " 58
 at_xfail=no
 (
-  $as_echo "1176. $at_setup_line: testing $at_desc ..."
+  $as_echo "1179. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -259814,13 +260535,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1176
-#AT_START_1177
-at_fn_group_banner 1177 'ofproto-dpif.at:8625' \
+#AT_STOP_1179
+#AT_START_1180
+at_fn_group_banner 1180 'ofproto-dpif.at:8625' \
   "ofproto-dpif megaflow - dec_ttl" "                " 58
 at_xfail=no
 (
-  $as_echo "1177. $at_setup_line: testing $at_desc ..."
+  $as_echo "1180. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -260159,13 +260880,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1177
-#AT_START_1178
-at_fn_group_banner 1178 'ofproto-dpif.at:8644' \
+#AT_STOP_1180
+#AT_START_1181
+at_fn_group_banner 1181 'ofproto-dpif.at:8644' \
   "ofproto-dpif megaflow - set dl_dst" "             " 58
 at_xfail=no
 (
-  $as_echo "1178. $at_setup_line: testing $at_desc ..."
+  $as_echo "1181. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -260489,13 +261210,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1178
-#AT_START_1179
-at_fn_group_banner 1179 'ofproto-dpif.at:8665' \
+#AT_STOP_1181
+#AT_START_1182
+at_fn_group_banner 1182 'ofproto-dpif.at:8665' \
   "ofproto-dpif megaflow - set dl_dst with match on dl_src" "" 58
 at_xfail=no
 (
-  $as_echo "1179. $at_setup_line: testing $at_desc ..."
+  $as_echo "1182. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -260835,13 +261556,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1179
-#AT_START_1180
-at_fn_group_banner 1180 'ofproto-dpif.at:8723' \
+#AT_STOP_1182
+#AT_START_1183
+at_fn_group_banner 1183 'ofproto-dpif.at:8723' \
   "ofproto-dpif megaflow - disabled" "               " 58
 at_xfail=no
 (
-  $as_echo "1180. $at_setup_line: testing $at_desc ..."
+  $as_echo "1183. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -261239,13 +261960,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1180
-#AT_START_1181
-at_fn_group_banner 1181 'ofproto-dpif.at:8724' \
+#AT_STOP_1183
+#AT_START_1184
+at_fn_group_banner 1184 'ofproto-dpif.at:8724' \
   "ofproto-dpif megaflow - disabled - pmd" "         " 58
 at_xfail=no
 (
-  $as_echo "1181. $at_setup_line: testing $at_desc ..."
+  $as_echo "1184. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -261643,13 +262364,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1181
-#AT_START_1182
-at_fn_group_banner 1182 'ofproto-dpif.at:8726' \
+#AT_STOP_1184
+#AT_START_1185
+at_fn_group_banner 1185 'ofproto-dpif.at:8726' \
   "ofproto-dpif - datapath port number change" "     " 58
 at_xfail=no
 (
-  $as_echo "1182. $at_setup_line: testing $at_desc ..."
+  $as_echo "1185. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -261975,13 +262696,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1182
-#AT_START_1183
-at_fn_group_banner 1183 'ofproto-dpif.at:8748' \
+#AT_STOP_1185
+#AT_START_1186
+at_fn_group_banner 1186 'ofproto-dpif.at:8748' \
   "ofproto - bundle with variable bfd/cfm config" "  " 58
 at_xfail=no
 (
-  $as_echo "1183. $at_setup_line: testing $at_desc ..."
+  $as_echo "1186. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -262471,13 +263192,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1183
-#AT_START_1184
-at_fn_group_banner 1184 'ofproto-dpif.at:8826' \
+#AT_STOP_1186
+#AT_START_1187
+at_fn_group_banner 1187 'ofproto-dpif.at:8826' \
   "ofproto-dpif - ofproto-dpif-monitor 1" "          " 58
 at_xfail=no
 (
-  $as_echo "1184. $at_setup_line: testing $at_desc ..."
+  $as_echo "1187. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -262973,13 +263694,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1184
-#AT_START_1185
-at_fn_group_banner 1185 'ofproto-dpif.at:8873' \
+#AT_STOP_1187
+#AT_START_1188
+at_fn_group_banner 1188 'ofproto-dpif.at:8873' \
   "ofproto-dpif - ofproto-dpif-monitor 2" "          " 58
 at_xfail=no
 (
-  $as_echo "1185. $at_setup_line: testing $at_desc ..."
+  $as_echo "1188. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -263239,13 +263960,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1185
-#AT_START_1186
-at_fn_group_banner 1186 'ofproto-dpif.at:8888' \
+#AT_STOP_1188
+#AT_START_1189
+at_fn_group_banner 1189 'ofproto-dpif.at:8888' \
   "ofproto-dpif - forward resubmit" "                " 59
 at_xfail=no
 (
-  $as_echo "1186. $at_setup_line: testing $at_desc ..."
+  $as_echo "1189. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -263537,13 +264258,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1186
-#AT_START_1187
-at_fn_group_banner 1187 'ofproto-dpif.at:8905' \
+#AT_STOP_1189
+#AT_START_1190
+at_fn_group_banner 1190 'ofproto-dpif.at:8905' \
   "ofproto-dpif - backward resubmit" "               " 59
 at_xfail=no
 (
-  $as_echo "1187. $at_setup_line: testing $at_desc ..."
+  $as_echo "1190. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -263853,13 +264574,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1187
-#AT_START_1188
-at_fn_group_banner 1188 'ofproto-dpif.at:8925' \
+#AT_STOP_1190
+#AT_START_1191
+at_fn_group_banner 1191 'ofproto-dpif.at:8925' \
   "ofproto-dpif - infinite resubmit" "               " 59
 at_xfail=no
 (
-  $as_echo "1188. $at_setup_line: testing $at_desc ..."
+  $as_echo "1191. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -264163,13 +264884,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1188
-#AT_START_1189
-at_fn_group_banner 1189 'ofproto-dpif.at:8941' \
+#AT_STOP_1191
+#AT_START_1192
+at_fn_group_banner 1192 'ofproto-dpif.at:8941' \
   "ofproto-dpif - backward resubmit without trace" " " 59
 at_xfail=no
 (
-  $as_echo "1189. $at_setup_line: testing $at_desc ..."
+  $as_echo "1192. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -264477,13 +265198,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1189
-#AT_START_1190
-at_fn_group_banner 1190 'ofproto-dpif.at:8964' \
+#AT_STOP_1192
+#AT_START_1193
+at_fn_group_banner 1193 'ofproto-dpif.at:8964' \
   "ofproto-dpif - exponential resubmit chain" "      " 59
 at_xfail=no
 (
-  $as_echo "1190. $at_setup_line: testing $at_desc ..."
+  $as_echo "1193. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -264793,13 +265514,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1190
-#AT_START_1191
-at_fn_group_banner 1191 'ofproto-dpif.at:8982' \
+#AT_STOP_1193
+#AT_START_1194
+at_fn_group_banner 1194 'ofproto-dpif.at:8982' \
   "ofproto-dpif - too many output actions" "         " 59
 at_xfail=no
 (
-  $as_echo "1191. $at_setup_line: testing $at_desc ..."
+  $as_echo "1194. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -265109,13 +265830,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1191
-#AT_START_1192
-at_fn_group_banner 1192 'ofproto-dpif.at:9000' \
+#AT_STOP_1194
+#AT_START_1195
+at_fn_group_banner 1195 'ofproto-dpif.at:9000' \
   "ofproto-dpif - stack too deep" "                  " 59
 at_xfail=no
 (
-  $as_echo "1192. $at_setup_line: testing $at_desc ..."
+  $as_echo "1195. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -265426,13 +266147,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1192
-#AT_START_1193
-at_fn_group_banner 1193 'ofproto-dpif.at:9020' \
+#AT_STOP_1195
+#AT_START_1196
+at_fn_group_banner 1196 'ofproto-dpif.at:9020' \
   "ofproto-dpif packet-out controller" "             " 59
 at_xfail=no
 (
-  $as_echo "1193. $at_setup_line: testing $at_desc ..."
+  $as_echo "1196. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -265844,13 +266565,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1193
-#AT_START_1194
-at_fn_group_banner 1194 'ofproto-dpif.at:9064' \
+#AT_STOP_1196
+#AT_START_1197
+at_fn_group_banner 1197 'ofproto-dpif.at:9064' \
   "ofproto-dpif packet-out controller (patch port)" "" 59
 at_xfail=no
 (
-  $as_echo "1194. $at_setup_line: testing $at_desc ..."
+  $as_echo "1197. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -266264,13 +266985,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1194
-#AT_START_1195
-at_fn_group_banner 1195 'ofproto-dpif.at:9117' \
+#AT_STOP_1197
+#AT_START_1198
+at_fn_group_banner 1198 'ofproto-dpif.at:9117' \
   "ofproto-dpif packet-out pipeline match field (OpenFlow 1.5)" "" 59
 at_xfail=no
 (
-  $as_echo "1195. $at_setup_line: testing $at_desc ..."
+  $as_echo "1198. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -266763,13 +267484,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1195
-#AT_START_1196
-at_fn_group_banner 1196 'ofproto-dpif.at:9167' \
+#AT_STOP_1198
+#AT_START_1199
+at_fn_group_banner 1199 'ofproto-dpif.at:9167' \
   "ofproto-dpif packet-out goto_table" "             " 59
 at_xfail=no
 (
-  $as_echo "1196. $at_setup_line: testing $at_desc ..."
+  $as_echo "1199. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -267199,13 +267920,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1196
-#AT_START_1197
-at_fn_group_banner 1197 'ofproto-dpif.at:9221' \
+#AT_STOP_1199
+#AT_START_1200
+at_fn_group_banner 1200 'ofproto-dpif.at:9221' \
   "ofproto-dpif packet-out table-miss (continue)" "  " 59
 at_xfail=no
 (
-  $as_echo "1197. $at_setup_line: testing $at_desc ..."
+  $as_echo "1200. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -267645,13 +268366,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1197
-#AT_START_1198
-at_fn_group_banner 1198 'ofproto-dpif.at:9271' \
+#AT_STOP_1200
+#AT_START_1201
+at_fn_group_banner 1201 'ofproto-dpif.at:9271' \
   "ofproto-dpif - ICMPv6" "                          " 59
 at_xfail=no
 (
-  $as_echo "1198. $at_setup_line: testing $at_desc ..."
+  $as_echo "1201. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -267982,13 +268703,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1198
-#AT_START_1199
-at_fn_group_banner 1199 'ofproto-dpif.at:9291' \
+#AT_STOP_1201
+#AT_START_1202
+at_fn_group_banner 1202 'ofproto-dpif.at:9291' \
   "ofproto-dpif - ICMPv6 type match" "               " 59
 at_xfail=no
 (
-  $as_echo "1199. $at_setup_line: testing $at_desc ..."
+  $as_echo "1202. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -268393,13 +269114,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1199
-#AT_START_1200
-at_fn_group_banner 1200 'ofproto-dpif.at:9321' \
+#AT_STOP_1202
+#AT_START_1203
+at_fn_group_banner 1203 'ofproto-dpif.at:9321' \
   "ofproto-dpif - Neighbor Discovery set-field with checksum update" "" 59
 at_xfail=no
 (
-  $as_echo "1200. $at_setup_line: testing $at_desc ..."
+  $as_echo "1203. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -268745,13 +269466,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1200
-#AT_START_1201
-at_fn_group_banner 1201 'ofproto-dpif.at:9343' \
+#AT_STOP_1203
+#AT_START_1204
+at_fn_group_banner 1204 'ofproto-dpif.at:9343' \
   "ofproto-dpif - vlan matching" "                   " 59
 at_xfail=no
 (
-  $as_echo "1201. $at_setup_line: testing $at_desc ..."
+  $as_echo "1204. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -269080,13 +269801,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1201
-#AT_START_1202
-at_fn_group_banner 1202 'ofproto-dpif.at:9361' \
+#AT_STOP_1204
+#AT_START_1205
+at_fn_group_banner 1205 'ofproto-dpif.at:9361' \
   "ofproto-dpif - in place modification" "           " 59
 at_xfail=no
 (
-  $as_echo "1202. $at_setup_line: testing $at_desc ..."
+  $as_echo "1205. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -269484,13 +270205,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1202
-#AT_START_1203
-at_fn_group_banner 1203 'ofproto-dpif.at:9406' \
+#AT_STOP_1205
+#AT_START_1206
+at_fn_group_banner 1206 'ofproto-dpif.at:9406' \
   "ofproto-dpif - in place modification (vlan)" "    " 59
 at_xfail=no
 (
-  $as_echo "1203. $at_setup_line: testing $at_desc ..."
+  $as_echo "1206. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -269990,13 +270711,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1203
-#AT_START_1204
-at_fn_group_banner 1204 'ofproto-dpif.at:9488' \
+#AT_STOP_1206
+#AT_START_1207
+at_fn_group_banner 1207 'ofproto-dpif.at:9488' \
   "ofproto-dpif - trace (unchanged)" "               " 59
 at_xfail=no
 (
-  $as_echo "1204. $at_setup_line: testing $at_desc ..."
+  $as_echo "1207. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -270301,13 +271022,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1204
-#AT_START_1205
-at_fn_group_banner 1205 'ofproto-dpif.at:9500' \
+#AT_STOP_1207
+#AT_START_1208
+at_fn_group_banner 1208 'ofproto-dpif.at:9500' \
   "ofproto-dpif - conntrack - controller" "          " 59
 at_xfail=no
 (
-  $as_echo "1205. $at_setup_line: testing $at_desc ..."
+  $as_echo "1208. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -270813,13 +271534,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1205
-#AT_START_1206
-at_fn_group_banner 1206 'ofproto-dpif.at:9626' \
+#AT_STOP_1208
+#AT_START_1209
+at_fn_group_banner 1209 'ofproto-dpif.at:9626' \
   "ofproto-dpif - conntrack - force commit" "        " 59
 at_xfail=no
 (
-  $as_echo "1206. $at_setup_line: testing $at_desc ..."
+  $as_echo "1209. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -271331,13 +272052,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1206
-#AT_START_1207
-at_fn_group_banner 1207 'ofproto-dpif.at:9708' \
+#AT_STOP_1209
+#AT_START_1210
+at_fn_group_banner 1210 'ofproto-dpif.at:9708' \
   "ofproto-dpif - conntrack - ipv6" "                " 59
 at_xfail=no
 (
-  $as_echo "1207. $at_setup_line: testing $at_desc ..."
+  $as_echo "1210. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -271737,13 +272458,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1207
-#AT_START_1208
-at_fn_group_banner 1208 'ofproto-dpif.at:9758' \
+#AT_STOP_1210
+#AT_START_1211
+at_fn_group_banner 1211 'ofproto-dpif.at:9758' \
   "ofproto-dpif - conntrack - output action" "       " 59
 at_xfail=no
 (
-  $as_echo "1208. $at_setup_line: testing $at_desc ..."
+  $as_echo "1211. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -272131,13 +272852,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1208
-#AT_START_1209
-at_fn_group_banner 1209 'ofproto-dpif.at:9817' \
+#AT_STOP_1211
+#AT_START_1212
+at_fn_group_banner 1212 'ofproto-dpif.at:9817' \
   "ofproto-dpif - conntrack - expiration" "          " 59
 at_xfail=no
 (
-  $as_echo "1209. $at_setup_line: testing $at_desc ..."
+  $as_echo "1212. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -272555,13 +273276,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1209
-#AT_START_1210
-at_fn_group_banner 1210 'ofproto-dpif.at:9871' \
+#AT_STOP_1212
+#AT_START_1213
+at_fn_group_banner 1213 'ofproto-dpif.at:9871' \
   "ofproto-dpif - conntrack - untrackable traffic" " " 59
 at_xfail=no
 (
-  $as_echo "1210. $at_setup_line: testing $at_desc ..."
+  $as_echo "1213. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -272938,13 +273659,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1210
-#AT_START_1211
-at_fn_group_banner 1211 'ofproto-dpif.at:9903' \
+#AT_STOP_1213
+#AT_START_1214
+at_fn_group_banner 1214 'ofproto-dpif.at:9903' \
   "ofproto-dpif - conntrack - zones" "               " 59
 at_xfail=no
 (
-  $as_echo "1211. $at_setup_line: testing $at_desc ..."
+  $as_echo "1214. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -273400,13 +274121,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1211
-#AT_START_1212
-at_fn_group_banner 1212 'ofproto-dpif.at:9968' \
+#AT_STOP_1214
+#AT_START_1215
+at_fn_group_banner 1215 'ofproto-dpif.at:9968' \
   "ofproto-dpif - conntrack - recirc,commit" "       " 59
 at_xfail=no
 (
-  $as_echo "1212. $at_setup_line: testing $at_desc ..."
+  $as_echo "1215. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -273806,13 +274527,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1212
-#AT_START_1213
-at_fn_group_banner 1213 'ofproto-dpif.at:10018' \
+#AT_STOP_1215
+#AT_START_1216
+at_fn_group_banner 1216 'ofproto-dpif.at:10018' \
   "ofproto-dpif - conntrack - ICMP related" "        " 59
 at_xfail=no
 (
-  $as_echo "1213. $at_setup_line: testing $at_desc ..."
+  $as_echo "1216. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -274197,13 +274918,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1213
-#AT_START_1214
-at_fn_group_banner 1214 'ofproto-dpif.at:10068' \
+#AT_STOP_1216
+#AT_START_1217
+at_fn_group_banner 1217 'ofproto-dpif.at:10068' \
   "ofproto-dpif - conntrack - ct_mark" "             " 59
 at_xfail=no
 (
-  $as_echo "1214. $at_setup_line: testing $at_desc ..."
+  $as_echo "1217. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -274658,13 +275379,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1214
-#AT_START_1215
-at_fn_group_banner 1215 'ofproto-dpif.at:10129' \
+#AT_STOP_1217
+#AT_START_1218
+at_fn_group_banner 1218 'ofproto-dpif.at:10129' \
   "ofproto-dpif - conntrack - ct_label" "            " 59
 at_xfail=no
 (
-  $as_echo "1215. $at_setup_line: testing $at_desc ..."
+  $as_echo "1218. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -275079,13 +275800,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1215
-#AT_START_1216
-at_fn_group_banner 1216 'ofproto-dpif.at:10177' \
+#AT_STOP_1218
+#AT_START_1219
+at_fn_group_banner 1219 'ofproto-dpif.at:10177' \
   "ofproto-dpif - conntrack - ct_label datapath flow" "" 59
 at_xfail=no
 (
-  $as_echo "1216. $at_setup_line: testing $at_desc ..."
+  $as_echo "1219. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -275424,13 +276145,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1216
-#AT_START_1217
-at_fn_group_banner 1217 'ofproto-dpif.at:10225' \
+#AT_STOP_1219
+#AT_START_1220
+at_fn_group_banner 1220 'ofproto-dpif.at:10225' \
   "ofproto-dpif - conntrack - no output" "           " 59
 at_xfail=no
 (
-  $as_echo "1217. $at_setup_line: testing $at_desc ..."
+  $as_echo "1220. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -275744,13 +276465,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1217
-#AT_START_1218
-at_fn_group_banner 1218 'ofproto-dpif.at:10249' \
+#AT_STOP_1220
+#AT_START_1221
+at_fn_group_banner 1221 'ofproto-dpif.at:10249' \
   "ofproto-dpif - conntrack - tcp port reuse" "      " 59
 at_xfail=no
 (
-  $as_echo "1218. $at_setup_line: testing $at_desc ..."
+  $as_echo "1221. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -276375,13 +277096,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1218
-#AT_START_1219
-at_fn_group_banner 1219 'ofproto-dpif.at:10313' \
+#AT_STOP_1221
+#AT_START_1222
+at_fn_group_banner 1222 'ofproto-dpif.at:10313' \
   "ofproto-dpif - conntrack - tcp pick up" "         " 59
 at_xfail=no
 (
-  $as_echo "1219. $at_setup_line: testing $at_desc ..."
+  $as_echo "1222. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -276962,13 +277683,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1219
-#AT_START_1220
-at_fn_group_banner 1220 'ofproto-dpif.at:10398' \
+#AT_STOP_1222
+#AT_START_1223
+at_fn_group_banner 1223 'ofproto-dpif.at:10398' \
   "ofproto-dpif - conntrack - disable tcp sequence checking" "" 59
 at_xfail=no
 (
-  $as_echo "1220. $at_setup_line: testing $at_desc ..."
+  $as_echo "1223. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -278029,13 +278750,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1220
-#AT_START_1221
-at_fn_group_banner 1221 'ofproto-dpif.at:10539' \
+#AT_STOP_1223
+#AT_START_1224
+at_fn_group_banner 1224 'ofproto-dpif.at:10539' \
   "ofproto-dpif - conntrack - ct_clear" "            " 59
 at_xfail=no
 (
-  $as_echo "1221. $at_setup_line: testing $at_desc ..."
+  $as_echo "1224. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -278438,13 +279159,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1221
-#AT_START_1222
-at_fn_group_banner 1222 'ofproto-dpif.at:10596' \
+#AT_STOP_1224
+#AT_START_1225
+at_fn_group_banner 1225 'ofproto-dpif.at:10596' \
   "ofproto-dpif - conntrack - match masked ct fields" "" 59
 at_xfail=no
 (
-  $as_echo "1222. $at_setup_line: testing $at_desc ..."
+  $as_echo "1225. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -278898,13 +279619,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1222
-#AT_START_1223
-at_fn_group_banner 1223 'ofproto-dpif.at:10652' \
+#AT_STOP_1225
+#AT_START_1226
+at_fn_group_banner 1226 'ofproto-dpif.at:10652' \
   "ofproto-dpif - conntrack - ofproto/trace" "       " 59
 at_xfail=no
 (
-  $as_echo "1223. $at_setup_line: testing $at_desc ..."
+  $as_echo "1226. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -279313,13 +280034,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1223
-#AT_START_1224
-at_fn_group_banner 1224 'ofproto-dpif.at:10710' \
+#AT_STOP_1226
+#AT_START_1227
+at_fn_group_banner 1227 'ofproto-dpif.at:10710' \
   "ofproto - set mtu" "                              " 59
 at_xfail=no
 (
-  $as_echo "1224. $at_setup_line: testing $at_desc ..."
+  $as_echo "1227. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -279842,13 +280563,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1224
-#AT_START_1225
-at_fn_group_banner 1225 'ofproto-dpif.at:10760' \
+#AT_STOP_1227
+#AT_START_1228
+at_fn_group_banner 1228 'ofproto-dpif.at:10760' \
   "ofproto - fragment prerequisites" "               " 59
 at_xfail=no
 (
-  $as_echo "1225. $at_setup_line: testing $at_desc ..."
+  $as_echo "1228. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -280228,13 +280949,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1225
-#AT_START_1226
-at_fn_group_banner 1226 'ofproto-dpif.at:10795' \
+#AT_STOP_1228
+#AT_START_1229
+at_fn_group_banner 1229 'ofproto-dpif.at:10795' \
   "ofproto-dpif - check_pkt_larger action" "         " 59
 at_xfail=no
 (
-  $as_echo "1226. $at_setup_line: testing $at_desc ..."
+  $as_echo "1229. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -280951,13 +281672,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1226
-#AT_START_1227
-at_fn_group_banner 1227 'ofproto-dpif.at:10922' \
+#AT_STOP_1229
+#AT_START_1230
+at_fn_group_banner 1230 'ofproto-dpif.at:10922' \
   "ofproto-dpif - check_pkt_larger with continuation and ct" "" 59
 at_xfail=no
 (
-  $as_echo "1227. $at_setup_line: testing $at_desc ..."
+  $as_echo "1230. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -281342,13 +282063,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1227
-#AT_START_1228
-at_fn_group_banner 1228 'bridge.at:7' \
+#AT_STOP_1230
+#AT_START_1231
+at_fn_group_banner 1231 'bridge.at:7' \
   "bridge - ports that disappear get added back" "   " 60
 at_xfail=no
 (
-  $as_echo "1228. $at_setup_line: testing $at_desc ..."
+  $as_echo "1231. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -281672,13 +282393,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1228
-#AT_START_1229
-at_fn_group_banner 1229 'bridge.at:44' \
+#AT_STOP_1231
+#AT_START_1232
+at_fn_group_banner 1232 'bridge.at:44' \
   "bridge - multiple bridges share a controller" "   " 60
 at_xfail=no
 (
-  $as_echo "1229. $at_setup_line: testing $at_desc ..."
+  $as_echo "1232. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -282038,13 +282759,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1229
-#AT_START_1230
-at_fn_group_banner 1230 'bridge.at:83' \
+#AT_STOP_1232
+#AT_START_1233
+at_fn_group_banner 1233 'bridge.at:83' \
   "bridge - add port after stopping controller" "    " 60
 at_xfail=no
 (
-  $as_echo "1230. $at_setup_line: testing $at_desc ..."
+  $as_echo "1233. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -282400,13 +283121,281 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1230
-#AT_START_1231
-at_fn_group_banner 1231 'netdev-type.at:4' \
+#AT_STOP_1233
+#AT_START_1234
+at_fn_group_banner 1234 'bridge.at:107' \
+  "bridge - change ofproto versions" "               " 60
+at_xfail=no
+(
+  $as_echo "1234. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+   touch .conf.db.~lock~
+   { set +x
+$as_echo "$at_srcdir/bridge.at:109: ovsdb-tool create conf.db \$abs_top_srcdir/vswitchd/vswitch.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema" "bridge.at:109"
+( $at_check_trace; ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:109"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/bridge.at:109: ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:\$OVS_RUNDIR/db.sock"
+at_fn_check_prepare_dynamic "ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock" "bridge.at:109"
+( $at_check_trace; ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:109"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   on_exit "kill `cat ovsdb-server.pid`"
+   { set +x
+$as_echo "$at_srcdir/bridge.at:109: sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "bridge.at:109"
+( $at_check_trace; sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:109"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+
+
+      { set +x
+$as_echo "$at_srcdir/bridge.at:109: ovs-vsctl --no-wait init "
+at_fn_check_prepare_trace "bridge.at:109"
+( $at_check_trace; ovs-vsctl --no-wait init
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:109"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+      { set +x
+$as_echo "$at_srcdir/bridge.at:109: ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl"
+at_fn_check_prepare_trace "bridge.at:109"
+( $at_check_trace; ovs-vswitchd --enable-dummy --disable-system --disable-system-route  --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:109"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log"
+$at_traceon; }
+
+
+   on_exit "kill_ovs_vswitchd `cat ovs-vswitchd.pid`"
+   { set +x
+$as_echo "$at_srcdir/bridge.at:109: sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'"
+at_fn_check_prepare_notrace 'an embedded newline' "bridge.at:109"
+( $at_check_trace; sed < stderr '
+/ovs_numa|INFO|Discovered /d
+/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
+/reconnect|INFO|/d
+/dpif_netlink|INFO|Generic Netlink family .ovs_datapath. does not exist/d
+/ofproto|INFO|using datapath ID/d
+/netdev_linux|INFO|.*device has unknown hardware address family/d
+/ofproto|INFO|datapath ID changed to fedcba9876543210/d
+/dpdk|INFO|DPDK Disabled - Use other_config:dpdk-init to enable/d
+/netlink_socket|INFO|netlink: could not enable listening to all nsid/d
+/probe tc:/d
+/tc: Using policy/d'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:109"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+   { set +x
+$as_echo "$at_srcdir/bridge.at:109: add_of_br 0 add-br vr_test0 -- \\
+     set bridge vr_test0 datapath-type=dummy \\
+                         protocols=OpenFlow10 "
+at_fn_check_prepare_notrace 'an embedded newline' "bridge.at:109"
+( $at_check_trace; add_of_br 0 add-br vr_test0 -- \
+     set bridge vr_test0 datapath-type=dummy \
+                         protocols=OpenFlow10
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:109"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+
+{ set +x
+$as_echo "$at_srcdir/bridge.at:115: ovs-vsctl set bridge vr_test0 protocols=OpenFlow10,OpenFlow14"
+at_fn_check_prepare_trace "bridge.at:115"
+( $at_check_trace; ovs-vsctl set bridge vr_test0 protocols=OpenFlow10,OpenFlow14
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:115"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/bridge.at:118: ovs-ofctl add-flow vr_test0 --bundle actions=normal"
+at_fn_check_prepare_trace "bridge.at:118"
+( $at_check_trace; ovs-ofctl add-flow vr_test0 --bundle actions=normal
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:118"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+
+{ set +x
+$as_echo "$at_srcdir/bridge.at:120: test -e \$OVS_RUNDIR/ovs-vswitchd.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovs-vswitchd.pid" "bridge.at:120"
+( $at_check_trace; test -e $OVS_RUNDIR/ovs-vswitchd.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:120"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovs-vswitchd.pid)
+   { set +x
+$as_echo "$at_srcdir/bridge.at:120: ovs-appctl -t ovs-vswitchd exit --cleanup"
+at_fn_check_prepare_trace "bridge.at:120"
+( $at_check_trace; ovs-appctl -t ovs-vswitchd exit --cleanup
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:120"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "bridge.at:120" "while kill -0 \$TMPPID 2>/dev/null"
+
+{ set +x
+$as_echo "$at_srcdir/bridge.at:121: test -e \$OVS_RUNDIR/ovsdb-server.pid"
+at_fn_check_prepare_dynamic "test -e $OVS_RUNDIR/ovsdb-server.pid" "bridge.at:121"
+( $at_check_trace; test -e $OVS_RUNDIR/ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:121"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   TMPPID=$(cat $OVS_RUNDIR/ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/bridge.at:121: ovs-appctl -t ovsdb-server exit"
+at_fn_check_prepare_trace "bridge.at:121"
+( $at_check_trace; ovs-appctl -t ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/bridge.at:121"
+$at_failed && at_fn_log_failure  \
+"ovsdb-server.log" \
+"ovs-vswitchd.log"
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "bridge.at:121" "while kill -0 \$TMPPID 2>/dev/null"
+
+ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_1234
+#AT_START_1235
+at_fn_group_banner 1235 'netdev-type.at:4' \
   "bridge - set MAC address of internal port" "      " 61
 at_xfail=no
 (
-  $as_echo "1231. $at_setup_line: testing $at_desc ..."
+  $as_echo "1235. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -282689,13 +283678,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1231
-#AT_START_1232
-at_fn_group_banner 1232 'ovsdb-log.at:3' \
+#AT_STOP_1235
+#AT_START_1236
+at_fn_group_banner 1236 'ovsdb-log.at:3' \
   "create empty, reread" "                           " 62
 at_xfail=no
 (
-  $as_echo "1232. $at_setup_line: testing $at_desc ..."
+  $as_echo "1236. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -282754,13 +283743,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1232
-#AT_START_1233
-at_fn_group_banner 1233 'ovsdb-log.at:18' \
+#AT_STOP_1236
+#AT_START_1237
+at_fn_group_banner 1237 'ovsdb-log.at:18' \
   "write one, reread" "                              " 62
 at_xfail=no
 (
-  $as_echo "1233. $at_setup_line: testing $at_desc ..."
+  $as_echo "1237. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -282821,13 +283810,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1233
-#AT_START_1234
-at_fn_group_banner 1234 'ovsdb-log.at:35' \
+#AT_STOP_1237
+#AT_START_1238
+at_fn_group_banner 1238 'ovsdb-log.at:35' \
   "check that create fails if file exists" "         " 62
 at_xfail=no
 (
-  $as_echo "1234. $at_setup_line: testing $at_desc ..."
+  $as_echo "1238. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -282920,13 +283909,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1234
-#AT_START_1235
-at_fn_group_banner 1235 'ovsdb-log.at:60' \
+#AT_STOP_1238
+#AT_START_1239
+at_fn_group_banner 1239 'ovsdb-log.at:60' \
   "write one, reread" "                              " 62
 at_xfail=no
 (
-  $as_echo "1235. $at_setup_line: testing $at_desc ..."
+  $as_echo "1239. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -282991,13 +283980,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1235
-#AT_START_1236
-at_fn_group_banner 1236 'ovsdb-log.at:81' \
+#AT_STOP_1239
+#AT_START_1240
+at_fn_group_banner 1240 'ovsdb-log.at:81' \
   "write one, replace, commit" "                     " 62
 at_xfail=no
 (
-  $as_echo "1236. $at_setup_line: testing $at_desc ..."
+  $as_echo "1240. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283086,13 +284075,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1236
-#AT_START_1237
-at_fn_group_banner 1237 'ovsdb-log.at:118' \
+#AT_STOP_1240
+#AT_START_1241
+at_fn_group_banner 1241 'ovsdb-log.at:118' \
   "write one, replace, abort" "                      " 62
 at_xfail=no
 (
-  $as_echo "1237. $at_setup_line: testing $at_desc ..."
+  $as_echo "1241. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283181,13 +284170,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1237
-#AT_START_1238
-at_fn_group_banner 1238 'ovsdb-log.at:155' \
+#AT_STOP_1241
+#AT_START_1242
+at_fn_group_banner 1242 'ovsdb-log.at:155' \
   "write one, reread - alternative magic" "          " 62
 at_xfail=no
 (
-  $as_echo "1238. $at_setup_line: testing $at_desc ..."
+  $as_echo "1242. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283270,13 +284259,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1238
-#AT_START_1239
-at_fn_group_banner 1239 'ovsdb-log.at:182' \
+#AT_STOP_1242
+#AT_START_1243
+at_fn_group_banner 1243 'ovsdb-log.at:182' \
   "write one, reread, append" "                      " 62
 at_xfail=no
 (
-  $as_echo "1239. $at_setup_line: testing $at_desc ..."
+  $as_echo "1243. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283362,13 +284351,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1239
-#AT_START_1240
-at_fn_group_banner 1240 'ovsdb-log.at:212' \
+#AT_STOP_1243
+#AT_START_1244
+at_fn_group_banner 1244 'ovsdb-log.at:212' \
   "write, reread one, overwrite" "                   " 62
 at_xfail=no
 (
-  $as_echo "1240. $at_setup_line: testing $at_desc ..."
+  $as_echo "1244. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283450,13 +284439,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1240
-#AT_START_1241
-at_fn_group_banner 1241 'ovsdb-log.at:238' \
+#AT_STOP_1244
+#AT_START_1245
+at_fn_group_banner 1245 'ovsdb-log.at:238' \
   "write, add corrupted data, read" "                " 62
 at_xfail=no
 (
-  $as_echo "1241. $at_setup_line: testing $at_desc ..."
+  $as_echo "1245. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283535,13 +284524,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1241
-#AT_START_1242
-at_fn_group_banner 1242 'ovsdb-log.at:260' \
+#AT_STOP_1245
+#AT_START_1246
+at_fn_group_banner 1246 'ovsdb-log.at:260' \
   "write, add corrupted data, read, overwrite" "     " 62
 at_xfail=no
 (
-  $as_echo "1242. $at_setup_line: testing $at_desc ..."
+  $as_echo "1246. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283642,13 +284631,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1242
-#AT_START_1243
-at_fn_group_banner 1243 'ovsdb-log.at:292' \
+#AT_STOP_1246
+#AT_START_1247
+at_fn_group_banner 1247 'ovsdb-log.at:292' \
   "write, corrupt some data, read, overwrite" "      " 62
 at_xfail=no
 (
-  $as_echo "1243. $at_setup_line: testing $at_desc ..."
+  $as_echo "1247. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283777,13 +284766,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1243
-#AT_START_1244
-at_fn_group_banner 1244 'ovsdb-log.at:325' \
+#AT_STOP_1247
+#AT_START_1248
+at_fn_group_banner 1248 'ovsdb-log.at:325' \
   "write, truncate file, read, overwrite" "          " 62
 at_xfail=no
 (
-  $as_echo "1244. $at_setup_line: testing $at_desc ..."
+  $as_echo "1248. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -283912,13 +284901,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1244
-#AT_START_1245
-at_fn_group_banner 1245 'ovsdb-log.at:358' \
+#AT_STOP_1248
+#AT_START_1249
+at_fn_group_banner 1249 'ovsdb-log.at:358' \
   "write bad JSON, read, overwrite" "                " 62
 at_xfail=no
 (
-  $as_echo "1245. $at_setup_line: testing $at_desc ..."
+  $as_echo "1249. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284019,13 +285008,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1245
-#AT_START_1246
-at_fn_group_banner 1246 'ovsdb-types.at:3' \
+#AT_STOP_1249
+#AT_START_1250
+at_fn_group_banner 1250 'ovsdb-types.at:3' \
   "integer - C" "                                    " 63
 at_xfail=no
 (
-  $as_echo "1246. $at_setup_line: testing $at_desc ..."
+  $as_echo "1250. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284051,13 +285040,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1246
-#AT_START_1247
-at_fn_group_banner 1247 'ovsdb-types.at:3' \
+#AT_STOP_1250
+#AT_START_1251
+at_fn_group_banner 1251 'ovsdb-types.at:3' \
   "integer - Python3" "                              " 63
 at_xfail=no
 (
-  $as_echo "1247. $at_setup_line: testing $at_desc ..."
+  $as_echo "1251. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284084,13 +285073,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1247
-#AT_START_1248
-at_fn_group_banner 1248 'ovsdb-types.at:5' \
+#AT_STOP_1251
+#AT_START_1252
+at_fn_group_banner 1252 'ovsdb-types.at:5' \
   "real - C" "                                       " 63
 at_xfail=no
 (
-  $as_echo "1248. $at_setup_line: testing $at_desc ..."
+  $as_echo "1252. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284116,13 +285105,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1248
-#AT_START_1249
-at_fn_group_banner 1249 'ovsdb-types.at:5' \
+#AT_STOP_1252
+#AT_START_1253
+at_fn_group_banner 1253 'ovsdb-types.at:5' \
   "real - Python3" "                                 " 63
 at_xfail=no
 (
-  $as_echo "1249. $at_setup_line: testing $at_desc ..."
+  $as_echo "1253. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284149,13 +285138,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1249
-#AT_START_1250
-at_fn_group_banner 1250 'ovsdb-types.at:7' \
+#AT_STOP_1253
+#AT_START_1254
+at_fn_group_banner 1254 'ovsdb-types.at:7' \
   "boolean - C" "                                    " 63
 at_xfail=no
 (
-  $as_echo "1250. $at_setup_line: testing $at_desc ..."
+  $as_echo "1254. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284181,13 +285170,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1250
-#AT_START_1251
-at_fn_group_banner 1251 'ovsdb-types.at:7' \
+#AT_STOP_1254
+#AT_START_1255
+at_fn_group_banner 1255 'ovsdb-types.at:7' \
   "boolean - Python3" "                              " 63
 at_xfail=no
 (
-  $as_echo "1251. $at_setup_line: testing $at_desc ..."
+  $as_echo "1255. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284214,13 +285203,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1251
-#AT_START_1252
-at_fn_group_banner 1252 'ovsdb-types.at:9' \
+#AT_STOP_1255
+#AT_START_1256
+at_fn_group_banner 1256 'ovsdb-types.at:9' \
   "string - C" "                                     " 63
 at_xfail=no
 (
-  $as_echo "1252. $at_setup_line: testing $at_desc ..."
+  $as_echo "1256. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284246,13 +285235,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1252
-#AT_START_1253
-at_fn_group_banner 1253 'ovsdb-types.at:9' \
+#AT_STOP_1256
+#AT_START_1257
+at_fn_group_banner 1257 'ovsdb-types.at:9' \
   "string - Python3" "                               " 63
 at_xfail=no
 (
-  $as_echo "1253. $at_setup_line: testing $at_desc ..."
+  $as_echo "1257. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284279,13 +285268,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1253
-#AT_START_1254
-at_fn_group_banner 1254 'ovsdb-types.at:11' \
+#AT_STOP_1257
+#AT_START_1258
+at_fn_group_banner 1258 'ovsdb-types.at:11' \
   "uuid - C" "                                       " 63
 at_xfail=no
 (
-  $as_echo "1254. $at_setup_line: testing $at_desc ..."
+  $as_echo "1258. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284311,13 +285300,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1254
-#AT_START_1255
-at_fn_group_banner 1255 'ovsdb-types.at:11' \
+#AT_STOP_1258
+#AT_START_1259
+at_fn_group_banner 1259 'ovsdb-types.at:11' \
   "uuid - Python3" "                                 " 63
 at_xfail=no
 (
-  $as_echo "1255. $at_setup_line: testing $at_desc ..."
+  $as_echo "1259. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284344,13 +285333,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1255
-#AT_START_1256
-at_fn_group_banner 1256 'ovsdb-types.at:13' \
+#AT_STOP_1259
+#AT_START_1260
+at_fn_group_banner 1260 'ovsdb-types.at:13' \
   "void is not a valid atomic-type - C" "            " 63
 at_xfail=no
 (
-  $as_echo "1256. $at_setup_line: testing $at_desc ..."
+  $as_echo "1260. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284398,13 +285387,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1256
-#AT_START_1257
-at_fn_group_banner 1257 'ovsdb-types.at:13' \
+#AT_STOP_1260
+#AT_START_1261
+at_fn_group_banner 1261 'ovsdb-types.at:13' \
   "void is not a valid atomic-type - Python3" "      " 63
 at_xfail=no
 (
-  $as_echo "1257. $at_setup_line: testing $at_desc ..."
+  $as_echo "1261. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284452,13 +285441,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1257
-#AT_START_1258
-at_fn_group_banner 1258 'ovsdb-types.at:18' \
+#AT_STOP_1261
+#AT_START_1262
+at_fn_group_banner 1262 'ovsdb-types.at:18' \
   "integer enum - C" "                               " 64
 at_xfail=no
 (
-  $as_echo "1258. $at_setup_line: testing $at_desc ..."
+  $as_echo "1262. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284484,13 +285473,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1258
-#AT_START_1259
-at_fn_group_banner 1259 'ovsdb-types.at:18' \
+#AT_STOP_1262
+#AT_START_1263
+at_fn_group_banner 1263 'ovsdb-types.at:18' \
   "integer enum - Python3" "                         " 64
 at_xfail=no
 (
-  $as_echo "1259. $at_setup_line: testing $at_desc ..."
+  $as_echo "1263. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284517,13 +285506,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1259
-#AT_START_1260
-at_fn_group_banner 1260 'ovsdb-types.at:21' \
+#AT_STOP_1263
+#AT_START_1264
+at_fn_group_banner 1264 'ovsdb-types.at:21' \
   "integer >= 5 - C" "                               " 64
 at_xfail=no
 (
-  $as_echo "1260. $at_setup_line: testing $at_desc ..."
+  $as_echo "1264. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284549,13 +285538,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1260
-#AT_START_1261
-at_fn_group_banner 1261 'ovsdb-types.at:21' \
+#AT_STOP_1264
+#AT_START_1265
+at_fn_group_banner 1265 'ovsdb-types.at:21' \
   "integer >= 5 - Python3" "                         " 64
 at_xfail=no
 (
-  $as_echo "1261. $at_setup_line: testing $at_desc ..."
+  $as_echo "1265. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284582,13 +285571,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1261
-#AT_START_1262
-at_fn_group_banner 1262 'ovsdb-types.at:24' \
+#AT_STOP_1265
+#AT_START_1266
+at_fn_group_banner 1266 'ovsdb-types.at:24' \
   "integer <= 7 - C" "                               " 64
 at_xfail=no
 (
-  $as_echo "1262. $at_setup_line: testing $at_desc ..."
+  $as_echo "1266. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284614,13 +285603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1262
-#AT_START_1263
-at_fn_group_banner 1263 'ovsdb-types.at:24' \
+#AT_STOP_1266
+#AT_START_1267
+at_fn_group_banner 1267 'ovsdb-types.at:24' \
   "integer <= 7 - Python3" "                         " 64
 at_xfail=no
 (
-  $as_echo "1263. $at_setup_line: testing $at_desc ..."
+  $as_echo "1267. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284647,13 +285636,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1263
-#AT_START_1264
-at_fn_group_banner 1264 'ovsdb-types.at:27' \
+#AT_STOP_1267
+#AT_START_1268
+at_fn_group_banner 1268 'ovsdb-types.at:27' \
   "integer between -5 and 10 - C" "                  " 64
 at_xfail=no
 (
-  $as_echo "1264. $at_setup_line: testing $at_desc ..."
+  $as_echo "1268. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284679,13 +285668,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1264
-#AT_START_1265
-at_fn_group_banner 1265 'ovsdb-types.at:27' \
+#AT_STOP_1268
+#AT_START_1269
+at_fn_group_banner 1269 'ovsdb-types.at:27' \
   "integer between -5 and 10 - Python3" "            " 64
 at_xfail=no
 (
-  $as_echo "1265. $at_setup_line: testing $at_desc ..."
+  $as_echo "1269. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284712,13 +285701,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1265
-#AT_START_1266
-at_fn_group_banner 1266 'ovsdb-types.at:30' \
+#AT_STOP_1269
+#AT_START_1270
+at_fn_group_banner 1270 'ovsdb-types.at:30' \
   "integer max may not be less than min - C" "       " 64
 at_xfail=no
 (
-  $as_echo "1266. $at_setup_line: testing $at_desc ..."
+  $as_echo "1270. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284766,13 +285755,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1266
-#AT_START_1267
-at_fn_group_banner 1267 'ovsdb-types.at:30' \
+#AT_STOP_1270
+#AT_START_1271
+at_fn_group_banner 1271 'ovsdb-types.at:30' \
   "integer max may not be less than min - Python3" " " 64
 at_xfail=no
 (
-  $as_echo "1267. $at_setup_line: testing $at_desc ..."
+  $as_echo "1271. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284820,13 +285809,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1267
-#AT_START_1268
-at_fn_group_banner 1268 'ovsdb-types.at:34' \
+#AT_STOP_1271
+#AT_START_1272
+at_fn_group_banner 1272 'ovsdb-types.at:34' \
   "real enum - C" "                                  " 64
 at_xfail=no
 (
-  $as_echo "1268. $at_setup_line: testing $at_desc ..."
+  $as_echo "1272. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284852,13 +285841,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1268
-#AT_START_1269
-at_fn_group_banner 1269 'ovsdb-types.at:34' \
+#AT_STOP_1272
+#AT_START_1273
+at_fn_group_banner 1273 'ovsdb-types.at:34' \
   "real enum - Python3" "                            " 64
 at_xfail=no
 (
-  $as_echo "1269. $at_setup_line: testing $at_desc ..."
+  $as_echo "1273. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284885,13 +285874,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1269
-#AT_START_1270
-at_fn_group_banner 1270 'ovsdb-types.at:37' \
+#AT_STOP_1273
+#AT_START_1274
+at_fn_group_banner 1274 'ovsdb-types.at:37' \
   "real >= -1.5 - C" "                               " 64
 at_xfail=no
 (
-  $as_echo "1270. $at_setup_line: testing $at_desc ..."
+  $as_echo "1274. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284917,13 +285906,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1270
-#AT_START_1271
-at_fn_group_banner 1271 'ovsdb-types.at:37' \
+#AT_STOP_1274
+#AT_START_1275
+at_fn_group_banner 1275 'ovsdb-types.at:37' \
   "real >= -1.5 - Python3" "                         " 64
 at_xfail=no
 (
-  $as_echo "1271. $at_setup_line: testing $at_desc ..."
+  $as_echo "1275. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284950,13 +285939,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1271
-#AT_START_1272
-at_fn_group_banner 1272 'ovsdb-types.at:40' \
+#AT_STOP_1275
+#AT_START_1276
+at_fn_group_banner 1276 'ovsdb-types.at:40' \
   "real <= 1e5 - C" "                                " 64
 at_xfail=no
 (
-  $as_echo "1272. $at_setup_line: testing $at_desc ..."
+  $as_echo "1276. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -284982,13 +285971,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1272
-#AT_START_1273
-at_fn_group_banner 1273 'ovsdb-types.at:40' \
+#AT_STOP_1276
+#AT_START_1277
+at_fn_group_banner 1277 'ovsdb-types.at:40' \
   "real <= 1e5 - Python3" "                          " 64
 at_xfail=no
 (
-  $as_echo "1273. $at_setup_line: testing $at_desc ..."
+  $as_echo "1277. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285015,13 +286004,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1273
-#AT_START_1274
-at_fn_group_banner 1274 'ovsdb-types.at:43' \
+#AT_STOP_1277
+#AT_START_1278
+at_fn_group_banner 1278 'ovsdb-types.at:43' \
   "real between -2.5 and 3.75 - C" "                 " 64
 at_xfail=no
 (
-  $as_echo "1274. $at_setup_line: testing $at_desc ..."
+  $as_echo "1278. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285047,13 +286036,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1274
-#AT_START_1275
-at_fn_group_banner 1275 'ovsdb-types.at:43' \
+#AT_STOP_1278
+#AT_START_1279
+at_fn_group_banner 1279 'ovsdb-types.at:43' \
   "real between -2.5 and 3.75 - Python3" "           " 64
 at_xfail=no
 (
-  $as_echo "1275. $at_setup_line: testing $at_desc ..."
+  $as_echo "1279. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285080,13 +286069,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1275
-#AT_START_1276
-at_fn_group_banner 1276 'ovsdb-types.at:46' \
+#AT_STOP_1279
+#AT_START_1280
+at_fn_group_banner 1280 'ovsdb-types.at:46' \
   "real max may not be less than min - C" "          " 64
 at_xfail=no
 (
-  $as_echo "1276. $at_setup_line: testing $at_desc ..."
+  $as_echo "1280. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285134,13 +286123,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1276
-#AT_START_1277
-at_fn_group_banner 1277 'ovsdb-types.at:46' \
+#AT_STOP_1280
+#AT_START_1281
+at_fn_group_banner 1281 'ovsdb-types.at:46' \
   "real max may not be less than min - Python3" "    " 64
 at_xfail=no
 (
-  $as_echo "1277. $at_setup_line: testing $at_desc ..."
+  $as_echo "1281. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285188,13 +286177,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1277
-#AT_START_1278
-at_fn_group_banner 1278 'ovsdb-types.at:50' \
+#AT_STOP_1281
+#AT_START_1282
+at_fn_group_banner 1282 'ovsdb-types.at:50' \
   "boolean - C" "                                    " 64
 at_xfail=no
 (
-  $as_echo "1278. $at_setup_line: testing $at_desc ..."
+  $as_echo "1282. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285220,13 +286209,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1278
-#AT_START_1279
-at_fn_group_banner 1279 'ovsdb-types.at:50' \
+#AT_STOP_1282
+#AT_START_1283
+at_fn_group_banner 1283 'ovsdb-types.at:50' \
   "boolean - Python3" "                              " 64
 at_xfail=no
 (
-  $as_echo "1279. $at_setup_line: testing $at_desc ..."
+  $as_echo "1283. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285253,13 +286242,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1279
-#AT_START_1280
-at_fn_group_banner 1280 'ovsdb-types.at:52' \
+#AT_STOP_1283
+#AT_START_1284
+at_fn_group_banner 1284 'ovsdb-types.at:52' \
   "boolean enum - C" "                               " 64
 at_xfail=no
 (
-  $as_echo "1280. $at_setup_line: testing $at_desc ..."
+  $as_echo "1284. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285285,13 +286274,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1280
-#AT_START_1281
-at_fn_group_banner 1281 'ovsdb-types.at:52' \
+#AT_STOP_1284
+#AT_START_1285
+at_fn_group_banner 1285 'ovsdb-types.at:52' \
   "boolean enum - Python3" "                         " 64
 at_xfail=no
 (
-  $as_echo "1281. $at_setup_line: testing $at_desc ..."
+  $as_echo "1285. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285318,13 +286307,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1281
-#AT_START_1282
-at_fn_group_banner 1282 'ovsdb-types.at:56' \
+#AT_STOP_1285
+#AT_START_1286
+at_fn_group_banner 1286 'ovsdb-types.at:56' \
   "string enum - C" "                                " 64
 at_xfail=no
 (
-  $as_echo "1282. $at_setup_line: testing $at_desc ..."
+  $as_echo "1286. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285350,13 +286339,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1282
-#AT_START_1283
-at_fn_group_banner 1283 'ovsdb-types.at:56' \
+#AT_STOP_1286
+#AT_START_1287
+at_fn_group_banner 1287 'ovsdb-types.at:56' \
   "string enum - Python3" "                          " 64
 at_xfail=no
 (
-  $as_echo "1283. $at_setup_line: testing $at_desc ..."
+  $as_echo "1287. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285383,13 +286372,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1283
-#AT_START_1284
-at_fn_group_banner 1284 'ovsdb-types.at:59' \
+#AT_STOP_1287
+#AT_START_1288
+at_fn_group_banner 1288 'ovsdb-types.at:59' \
   "string minLength - C" "                           " 64
 at_xfail=no
 (
-  $as_echo "1284. $at_setup_line: testing $at_desc ..."
+  $as_echo "1288. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285415,13 +286404,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1284
-#AT_START_1285
-at_fn_group_banner 1285 'ovsdb-types.at:59' \
+#AT_STOP_1288
+#AT_START_1289
+at_fn_group_banner 1289 'ovsdb-types.at:59' \
   "string minLength - Python3" "                     " 64
 at_xfail=no
 (
-  $as_echo "1285. $at_setup_line: testing $at_desc ..."
+  $as_echo "1289. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285448,13 +286437,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1285
-#AT_START_1286
-at_fn_group_banner 1286 'ovsdb-types.at:62' \
+#AT_STOP_1289
+#AT_START_1290
+at_fn_group_banner 1290 'ovsdb-types.at:62' \
   "string maxLength - C" "                           " 64
 at_xfail=no
 (
-  $as_echo "1286. $at_setup_line: testing $at_desc ..."
+  $as_echo "1290. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285480,13 +286469,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1286
-#AT_START_1287
-at_fn_group_banner 1287 'ovsdb-types.at:62' \
+#AT_STOP_1290
+#AT_START_1291
+at_fn_group_banner 1291 'ovsdb-types.at:62' \
   "string maxLength - Python3" "                     " 64
 at_xfail=no
 (
-  $as_echo "1287. $at_setup_line: testing $at_desc ..."
+  $as_echo "1291. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285513,13 +286502,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1287
-#AT_START_1288
-at_fn_group_banner 1288 'ovsdb-types.at:65' \
+#AT_STOP_1291
+#AT_START_1292
+at_fn_group_banner 1292 'ovsdb-types.at:65' \
   "string minLength and maxLength - C" "             " 64
 at_xfail=no
 (
-  $as_echo "1288. $at_setup_line: testing $at_desc ..."
+  $as_echo "1292. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285545,13 +286534,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1288
-#AT_START_1289
-at_fn_group_banner 1289 'ovsdb-types.at:65' \
+#AT_STOP_1292
+#AT_START_1293
+at_fn_group_banner 1293 'ovsdb-types.at:65' \
   "string minLength and maxLength - Python3" "       " 64
 at_xfail=no
 (
-  $as_echo "1289. $at_setup_line: testing $at_desc ..."
+  $as_echo "1293. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285578,13 +286567,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1289
-#AT_START_1290
-at_fn_group_banner 1290 'ovsdb-types.at:68' \
+#AT_STOP_1293
+#AT_START_1294
+at_fn_group_banner 1294 'ovsdb-types.at:68' \
   "maxLength must not be less than minLength - C" "  " 64
 at_xfail=no
 (
-  $as_echo "1290. $at_setup_line: testing $at_desc ..."
+  $as_echo "1294. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285632,13 +286621,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1290
-#AT_START_1291
-at_fn_group_banner 1291 'ovsdb-types.at:68' \
+#AT_STOP_1294
+#AT_START_1295
+at_fn_group_banner 1295 'ovsdb-types.at:68' \
   "maxLength must not be less than minLength - Python3" "" 64
 at_xfail=no
 (
-  $as_echo "1291. $at_setup_line: testing $at_desc ..."
+  $as_echo "1295. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285686,13 +286675,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1291
-#AT_START_1292
-at_fn_group_banner 1292 'ovsdb-types.at:71' \
+#AT_STOP_1295
+#AT_START_1296
+at_fn_group_banner 1296 'ovsdb-types.at:71' \
   "maxLength must not be negative - C" "             " 64
 at_xfail=no
 (
-  $as_echo "1292. $at_setup_line: testing $at_desc ..."
+  $as_echo "1296. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285740,13 +286729,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1292
-#AT_START_1293
-at_fn_group_banner 1293 'ovsdb-types.at:71' \
+#AT_STOP_1296
+#AT_START_1297
+at_fn_group_banner 1297 'ovsdb-types.at:71' \
   "maxLength must not be negative - Python3" "       " 64
 at_xfail=no
 (
-  $as_echo "1293. $at_setup_line: testing $at_desc ..."
+  $as_echo "1297. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285794,13 +286783,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1293
-#AT_START_1294
-at_fn_group_banner 1294 'ovsdb-types.at:75' \
+#AT_STOP_1297
+#AT_START_1298
+at_fn_group_banner 1298 'ovsdb-types.at:75' \
   "uuid enum - C" "                                  " 64
 at_xfail=no
 (
-  $as_echo "1294. $at_setup_line: testing $at_desc ..."
+  $as_echo "1298. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285826,13 +286815,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1294
-#AT_START_1295
-at_fn_group_banner 1295 'ovsdb-types.at:75' \
+#AT_STOP_1298
+#AT_START_1299
+at_fn_group_banner 1299 'ovsdb-types.at:75' \
   "uuid enum - Python3" "                            " 64
 at_xfail=no
 (
-  $as_echo "1295. $at_setup_line: testing $at_desc ..."
+  $as_echo "1299. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285859,13 +286848,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1295
-#AT_START_1296
-at_fn_group_banner 1296 'ovsdb-types.at:78' \
+#AT_STOP_1299
+#AT_START_1300
+at_fn_group_banner 1300 'ovsdb-types.at:78' \
   "uuid refTable - C" "                              " 64
 at_xfail=no
 (
-  $as_echo "1296. $at_setup_line: testing $at_desc ..."
+  $as_echo "1300. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285891,13 +286880,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1296
-#AT_START_1297
-at_fn_group_banner 1297 'ovsdb-types.at:78' \
+#AT_STOP_1300
+#AT_START_1301
+at_fn_group_banner 1301 'ovsdb-types.at:78' \
   "uuid refTable - Python3" "                        " 64
 at_xfail=no
 (
-  $as_echo "1297. $at_setup_line: testing $at_desc ..."
+  $as_echo "1301. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285924,13 +286913,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1297
-#AT_START_1298
-at_fn_group_banner 1298 'ovsdb-types.at:81' \
+#AT_STOP_1301
+#AT_START_1302
+at_fn_group_banner 1302 'ovsdb-types.at:81' \
   "uuid refTable must be valid id - C" "             " 64
 at_xfail=no
 (
-  $as_echo "1298. $at_setup_line: testing $at_desc ..."
+  $as_echo "1302. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -285978,13 +286967,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1298
-#AT_START_1299
-at_fn_group_banner 1299 'ovsdb-types.at:81' \
+#AT_STOP_1302
+#AT_START_1303
+at_fn_group_banner 1303 'ovsdb-types.at:81' \
   "uuid refTable must be valid id - Python3" "       " 64
 at_xfail=no
 (
-  $as_echo "1299. $at_setup_line: testing $at_desc ..."
+  $as_echo "1303. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286032,13 +287021,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1299
-#AT_START_1300
-at_fn_group_banner 1300 'ovsdb-types.at:85' \
+#AT_STOP_1303
+#AT_START_1304
+at_fn_group_banner 1304 'ovsdb-types.at:85' \
   "void is not a valid base-type - C" "              " 64
 at_xfail=no
 (
-  $as_echo "1300. $at_setup_line: testing $at_desc ..."
+  $as_echo "1304. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286086,13 +287075,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1300
-#AT_START_1301
-at_fn_group_banner 1301 'ovsdb-types.at:85' \
+#AT_STOP_1304
+#AT_START_1305
+at_fn_group_banner 1305 'ovsdb-types.at:85' \
   "void is not a valid base-type - Python3" "        " 64
 at_xfail=no
 (
-  $as_echo "1301. $at_setup_line: testing $at_desc ..."
+  $as_echo "1305. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286140,13 +287129,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1301
-#AT_START_1302
-at_fn_group_banner 1302 'ovsdb-types.at:87' \
+#AT_STOP_1305
+#AT_START_1306
+at_fn_group_banner 1306 'ovsdb-types.at:87' \
   "\"type\" member must be present - C" "              " 64
 at_xfail=no
 (
-  $as_echo "1302. $at_setup_line: testing $at_desc ..."
+  $as_echo "1306. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286194,13 +287183,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1302
-#AT_START_1303
-at_fn_group_banner 1303 'ovsdb-types.at:87' \
+#AT_STOP_1306
+#AT_START_1307
+at_fn_group_banner 1307 'ovsdb-types.at:87' \
   "\"type\" member must be present - Python3" "        " 64
 at_xfail=no
 (
-  $as_echo "1303. $at_setup_line: testing $at_desc ..."
+  $as_echo "1307. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286248,13 +287237,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1303
-#AT_START_1304
-at_fn_group_banner 1304 'ovsdb-types.at:92' \
+#AT_STOP_1307
+#AT_START_1308
+at_fn_group_banner 1308 'ovsdb-types.at:92' \
   "simple integer - C" "                             " 65
 at_xfail=no
 (
-  $as_echo "1304. $at_setup_line: testing $at_desc ..."
+  $as_echo "1308. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286280,13 +287269,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1304
-#AT_START_1305
-at_fn_group_banner 1305 'ovsdb-types.at:92' \
+#AT_STOP_1308
+#AT_START_1309
+at_fn_group_banner 1309 'ovsdb-types.at:92' \
   "simple integer - Python3" "                       " 65
 at_xfail=no
 (
-  $as_echo "1305. $at_setup_line: testing $at_desc ..."
+  $as_echo "1309. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286313,13 +287302,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1305
-#AT_START_1306
-at_fn_group_banner 1306 'ovsdb-types.at:94' \
+#AT_STOP_1309
+#AT_START_1310
+at_fn_group_banner 1310 'ovsdb-types.at:94' \
   "simple real - C" "                                " 65
 at_xfail=no
 (
-  $as_echo "1306. $at_setup_line: testing $at_desc ..."
+  $as_echo "1310. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286345,13 +287334,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1306
-#AT_START_1307
-at_fn_group_banner 1307 'ovsdb-types.at:94' \
+#AT_STOP_1310
+#AT_START_1311
+at_fn_group_banner 1311 'ovsdb-types.at:94' \
   "simple real - Python3" "                          " 65
 at_xfail=no
 (
-  $as_echo "1307. $at_setup_line: testing $at_desc ..."
+  $as_echo "1311. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286378,13 +287367,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1307
-#AT_START_1308
-at_fn_group_banner 1308 'ovsdb-types.at:96' \
+#AT_STOP_1311
+#AT_START_1312
+at_fn_group_banner 1312 'ovsdb-types.at:96' \
   "simple boolean - C" "                             " 65
 at_xfail=no
 (
-  $as_echo "1308. $at_setup_line: testing $at_desc ..."
+  $as_echo "1312. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286410,13 +287399,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1308
-#AT_START_1309
-at_fn_group_banner 1309 'ovsdb-types.at:96' \
+#AT_STOP_1312
+#AT_START_1313
+at_fn_group_banner 1313 'ovsdb-types.at:96' \
   "simple boolean - Python3" "                       " 65
 at_xfail=no
 (
-  $as_echo "1309. $at_setup_line: testing $at_desc ..."
+  $as_echo "1313. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286443,13 +287432,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1309
-#AT_START_1310
-at_fn_group_banner 1310 'ovsdb-types.at:98' \
+#AT_STOP_1313
+#AT_START_1314
+at_fn_group_banner 1314 'ovsdb-types.at:98' \
   "simple string - C" "                              " 65
 at_xfail=no
 (
-  $as_echo "1310. $at_setup_line: testing $at_desc ..."
+  $as_echo "1314. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286475,13 +287464,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1310
-#AT_START_1311
-at_fn_group_banner 1311 'ovsdb-types.at:98' \
+#AT_STOP_1314
+#AT_START_1315
+at_fn_group_banner 1315 'ovsdb-types.at:98' \
   "simple string - Python3" "                        " 65
 at_xfail=no
 (
-  $as_echo "1311. $at_setup_line: testing $at_desc ..."
+  $as_echo "1315. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286508,13 +287497,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1311
-#AT_START_1312
-at_fn_group_banner 1312 'ovsdb-types.at:100' \
+#AT_STOP_1315
+#AT_START_1316
+at_fn_group_banner 1316 'ovsdb-types.at:100' \
   "simple uuid - C" "                                " 65
 at_xfail=no
 (
-  $as_echo "1312. $at_setup_line: testing $at_desc ..."
+  $as_echo "1316. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286540,13 +287529,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1312
-#AT_START_1313
-at_fn_group_banner 1313 'ovsdb-types.at:100' \
+#AT_STOP_1316
+#AT_START_1317
+at_fn_group_banner 1317 'ovsdb-types.at:100' \
   "simple uuid - Python3" "                          " 65
 at_xfail=no
 (
-  $as_echo "1313. $at_setup_line: testing $at_desc ..."
+  $as_echo "1317. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286573,13 +287562,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1313
-#AT_START_1314
-at_fn_group_banner 1314 'ovsdb-types.at:102' \
+#AT_STOP_1317
+#AT_START_1318
+at_fn_group_banner 1318 'ovsdb-types.at:102' \
   "integer in object - C" "                          " 65
 at_xfail=no
 (
-  $as_echo "1314. $at_setup_line: testing $at_desc ..."
+  $as_echo "1318. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286605,13 +287594,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1314
-#AT_START_1315
-at_fn_group_banner 1315 'ovsdb-types.at:102' \
+#AT_STOP_1318
+#AT_START_1319
+at_fn_group_banner 1319 'ovsdb-types.at:102' \
   "integer in object - Python3" "                    " 65
 at_xfail=no
 (
-  $as_echo "1315. $at_setup_line: testing $at_desc ..."
+  $as_echo "1319. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286638,13 +287627,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1315
-#AT_START_1316
-at_fn_group_banner 1316 'ovsdb-types.at:104' \
+#AT_STOP_1319
+#AT_START_1320
+at_fn_group_banner 1320 'ovsdb-types.at:104' \
   "real in object with explicit min and max - C" "   " 65
 at_xfail=no
 (
-  $as_echo "1316. $at_setup_line: testing $at_desc ..."
+  $as_echo "1320. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286670,13 +287659,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1316
-#AT_START_1317
-at_fn_group_banner 1317 'ovsdb-types.at:104' \
+#AT_STOP_1320
+#AT_START_1321
+at_fn_group_banner 1321 'ovsdb-types.at:104' \
   "real in object with explicit min and max - Python3" "" 65
 at_xfail=no
 (
-  $as_echo "1317. $at_setup_line: testing $at_desc ..."
+  $as_echo "1321. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286703,13 +287692,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1317
-#AT_START_1318
-at_fn_group_banner 1318 'ovsdb-types.at:107' \
+#AT_STOP_1321
+#AT_START_1322
+at_fn_group_banner 1322 'ovsdb-types.at:107' \
   "key type is required - C" "                       " 65
 at_xfail=no
 (
-  $as_echo "1318. $at_setup_line: testing $at_desc ..."
+  $as_echo "1322. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286757,13 +287746,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1318
-#AT_START_1319
-at_fn_group_banner 1319 'ovsdb-types.at:107' \
+#AT_STOP_1322
+#AT_START_1323
+at_fn_group_banner 1323 'ovsdb-types.at:107' \
   "key type is required - Python3" "                 " 65
 at_xfail=no
 (
-  $as_echo "1319. $at_setup_line: testing $at_desc ..."
+  $as_echo "1323. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286811,13 +287800,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1319
-#AT_START_1320
-at_fn_group_banner 1320 'ovsdb-types.at:109' \
+#AT_STOP_1323
+#AT_START_1324
+at_fn_group_banner 1324 'ovsdb-types.at:109' \
   "void is not a valid type - C" "                   " 65
 at_xfail=no
 (
-  $as_echo "1320. $at_setup_line: testing $at_desc ..."
+  $as_echo "1324. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286865,13 +287854,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1320
-#AT_START_1321
-at_fn_group_banner 1321 'ovsdb-types.at:109' \
+#AT_STOP_1324
+#AT_START_1325
+at_fn_group_banner 1325 'ovsdb-types.at:109' \
   "void is not a valid type - Python3" "             " 65
 at_xfail=no
 (
-  $as_echo "1321. $at_setup_line: testing $at_desc ..."
+  $as_echo "1325. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286919,13 +287908,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1321
-#AT_START_1322
-at_fn_group_banner 1322 'ovsdb-types.at:114' \
+#AT_STOP_1325
+#AT_START_1326
+at_fn_group_banner 1326 'ovsdb-types.at:114' \
   "optional boolean - C" "                           " 66
 at_xfail=no
 (
-  $as_echo "1322. $at_setup_line: testing $at_desc ..."
+  $as_echo "1326. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286951,13 +287940,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1322
-#AT_START_1323
-at_fn_group_banner 1323 'ovsdb-types.at:114' \
+#AT_STOP_1326
+#AT_START_1327
+at_fn_group_banner 1327 'ovsdb-types.at:114' \
   "optional boolean - Python3" "                     " 66
 at_xfail=no
 (
-  $as_echo "1323. $at_setup_line: testing $at_desc ..."
+  $as_echo "1327. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -286984,13 +287973,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1323
-#AT_START_1324
-at_fn_group_banner 1324 'ovsdb-types.at:118' \
+#AT_STOP_1327
+#AT_START_1328
+at_fn_group_banner 1328 'ovsdb-types.at:118' \
   "set of 1 to 3 uuids - C" "                        " 66
 at_xfail=no
 (
-  $as_echo "1324. $at_setup_line: testing $at_desc ..."
+  $as_echo "1328. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287016,13 +288005,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1324
-#AT_START_1325
-at_fn_group_banner 1325 'ovsdb-types.at:118' \
+#AT_STOP_1328
+#AT_START_1329
+at_fn_group_banner 1329 'ovsdb-types.at:118' \
   "set of 1 to 3 uuids - Python3" "                  " 66
 at_xfail=no
 (
-  $as_echo "1325. $at_setup_line: testing $at_desc ..."
+  $as_echo "1329. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287049,13 +288038,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1325
-#AT_START_1326
-at_fn_group_banner 1326 'ovsdb-types.at:121' \
+#AT_STOP_1329
+#AT_START_1330
+at_fn_group_banner 1330 'ovsdb-types.at:121' \
   "set of 0 to 3 strings - C" "                      " 66
 at_xfail=no
 (
-  $as_echo "1326. $at_setup_line: testing $at_desc ..."
+  $as_echo "1330. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287081,13 +288070,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1326
-#AT_START_1327
-at_fn_group_banner 1327 'ovsdb-types.at:121' \
+#AT_STOP_1330
+#AT_START_1331
+at_fn_group_banner 1331 'ovsdb-types.at:121' \
   "set of 0 to 3 strings - Python3" "                " 66
 at_xfail=no
 (
-  $as_echo "1327. $at_setup_line: testing $at_desc ..."
+  $as_echo "1331. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287114,13 +288103,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1327
-#AT_START_1328
-at_fn_group_banner 1328 'ovsdb-types.at:124' \
+#AT_STOP_1331
+#AT_START_1332
+at_fn_group_banner 1332 'ovsdb-types.at:124' \
   "set of 0 or more integers - C" "                  " 66
 at_xfail=no
 (
-  $as_echo "1328. $at_setup_line: testing $at_desc ..."
+  $as_echo "1332. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287146,13 +288135,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1328
-#AT_START_1329
-at_fn_group_banner 1329 'ovsdb-types.at:124' \
+#AT_STOP_1332
+#AT_START_1333
+at_fn_group_banner 1333 'ovsdb-types.at:124' \
   "set of 0 or more integers - Python3" "            " 66
 at_xfail=no
 (
-  $as_echo "1329. $at_setup_line: testing $at_desc ..."
+  $as_echo "1333. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287179,13 +288168,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1329
-#AT_START_1330
-at_fn_group_banner 1330 'ovsdb-types.at:127' \
+#AT_STOP_1333
+#AT_START_1334
+at_fn_group_banner 1334 'ovsdb-types.at:127' \
   "set of 1 or more reals - C" "                     " 66
 at_xfail=no
 (
-  $as_echo "1330. $at_setup_line: testing $at_desc ..."
+  $as_echo "1334. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287211,13 +288200,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1330
-#AT_START_1331
-at_fn_group_banner 1331 'ovsdb-types.at:127' \
+#AT_STOP_1334
+#AT_START_1335
+at_fn_group_banner 1335 'ovsdb-types.at:127' \
   "set of 1 or more reals - Python3" "               " 66
 at_xfail=no
 (
-  $as_echo "1331. $at_setup_line: testing $at_desc ..."
+  $as_echo "1335. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287244,13 +288233,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1331
-#AT_START_1332
-at_fn_group_banner 1332 'ovsdb-types.at:131' \
+#AT_STOP_1335
+#AT_START_1336
+at_fn_group_banner 1336 'ovsdb-types.at:131' \
   "set max cannot be less than min - C" "            " 66
 at_xfail=no
 (
-  $as_echo "1332. $at_setup_line: testing $at_desc ..."
+  $as_echo "1336. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287298,13 +288287,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1332
-#AT_START_1333
-at_fn_group_banner 1333 'ovsdb-types.at:131' \
+#AT_STOP_1336
+#AT_START_1337
+at_fn_group_banner 1337 'ovsdb-types.at:131' \
   "set max cannot be less than min - Python3" "      " 66
 at_xfail=no
 (
-  $as_echo "1333. $at_setup_line: testing $at_desc ..."
+  $as_echo "1337. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287352,13 +288341,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1333
-#AT_START_1334
-at_fn_group_banner 1334 'ovsdb-types.at:134' \
+#AT_STOP_1337
+#AT_START_1338
+at_fn_group_banner 1338 'ovsdb-types.at:134' \
   "set max cannot be negative - C" "                 " 66
 at_xfail=no
 (
-  $as_echo "1334. $at_setup_line: testing $at_desc ..."
+  $as_echo "1338. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287406,13 +288395,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1334
-#AT_START_1335
-at_fn_group_banner 1335 'ovsdb-types.at:134' \
+#AT_STOP_1338
+#AT_START_1339
+at_fn_group_banner 1339 'ovsdb-types.at:134' \
   "set max cannot be negative - Python3" "           " 66
 at_xfail=no
 (
-  $as_echo "1335. $at_setup_line: testing $at_desc ..."
+  $as_echo "1339. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287460,13 +288449,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1335
-#AT_START_1336
-at_fn_group_banner 1336 'ovsdb-types.at:137' \
+#AT_STOP_1339
+#AT_START_1340
+at_fn_group_banner 1340 'ovsdb-types.at:137' \
   "set min cannot be negative - C" "                 " 66
 at_xfail=no
 (
-  $as_echo "1336. $at_setup_line: testing $at_desc ..."
+  $as_echo "1340. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287514,13 +288503,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1336
-#AT_START_1337
-at_fn_group_banner 1337 'ovsdb-types.at:137' \
+#AT_STOP_1340
+#AT_START_1341
+at_fn_group_banner 1341 'ovsdb-types.at:137' \
   "set min cannot be negative - Python3" "           " 66
 at_xfail=no
 (
-  $as_echo "1337. $at_setup_line: testing $at_desc ..."
+  $as_echo "1341. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287568,13 +288557,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1337
-#AT_START_1338
-at_fn_group_banner 1338 'ovsdb-types.at:140' \
+#AT_STOP_1341
+#AT_START_1342
+at_fn_group_banner 1342 'ovsdb-types.at:140' \
   "set min cannot be greater than one - C" "         " 66
 at_xfail=no
 (
-  $as_echo "1338. $at_setup_line: testing $at_desc ..."
+  $as_echo "1342. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287622,13 +288611,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1338
-#AT_START_1339
-at_fn_group_banner 1339 'ovsdb-types.at:140' \
+#AT_STOP_1342
+#AT_START_1343
+at_fn_group_banner 1343 'ovsdb-types.at:140' \
   "set min cannot be greater than one - Python3" "   " 66
 at_xfail=no
 (
-  $as_echo "1339. $at_setup_line: testing $at_desc ..."
+  $as_echo "1343. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287676,13 +288665,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1339
-#AT_START_1340
-at_fn_group_banner 1340 'ovsdb-types.at:146' \
+#AT_STOP_1343
+#AT_START_1344
+at_fn_group_banner 1344 'ovsdb-types.at:146' \
   "map of 1 integer to boolean - C" "                " 67
 at_xfail=no
 (
-  $as_echo "1340. $at_setup_line: testing $at_desc ..."
+  $as_echo "1344. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287708,13 +288697,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1340
-#AT_START_1341
-at_fn_group_banner 1341 'ovsdb-types.at:146' \
+#AT_STOP_1344
+#AT_START_1345
+at_fn_group_banner 1345 'ovsdb-types.at:146' \
   "map of 1 integer to boolean - Python3" "          " 67
 at_xfail=no
 (
-  $as_echo "1341. $at_setup_line: testing $at_desc ..."
+  $as_echo "1345. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287741,13 +288730,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1341
-#AT_START_1342
-at_fn_group_banner 1342 'ovsdb-types.at:149' \
+#AT_STOP_1345
+#AT_START_1346
+at_fn_group_banner 1346 'ovsdb-types.at:149' \
   "map of 1 boolean to integer, explicit min and max - C" "" 67
 at_xfail=no
 (
-  $as_echo "1342. $at_setup_line: testing $at_desc ..."
+  $as_echo "1346. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287773,13 +288762,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1342
-#AT_START_1343
-at_fn_group_banner 1343 'ovsdb-types.at:149' \
+#AT_STOP_1346
+#AT_START_1347
+at_fn_group_banner 1347 'ovsdb-types.at:149' \
   "map of 1 boolean to integer, explicit min and max - Python3" "" 67
 at_xfail=no
 (
-  $as_echo "1343. $at_setup_line: testing $at_desc ..."
+  $as_echo "1347. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287806,13 +288795,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1343
-#AT_START_1344
-at_fn_group_banner 1344 'ovsdb-types.at:152' \
+#AT_STOP_1347
+#AT_START_1348
+at_fn_group_banner 1348 'ovsdb-types.at:152' \
   "map of 1 to 5 uuid to real - C" "                 " 67
 at_xfail=no
 (
-  $as_echo "1344. $at_setup_line: testing $at_desc ..."
+  $as_echo "1348. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287838,13 +288827,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1344
-#AT_START_1345
-at_fn_group_banner 1345 'ovsdb-types.at:152' \
+#AT_STOP_1348
+#AT_START_1349
+at_fn_group_banner 1349 'ovsdb-types.at:152' \
   "map of 1 to 5 uuid to real - Python3" "           " 67
 at_xfail=no
 (
-  $as_echo "1345. $at_setup_line: testing $at_desc ..."
+  $as_echo "1349. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287871,13 +288860,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1345
-#AT_START_1346
-at_fn_group_banner 1346 'ovsdb-types.at:155' \
+#AT_STOP_1349
+#AT_START_1350
+at_fn_group_banner 1350 'ovsdb-types.at:155' \
   "map of 0 to 10 string to uuid - C" "              " 67
 at_xfail=no
 (
-  $as_echo "1346. $at_setup_line: testing $at_desc ..."
+  $as_echo "1350. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287903,13 +288892,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1346
-#AT_START_1347
-at_fn_group_banner 1347 'ovsdb-types.at:155' \
+#AT_STOP_1350
+#AT_START_1351
+at_fn_group_banner 1351 'ovsdb-types.at:155' \
   "map of 0 to 10 string to uuid - Python3" "        " 67
 at_xfail=no
 (
-  $as_echo "1347. $at_setup_line: testing $at_desc ..."
+  $as_echo "1351. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287936,13 +288925,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1347
-#AT_START_1348
-at_fn_group_banner 1348 'ovsdb-types.at:158' \
+#AT_STOP_1351
+#AT_START_1352
+at_fn_group_banner 1352 'ovsdb-types.at:158' \
   "map of 1 to 20 real to string - C" "              " 67
 at_xfail=no
 (
-  $as_echo "1348. $at_setup_line: testing $at_desc ..."
+  $as_echo "1352. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -287968,13 +288957,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1348
-#AT_START_1349
-at_fn_group_banner 1349 'ovsdb-types.at:158' \
+#AT_STOP_1352
+#AT_START_1353
+at_fn_group_banner 1353 'ovsdb-types.at:158' \
   "map of 1 to 20 real to string - Python3" "        " 67
 at_xfail=no
 (
-  $as_echo "1349. $at_setup_line: testing $at_desc ..."
+  $as_echo "1353. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288001,13 +288990,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1349
-#AT_START_1350
-at_fn_group_banner 1350 'ovsdb-types.at:161' \
+#AT_STOP_1353
+#AT_START_1354
+at_fn_group_banner 1354 'ovsdb-types.at:161' \
   "map of 0 or more string to real - C" "            " 67
 at_xfail=no
 (
-  $as_echo "1350. $at_setup_line: testing $at_desc ..."
+  $as_echo "1354. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288033,13 +289022,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1350
-#AT_START_1351
-at_fn_group_banner 1351 'ovsdb-types.at:161' \
+#AT_STOP_1354
+#AT_START_1355
+at_fn_group_banner 1355 'ovsdb-types.at:161' \
   "map of 0 or more string to real - Python3" "      " 67
 at_xfail=no
 (
-  $as_echo "1351. $at_setup_line: testing $at_desc ..."
+  $as_echo "1355. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288066,13 +289055,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1351
-#AT_START_1352
-at_fn_group_banner 1352 'ovsdb-types.at:165' \
+#AT_STOP_1355
+#AT_START_1356
+at_fn_group_banner 1356 'ovsdb-types.at:165' \
   "map key type is required - C" "                   " 67
 at_xfail=no
 (
-  $as_echo "1352. $at_setup_line: testing $at_desc ..."
+  $as_echo "1356. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288120,13 +289109,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1352
-#AT_START_1353
-at_fn_group_banner 1353 'ovsdb-types.at:165' \
+#AT_STOP_1356
+#AT_START_1357
+at_fn_group_banner 1357 'ovsdb-types.at:165' \
   "map key type is required - Python3" "             " 67
 at_xfail=no
 (
-  $as_echo "1353. $at_setup_line: testing $at_desc ..."
+  $as_echo "1357. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288174,13 +289163,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1353
-#AT_START_1354
-at_fn_group_banner 1354 'ovsdb-data.at:3' \
+#AT_STOP_1357
+#AT_START_1358
+at_fn_group_banner 1358 'ovsdb-data.at:3' \
   "default atoms - C" "                              " 68
 at_xfail=no
 (
-  $as_echo "1354. $at_setup_line: testing $at_desc ..."
+  $as_echo "1358. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288210,13 +289199,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1354
-#AT_START_1355
-at_fn_group_banner 1355 'ovsdb-data.at:3' \
+#AT_STOP_1358
+#AT_START_1359
+at_fn_group_banner 1359 'ovsdb-data.at:3' \
   "default atoms - Python3" "                        " 68
 at_xfail=no
 (
-  $as_echo "1355. $at_setup_line: testing $at_desc ..."
+  $as_echo "1359. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288247,13 +289236,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1355
-#AT_START_1356
-at_fn_group_banner 1356 'ovsdb-data.at:11' \
+#AT_STOP_1359
+#AT_START_1360
+at_fn_group_banner 1360 'ovsdb-data.at:11' \
   "default data - C" "                               " 68
 at_xfail=no
 (
-  $as_echo "1356. $at_setup_line: testing $at_desc ..."
+  $as_echo "1360. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288338,13 +289327,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1356
-#AT_START_1357
-at_fn_group_banner 1357 'ovsdb-data.at:11' \
+#AT_STOP_1360
+#AT_START_1361
+at_fn_group_banner 1361 'ovsdb-data.at:11' \
   "default data - Python3" "                         " 68
 at_xfail=no
 (
-  $as_echo "1357. $at_setup_line: testing $at_desc ..."
+  $as_echo "1361. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288430,13 +289419,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1357
-#AT_START_1358
-at_fn_group_banner 1358 'ovsdb-data.at:76' \
+#AT_STOP_1361
+#AT_START_1362
+at_fn_group_banner 1362 'ovsdb-data.at:76' \
   "integer atom from JSON - C" "                     " 69
 at_xfail=no
 (
-  $as_echo "1358. $at_setup_line: testing $at_desc ..."
+  $as_echo "1362. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288476,13 +289465,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1358
-#AT_START_1359
-at_fn_group_banner 1359 'ovsdb-data.at:76' \
+#AT_STOP_1362
+#AT_START_1363
+at_fn_group_banner 1363 'ovsdb-data.at:76' \
   "integer atom from JSON - Python3" "               " 69
 at_xfail=no
 (
-  $as_echo "1359. $at_setup_line: testing $at_desc ..."
+  $as_echo "1363. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288523,13 +289512,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1359
-#AT_START_1360
-at_fn_group_banner 1360 'ovsdb-data.at:89' \
+#AT_STOP_1363
+#AT_START_1364
+at_fn_group_banner 1364 'ovsdb-data.at:89' \
   "integer atom from string" "                       " 69
 at_xfail=no
 (
-  $as_echo "1360. $at_setup_line: testing $at_desc ..."
+  $as_echo "1364. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288590,13 +289579,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1360
-#AT_START_1361
-at_fn_group_banner 1361 'ovsdb-data.at:116' \
+#AT_STOP_1364
+#AT_START_1365
+at_fn_group_banner 1365 'ovsdb-data.at:116' \
   "real atom from JSON - C" "                        " 69
 at_xfail=no
 (
-  $as_echo "1361. $at_setup_line: testing $at_desc ..."
+  $as_echo "1365. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288642,13 +289631,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1361
-#AT_START_1362
-at_fn_group_banner 1362 'ovsdb-data.at:116' \
+#AT_STOP_1365
+#AT_START_1366
+at_fn_group_banner 1366 'ovsdb-data.at:116' \
   "real atom from JSON - Python3" "                  " 69
 at_xfail=no
 (
-  $as_echo "1362. $at_setup_line: testing $at_desc ..."
+  $as_echo "1366. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288695,13 +289684,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1362
-#AT_START_1363
-at_fn_group_banner 1363 'ovsdb-data.at:133' \
+#AT_STOP_1366
+#AT_START_1367
+at_fn_group_banner 1367 'ovsdb-data.at:133' \
   "real atom from string" "                          " 69
 at_xfail=no
 (
-  $as_echo "1363. $at_setup_line: testing $at_desc ..."
+  $as_echo "1367. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288747,13 +289736,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1363
-#AT_START_1364
-at_fn_group_banner 1364 'ovsdb-data.at:150' \
+#AT_STOP_1367
+#AT_START_1368
+at_fn_group_banner 1368 'ovsdb-data.at:150' \
   "boolean atom from JSON - C" "                     " 69
 at_xfail=no
 (
-  $as_echo "1364. $at_setup_line: testing $at_desc ..."
+  $as_echo "1368. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288780,13 +289769,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1364
-#AT_START_1365
-at_fn_group_banner 1365 'ovsdb-data.at:150' \
+#AT_STOP_1368
+#AT_START_1369
+at_fn_group_banner 1369 'ovsdb-data.at:150' \
   "boolean atom from JSON - Python3" "               " 69
 at_xfail=no
 (
-  $as_echo "1365. $at_setup_line: testing $at_desc ..."
+  $as_echo "1369. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288814,13 +289803,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1365
-#AT_START_1366
-at_fn_group_banner 1366 'ovsdb-data.at:155' \
+#AT_STOP_1369
+#AT_START_1370
+at_fn_group_banner 1370 'ovsdb-data.at:155' \
   "boolean atom from string" "                       " 69
 at_xfail=no
 (
-  $as_echo "1366. $at_setup_line: testing $at_desc ..."
+  $as_echo "1370. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288847,13 +289836,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1366
-#AT_START_1367
-at_fn_group_banner 1367 'ovsdb-data.at:160' \
+#AT_STOP_1370
+#AT_START_1371
+at_fn_group_banner 1371 'ovsdb-data.at:160' \
   "string atom from JSON - C" "                      " 69
 at_xfail=no
 (
-  $as_echo "1367. $at_setup_line: testing $at_desc ..."
+  $as_echo "1371. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288881,13 +289870,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1367
-#AT_START_1368
-at_fn_group_banner 1368 'ovsdb-data.at:160' \
+#AT_STOP_1371
+#AT_START_1372
+at_fn_group_banner 1372 'ovsdb-data.at:160' \
   "string atom from JSON - Python3" "                " 69
 at_xfail=no
 (
-  $as_echo "1368. $at_setup_line: testing $at_desc ..."
+  $as_echo "1372. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288916,13 +289905,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1368
-#AT_START_1369
-at_fn_group_banner 1369 'ovsdb-data.at:166' \
+#AT_STOP_1372
+#AT_START_1373
+at_fn_group_banner 1373 'ovsdb-data.at:166' \
   "string atom from string" "                        " 69
 at_xfail=no
 (
-  $as_echo "1369. $at_setup_line: testing $at_desc ..."
+  $as_echo "1373. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288965,13 +289954,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1369
-#AT_START_1370
-at_fn_group_banner 1370 'ovsdb-data.at:181' \
+#AT_STOP_1373
+#AT_START_1374
+at_fn_group_banner 1374 'ovsdb-data.at:181' \
   "uuid atom from JSON - C" "                        " 69
 at_xfail=no
 (
-  $as_echo "1370. $at_setup_line: testing $at_desc ..."
+  $as_echo "1374. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -288997,13 +289986,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1370
-#AT_START_1371
-at_fn_group_banner 1371 'ovsdb-data.at:181' \
+#AT_STOP_1374
+#AT_START_1375
+at_fn_group_banner 1375 'ovsdb-data.at:181' \
   "uuid atom from JSON - Python3" "                  " 69
 at_xfail=no
 (
-  $as_echo "1371. $at_setup_line: testing $at_desc ..."
+  $as_echo "1375. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289030,13 +290019,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1371
-#AT_START_1372
-at_fn_group_banner 1372 'ovsdb-data.at:185' \
+#AT_STOP_1375
+#AT_START_1376
+at_fn_group_banner 1376 'ovsdb-data.at:185' \
   "uuid atom from string" "                          " 69
 at_xfail=no
 (
-  $as_echo "1372. $at_setup_line: testing $at_desc ..."
+  $as_echo "1376. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289062,13 +290051,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1372
-#AT_START_1373
-at_fn_group_banner 1373 'ovsdb-data.at:189' \
+#AT_STOP_1376
+#AT_START_1377
+at_fn_group_banner 1377 'ovsdb-data.at:189' \
   "integer atom sorting - C" "                       " 69
 at_xfail=no
 (
-  $as_echo "1373. $at_setup_line: testing $at_desc ..."
+  $as_echo "1377. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289094,13 +290083,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1373
-#AT_START_1374
-at_fn_group_banner 1374 'ovsdb-data.at:189' \
+#AT_STOP_1377
+#AT_START_1378
+at_fn_group_banner 1378 'ovsdb-data.at:189' \
   "integer atom sorting - Python3" "                 " 69
 at_xfail=no
 (
-  $as_echo "1374. $at_setup_line: testing $at_desc ..."
+  $as_echo "1378. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289127,13 +290116,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1374
-#AT_START_1375
-at_fn_group_banner 1375 'ovsdb-data.at:193' \
+#AT_STOP_1378
+#AT_START_1379
+at_fn_group_banner 1379 'ovsdb-data.at:193' \
   "real atom sorting - C" "                          " 69
 at_xfail=no
 (
-  $as_echo "1375. $at_setup_line: testing $at_desc ..."
+  $as_echo "1379. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289159,13 +290148,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1375
-#AT_START_1376
-at_fn_group_banner 1376 'ovsdb-data.at:193' \
+#AT_STOP_1379
+#AT_START_1380
+at_fn_group_banner 1380 'ovsdb-data.at:193' \
   "real atom sorting - Python3" "                    " 69
 at_xfail=no
 (
-  $as_echo "1376. $at_setup_line: testing $at_desc ..."
+  $as_echo "1380. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289192,13 +290181,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1376
-#AT_START_1377
-at_fn_group_banner 1377 'ovsdb-data.at:197' \
+#AT_STOP_1380
+#AT_START_1381
+at_fn_group_banner 1381 'ovsdb-data.at:197' \
   "boolean atom sorting - C" "                       " 69
 at_xfail=no
 (
-  $as_echo "1377. $at_setup_line: testing $at_desc ..."
+  $as_echo "1381. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289224,13 +290213,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1377
-#AT_START_1378
-at_fn_group_banner 1378 'ovsdb-data.at:197' \
+#AT_STOP_1381
+#AT_START_1382
+at_fn_group_banner 1382 'ovsdb-data.at:197' \
   "boolean atom sorting - Python3" "                 " 69
 at_xfail=no
 (
-  $as_echo "1378. $at_setup_line: testing $at_desc ..."
+  $as_echo "1382. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289257,13 +290246,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1378
-#AT_START_1379
-at_fn_group_banner 1379 'ovsdb-data.at:201' \
+#AT_STOP_1382
+#AT_START_1383
+at_fn_group_banner 1383 'ovsdb-data.at:201' \
   "string atom sorting - C" "                        " 69
 at_xfail=no
 (
-  $as_echo "1379. $at_setup_line: testing $at_desc ..."
+  $as_echo "1383. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289289,13 +290278,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1379
-#AT_START_1380
-at_fn_group_banner 1380 'ovsdb-data.at:201' \
+#AT_STOP_1383
+#AT_START_1384
+at_fn_group_banner 1384 'ovsdb-data.at:201' \
   "string atom sorting - Python3" "                  " 69
 at_xfail=no
 (
-  $as_echo "1380. $at_setup_line: testing $at_desc ..."
+  $as_echo "1384. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289322,13 +290311,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1380
-#AT_START_1381
-at_fn_group_banner 1381 'ovsdb-data.at:205' \
+#AT_STOP_1384
+#AT_START_1385
+at_fn_group_banner 1385 'ovsdb-data.at:205' \
   "uuid atom sorting - C" "                          " 69
 at_xfail=no
 (
-  $as_echo "1381. $at_setup_line: testing $at_desc ..."
+  $as_echo "1385. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289420,13 +290409,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1381
-#AT_START_1382
-at_fn_group_banner 1382 'ovsdb-data.at:205' \
+#AT_STOP_1385
+#AT_START_1386
+at_fn_group_banner 1386 'ovsdb-data.at:205' \
   "uuid atom sorting - Python3" "                    " 69
 at_xfail=no
 (
-  $as_echo "1382. $at_setup_line: testing $at_desc ..."
+  $as_echo "1386. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289519,13 +290508,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1382
-#AT_START_1383
-at_fn_group_banner 1383 'ovsdb-data.at:242' \
+#AT_STOP_1386
+#AT_START_1387
+at_fn_group_banner 1387 'ovsdb-data.at:242' \
   "real not acceptable integer JSON atom - C" "      " 69
 at_xfail=no
 (
-  $as_echo "1383. $at_setup_line: testing $at_desc ..."
+  $as_echo "1387. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289551,13 +290540,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1383
-#AT_START_1384
-at_fn_group_banner 1384 'ovsdb-data.at:242' \
+#AT_STOP_1387
+#AT_START_1388
+at_fn_group_banner 1388 'ovsdb-data.at:242' \
   "real not acceptable integer JSON atom - Python3" "" 69
 at_xfail=no
 (
-  $as_echo "1384. $at_setup_line: testing $at_desc ..."
+  $as_echo "1388. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289584,13 +290573,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1384
-#AT_START_1385
-at_fn_group_banner 1385 'ovsdb-data.at:248' \
+#AT_STOP_1388
+#AT_START_1389
+at_fn_group_banner 1389 'ovsdb-data.at:248' \
   "no invalid UTF-8 sequences in strings" "          " 69
 at_xfail=no
 (
-  $as_echo "1385. $at_setup_line: testing $at_desc ..."
+  $as_echo "1389. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289623,13 +290612,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1385
-#AT_START_1386
-at_fn_group_banner 1386 'ovsdb-data.at:271' \
+#AT_STOP_1389
+#AT_START_1390
+at_fn_group_banner 1390 'ovsdb-data.at:271' \
   "real not acceptable integer string atom" "        " 69
 at_xfail=no
 (
-  $as_echo "1386. $at_setup_line: testing $at_desc ..."
+  $as_echo "1390. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289677,13 +290666,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1386
-#AT_START_1387
-at_fn_group_banner 1387 'ovsdb-data.at:275' \
+#AT_STOP_1390
+#AT_START_1391
+at_fn_group_banner 1391 'ovsdb-data.at:275' \
   "inverted range is not acceptable integer string atom positive and negative" "" 69
 at_xfail=no
 (
-  $as_echo "1387. $at_setup_line: testing $at_desc ..."
+  $as_echo "1391. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289731,13 +290720,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1387
-#AT_START_1388
-at_fn_group_banner 1388 'ovsdb-data.at:279' \
+#AT_STOP_1391
+#AT_START_1392
+at_fn_group_banner 1392 'ovsdb-data.at:279' \
   "inverted range is not acceptable integer string atom negative" "" 69
 at_xfail=no
 (
-  $as_echo "1388. $at_setup_line: testing $at_desc ..."
+  $as_echo "1392. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289785,13 +290774,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1388
-#AT_START_1389
-at_fn_group_banner 1389 'ovsdb-data.at:283' \
+#AT_STOP_1392
+#AT_START_1393
+at_fn_group_banner 1393 'ovsdb-data.at:283' \
   "inverted range is not acceptable integer string atom positive" "" 69
 at_xfail=no
 (
-  $as_echo "1389. $at_setup_line: testing $at_desc ..."
+  $as_echo "1393. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289839,13 +290828,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1389
-#AT_START_1390
-at_fn_group_banner 1390 'ovsdb-data.at:287' \
+#AT_STOP_1393
+#AT_START_1394
+at_fn_group_banner 1394 'ovsdb-data.at:287' \
   "too big range is not acceptable integer string atom positive and negative" "" 69
 at_xfail=no
 (
-  $as_echo "1390. $at_setup_line: testing $at_desc ..."
+  $as_echo "1394. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289893,13 +290882,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1390
-#AT_START_1391
-at_fn_group_banner 1391 'ovsdb-data.at:291' \
+#AT_STOP_1394
+#AT_START_1395
+at_fn_group_banner 1395 'ovsdb-data.at:291' \
   "too big range is not acceptable integer string atom negative" "" 69
 at_xfail=no
 (
-  $as_echo "1391. $at_setup_line: testing $at_desc ..."
+  $as_echo "1395. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -289947,13 +290936,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1391
-#AT_START_1392
-at_fn_group_banner 1392 'ovsdb-data.at:295' \
+#AT_STOP_1395
+#AT_START_1396
+at_fn_group_banner 1396 'ovsdb-data.at:295' \
   "too big range is not acceptable integer string atom positive" "" 69
 at_xfail=no
 (
-  $as_echo "1392. $at_setup_line: testing $at_desc ..."
+  $as_echo "1396. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290001,13 +290990,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1392
-#AT_START_1393
-at_fn_group_banner 1393 'ovsdb-data.at:299' \
+#AT_STOP_1396
+#AT_START_1397
+at_fn_group_banner 1397 'ovsdb-data.at:299' \
   "string \"true\" not acceptable boolean JSON atom - C" "" 69
 at_xfail=no
 (
-  $as_echo "1393. $at_setup_line: testing $at_desc ..."
+  $as_echo "1397. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290033,13 +291022,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1393
-#AT_START_1394
-at_fn_group_banner 1394 'ovsdb-data.at:299' \
+#AT_STOP_1397
+#AT_START_1398
+at_fn_group_banner 1398 'ovsdb-data.at:299' \
   "string \"true\" not acceptable boolean JSON atom - Python3" "" 69
 at_xfail=no
 (
-  $as_echo "1394. $at_setup_line: testing $at_desc ..."
+  $as_echo "1398. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290066,13 +291055,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1394
-#AT_START_1395
-at_fn_group_banner 1395 'ovsdb-data.at:303' \
+#AT_STOP_1398
+#AT_START_1399
+at_fn_group_banner 1399 'ovsdb-data.at:303' \
   "string \"true\" not acceptable boolean string atom" "" 69
 at_xfail=no
 (
-  $as_echo "1395. $at_setup_line: testing $at_desc ..."
+  $as_echo "1399. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290120,13 +291109,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1395
-#AT_START_1396
-at_fn_group_banner 1396 'ovsdb-data.at:307' \
+#AT_STOP_1399
+#AT_START_1400
+at_fn_group_banner 1400 'ovsdb-data.at:307' \
   "integer not acceptable string JSON atom - C" "    " 69
 at_xfail=no
 (
-  $as_echo "1396. $at_setup_line: testing $at_desc ..."
+  $as_echo "1400. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290152,13 +291141,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1396
-#AT_START_1397
-at_fn_group_banner 1397 'ovsdb-data.at:307' \
+#AT_STOP_1400
+#AT_START_1401
+at_fn_group_banner 1401 'ovsdb-data.at:307' \
   "integer not acceptable string JSON atom - Python3" "" 69
 at_xfail=no
 (
-  $as_echo "1397. $at_setup_line: testing $at_desc ..."
+  $as_echo "1401. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290185,13 +291174,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1397
-#AT_START_1398
-at_fn_group_banner 1398 'ovsdb-data.at:311' \
+#AT_STOP_1401
+#AT_START_1402
+at_fn_group_banner 1402 'ovsdb-data.at:311' \
   "uuid atom must be expressed as JSON array - C" "  " 69
 at_xfail=no
 (
-  $as_echo "1398. $at_setup_line: testing $at_desc ..."
+  $as_echo "1402. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290217,13 +291206,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1398
-#AT_START_1399
-at_fn_group_banner 1399 'ovsdb-data.at:311' \
+#AT_STOP_1402
+#AT_START_1403
+at_fn_group_banner 1403 'ovsdb-data.at:311' \
   "uuid atom must be expressed as JSON array - Python3" "" 69
 at_xfail=no
 (
-  $as_echo "1399. $at_setup_line: testing $at_desc ..."
+  $as_echo "1403. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290250,13 +291239,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1399
-#AT_START_1400
-at_fn_group_banner 1400 'ovsdb-data.at:315' \
+#AT_STOP_1403
+#AT_START_1404
+at_fn_group_banner 1404 'ovsdb-data.at:315' \
   "named-uuid requires symbol table - C" "           " 69
 at_xfail=no
 (
-  $as_echo "1400. $at_setup_line: testing $at_desc ..."
+  $as_echo "1404. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290282,13 +291271,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1400
-#AT_START_1401
-at_fn_group_banner 1401 'ovsdb-data.at:315' \
+#AT_STOP_1404
+#AT_START_1405
+at_fn_group_banner 1405 'ovsdb-data.at:315' \
   "named-uuid requires symbol table - Python3" "     " 69
 at_xfail=no
 (
-  $as_echo "1401. $at_setup_line: testing $at_desc ..."
+  $as_echo "1405. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290315,13 +291304,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1401
-#AT_START_1402
-at_fn_group_banner 1402 'ovsdb-data.at:319' \
+#AT_STOP_1405
+#AT_START_1406
+at_fn_group_banner 1406 'ovsdb-data.at:319' \
   "empty string atom must be quoted" "               " 69
 at_xfail=no
 (
-  $as_echo "1402. $at_setup_line: testing $at_desc ..."
+  $as_echo "1406. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290369,13 +291358,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1402
-#AT_START_1403
-at_fn_group_banner 1403 'ovsdb-data.at:323' \
+#AT_STOP_1406
+#AT_START_1407
+at_fn_group_banner 1407 'ovsdb-data.at:323' \
   "quotes must be balanced" "                        " 69
 at_xfail=no
 (
-  $as_echo "1403. $at_setup_line: testing $at_desc ..."
+  $as_echo "1407. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290423,13 +291412,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1403
-#AT_START_1404
-at_fn_group_banner 1404 'ovsdb-data.at:327' \
+#AT_STOP_1407
+#AT_START_1408
+at_fn_group_banner 1408 'ovsdb-data.at:327' \
   "quoted string must not contain unescaped quote" " " 69
 at_xfail=no
 (
-  $as_echo "1404. $at_setup_line: testing $at_desc ..."
+  $as_echo "1408. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290477,13 +291466,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1404
-#AT_START_1405
-at_fn_group_banner 1405 'ovsdb-data.at:331' \
+#AT_STOP_1408
+#AT_START_1409
+at_fn_group_banner 1409 'ovsdb-data.at:331' \
   "quoted string must not end with backslash" "      " 69
 at_xfail=no
 (
-  $as_echo "1405. $at_setup_line: testing $at_desc ..."
+  $as_echo "1409. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290531,13 +291520,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1405
-#AT_START_1406
-at_fn_group_banner 1406 'ovsdb-data.at:335' \
+#AT_STOP_1409
+#AT_START_1410
+at_fn_group_banner 1410 'ovsdb-data.at:335' \
   "uuids must be valid" "                            " 69
 at_xfail=no
 (
-  $as_echo "1406. $at_setup_line: testing $at_desc ..."
+  $as_echo "1410. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290585,13 +291574,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1406
-#AT_START_1407
-at_fn_group_banner 1407 'ovsdb-data.at:341' \
+#AT_STOP_1410
+#AT_START_1411
+at_fn_group_banner 1411 'ovsdb-data.at:341' \
   "integer atom enum - C" "                          " 70
 at_xfail=no
 (
-  $as_echo "1407. $at_setup_line: testing $at_desc ..."
+  $as_echo "1411. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290646,13 +291635,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1407
-#AT_START_1408
-at_fn_group_banner 1408 'ovsdb-data.at:341' \
+#AT_STOP_1411
+#AT_START_1412
+at_fn_group_banner 1412 'ovsdb-data.at:341' \
   "integer atom enum - Python3" "                    " 70
 at_xfail=no
 (
-  $as_echo "1408. $at_setup_line: testing $at_desc ..."
+  $as_echo "1412. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290708,13 +291697,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1408
-#AT_START_1409
-at_fn_group_banner 1409 'ovsdb-data.at:364' \
+#AT_STOP_1412
+#AT_START_1413
+at_fn_group_banner 1413 'ovsdb-data.at:364' \
   "integer atom enum from string" "                  " 70
 at_xfail=no
 (
-  $as_echo "1409. $at_setup_line: testing $at_desc ..."
+  $as_echo "1413. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290754,13 +291743,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1409
-#AT_START_1410
-at_fn_group_banner 1410 'ovsdb-data.at:377' \
+#AT_STOP_1413
+#AT_START_1414
+at_fn_group_banner 1414 'ovsdb-data.at:377' \
   "integer not in enum set from string" "            " 70
 at_xfail=no
 (
-  $as_echo "1410. $at_setup_line: testing $at_desc ..."
+  $as_echo "1414. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290808,13 +291797,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1410
-#AT_START_1411
-at_fn_group_banner 1411 'ovsdb-data.at:381' \
+#AT_STOP_1414
+#AT_START_1415
+at_fn_group_banner 1415 'ovsdb-data.at:381' \
   "integer range not in enum set from string" "      " 70
 at_xfail=no
 (
-  $as_echo "1411. $at_setup_line: testing $at_desc ..."
+  $as_echo "1415. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290862,13 +291851,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1411
-#AT_START_1412
-at_fn_group_banner 1412 'ovsdb-data.at:385' \
+#AT_STOP_1415
+#AT_START_1416
+at_fn_group_banner 1416 'ovsdb-data.at:385' \
   "real atom enum - C" "                             " 70
 at_xfail=no
 (
-  $as_echo "1412. $at_setup_line: testing $at_desc ..."
+  $as_echo "1416. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290914,13 +291903,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1412
-#AT_START_1413
-at_fn_group_banner 1413 'ovsdb-data.at:385' \
+#AT_STOP_1416
+#AT_START_1417
+at_fn_group_banner 1417 'ovsdb-data.at:385' \
   "real atom enum - Python3" "                       " 70
 at_xfail=no
 (
-  $as_echo "1413. $at_setup_line: testing $at_desc ..."
+  $as_echo "1417. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -290967,13 +291956,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1413
-#AT_START_1414
-at_fn_group_banner 1414 'ovsdb-data.at:402' \
+#AT_STOP_1417
+#AT_START_1418
+at_fn_group_banner 1418 'ovsdb-data.at:402' \
   "boolean atom enum - C" "                          " 70
 at_xfail=no
 (
-  $as_echo "1414. $at_setup_line: testing $at_desc ..."
+  $as_echo "1418. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291004,13 +291993,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1414
-#AT_START_1415
-at_fn_group_banner 1415 'ovsdb-data.at:402' \
+#AT_STOP_1418
+#AT_START_1419
+at_fn_group_banner 1419 'ovsdb-data.at:402' \
   "boolean atom enum - Python3" "                    " 70
 at_xfail=no
 (
-  $as_echo "1415. $at_setup_line: testing $at_desc ..."
+  $as_echo "1419. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291042,13 +292031,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1415
-#AT_START_1416
-at_fn_group_banner 1416 'ovsdb-data.at:409' \
+#AT_STOP_1419
+#AT_START_1420
+at_fn_group_banner 1420 'ovsdb-data.at:409' \
   "string atom enum - C" "                           " 70
 at_xfail=no
 (
-  $as_echo "1416. $at_setup_line: testing $at_desc ..."
+  $as_echo "1420. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291091,13 +292080,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1416
-#AT_START_1417
-at_fn_group_banner 1417 'ovsdb-data.at:409' \
+#AT_STOP_1420
+#AT_START_1421
+at_fn_group_banner 1421 'ovsdb-data.at:409' \
   "string atom enum - Python3" "                     " 70
 at_xfail=no
 (
-  $as_echo "1417. $at_setup_line: testing $at_desc ..."
+  $as_echo "1421. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291141,13 +292130,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1417
-#AT_START_1418
-at_fn_group_banner 1418 'ovsdb-data.at:424' \
+#AT_STOP_1421
+#AT_START_1422
+at_fn_group_banner 1422 'ovsdb-data.at:424' \
   "uuid atom enum - C" "                             " 70
 at_xfail=no
 (
-  $as_echo "1418. $at_setup_line: testing $at_desc ..."
+  $as_echo "1422. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291181,13 +292170,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1418
-#AT_START_1419
-at_fn_group_banner 1419 'ovsdb-data.at:424' \
+#AT_STOP_1422
+#AT_START_1423
+at_fn_group_banner 1423 'ovsdb-data.at:424' \
   "uuid atom enum - Python3" "                       " 70
 at_xfail=no
 (
-  $as_echo "1419. $at_setup_line: testing $at_desc ..."
+  $as_echo "1423. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291222,13 +292211,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1419
-#AT_START_1420
-at_fn_group_banner 1420 'ovsdb-data.at:435' \
+#AT_STOP_1423
+#AT_START_1424
+at_fn_group_banner 1424 'ovsdb-data.at:435' \
   "integers >= 5 - C" "                              " 71
 at_xfail=no
 (
-  $as_echo "1420. $at_setup_line: testing $at_desc ..."
+  $as_echo "1424. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291268,13 +292257,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1420
-#AT_START_1421
-at_fn_group_banner 1421 'ovsdb-data.at:435' \
+#AT_STOP_1424
+#AT_START_1425
+at_fn_group_banner 1425 'ovsdb-data.at:435' \
   "integers >= 5 - Python3" "                        " 71
 at_xfail=no
 (
-  $as_echo "1421. $at_setup_line: testing $at_desc ..."
+  $as_echo "1425. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291315,13 +292304,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1421
-#AT_START_1422
-at_fn_group_banner 1422 'ovsdb-data.at:448' \
+#AT_STOP_1425
+#AT_START_1426
+at_fn_group_banner 1426 'ovsdb-data.at:448' \
   "integers <= -1 - C" "                             " 71
 at_xfail=no
 (
-  $as_echo "1422. $at_setup_line: testing $at_desc ..."
+  $as_echo "1426. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291358,13 +292347,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1422
-#AT_START_1423
-at_fn_group_banner 1423 'ovsdb-data.at:448' \
+#AT_STOP_1426
+#AT_START_1427
+at_fn_group_banner 1427 'ovsdb-data.at:448' \
   "integers <= -1 - Python3" "                       " 71
 at_xfail=no
 (
-  $as_echo "1423. $at_setup_line: testing $at_desc ..."
+  $as_echo "1427. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291402,13 +292391,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1423
-#AT_START_1424
-at_fn_group_banner 1424 'ovsdb-data.at:459' \
+#AT_STOP_1427
+#AT_START_1428
+at_fn_group_banner 1428 'ovsdb-data.at:459' \
   "integers in range -10 to 10 - C" "                " 71
 at_xfail=no
 (
-  $as_echo "1424. $at_setup_line: testing $at_desc ..."
+  $as_echo "1428. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291460,13 +292449,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1424
-#AT_START_1425
-at_fn_group_banner 1425 'ovsdb-data.at:459' \
+#AT_STOP_1428
+#AT_START_1429
+at_fn_group_banner 1429 'ovsdb-data.at:459' \
   "integers in range -10 to 10 - Python3" "          " 71
 at_xfail=no
 (
-  $as_echo "1425. $at_setup_line: testing $at_desc ..."
+  $as_echo "1429. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291519,13 +292508,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1425
-#AT_START_1426
-at_fn_group_banner 1426 'ovsdb-data.at:480' \
+#AT_STOP_1429
+#AT_START_1430
+at_fn_group_banner 1430 'ovsdb-data.at:480' \
   "reals >= 5 - C" "                                 " 71
 at_xfail=no
 (
-  $as_echo "1426. $at_setup_line: testing $at_desc ..."
+  $as_echo "1430. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291565,13 +292554,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1426
-#AT_START_1427
-at_fn_group_banner 1427 'ovsdb-data.at:480' \
+#AT_STOP_1430
+#AT_START_1431
+at_fn_group_banner 1431 'ovsdb-data.at:480' \
   "reals >= 5 - Python3" "                           " 71
 at_xfail=no
 (
-  $as_echo "1427. $at_setup_line: testing $at_desc ..."
+  $as_echo "1431. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291612,13 +292601,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1427
-#AT_START_1428
-at_fn_group_banner 1428 'ovsdb-data.at:493' \
+#AT_STOP_1431
+#AT_START_1432
+at_fn_group_banner 1432 'ovsdb-data.at:493' \
   "reals <= -1 - C" "                                " 71
 at_xfail=no
 (
-  $as_echo "1428. $at_setup_line: testing $at_desc ..."
+  $as_echo "1432. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291655,13 +292644,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1428
-#AT_START_1429
-at_fn_group_banner 1429 'ovsdb-data.at:493' \
+#AT_STOP_1432
+#AT_START_1433
+at_fn_group_banner 1433 'ovsdb-data.at:493' \
   "reals <= -1 - Python3" "                          " 71
 at_xfail=no
 (
-  $as_echo "1429. $at_setup_line: testing $at_desc ..."
+  $as_echo "1433. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291699,13 +292688,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1429
-#AT_START_1430
-at_fn_group_banner 1430 'ovsdb-data.at:504' \
+#AT_STOP_1433
+#AT_START_1434
+at_fn_group_banner 1434 'ovsdb-data.at:504' \
   "reals in range -10 to 10 - C" "                   " 71
 at_xfail=no
 (
-  $as_echo "1430. $at_setup_line: testing $at_desc ..."
+  $as_echo "1434. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291757,13 +292746,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1430
-#AT_START_1431
-at_fn_group_banner 1431 'ovsdb-data.at:504' \
+#AT_STOP_1434
+#AT_START_1435
+at_fn_group_banner 1435 'ovsdb-data.at:504' \
   "reals in range -10 to 10 - Python3" "             " 71
 at_xfail=no
 (
-  $as_echo "1431. $at_setup_line: testing $at_desc ..."
+  $as_echo "1435. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291816,13 +292805,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1431
-#AT_START_1432
-at_fn_group_banner 1432 'ovsdb-data.at:525' \
+#AT_STOP_1435
+#AT_START_1436
+at_fn_group_banner 1436 'ovsdb-data.at:525' \
   "strings at least 2 characters long - C" "         " 71
 at_xfail=no
 (
-  $as_echo "1432. $at_setup_line: testing $at_desc ..."
+  $as_echo "1436. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291862,13 +292851,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1432
-#AT_START_1433
-at_fn_group_banner 1433 'ovsdb-data.at:525' \
+#AT_STOP_1436
+#AT_START_1437
+at_fn_group_banner 1437 'ovsdb-data.at:525' \
   "strings at least 2 characters long - Python3" "   " 71
 at_xfail=no
 (
-  $as_echo "1433. $at_setup_line: testing $at_desc ..."
+  $as_echo "1437. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291909,13 +292898,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1433
-#AT_START_1434
-at_fn_group_banner 1434 'ovsdb-data.at:538' \
+#AT_STOP_1437
+#AT_START_1438
+at_fn_group_banner 1438 'ovsdb-data.at:538' \
   "strings no more than 2 characters long - C" "     " 71
 at_xfail=no
 (
-  $as_echo "1434. $at_setup_line: testing $at_desc ..."
+  $as_echo "1438. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -291955,13 +292944,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1434
-#AT_START_1435
-at_fn_group_banner 1435 'ovsdb-data.at:538' \
+#AT_STOP_1438
+#AT_START_1439
+at_fn_group_banner 1439 'ovsdb-data.at:538' \
   "strings no more than 2 characters long - Python3" "" 71
 at_xfail=no
 (
-  $as_echo "1435. $at_setup_line: testing $at_desc ..."
+  $as_echo "1439. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292002,13 +292991,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1435
-#AT_START_1436
-at_fn_group_banner 1436 'ovsdb-data.at:553' \
+#AT_STOP_1439
+#AT_START_1440
+at_fn_group_banner 1440 'ovsdb-data.at:553' \
   "integer JSON datum - C" "                         " 72
 at_xfail=no
 (
-  $as_echo "1436. $at_setup_line: testing $at_desc ..."
+  $as_echo "1440. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292036,13 +293025,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1436
-#AT_START_1437
-at_fn_group_banner 1437 'ovsdb-data.at:553' \
+#AT_STOP_1440
+#AT_START_1441
+at_fn_group_banner 1441 'ovsdb-data.at:553' \
   "integer JSON datum - Python3" "                   " 72
 at_xfail=no
 (
-  $as_echo "1437. $at_setup_line: testing $at_desc ..."
+  $as_echo "1441. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292071,13 +293060,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1437
-#AT_START_1438
-at_fn_group_banner 1438 'ovsdb-data.at:559' \
+#AT_STOP_1441
+#AT_START_1442
+at_fn_group_banner 1442 'ovsdb-data.at:559' \
   "integer string datum" "                           " 72
 at_xfail=no
 (
-  $as_echo "1438. $at_setup_line: testing $at_desc ..."
+  $as_echo "1442. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292106,13 +293095,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1438
-#AT_START_1439
-at_fn_group_banner 1439 'ovsdb-data.at:566' \
+#AT_STOP_1442
+#AT_START_1443
+at_fn_group_banner 1443 'ovsdb-data.at:566' \
   "real JSON datum - C" "                            " 72
 at_xfail=no
 (
-  $as_echo "1439. $at_setup_line: testing $at_desc ..."
+  $as_echo "1443. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292140,13 +293129,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1439
-#AT_START_1440
-at_fn_group_banner 1440 'ovsdb-data.at:566' \
+#AT_STOP_1443
+#AT_START_1444
+at_fn_group_banner 1444 'ovsdb-data.at:566' \
   "real JSON datum - Python3" "                      " 72
 at_xfail=no
 (
-  $as_echo "1440. $at_setup_line: testing $at_desc ..."
+  $as_echo "1444. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292175,13 +293164,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1440
-#AT_START_1441
-at_fn_group_banner 1441 'ovsdb-data.at:572' \
+#AT_STOP_1444
+#AT_START_1445
+at_fn_group_banner 1445 'ovsdb-data.at:572' \
   "real string datum" "                              " 72
 at_xfail=no
 (
-  $as_echo "1441. $at_setup_line: testing $at_desc ..."
+  $as_echo "1445. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292209,13 +293198,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1441
-#AT_START_1442
-at_fn_group_banner 1442 'ovsdb-data.at:578' \
+#AT_STOP_1445
+#AT_START_1446
+at_fn_group_banner 1446 'ovsdb-data.at:578' \
   "boolean JSON datum - C" "                         " 72
 at_xfail=no
 (
-  $as_echo "1442. $at_setup_line: testing $at_desc ..."
+  $as_echo "1446. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292242,13 +293231,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1442
-#AT_START_1443
-at_fn_group_banner 1443 'ovsdb-data.at:578' \
+#AT_STOP_1446
+#AT_START_1447
+at_fn_group_banner 1447 'ovsdb-data.at:578' \
   "boolean JSON datum - Python3" "                   " 72
 at_xfail=no
 (
-  $as_echo "1443. $at_setup_line: testing $at_desc ..."
+  $as_echo "1447. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292276,13 +293265,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1443
-#AT_START_1444
-at_fn_group_banner 1444 'ovsdb-data.at:583' \
+#AT_STOP_1447
+#AT_START_1448
+at_fn_group_banner 1448 'ovsdb-data.at:583' \
   "boolean string datum" "                           " 72
 at_xfail=no
 (
-  $as_echo "1444. $at_setup_line: testing $at_desc ..."
+  $as_echo "1448. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292309,13 +293298,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1444
-#AT_START_1445
-at_fn_group_banner 1445 'ovsdb-data.at:588' \
+#AT_STOP_1448
+#AT_START_1449
+at_fn_group_banner 1449 'ovsdb-data.at:588' \
   "string JSON datum - C" "                          " 72
 at_xfail=no
 (
-  $as_echo "1445. $at_setup_line: testing $at_desc ..."
+  $as_echo "1449. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292343,13 +293332,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1445
-#AT_START_1446
-at_fn_group_banner 1446 'ovsdb-data.at:588' \
+#AT_STOP_1449
+#AT_START_1450
+at_fn_group_banner 1450 'ovsdb-data.at:588' \
   "string JSON datum - Python3" "                    " 72
 at_xfail=no
 (
-  $as_echo "1446. $at_setup_line: testing $at_desc ..."
+  $as_echo "1450. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292378,13 +293367,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1446
-#AT_START_1447
-at_fn_group_banner 1447 'ovsdb-data.at:594' \
+#AT_STOP_1450
+#AT_START_1451
+at_fn_group_banner 1451 'ovsdb-data.at:594' \
   "string string datum" "                            " 72
 at_xfail=no
 (
-  $as_echo "1447. $at_setup_line: testing $at_desc ..."
+  $as_echo "1451. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292413,13 +293402,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1447
-#AT_START_1448
-at_fn_group_banner 1448 'ovsdb-data.at:603' \
+#AT_STOP_1451
+#AT_START_1452
+at_fn_group_banner 1452 'ovsdb-data.at:603' \
   "JSON optional boolean - C" "                      " 73
 at_xfail=no
 (
-  $as_echo "1448. $at_setup_line: testing $at_desc ..."
+  $as_echo "1452. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292453,13 +293442,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1448
-#AT_START_1449
-at_fn_group_banner 1449 'ovsdb-data.at:603' \
+#AT_STOP_1452
+#AT_START_1453
+at_fn_group_banner 1453 'ovsdb-data.at:603' \
   "JSON optional boolean - Python3" "                " 73
 at_xfail=no
 (
-  $as_echo "1449. $at_setup_line: testing $at_desc ..."
+  $as_echo "1453. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292494,13 +293483,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1449
-#AT_START_1450
-at_fn_group_banner 1450 'ovsdb-data.at:613' \
+#AT_STOP_1453
+#AT_START_1454
+at_fn_group_banner 1454 'ovsdb-data.at:613' \
   "string optional boolean" "                        " 73
 at_xfail=no
 (
-  $as_echo "1450. $at_setup_line: testing $at_desc ..."
+  $as_echo "1454. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292534,13 +293523,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1450
-#AT_START_1451
-at_fn_group_banner 1451 'ovsdb-data.at:623' \
+#AT_STOP_1454
+#AT_START_1455
+at_fn_group_banner 1455 'ovsdb-data.at:623' \
   "JSON set of 0 or more integers - C" "             " 73
 at_xfail=no
 (
-  $as_echo "1451. $at_setup_line: testing $at_desc ..."
+  $as_echo "1455. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292586,13 +293575,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1451
-#AT_START_1452
-at_fn_group_banner 1452 'ovsdb-data.at:623' \
+#AT_STOP_1455
+#AT_START_1456
+at_fn_group_banner 1456 'ovsdb-data.at:623' \
   "JSON set of 0 or more integers - Python3" "       " 73
 at_xfail=no
 (
-  $as_echo "1452. $at_setup_line: testing $at_desc ..."
+  $as_echo "1456. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292639,13 +293628,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1452
-#AT_START_1453
-at_fn_group_banner 1453 'ovsdb-data.at:640' \
+#AT_STOP_1456
+#AT_START_1457
+at_fn_group_banner 1457 'ovsdb-data.at:640' \
   "string set of 0 or more integers" "               " 73
 at_xfail=no
 (
-  $as_echo "1453. $at_setup_line: testing $at_desc ..."
+  $as_echo "1457. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292694,13 +293683,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1453
-#AT_START_1454
-at_fn_group_banner 1454 'ovsdb-data.at:659' \
+#AT_STOP_1457
+#AT_START_1458
+at_fn_group_banner 1458 'ovsdb-data.at:659' \
   "JSON set of 1 to 3 uuids - C" "                   " 73
 at_xfail=no
 (
-  $as_echo "1454. $at_setup_line: testing $at_desc ..."
+  $as_echo "1458. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292738,13 +293727,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1454
-#AT_START_1455
-at_fn_group_banner 1455 'ovsdb-data.at:659' \
+#AT_STOP_1458
+#AT_START_1459
+at_fn_group_banner 1459 'ovsdb-data.at:659' \
   "JSON set of 1 to 3 uuids - Python3" "             " 73
 at_xfail=no
 (
-  $as_echo "1455. $at_setup_line: testing $at_desc ..."
+  $as_echo "1459. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292783,13 +293772,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1455
-#AT_START_1456
-at_fn_group_banner 1456 'ovsdb-data.at:670' \
+#AT_STOP_1459
+#AT_START_1460
+at_fn_group_banner 1460 'ovsdb-data.at:670' \
   "string set of 1 to 3 uuids" "                     " 73
 at_xfail=no
 (
-  $as_echo "1456. $at_setup_line: testing $at_desc ..."
+  $as_echo "1460. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292824,13 +293813,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1456
-#AT_START_1457
-at_fn_group_banner 1457 'ovsdb-data.at:679' \
+#AT_STOP_1460
+#AT_START_1461
+at_fn_group_banner 1461 'ovsdb-data.at:679' \
   "JSON set of 0 to 3 strings - C" "                 " 73
 at_xfail=no
 (
-  $as_echo "1457. $at_setup_line: testing $at_desc ..."
+  $as_echo "1461. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292870,13 +293859,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1457
-#AT_START_1458
-at_fn_group_banner 1458 'ovsdb-data.at:679' \
+#AT_STOP_1461
+#AT_START_1462
+at_fn_group_banner 1462 'ovsdb-data.at:679' \
   "JSON set of 0 to 3 strings - Python3" "           " 73
 at_xfail=no
 (
-  $as_echo "1458. $at_setup_line: testing $at_desc ..."
+  $as_echo "1462. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292917,13 +293906,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1458
-#AT_START_1459
-at_fn_group_banner 1459 'ovsdb-data.at:692' \
+#AT_STOP_1462
+#AT_START_1463
+at_fn_group_banner 1463 'ovsdb-data.at:692' \
   "string set of 0 to 3 strings" "                   " 73
 at_xfail=no
 (
-  $as_echo "1459. $at_setup_line: testing $at_desc ..."
+  $as_echo "1463. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -292960,13 +293949,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1459
-#AT_START_1460
-at_fn_group_banner 1460 'ovsdb-data.at:703' \
+#AT_STOP_1463
+#AT_START_1464
+at_fn_group_banner 1464 'ovsdb-data.at:703' \
   "duplicate boolean not allowed in JSON set - C" "  " 73
 at_xfail=no
 (
-  $as_echo "1460. $at_setup_line: testing $at_desc ..."
+  $as_echo "1464. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293014,13 +294003,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1460
-#AT_START_1461
-at_fn_group_banner 1461 'ovsdb-data.at:703' \
+#AT_STOP_1464
+#AT_START_1465
+at_fn_group_banner 1465 'ovsdb-data.at:703' \
   "duplicate boolean not allowed in JSON set - Python3" "" 73
 at_xfail=no
 (
-  $as_echo "1461. $at_setup_line: testing $at_desc ..."
+  $as_echo "1465. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293068,13 +294057,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1461
-#AT_START_1462
-at_fn_group_banner 1462 'ovsdb-data.at:707' \
+#AT_STOP_1465
+#AT_START_1466
+at_fn_group_banner 1466 'ovsdb-data.at:707' \
   "duplicate boolean not allowed in string set" "    " 73
 at_xfail=no
 (
-  $as_echo "1462. $at_setup_line: testing $at_desc ..."
+  $as_echo "1466. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293122,13 +294111,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1462
-#AT_START_1463
-at_fn_group_banner 1463 'ovsdb-data.at:711' \
+#AT_STOP_1466
+#AT_START_1467
+at_fn_group_banner 1467 'ovsdb-data.at:711' \
   "duplicate integer not allowed in JSON set - C" "  " 73
 at_xfail=no
 (
-  $as_echo "1463. $at_setup_line: testing $at_desc ..."
+  $as_echo "1467. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293176,13 +294165,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1463
-#AT_START_1464
-at_fn_group_banner 1464 'ovsdb-data.at:711' \
+#AT_STOP_1467
+#AT_START_1468
+at_fn_group_banner 1468 'ovsdb-data.at:711' \
   "duplicate integer not allowed in JSON set - Python3" "" 73
 at_xfail=no
 (
-  $as_echo "1464. $at_setup_line: testing $at_desc ..."
+  $as_echo "1468. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293230,13 +294219,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1464
-#AT_START_1465
-at_fn_group_banner 1465 'ovsdb-data.at:715' \
+#AT_STOP_1468
+#AT_START_1469
+at_fn_group_banner 1469 'ovsdb-data.at:715' \
   "duplicate integer not allowed in string set" "    " 73
 at_xfail=no
 (
-  $as_echo "1465. $at_setup_line: testing $at_desc ..."
+  $as_echo "1469. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293284,13 +294273,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1465
-#AT_START_1466
-at_fn_group_banner 1466 'ovsdb-data.at:719' \
+#AT_STOP_1469
+#AT_START_1470
+at_fn_group_banner 1470 'ovsdb-data.at:719' \
   "duplicate real not allowed in JSON set - C" "     " 73
 at_xfail=no
 (
-  $as_echo "1466. $at_setup_line: testing $at_desc ..."
+  $as_echo "1470. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293338,13 +294327,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1466
-#AT_START_1467
-at_fn_group_banner 1467 'ovsdb-data.at:719' \
+#AT_STOP_1470
+#AT_START_1471
+at_fn_group_banner 1471 'ovsdb-data.at:719' \
   "duplicate real not allowed in JSON set - Python3" "" 73
 at_xfail=no
 (
-  $as_echo "1467. $at_setup_line: testing $at_desc ..."
+  $as_echo "1471. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293392,13 +294381,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1467
-#AT_START_1468
-at_fn_group_banner 1468 'ovsdb-data.at:723' \
+#AT_STOP_1471
+#AT_START_1472
+at_fn_group_banner 1472 'ovsdb-data.at:723' \
   "duplicate real not allowed in string set" "       " 73
 at_xfail=no
 (
-  $as_echo "1468. $at_setup_line: testing $at_desc ..."
+  $as_echo "1472. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293446,13 +294435,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1468
-#AT_START_1469
-at_fn_group_banner 1469 'ovsdb-data.at:727' \
+#AT_STOP_1472
+#AT_START_1473
+at_fn_group_banner 1473 'ovsdb-data.at:727' \
   "duplicate string not allowed in JSON set - C" "   " 73
 at_xfail=no
 (
-  $as_echo "1469. $at_setup_line: testing $at_desc ..."
+  $as_echo "1473. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293500,13 +294489,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1469
-#AT_START_1470
-at_fn_group_banner 1470 'ovsdb-data.at:727' \
+#AT_STOP_1473
+#AT_START_1474
+at_fn_group_banner 1474 'ovsdb-data.at:727' \
   "duplicate string not allowed in JSON set - Python3" "" 73
 at_xfail=no
 (
-  $as_echo "1470. $at_setup_line: testing $at_desc ..."
+  $as_echo "1474. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293554,13 +294543,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1470
-#AT_START_1471
-at_fn_group_banner 1471 'ovsdb-data.at:731' \
+#AT_STOP_1474
+#AT_START_1475
+at_fn_group_banner 1475 'ovsdb-data.at:731' \
   "duplicate string not allowed in string set" "     " 73
 at_xfail=no
 (
-  $as_echo "1471. $at_setup_line: testing $at_desc ..."
+  $as_echo "1475. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293608,13 +294597,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1471
-#AT_START_1472
-at_fn_group_banner 1472 'ovsdb-data.at:735' \
+#AT_STOP_1475
+#AT_START_1476
+at_fn_group_banner 1476 'ovsdb-data.at:735' \
   "duplicate uuid not allowed in JSON set - C" "     " 73
 at_xfail=no
 (
-  $as_echo "1472. $at_setup_line: testing $at_desc ..."
+  $as_echo "1476. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293668,13 +294657,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1472
-#AT_START_1473
-at_fn_group_banner 1473 'ovsdb-data.at:735' \
+#AT_STOP_1476
+#AT_START_1477
+at_fn_group_banner 1477 'ovsdb-data.at:735' \
   "duplicate uuid not allowed in JSON set - Python3" "" 73
 at_xfail=no
 (
-  $as_echo "1473. $at_setup_line: testing $at_desc ..."
+  $as_echo "1477. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293728,13 +294717,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1473
-#AT_START_1474
-at_fn_group_banner 1474 'ovsdb-data.at:742' \
+#AT_STOP_1477
+#AT_START_1478
+at_fn_group_banner 1478 'ovsdb-data.at:742' \
   "duplicate uuid not allowed in string set" "       " 73
 at_xfail=no
 (
-  $as_echo "1474. $at_setup_line: testing $at_desc ..."
+  $as_echo "1478. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293788,13 +294777,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1474
-#AT_START_1475
-at_fn_group_banner 1475 'ovsdb-data.at:751' \
+#AT_STOP_1478
+#AT_START_1479
+at_fn_group_banner 1479 'ovsdb-data.at:751' \
   "JSON map of 1 integer to boolean - C" "           " 74
 at_xfail=no
 (
-  $as_echo "1475. $at_setup_line: testing $at_desc ..."
+  $as_echo "1479. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293822,13 +294811,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1475
-#AT_START_1476
-at_fn_group_banner 1476 'ovsdb-data.at:751' \
+#AT_STOP_1479
+#AT_START_1480
+at_fn_group_banner 1480 'ovsdb-data.at:751' \
   "JSON map of 1 integer to boolean - Python3" "     " 74
 at_xfail=no
 (
-  $as_echo "1476. $at_setup_line: testing $at_desc ..."
+  $as_echo "1480. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293857,13 +294846,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1476
-#AT_START_1477
-at_fn_group_banner 1477 'ovsdb-data.at:756' \
+#AT_STOP_1480
+#AT_START_1481
+at_fn_group_banner 1481 'ovsdb-data.at:756' \
   "string map of 1 integer to boolean" "             " 74
 at_xfail=no
 (
-  $as_echo "1477. $at_setup_line: testing $at_desc ..."
+  $as_echo "1481. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293891,13 +294880,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1477
-#AT_START_1478
-at_fn_group_banner 1478 'ovsdb-data.at:761' \
+#AT_STOP_1481
+#AT_START_1482
+at_fn_group_banner 1482 'ovsdb-data.at:761' \
   "JSON map of at least 1 integer to boolean - C" "  " 74
 at_xfail=no
 (
-  $as_echo "1478. $at_setup_line: testing $at_desc ..."
+  $as_echo "1482. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293931,13 +294920,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1478
-#AT_START_1479
-at_fn_group_banner 1479 'ovsdb-data.at:761' \
+#AT_STOP_1482
+#AT_START_1483
+at_fn_group_banner 1483 'ovsdb-data.at:761' \
   "JSON map of at least 1 integer to boolean - Python3" "" 74
 at_xfail=no
 (
-  $as_echo "1479. $at_setup_line: testing $at_desc ..."
+  $as_echo "1483. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -293972,13 +294961,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1479
-#AT_START_1480
-at_fn_group_banner 1480 'ovsdb-data.at:770' \
+#AT_STOP_1483
+#AT_START_1484
+at_fn_group_banner 1484 'ovsdb-data.at:770' \
   "string map of at least 1 integer to boolean" "    " 74
 at_xfail=no
 (
-  $as_echo "1480. $at_setup_line: testing $at_desc ..."
+  $as_echo "1484. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294012,13 +295001,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1480
-#AT_START_1481
-at_fn_group_banner 1481 'ovsdb-data.at:779' \
+#AT_STOP_1484
+#AT_START_1485
+at_fn_group_banner 1485 'ovsdb-data.at:779' \
   "JSON map of 1 boolean to integer - C" "           " 74
 at_xfail=no
 (
-  $as_echo "1481. $at_setup_line: testing $at_desc ..."
+  $as_echo "1485. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294046,13 +295035,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1481
-#AT_START_1482
-at_fn_group_banner 1482 'ovsdb-data.at:779' \
+#AT_STOP_1485
+#AT_START_1486
+at_fn_group_banner 1486 'ovsdb-data.at:779' \
   "JSON map of 1 boolean to integer - Python3" "     " 74
 at_xfail=no
 (
-  $as_echo "1482. $at_setup_line: testing $at_desc ..."
+  $as_echo "1486. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294081,13 +295070,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1482
-#AT_START_1483
-at_fn_group_banner 1483 'ovsdb-data.at:784' \
+#AT_STOP_1486
+#AT_START_1487
+at_fn_group_banner 1487 'ovsdb-data.at:784' \
   "string map of 1 boolean to integer" "             " 74
 at_xfail=no
 (
-  $as_echo "1483. $at_setup_line: testing $at_desc ..."
+  $as_echo "1487. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294115,13 +295104,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1483
-#AT_START_1484
-at_fn_group_banner 1484 'ovsdb-data.at:789' \
+#AT_STOP_1487
+#AT_START_1488
+at_fn_group_banner 1488 'ovsdb-data.at:789' \
   "JSON map of 1 uuid to real - C" "                 " 74
 at_xfail=no
 (
-  $as_echo "1484. $at_setup_line: testing $at_desc ..."
+  $as_echo "1488. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294157,13 +295146,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1484
-#AT_START_1485
-at_fn_group_banner 1485 'ovsdb-data.at:789' \
+#AT_STOP_1488
+#AT_START_1489
+at_fn_group_banner 1489 'ovsdb-data.at:789' \
   "JSON map of 1 uuid to real - Python3" "           " 74
 at_xfail=no
 (
-  $as_echo "1485. $at_setup_line: testing $at_desc ..."
+  $as_echo "1489. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294200,13 +295189,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1485
-#AT_START_1486
-at_fn_group_banner 1486 'ovsdb-data.at:798' \
+#AT_STOP_1489
+#AT_START_1490
+at_fn_group_banner 1490 'ovsdb-data.at:798' \
   "string map of 1 uuid to real" "                   " 74
 at_xfail=no
 (
-  $as_echo "1486. $at_setup_line: testing $at_desc ..."
+  $as_echo "1490. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294242,13 +295231,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1486
-#AT_START_1487
-at_fn_group_banner 1487 'ovsdb-data.at:807' \
+#AT_STOP_1490
+#AT_START_1491
+at_fn_group_banner 1491 'ovsdb-data.at:807' \
   "JSON map of 10 string to string - C" "            " 74
 at_xfail=no
 (
-  $as_echo "1487. $at_setup_line: testing $at_desc ..."
+  $as_echo "1491. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294294,13 +295283,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1487
-#AT_START_1488
-at_fn_group_banner 1488 'ovsdb-data.at:807' \
+#AT_STOP_1491
+#AT_START_1492
+at_fn_group_banner 1492 'ovsdb-data.at:807' \
   "JSON map of 10 string to string - Python3" "      " 74
 at_xfail=no
 (
-  $as_echo "1488. $at_setup_line: testing $at_desc ..."
+  $as_echo "1492. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294347,13 +295336,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1488
-#AT_START_1489
-at_fn_group_banner 1489 'ovsdb-data.at:821' \
+#AT_STOP_1492
+#AT_START_1493
+at_fn_group_banner 1493 'ovsdb-data.at:821' \
   "string map of 10 string to string" "              " 74
 at_xfail=no
 (
-  $as_echo "1489. $at_setup_line: testing $at_desc ..."
+  $as_echo "1493. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294399,13 +295388,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1489
-#AT_START_1490
-at_fn_group_banner 1490 'ovsdb-data.at:835' \
+#AT_STOP_1493
+#AT_START_1494
+at_fn_group_banner 1494 'ovsdb-data.at:835' \
   "duplicate integer key not allowed in JSON map - C" "" 74
 at_xfail=no
 (
-  $as_echo "1490. $at_setup_line: testing $at_desc ..."
+  $as_echo "1494. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294455,13 +295444,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1490
-#AT_START_1491
-at_fn_group_banner 1491 'ovsdb-data.at:835' \
+#AT_STOP_1494
+#AT_START_1495
+at_fn_group_banner 1495 'ovsdb-data.at:835' \
   "duplicate integer key not allowed in JSON map - Python3" "" 74
 at_xfail=no
 (
-  $as_echo "1491. $at_setup_line: testing $at_desc ..."
+  $as_echo "1495. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294511,13 +295500,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1491
-#AT_START_1492
-at_fn_group_banner 1492 'ovsdb-data.at:840' \
+#AT_STOP_1495
+#AT_START_1496
+at_fn_group_banner 1496 'ovsdb-data.at:840' \
   "duplicate integer key not allowed in string map" "" 74
 at_xfail=no
 (
-  $as_echo "1492. $at_setup_line: testing $at_desc ..."
+  $as_echo "1496. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294567,13 +295556,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1492
-#AT_START_1493
-at_fn_group_banner 1493 'ovsdb-data.at:845' \
+#AT_STOP_1496
+#AT_START_1497
+at_fn_group_banner 1497 'ovsdb-data.at:845' \
   "generate and apply diff -- integer" "             " 74
 at_xfail=no
 (
-  $as_echo "1493. $at_setup_line: testing $at_desc ..."
+  $as_echo "1497. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294601,13 +295590,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1493
-#AT_START_1494
-at_fn_group_banner 1494 'ovsdb-data.at:851' \
+#AT_STOP_1497
+#AT_START_1498
+at_fn_group_banner 1498 'ovsdb-data.at:851' \
   "generate and apply diff -- boolean" "             " 74
 at_xfail=no
 (
-  $as_echo "1494. $at_setup_line: testing $at_desc ..."
+  $as_echo "1498. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294635,13 +295624,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1494
-#AT_START_1495
-at_fn_group_banner 1495 'ovsdb-data.at:857' \
+#AT_STOP_1498
+#AT_START_1499
+at_fn_group_banner 1499 'ovsdb-data.at:857' \
   "generate and apply diff -- string" "              " 74
 at_xfail=no
 (
-  $as_echo "1495. $at_setup_line: testing $at_desc ..."
+  $as_echo "1499. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294669,13 +295658,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1495
-#AT_START_1496
-at_fn_group_banner 1496 'ovsdb-data.at:864' \
+#AT_STOP_1499
+#AT_START_1500
+at_fn_group_banner 1500 'ovsdb-data.at:864' \
   "generate and apply diff -- set" "                 " 74
 at_xfail=no
 (
-  $as_echo "1496. $at_setup_line: testing $at_desc ..."
+  $as_echo "1500. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294722,13 +295711,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1496
-#AT_START_1497
-at_fn_group_banner 1497 'ovsdb-data.at:885' \
+#AT_STOP_1500
+#AT_START_1501
+at_fn_group_banner 1501 'ovsdb-data.at:885' \
   "generate and apply diff -- set -- size error" "   " 74
 at_xfail=no
 (
-  $as_echo "1497. $at_setup_line: testing $at_desc ..."
+  $as_echo "1501. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294778,13 +295767,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1497
-#AT_START_1498
-at_fn_group_banner 1498 'ovsdb-data.at:891' \
+#AT_STOP_1501
+#AT_START_1502
+at_fn_group_banner 1502 'ovsdb-data.at:891' \
   "generate and apply diff -- map" "                 " 74
 at_xfail=no
 (
-  $as_echo "1498. $at_setup_line: testing $at_desc ..."
+  $as_echo "1502. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294836,13 +295825,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1498
-#AT_START_1499
-at_fn_group_banner 1499 'ovsdb-data.at:915' \
+#AT_STOP_1502
+#AT_START_1503
+at_fn_group_banner 1503 'ovsdb-data.at:915' \
   "generate and apply diff with map -- size error" " " 74
 at_xfail=no
 (
-  $as_echo "1499. $at_setup_line: testing $at_desc ..."
+  $as_echo "1503. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294902,13 +295891,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1499
-#AT_START_1500
-at_fn_group_banner 1500 'ovsdb-column.at:3' \
+#AT_STOP_1503
+#AT_START_1504
+at_fn_group_banner 1504 'ovsdb-column.at:3' \
   "ordinary column - C" "                            " 75
 at_xfail=no
 (
-  $as_echo "1500. $at_setup_line: testing $at_desc ..."
+  $as_echo "1504. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294934,13 +295923,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1500
-#AT_START_1501
-at_fn_group_banner 1501 'ovsdb-column.at:3' \
+#AT_STOP_1504
+#AT_START_1505
+at_fn_group_banner 1505 'ovsdb-column.at:3' \
   "ordinary column - Python3" "                      " 75
 at_xfail=no
 (
-  $as_echo "1501. $at_setup_line: testing $at_desc ..."
+  $as_echo "1505. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294967,13 +295956,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1501
-#AT_START_1502
-at_fn_group_banner 1502 'ovsdb-column.at:7' \
+#AT_STOP_1505
+#AT_START_1506
+at_fn_group_banner 1506 'ovsdb-column.at:7' \
   "immutable column - C" "                           " 75
 at_xfail=no
 (
-  $as_echo "1502. $at_setup_line: testing $at_desc ..."
+  $as_echo "1506. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -294999,13 +295988,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1502
-#AT_START_1503
-at_fn_group_banner 1503 'ovsdb-column.at:7' \
+#AT_STOP_1506
+#AT_START_1507
+at_fn_group_banner 1507 'ovsdb-column.at:7' \
   "immutable column - Python3" "                     " 75
 at_xfail=no
 (
-  $as_echo "1503. $at_setup_line: testing $at_desc ..."
+  $as_echo "1507. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295032,13 +296021,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1503
-#AT_START_1504
-at_fn_group_banner 1504 'ovsdb-column.at:11' \
+#AT_STOP_1507
+#AT_START_1508
+at_fn_group_banner 1508 'ovsdb-column.at:11' \
   "ephemeral column - C" "                           " 75
 at_xfail=no
 (
-  $as_echo "1504. $at_setup_line: testing $at_desc ..."
+  $as_echo "1508. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295064,13 +296053,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1504
-#AT_START_1505
-at_fn_group_banner 1505 'ovsdb-column.at:11' \
+#AT_STOP_1508
+#AT_START_1509
+at_fn_group_banner 1509 'ovsdb-column.at:11' \
   "ephemeral column - Python3" "                     " 75
 at_xfail=no
 (
-  $as_echo "1505. $at_setup_line: testing $at_desc ..."
+  $as_echo "1509. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295097,13 +296086,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1505
-#AT_START_1506
-at_fn_group_banner 1506 'ovsdb-table.at:3' \
+#AT_STOP_1509
+#AT_START_1510
+at_fn_group_banner 1510 'ovsdb-table.at:3' \
   "non-root table with one column - C" "             " 76
 at_xfail=no
 (
-  $as_echo "1506. $at_setup_line: testing $at_desc ..."
+  $as_echo "1510. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295129,13 +296118,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1506
-#AT_START_1507
-at_fn_group_banner 1507 'ovsdb-table.at:3' \
+#AT_STOP_1510
+#AT_START_1511
+at_fn_group_banner 1511 'ovsdb-table.at:3' \
   "non-root table with one column - Python3" "       " 76
 at_xfail=no
 (
-  $as_echo "1507. $at_setup_line: testing $at_desc ..."
+  $as_echo "1511. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295162,13 +296151,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1507
-#AT_START_1508
-at_fn_group_banner 1508 'ovsdb-table.at:7' \
+#AT_STOP_1511
+#AT_START_1512
+at_fn_group_banner 1512 'ovsdb-table.at:7' \
   "immutable table with one column - C" "            " 76
 at_xfail=no
 (
-  $as_echo "1508. $at_setup_line: testing $at_desc ..."
+  $as_echo "1512. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295198,13 +296187,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1508
-#AT_START_1509
-at_fn_group_banner 1509 'ovsdb-table.at:7' \
+#AT_STOP_1512
+#AT_START_1513
+at_fn_group_banner 1513 'ovsdb-table.at:7' \
   "immutable table with one column - Python3" "      " 76
 at_xfail=no
 (
-  $as_echo "1509. $at_setup_line: testing $at_desc ..."
+  $as_echo "1513. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295235,13 +296224,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1509
-#AT_START_1510
-at_fn_group_banner 1510 'ovsdb-table.at:13' \
+#AT_STOP_1513
+#AT_START_1514
+at_fn_group_banner 1514 'ovsdb-table.at:13' \
   "root table with one column - C" "                 " 76
 at_xfail=no
 (
-  $as_echo "1510. $at_setup_line: testing $at_desc ..."
+  $as_echo "1514. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295271,13 +296260,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1510
-#AT_START_1511
-at_fn_group_banner 1511 'ovsdb-table.at:13' \
+#AT_STOP_1514
+#AT_START_1515
+at_fn_group_banner 1515 'ovsdb-table.at:13' \
   "root table with one column - Python3" "           " 76
 at_xfail=no
 (
-  $as_echo "1511. $at_setup_line: testing $at_desc ..."
+  $as_echo "1515. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295308,13 +296297,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1511
-#AT_START_1512
-at_fn_group_banner 1512 'ovsdb-table.at:19' \
+#AT_STOP_1515
+#AT_START_1516
+at_fn_group_banner 1516 'ovsdb-table.at:19' \
   "non-root table with default_is_root=true - C" "   " 76
 at_xfail=no
 (
-  $as_echo "1512. $at_setup_line: testing $at_desc ..."
+  $as_echo "1516. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295340,13 +296329,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1512
-#AT_START_1513
-at_fn_group_banner 1513 'ovsdb-table.at:19' \
+#AT_STOP_1516
+#AT_START_1517
+at_fn_group_banner 1517 'ovsdb-table.at:19' \
   "non-root table with default_is_root=true - Python3" "" 76
 at_xfail=no
 (
-  $as_echo "1513. $at_setup_line: testing $at_desc ..."
+  $as_echo "1517. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295373,13 +296362,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1513
-#AT_START_1514
-at_fn_group_banner 1514 'ovsdb-table.at:23' \
+#AT_STOP_1517
+#AT_START_1518
+at_fn_group_banner 1518 'ovsdb-table.at:23' \
   "root table with default_is_root=true - C" "       " 76
 at_xfail=no
 (
-  $as_echo "1514. $at_setup_line: testing $at_desc ..."
+  $as_echo "1518. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295409,13 +296398,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1514
-#AT_START_1515
-at_fn_group_banner 1515 'ovsdb-table.at:23' \
+#AT_STOP_1518
+#AT_START_1519
+at_fn_group_banner 1519 'ovsdb-table.at:23' \
   "root table with default_is_root=true - Python3" " " 76
 at_xfail=no
 (
-  $as_echo "1515. $at_setup_line: testing $at_desc ..."
+  $as_echo "1519. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295446,13 +296435,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1515
-#AT_START_1516
-at_fn_group_banner 1516 'ovsdb-table.at:29' \
+#AT_STOP_1519
+#AT_START_1520
+at_fn_group_banner 1520 'ovsdb-table.at:29' \
   "table with maxRows of 2 - C" "                    " 76
 at_xfail=no
 (
-  $as_echo "1516. $at_setup_line: testing $at_desc ..."
+  $as_echo "1520. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295480,13 +296469,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1516
-#AT_START_1517
-at_fn_group_banner 1517 'ovsdb-table.at:29' \
+#AT_STOP_1520
+#AT_START_1521
+at_fn_group_banner 1521 'ovsdb-table.at:29' \
   "table with maxRows of 2 - Python3" "              " 76
 at_xfail=no
 (
-  $as_echo "1517. $at_setup_line: testing $at_desc ..."
+  $as_echo "1521. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295515,13 +296504,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1517
-#AT_START_1518
-at_fn_group_banner 1518 'ovsdb-table.at:34' \
+#AT_STOP_1521
+#AT_START_1522
+at_fn_group_banner 1522 'ovsdb-table.at:34' \
   "table with index - C" "                           " 76
 at_xfail=no
 (
-  $as_echo "1518. $at_setup_line: testing $at_desc ..."
+  $as_echo "1522. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295551,13 +296540,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1518
-#AT_START_1519
-at_fn_group_banner 1519 'ovsdb-table.at:34' \
+#AT_STOP_1522
+#AT_START_1523
+at_fn_group_banner 1523 'ovsdb-table.at:34' \
   "table with index - Python3" "                     " 76
 at_xfail=no
 (
-  $as_echo "1519. $at_setup_line: testing $at_desc ..."
+  $as_echo "1523. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295588,13 +296577,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1519
-#AT_START_1520
-at_fn_group_banner 1520 'ovsdb-table.at:40' \
+#AT_STOP_1523
+#AT_START_1524
+at_fn_group_banner 1524 'ovsdb-table.at:40' \
   "table with syntax error in index - C" "           " 76
 at_xfail=no
 (
-  $as_echo "1520. $at_setup_line: testing $at_desc ..."
+  $as_echo "1524. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295646,13 +296635,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1520
-#AT_START_1521
-at_fn_group_banner 1521 'ovsdb-table.at:40' \
+#AT_STOP_1524
+#AT_START_1525
+at_fn_group_banner 1525 'ovsdb-table.at:40' \
   "table with syntax error in index - Python3" "     " 76
 at_xfail=no
 (
-  $as_echo "1521. $at_setup_line: testing $at_desc ..."
+  $as_echo "1525. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295704,13 +296693,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1521
-#AT_START_1522
-at_fn_group_banner 1522 'ovsdb-table.at:46' \
+#AT_STOP_1525
+#AT_START_1526
+at_fn_group_banner 1526 'ovsdb-table.at:46' \
   "table with empty index - C" "                     " 76
 at_xfail=no
 (
-  $as_echo "1522. $at_setup_line: testing $at_desc ..."
+  $as_echo "1526. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295762,13 +296751,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1522
-#AT_START_1523
-at_fn_group_banner 1523 'ovsdb-table.at:46' \
+#AT_STOP_1526
+#AT_START_1527
+at_fn_group_banner 1527 'ovsdb-table.at:46' \
   "table with empty index - Python3" "               " 76
 at_xfail=no
 (
-  $as_echo "1523. $at_setup_line: testing $at_desc ..."
+  $as_echo "1527. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295820,13 +296809,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1523
-#AT_START_1524
-at_fn_group_banner 1524 'ovsdb-table.at:52' \
+#AT_STOP_1527
+#AT_START_1528
+at_fn_group_banner 1528 'ovsdb-table.at:52' \
   "table with index of ephemeral column - C" "       " 76
 at_xfail=no
 (
-  $as_echo "1524. $at_setup_line: testing $at_desc ..."
+  $as_echo "1528. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295880,13 +296869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1524
-#AT_START_1525
-at_fn_group_banner 1525 'ovsdb-table.at:52' \
+#AT_STOP_1528
+#AT_START_1529
+at_fn_group_banner 1529 'ovsdb-table.at:52' \
   "table with index of ephemeral column - Python3" " " 76
 at_xfail=no
 (
-  $as_echo "1525. $at_setup_line: testing $at_desc ..."
+  $as_echo "1529. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295940,13 +296929,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1525
-#AT_START_1526
-at_fn_group_banner 1526 'ovsdb-table.at:59' \
+#AT_STOP_1529
+#AT_START_1530
+at_fn_group_banner 1530 'ovsdb-table.at:59' \
   "column names may not begin with _ - C" "          " 76
 at_xfail=no
 (
-  $as_echo "1526. $at_setup_line: testing $at_desc ..."
+  $as_echo "1530. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -295996,13 +296985,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1526
-#AT_START_1527
-at_fn_group_banner 1527 'ovsdb-table.at:59' \
+#AT_STOP_1530
+#AT_START_1531
+at_fn_group_banner 1531 'ovsdb-table.at:59' \
   "column names may not begin with _ - Python3" "    " 76
 at_xfail=no
 (
-  $as_echo "1527. $at_setup_line: testing $at_desc ..."
+  $as_echo "1531. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296052,13 +297041,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1527
-#AT_START_1528
-at_fn_group_banner 1528 'ovsdb-table.at:65' \
+#AT_STOP_1531
+#AT_START_1532
+at_fn_group_banner 1532 'ovsdb-table.at:65' \
   "table must have at least one column (1) - C" "    " 76
 at_xfail=no
 (
-  $as_echo "1528. $at_setup_line: testing $at_desc ..."
+  $as_echo "1532. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296106,13 +297095,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1528
-#AT_START_1529
-at_fn_group_banner 1529 'ovsdb-table.at:65' \
+#AT_STOP_1532
+#AT_START_1533
+at_fn_group_banner 1533 'ovsdb-table.at:65' \
   "table must have at least one column (1) - Python3" "" 76
 at_xfail=no
 (
-  $as_echo "1529. $at_setup_line: testing $at_desc ..."
+  $as_echo "1533. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296160,13 +297149,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1529
-#AT_START_1530
-at_fn_group_banner 1530 'ovsdb-table.at:69' \
+#AT_STOP_1533
+#AT_START_1534
+at_fn_group_banner 1534 'ovsdb-table.at:69' \
   "table must have at least one column (2) - C" "    " 76
 at_xfail=no
 (
-  $as_echo "1530. $at_setup_line: testing $at_desc ..."
+  $as_echo "1534. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296214,13 +297203,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1530
-#AT_START_1531
-at_fn_group_banner 1531 'ovsdb-table.at:69' \
+#AT_STOP_1534
+#AT_START_1535
+at_fn_group_banner 1535 'ovsdb-table.at:69' \
   "table must have at least one column (2) - Python3" "" 76
 at_xfail=no
 (
-  $as_echo "1531. $at_setup_line: testing $at_desc ..."
+  $as_echo "1535. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296268,13 +297257,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1531
-#AT_START_1532
-at_fn_group_banner 1532 'ovsdb-table.at:73' \
+#AT_STOP_1535
+#AT_START_1536
+at_fn_group_banner 1536 'ovsdb-table.at:73' \
   "table maxRows must be positive - C" "             " 76
 at_xfail=no
 (
-  $as_echo "1532. $at_setup_line: testing $at_desc ..."
+  $as_echo "1536. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296324,13 +297313,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1532
-#AT_START_1533
-at_fn_group_banner 1533 'ovsdb-table.at:73' \
+#AT_STOP_1536
+#AT_START_1537
+at_fn_group_banner 1537 'ovsdb-table.at:73' \
   "table maxRows must be positive - Python3" "       " 76
 at_xfail=no
 (
-  $as_echo "1533. $at_setup_line: testing $at_desc ..."
+  $as_echo "1537. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296380,13 +297369,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1533
-#AT_START_1534
-at_fn_group_banner 1534 'ovsdb-row.at:3' \
+#AT_STOP_1537
+#AT_START_1538
+at_fn_group_banner 1538 'ovsdb-row.at:3' \
   "row with one string column" "                     " 77
 at_xfail=no
 (
-  $as_echo "1534. $at_setup_line: testing $at_desc ..."
+  $as_echo "1538. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296429,13 +297418,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1534
-#AT_START_1535
-at_fn_group_banner 1535 'ovsdb-row.at:19' \
+#AT_STOP_1538
+#AT_START_1539
+at_fn_group_banner 1539 'ovsdb-row.at:19' \
   "row with one integer column" "                    " 77
 at_xfail=no
 (
-  $as_echo "1535. $at_setup_line: testing $at_desc ..."
+  $as_echo "1539. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296478,13 +297467,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1535
-#AT_START_1536
-at_fn_group_banner 1536 'ovsdb-row.at:35' \
+#AT_STOP_1539
+#AT_START_1540
+at_fn_group_banner 1540 'ovsdb-row.at:35' \
   "row with one real column" "                       " 77
 at_xfail=no
 (
-  $as_echo "1536. $at_setup_line: testing $at_desc ..."
+  $as_echo "1540. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296527,13 +297516,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1536
-#AT_START_1537
-at_fn_group_banner 1537 'ovsdb-row.at:51' \
+#AT_STOP_1540
+#AT_START_1541
+at_fn_group_banner 1541 'ovsdb-row.at:51' \
   "row with one boolean column" "                    " 77
 at_xfail=no
 (
-  $as_echo "1537. $at_setup_line: testing $at_desc ..."
+  $as_echo "1541. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296572,13 +297561,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1537
-#AT_START_1538
-at_fn_group_banner 1538 'ovsdb-row.at:64' \
+#AT_STOP_1541
+#AT_START_1542
+at_fn_group_banner 1542 'ovsdb-row.at:64' \
   "row with one uuid column" "                       " 77
 at_xfail=no
 (
-  $as_echo "1538. $at_setup_line: testing $at_desc ..."
+  $as_echo "1542. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296617,13 +297606,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1538
-#AT_START_1539
-at_fn_group_banner 1539 'ovsdb-row.at:77' \
+#AT_STOP_1542
+#AT_START_1543
+at_fn_group_banner 1543 'ovsdb-row.at:77' \
   "row with set of 1 to 2 elements" "                " 77
 at_xfail=no
 (
-  $as_echo "1539. $at_setup_line: testing $at_desc ..."
+  $as_echo "1543. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296654,13 +297643,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1539
-#AT_START_1540
-at_fn_group_banner 1540 'ovsdb-row.at:84' \
+#AT_STOP_1543
+#AT_START_1544
+at_fn_group_banner 1544 'ovsdb-row.at:84' \
   "row with map of 1 to 2 elements" "                " 77
 at_xfail=no
 (
-  $as_echo "1540. $at_setup_line: testing $at_desc ..."
+  $as_echo "1544. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296691,13 +297680,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1540
-#AT_START_1541
-at_fn_group_banner 1541 'ovsdb-row.at:91' \
+#AT_STOP_1544
+#AT_START_1545
+at_fn_group_banner 1545 'ovsdb-row.at:91' \
   "row with several columns" "                       " 77
 at_xfail=no
 (
-  $as_echo "1541. $at_setup_line: testing $at_desc ..."
+  $as_echo "1545. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296756,13 +297745,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1541
-#AT_START_1542
-at_fn_group_banner 1542 'ovsdb-row.at:113' \
+#AT_STOP_1545
+#AT_START_1546
+at_fn_group_banner 1546 'ovsdb-row.at:113' \
   "row hashing (scalars)" "                          " 77
 at_xfail=no
 (
-  $as_echo "1542. $at_setup_line: testing $at_desc ..."
+  $as_echo "1546. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -296904,13 +297893,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1542
-#AT_START_1543
-at_fn_group_banner 1543 'ovsdb-row.at:182' \
+#AT_STOP_1546
+#AT_START_1547
+at_fn_group_banner 1547 'ovsdb-row.at:182' \
   "row hashing (sets)" "                             " 77
 at_xfail=no
 (
-  $as_echo "1543. $at_setup_line: testing $at_desc ..."
+  $as_echo "1547. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297014,13 +298003,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1543
-#AT_START_1544
-at_fn_group_banner 1544 'ovsdb-row.at:235' \
+#AT_STOP_1547
+#AT_START_1548
+at_fn_group_banner 1548 'ovsdb-row.at:235' \
   "row hashing (maps)" "                             " 77
 at_xfail=no
 (
-  $as_echo "1544. $at_setup_line: testing $at_desc ..."
+  $as_echo "1548. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297116,13 +298105,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1544
-#AT_START_1545
-at_fn_group_banner 1545 'ovsdb-schema.at:3' \
+#AT_STOP_1548
+#AT_START_1549
+at_fn_group_banner 1549 'ovsdb-schema.at:3' \
   "schema with valid refTables - C" "                " 78
 at_xfail=no
 (
-  $as_echo "1545. $at_setup_line: testing $at_desc ..."
+  $as_echo "1549. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297188,13 +298177,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1545
-#AT_START_1546
-at_fn_group_banner 1546 'ovsdb-schema.at:3' \
+#AT_STOP_1549
+#AT_START_1550
+at_fn_group_banner 1550 'ovsdb-schema.at:3' \
   "schema with valid refTables - Python3" "          " 78
 at_xfail=no
 (
-  $as_echo "1546. $at_setup_line: testing $at_desc ..."
+  $as_echo "1550. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297261,13 +298250,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1546
-#AT_START_1547
-at_fn_group_banner 1547 'ovsdb-schema.at:30' \
+#AT_STOP_1550
+#AT_START_1551
+at_fn_group_banner 1551 'ovsdb-schema.at:30' \
   "schema with ephemeral strong references - C" "    " 78
 at_xfail=no
 (
-  $as_echo "1547. $at_setup_line: testing $at_desc ..."
+  $as_echo "1551. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297343,13 +298332,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1547
-#AT_START_1548
-at_fn_group_banner 1548 'ovsdb-schema.at:30' \
+#AT_STOP_1551
+#AT_START_1552
+at_fn_group_banner 1552 'ovsdb-schema.at:30' \
   "schema with ephemeral strong references - Python3" "" 78
 at_xfail=no
 (
-  $as_echo "1548. $at_setup_line: testing $at_desc ..."
+  $as_echo "1552. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297426,13 +298415,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1548
-#AT_START_1549
-at_fn_group_banner 1549 'ovsdb-schema.at:60' \
+#AT_STOP_1552
+#AT_START_1553
+at_fn_group_banner 1553 'ovsdb-schema.at:60' \
   "schema with immutable weak references - C" "      " 78
 at_xfail=no
 (
-  $as_echo "1549. $at_setup_line: testing $at_desc ..."
+  $as_echo "1553. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297482,13 +298471,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1549
-#AT_START_1550
-at_fn_group_banner 1550 'ovsdb-schema.at:60' \
+#AT_STOP_1553
+#AT_START_1554
+at_fn_group_banner 1554 'ovsdb-schema.at:60' \
   "schema with immutable weak references - Python3" "" 78
 at_xfail=no
 (
-  $as_echo "1550. $at_setup_line: testing $at_desc ..."
+  $as_echo "1554. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297539,13 +298528,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1550
-#AT_START_1551
-at_fn_group_banner 1551 'ovsdb-schema.at:78' \
+#AT_STOP_1554
+#AT_START_1555
+at_fn_group_banner 1555 'ovsdb-schema.at:78' \
   "schema without version number - C" "              " 78
 at_xfail=no
 (
-  $as_echo "1551. $at_setup_line: testing $at_desc ..."
+  $as_echo "1555. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297583,13 +298572,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1551
-#AT_START_1552
-at_fn_group_banner 1552 'ovsdb-schema.at:78' \
+#AT_STOP_1555
+#AT_START_1556
+at_fn_group_banner 1556 'ovsdb-schema.at:78' \
   "schema without version number - Python3" "        " 78
 at_xfail=no
 (
-  $as_echo "1552. $at_setup_line: testing $at_desc ..."
+  $as_echo "1556. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297628,13 +298617,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1552
-#AT_START_1553
-at_fn_group_banner 1553 'ovsdb-schema.at:88' \
+#AT_STOP_1556
+#AT_START_1557
+at_fn_group_banner 1557 'ovsdb-schema.at:88' \
   "schema with invalid refTables - C" "              " 78
 at_xfail=no
 (
-  $as_echo "1553. $at_setup_line: testing $at_desc ..."
+  $as_echo "1557. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297720,13 +298709,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1553
-#AT_START_1554
-at_fn_group_banner 1554 'ovsdb-schema.at:88' \
+#AT_STOP_1557
+#AT_START_1558
+at_fn_group_banner 1558 'ovsdb-schema.at:88' \
   "schema with invalid refTables - Python3" "        " 78
 at_xfail=no
 (
-  $as_echo "1554. $at_setup_line: testing $at_desc ..."
+  $as_echo "1558. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297812,13 +298801,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1554
-#AT_START_1555
-at_fn_group_banner 1555 'ovsdb-schema.at:111' \
+#AT_STOP_1558
+#AT_START_1559
+at_fn_group_banner 1559 'ovsdb-schema.at:111' \
   "schema with invalid version number - C" "         " 78
 at_xfail=no
 (
-  $as_echo "1555. $at_setup_line: testing $at_desc ..."
+  $as_echo "1559. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297880,13 +298869,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1555
-#AT_START_1556
-at_fn_group_banner 1556 'ovsdb-schema.at:111' \
+#AT_STOP_1559
+#AT_START_1560
+at_fn_group_banner 1560 'ovsdb-schema.at:111' \
   "schema with invalid version number - Python3" "   " 78
 at_xfail=no
 (
-  $as_echo "1556. $at_setup_line: testing $at_desc ..."
+  $as_echo "1560. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297948,13 +298937,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1556
-#AT_START_1557
-at_fn_group_banner 1557 'ovsdb-condition.at:3' \
+#AT_STOP_1560
+#AT_START_1561
+at_fn_group_banner 1561 'ovsdb-condition.at:3' \
   "null condition" "                                 " 79
 at_xfail=no
 (
-  $as_echo "1557. $at_setup_line: testing $at_desc ..."
+  $as_echo "1561. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -297984,13 +298973,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1557
-#AT_START_1558
-at_fn_group_banner 1558 'ovsdb-condition.at:9' \
+#AT_STOP_1561
+#AT_START_1562
+at_fn_group_banner 1562 'ovsdb-condition.at:9' \
   "conditions on scalars" "                          " 79
 at_xfail=no
 (
-  $as_echo "1558. $at_setup_line: testing $at_desc ..."
+  $as_echo "1562. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298111,13 +299100,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1558
-#AT_START_1559
-at_fn_group_banner 1559 'ovsdb-condition.at:75' \
+#AT_STOP_1562
+#AT_START_1563
+at_fn_group_banner 1563 'ovsdb-condition.at:75' \
   "disallowed conditions on scalars" "               " 79
 at_xfail=no
 (
-  $as_echo "1559. $at_setup_line: testing $at_desc ..."
+  $as_echo "1563. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298342,13 +299331,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1559
-#AT_START_1560
-at_fn_group_banner 1560 'ovsdb-condition.at:213' \
+#AT_STOP_1563
+#AT_START_1564
+at_fn_group_banner 1564 'ovsdb-condition.at:213' \
   "conditions on optional scalars" "                 " 79
 at_xfail=no
 (
-  $as_echo "1560. $at_setup_line: testing $at_desc ..."
+  $as_echo "1564. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298469,13 +299458,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1560
-#AT_START_1561
-at_fn_group_banner 1561 'ovsdb-condition.at:279' \
+#AT_STOP_1564
+#AT_START_1565
+at_fn_group_banner 1565 'ovsdb-condition.at:279' \
   "disallowed conditions on optional scalars" "      " 79
 at_xfail=no
 (
-  $as_echo "1561. $at_setup_line: testing $at_desc ..."
+  $as_echo "1565. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298625,13 +299614,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1561
-#AT_START_1562
-at_fn_group_banner 1562 'ovsdb-condition.at:366' \
+#AT_STOP_1565
+#AT_START_1566
+at_fn_group_banner 1566 'ovsdb-condition.at:366' \
   "conditions on sets" "                             " 79
 at_xfail=no
 (
-  $as_echo "1562. $at_setup_line: testing $at_desc ..."
+  $as_echo "1566. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298750,13 +299739,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1562
-#AT_START_1563
-at_fn_group_banner 1563 'ovsdb-condition.at:427' \
+#AT_STOP_1566
+#AT_START_1567
+at_fn_group_banner 1567 'ovsdb-condition.at:427' \
   "condition sorting" "                              " 79
 at_xfail=no
 (
-  $as_echo "1563. $at_setup_line: testing $at_desc ..."
+  $as_echo "1567. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298802,13 +299791,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1563
-#AT_START_1564
-at_fn_group_banner 1564 'ovsdb-condition.at:441' \
+#AT_STOP_1567
+#AT_START_1568
+at_fn_group_banner 1568 'ovsdb-condition.at:441' \
   "boolean condition" "                              " 79
 at_xfail=no
 (
-  $as_echo "1564. $at_setup_line: testing $at_desc ..."
+  $as_echo "1568. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298838,13 +299827,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1564
-#AT_START_1565
-at_fn_group_banner 1565 'ovsdb-condition.at:447' \
+#AT_STOP_1568
+#AT_START_1569
+at_fn_group_banner 1569 'ovsdb-condition.at:447' \
   "boolean condition" "                              " 79
 at_xfail=no
 (
-  $as_echo "1565. $at_setup_line: testing $at_desc ..."
+  $as_echo "1569. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298874,13 +299863,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1565
-#AT_START_1566
-at_fn_group_banner 1566 'ovsdb-condition.at:453' \
+#AT_STOP_1569
+#AT_START_1570
+at_fn_group_banner 1570 'ovsdb-condition.at:453' \
   "evaluating null condition" "                      " 79
 at_xfail=no
 (
-  $as_echo "1566. $at_setup_line: testing $at_desc ..."
+  $as_echo "1570. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298916,13 +299905,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1566
-#AT_START_1567
-at_fn_group_banner 1567 'ovsdb-condition.at:462' \
+#AT_STOP_1570
+#AT_START_1571
+at_fn_group_banner 1571 'ovsdb-condition.at:462' \
   "evaluating conditions on integers" "              " 79
 at_xfail=no
 (
-  $as_echo "1567. $at_setup_line: testing $at_desc ..."
+  $as_echo "1571. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -298982,13 +299971,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1567
-#AT_START_1568
-at_fn_group_banner 1568 'ovsdb-condition.at:487' \
+#AT_STOP_1571
+#AT_START_1572
+at_fn_group_banner 1572 'ovsdb-condition.at:487' \
   "evaluating conditions on reals" "                 " 79
 at_xfail=no
 (
-  $as_echo "1568. $at_setup_line: testing $at_desc ..."
+  $as_echo "1572. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299047,14 +300036,14 @@
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_1568
-#AT_START_1569
-at_fn_group_banner 1569 'ovsdb-condition.at:512' \
+read at_status <"$at_status_file"
+#AT_STOP_1572
+#AT_START_1573
+at_fn_group_banner 1573 'ovsdb-condition.at:512' \
   "evaluating conditions on booleans" "              " 79
 at_xfail=no
 (
-  $as_echo "1569. $at_setup_line: testing $at_desc ..."
+  $as_echo "1573. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299112,13 +300101,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1569
-#AT_START_1570
-at_fn_group_banner 1570 'ovsdb-condition.at:536' \
+#AT_STOP_1573
+#AT_START_1574
+at_fn_group_banner 1574 'ovsdb-condition.at:536' \
   "evaluating conditions on strings" "               " 79
 at_xfail=no
 (
-  $as_echo "1570. $at_setup_line: testing $at_desc ..."
+  $as_echo "1574. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299178,13 +300167,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1570
-#AT_START_1571
-at_fn_group_banner 1571 'ovsdb-condition.at:561' \
+#AT_STOP_1574
+#AT_START_1575
+at_fn_group_banner 1575 'ovsdb-condition.at:561' \
   "evaluating conditions on UUIDs" "                 " 79
 at_xfail=no
 (
-  $as_echo "1571. $at_setup_line: testing $at_desc ..."
+  $as_echo "1575. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299246,13 +300235,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1571
-#AT_START_1572
-at_fn_group_banner 1572 'ovsdb-condition.at:587' \
+#AT_STOP_1575
+#AT_START_1576
+at_fn_group_banner 1576 'ovsdb-condition.at:587' \
   "evaluating conditions on sets" "                  " 79
 at_xfail=no
 (
-  $as_echo "1572. $at_setup_line: testing $at_desc ..."
+  $as_echo "1576. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299396,13 +300385,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1572
-#AT_START_1573
-at_fn_group_banner 1573 'ovsdb-condition.at:669' \
+#AT_STOP_1576
+#AT_START_1577
+at_fn_group_banner 1577 'ovsdb-condition.at:669' \
   "evaluating conditions on maps (1)" "              " 79
 at_xfail=no
 (
-  $as_echo "1573. $at_setup_line: testing $at_desc ..."
+  $as_echo "1577. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299552,13 +300541,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1573
-#AT_START_1574
-at_fn_group_banner 1574 'ovsdb-condition.at:754' \
+#AT_STOP_1577
+#AT_START_1578
+at_fn_group_banner 1578 'ovsdb-condition.at:754' \
   "evaluating conditions on maps (2)" "              " 79
 at_xfail=no
 (
-  $as_echo "1574. $at_setup_line: testing $at_desc ..."
+  $as_echo "1578. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299726,13 +300715,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1574
-#AT_START_1575
-at_fn_group_banner 1575 'ovsdb-condition.at:846' \
+#AT_STOP_1578
+#AT_START_1579
+at_fn_group_banner 1579 'ovsdb-condition.at:846' \
   "evaluating conditions on optional integers" "     " 79
 at_xfail=no
 (
-  $as_echo "1575. $at_setup_line: testing $at_desc ..."
+  $as_echo "1579. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299806,13 +300795,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1575
-#AT_START_1576
-at_fn_group_banner 1576 'ovsdb-condition.at:881' \
+#AT_STOP_1579
+#AT_START_1580
+at_fn_group_banner 1580 'ovsdb-condition.at:881' \
   "evaluating conditions on optional strings" "      " 79
 at_xfail=no
 (
-  $as_echo "1576. $at_setup_line: testing $at_desc ..."
+  $as_echo "1580. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299874,13 +300863,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1576
-#AT_START_1577
-at_fn_group_banner 1577 'ovsdb-condition.at:908' \
+#AT_STOP_1580
+#AT_START_1581
+at_fn_group_banner 1581 'ovsdb-condition.at:908' \
   "evaluating conditions on optional reals" "        " 79
 at_xfail=no
 (
-  $as_echo "1577. $at_setup_line: testing $at_desc ..."
+  $as_echo "1581. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299954,13 +300943,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1577
-#AT_START_1578
-at_fn_group_banner 1578 'ovsdb-condition.at:943' \
+#AT_STOP_1581
+#AT_START_1582
+at_fn_group_banner 1582 'ovsdb-condition.at:943' \
   "evaluating false boolean condition" "             " 79
 at_xfail=no
 (
-  $as_echo "1578. $at_setup_line: testing $at_desc ..."
+  $as_echo "1582. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -299996,13 +300985,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1578
-#AT_START_1579
-at_fn_group_banner 1579 'ovsdb-condition.at:952' \
+#AT_STOP_1582
+#AT_START_1583
+at_fn_group_banner 1583 'ovsdb-condition.at:952' \
   "evaluating true boolean condition" "              " 79
 at_xfail=no
 (
-  $as_echo "1579. $at_setup_line: testing $at_desc ..."
+  $as_echo "1583. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300038,13 +301027,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1579
-#AT_START_1580
-at_fn_group_banner 1580 'ovsdb-condition.at:961' \
+#AT_STOP_1583
+#AT_START_1584
+at_fn_group_banner 1584 'ovsdb-condition.at:961' \
   "compare condition" "                              " 79
 at_xfail=no
 (
-  $as_echo "1580. $at_setup_line: testing $at_desc ..."
+  $as_echo "1584. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300082,13 +301071,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1580
-#AT_START_1581
-at_fn_group_banner 1581 'ovsdb-mutation.at:3' \
+#AT_STOP_1584
+#AT_START_1585
+at_fn_group_banner 1585 'ovsdb-mutation.at:3' \
   "null mutation" "                                  " 80
 at_xfail=no
 (
-  $as_echo "1581. $at_setup_line: testing $at_desc ..."
+  $as_echo "1585. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300118,13 +301107,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1581
-#AT_START_1582
-at_fn_group_banner 1582 'ovsdb-mutation.at:9' \
+#AT_STOP_1585
+#AT_START_1586
+at_fn_group_banner 1586 'ovsdb-mutation.at:9' \
   "mutations on scalars" "                           " 80
 at_xfail=no
 (
-  $as_echo "1582. $at_setup_line: testing $at_desc ..."
+  $as_echo "1586. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300188,13 +301177,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1582
-#AT_START_1583
-at_fn_group_banner 1583 'ovsdb-mutation.at:37' \
+#AT_STOP_1586
+#AT_START_1587
+at_fn_group_banner 1587 'ovsdb-mutation.at:37' \
   "disallowed mutations on scalars" "                " 80
 at_xfail=no
 (
-  $as_echo "1583. $at_setup_line: testing $at_desc ..."
+  $as_echo "1587. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300309,13 +301298,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1583
-#AT_START_1584
-at_fn_group_banner 1584 'ovsdb-mutation.at:102' \
+#AT_STOP_1587
+#AT_START_1588
+at_fn_group_banner 1588 'ovsdb-mutation.at:102' \
   "disallowed mutations on immutable columns" "      " 80
 at_xfail=no
 (
-  $as_echo "1584. $at_setup_line: testing $at_desc ..."
+  $as_echo "1588. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300349,13 +301338,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1584
-#AT_START_1585
-at_fn_group_banner 1585 'ovsdb-mutation.at:114' \
+#AT_STOP_1588
+#AT_START_1589
+at_fn_group_banner 1589 'ovsdb-mutation.at:114' \
   "mutations on sets" "                              " 80
 at_xfail=no
 (
-  $as_echo "1585. $at_setup_line: testing $at_desc ..."
+  $as_echo "1589. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300457,13 +301446,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1585
-#AT_START_1586
-at_fn_group_banner 1586 'ovsdb-mutation.at:166' \
+#AT_STOP_1589
+#AT_START_1590
+at_fn_group_banner 1590 'ovsdb-mutation.at:166' \
   "executing null mutation" "                        " 80
 at_xfail=no
 (
-  $as_echo "1586. $at_setup_line: testing $at_desc ..."
+  $as_echo "1590. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300503,13 +301492,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1586
-#AT_START_1587
-at_fn_group_banner 1587 'ovsdb-mutation.at:179' \
+#AT_STOP_1590
+#AT_START_1591
+at_fn_group_banner 1591 'ovsdb-mutation.at:179' \
   "executing mutations on integers" "                " 80
 at_xfail=no
 (
-  $as_echo "1587. $at_setup_line: testing $at_desc ..."
+  $as_echo "1591. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300577,13 +301566,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1587
-#AT_START_1588
-at_fn_group_banner 1588 'ovsdb-mutation.at:216' \
+#AT_STOP_1591
+#AT_START_1592
+at_fn_group_banner 1592 'ovsdb-mutation.at:216' \
   "integer overflow detection" "                     " 80
 at_xfail=no
 (
-  $as_echo "1588. $at_setup_line: testing $at_desc ..."
+  $as_echo "1592. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300701,13 +301690,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1588
-#AT_START_1589
-at_fn_group_banner 1589 'ovsdb-mutation.at:297' \
+#AT_STOP_1592
+#AT_START_1593
+at_fn_group_banner 1593 'ovsdb-mutation.at:297' \
   "executing mutations on integers with constraints" "" 80
 at_xfail=no
 (
-  $as_echo "1589. $at_setup_line: testing $at_desc ..."
+  $as_echo "1593. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300779,13 +301768,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1589
-#AT_START_1590
-at_fn_group_banner 1590 'ovsdb-mutation.at:336' \
+#AT_STOP_1593
+#AT_START_1594
+at_fn_group_banner 1594 'ovsdb-mutation.at:336' \
   "executing mutations on reals" "                   " 80
 at_xfail=no
 (
-  $as_echo "1590. $at_setup_line: testing $at_desc ..."
+  $as_echo "1594. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300846,13 +301835,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1590
-#AT_START_1591
-at_fn_group_banner 1591 'ovsdb-mutation.at:367' \
+#AT_STOP_1594
+#AT_START_1595
+at_fn_group_banner 1595 'ovsdb-mutation.at:367' \
   "real overflow detection" "                        " 80
 at_xfail=no
 (
-  $as_echo "1591. $at_setup_line: testing $at_desc ..."
+  $as_echo "1595. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300927,13 +301916,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1591
-#AT_START_1592
-at_fn_group_banner 1592 'ovsdb-mutation.at:410' \
+#AT_STOP_1595
+#AT_START_1596
+at_fn_group_banner 1596 'ovsdb-mutation.at:410' \
   "executing mutations on reals with constraints" "  " 80
 at_xfail=no
 (
-  $as_echo "1592. $at_setup_line: testing $at_desc ..."
+  $as_echo "1596. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -300998,13 +301987,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1592
-#AT_START_1593
-at_fn_group_banner 1593 'ovsdb-mutation.at:443' \
+#AT_STOP_1596
+#AT_START_1597
+at_fn_group_banner 1597 'ovsdb-mutation.at:443' \
   "executing mutations on integer sets" "            " 80
 at_xfail=no
 (
-  $as_echo "1593. $at_setup_line: testing $at_desc ..."
+  $as_echo "1597. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301117,13 +302106,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1593
-#AT_START_1594
-at_fn_group_banner 1594 'ovsdb-mutation.at:517' \
+#AT_STOP_1597
+#AT_START_1598
+at_fn_group_banner 1598 'ovsdb-mutation.at:517' \
   "executing mutations on integer sets with constraints" "" 80
 at_xfail=no
 (
-  $as_echo "1594. $at_setup_line: testing $at_desc ..."
+  $as_echo "1598. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301195,13 +302184,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1594
-#AT_START_1595
-at_fn_group_banner 1595 'ovsdb-mutation.at:556' \
+#AT_STOP_1598
+#AT_START_1599
+at_fn_group_banner 1599 'ovsdb-mutation.at:556' \
   "executing mutations on real sets" "               " 80
 at_xfail=no
 (
-  $as_echo "1595. $at_setup_line: testing $at_desc ..."
+  $as_echo "1599. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301312,13 +302301,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1595
-#AT_START_1596
-at_fn_group_banner 1596 'ovsdb-mutation.at:629' \
+#AT_STOP_1599
+#AT_START_1600
+at_fn_group_banner 1600 'ovsdb-mutation.at:629' \
   "executing mutations on boolean sets" "            " 80
 at_xfail=no
 (
-  $as_echo "1596. $at_setup_line: testing $at_desc ..."
+  $as_echo "1600. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301401,13 +302390,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1596
-#AT_START_1597
-at_fn_group_banner 1597 'ovsdb-mutation.at:679' \
+#AT_STOP_1600
+#AT_START_1601
+at_fn_group_banner 1601 'ovsdb-mutation.at:679' \
   "executing mutations on string sets" "             " 80
 at_xfail=no
 (
-  $as_echo "1597. $at_setup_line: testing $at_desc ..."
+  $as_echo "1601. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301490,13 +302479,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1597
-#AT_START_1598
-at_fn_group_banner 1598 'ovsdb-mutation.at:729' \
+#AT_STOP_1601
+#AT_START_1602
+at_fn_group_banner 1602 'ovsdb-mutation.at:729' \
   "executing mutations on uuid sets" "               " 80
 at_xfail=no
 (
-  $as_echo "1598. $at_setup_line: testing $at_desc ..."
+  $as_echo "1602. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301579,13 +302568,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1598
-#AT_START_1599
-at_fn_group_banner 1599 'ovsdb-mutation.at:779' \
+#AT_STOP_1602
+#AT_START_1603
+at_fn_group_banner 1603 'ovsdb-mutation.at:779' \
   "executing mutations on integer maps" "            " 80
 at_xfail=no
 (
-  $as_echo "1599. $at_setup_line: testing $at_desc ..."
+  $as_echo "1603. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301668,13 +302657,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1599
-#AT_START_1600
-at_fn_group_banner 1600 'ovsdb-query.at:3' \
+#AT_STOP_1603
+#AT_START_1604
+at_fn_group_banner 1604 'ovsdb-query.at:3' \
   "queries on scalars" "                             " 81
 at_xfail=no
 (
-  $as_echo "1600. $at_setup_line: testing $at_desc ..."
+  $as_echo "1604. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301845,13 +302834,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1600
-#AT_START_1601
-at_fn_group_banner 1601 'ovsdb-query.at:95' \
+#AT_STOP_1604
+#AT_START_1605
+at_fn_group_banner 1605 'ovsdb-query.at:95' \
   "queries on sets" "                                " 81
 at_xfail=no
 (
-  $as_echo "1601. $at_setup_line: testing $at_desc ..."
+  $as_echo "1605. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -301993,13 +302982,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1601
-#AT_START_1602
-at_fn_group_banner 1602 'ovsdb-query.at:176' \
+#AT_STOP_1605
+#AT_START_1606
+at_fn_group_banner 1606 'ovsdb-query.at:176' \
   "queries on maps (1)" "                            " 81
 at_xfail=no
 (
-  $as_echo "1602. $at_setup_line: testing $at_desc ..."
+  $as_echo "1606. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302147,13 +303136,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1602
-#AT_START_1603
-at_fn_group_banner 1603 'ovsdb-query.at:260' \
+#AT_STOP_1606
+#AT_START_1607
+at_fn_group_banner 1607 'ovsdb-query.at:260' \
   "queries on maps (2)" "                            " 81
 at_xfail=no
 (
-  $as_echo "1603. $at_setup_line: testing $at_desc ..."
+  $as_echo "1607. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302319,13 +303308,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1603
-#AT_START_1604
-at_fn_group_banner 1604 'ovsdb-query.at:351' \
+#AT_STOP_1607
+#AT_START_1608
+at_fn_group_banner 1608 'ovsdb-query.at:351' \
   "UUID-distinct queries on scalars" "               " 81
 at_xfail=no
 (
-  $as_echo "1604. $at_setup_line: testing $at_desc ..."
+  $as_echo "1608. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302498,13 +303487,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1604
-#AT_START_1605
-at_fn_group_banner 1605 'ovsdb-query.at:444' \
+#AT_STOP_1608
+#AT_START_1609
+at_fn_group_banner 1609 'ovsdb-query.at:444' \
   "Boolean-distinct queries on scalars" "            " 81
 at_xfail=no
 (
-  $as_echo "1605. $at_setup_line: testing $at_desc ..."
+  $as_echo "1609. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302677,13 +303666,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1605
-#AT_START_1606
-at_fn_group_banner 1606 'ovsdb-query.at:537' \
+#AT_STOP_1609
+#AT_START_1610
+at_fn_group_banner 1610 'ovsdb-query.at:537' \
   "parse colunn set containing bad name" "           " 81
 at_xfail=no
 (
-  $as_echo "1606. $at_setup_line: testing $at_desc ..."
+  $as_echo "1610. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302739,13 +303728,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1606
-#AT_START_1607
-at_fn_group_banner 1607 'ovsdb-transaction.at:3' \
+#AT_STOP_1610
+#AT_START_1611
+at_fn_group_banner 1611 'ovsdb-transaction.at:3' \
   "empty table, empty transaction" "                 " 82
 at_xfail=no
 (
-  $as_echo "1607. $at_setup_line: testing $at_desc ..."
+  $as_echo "1611. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302785,13 +303774,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1607
-#AT_START_1608
-at_fn_group_banner 1608 'ovsdb-transaction.at:17' \
+#AT_STOP_1611
+#AT_START_1612
+at_fn_group_banner 1612 'ovsdb-transaction.at:17' \
   "nonempty table, empty transaction" "              " 82
 at_xfail=no
 (
-  $as_echo "1608. $at_setup_line: testing $at_desc ..."
+  $as_echo "1612. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302843,13 +303832,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1608
-#AT_START_1609
-at_fn_group_banner 1609 'ovsdb-transaction.at:41' \
+#AT_STOP_1612
+#AT_START_1613
+at_fn_group_banner 1613 'ovsdb-transaction.at:41' \
   "insert, commit" "                                 " 82
 at_xfail=no
 (
-  $as_echo "1609. $at_setup_line: testing $at_desc ..."
+  $as_echo "1613. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302906,13 +303895,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1609
-#AT_START_1610
-at_fn_group_banner 1610 'ovsdb-transaction.at:70' \
+#AT_STOP_1613
+#AT_START_1614
+at_fn_group_banner 1614 'ovsdb-transaction.at:70' \
   "insert, abort" "                                  " 82
 at_xfail=no
 (
-  $as_echo "1610. $at_setup_line: testing $at_desc ..."
+  $as_echo "1614. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -302968,13 +303957,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1610
-#AT_START_1611
-at_fn_group_banner 1611 'ovsdb-transaction.at:98' \
+#AT_STOP_1614
+#AT_START_1615
+at_fn_group_banner 1615 'ovsdb-transaction.at:98' \
   "modify, commit" "                                 " 82
 at_xfail=no
 (
-  $as_echo "1611. $at_setup_line: testing $at_desc ..."
+  $as_echo "1615. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303032,13 +304021,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1611
-#AT_START_1612
-at_fn_group_banner 1612 'ovsdb-transaction.at:127' \
+#AT_STOP_1615
+#AT_START_1616
+at_fn_group_banner 1616 'ovsdb-transaction.at:127' \
   "modify, abort" "                                  " 82
 at_xfail=no
 (
-  $as_echo "1612. $at_setup_line: testing $at_desc ..."
+  $as_echo "1616. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303096,13 +304085,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1612
-#AT_START_1613
-at_fn_group_banner 1613 'ovsdb-transaction.at:156' \
+#AT_STOP_1616
+#AT_START_1617
+at_fn_group_banner 1617 'ovsdb-transaction.at:156' \
   "delete, commit" "                                 " 82
 at_xfail=no
 (
-  $as_echo "1613. $at_setup_line: testing $at_desc ..."
+  $as_echo "1617. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303155,13 +304144,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1613
-#AT_START_1614
-at_fn_group_banner 1614 'ovsdb-transaction.at:181' \
+#AT_STOP_1617
+#AT_START_1618
+at_fn_group_banner 1618 'ovsdb-transaction.at:181' \
   "delete, abort" "                                  " 82
 at_xfail=no
 (
-  $as_echo "1614. $at_setup_line: testing $at_desc ..."
+  $as_echo "1618. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303215,13 +304204,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1614
-#AT_START_1615
-at_fn_group_banner 1615 'ovsdb-transaction.at:207' \
+#AT_STOP_1618
+#AT_START_1619
+at_fn_group_banner 1619 'ovsdb-transaction.at:207' \
   "modify, delete, commit" "                         " 82
 at_xfail=no
 (
-  $as_echo "1615. $at_setup_line: testing $at_desc ..."
+  $as_echo "1619. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303277,13 +304266,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1615
-#AT_START_1616
-at_fn_group_banner 1616 'ovsdb-transaction.at:234' \
+#AT_STOP_1619
+#AT_START_1620
+at_fn_group_banner 1620 'ovsdb-transaction.at:234' \
   "modify, delete, abort" "                          " 82
 at_xfail=no
 (
-  $as_echo "1616. $at_setup_line: testing $at_desc ..."
+  $as_echo "1620. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303340,13 +304329,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1616
-#AT_START_1617
-at_fn_group_banner 1617 'ovsdb-transaction.at:262' \
+#AT_STOP_1620
+#AT_START_1621
+at_fn_group_banner 1621 'ovsdb-transaction.at:262' \
   "insert, delete, commit" "                         " 82
 at_xfail=no
 (
-  $as_echo "1617. $at_setup_line: testing $at_desc ..."
+  $as_echo "1621. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303405,13 +304394,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1617
-#AT_START_1618
-at_fn_group_banner 1618 'ovsdb-transaction.at:291' \
+#AT_STOP_1621
+#AT_START_1622
+at_fn_group_banner 1622 'ovsdb-transaction.at:291' \
   "insert, delete, abort" "                          " 82
 at_xfail=no
 (
-  $as_echo "1618. $at_setup_line: testing $at_desc ..."
+  $as_echo "1622. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303471,13 +304460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1618
-#AT_START_1619
-at_fn_group_banner 1619 'ovsdb-transaction.at:322' \
+#AT_STOP_1622
+#AT_START_1623
+at_fn_group_banner 1623 'ovsdb-transaction.at:322' \
   "insert, modify, delete, commit" "                 " 82
 at_xfail=no
 (
-  $as_echo "1619. $at_setup_line: testing $at_desc ..."
+  $as_echo "1623. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303539,13 +304528,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1619
-#AT_START_1620
-at_fn_group_banner 1620 'ovsdb-transaction.at:353' \
+#AT_STOP_1623
+#AT_START_1624
+at_fn_group_banner 1624 'ovsdb-transaction.at:353' \
   "insert, modify, delete, abort" "                  " 82
 at_xfail=no
 (
-  $as_echo "1620. $at_setup_line: testing $at_desc ..."
+  $as_echo "1624. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303608,13 +304597,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1620
-#AT_START_1621
-at_fn_group_banner 1621 'ovsdb-transaction.at:385' \
+#AT_STOP_1624
+#AT_START_1625
+at_fn_group_banner 1625 'ovsdb-transaction.at:385' \
   "deletes are aborted cleanly" "                    " 82
 at_xfail=no
 (
-  $as_echo "1621. $at_setup_line: testing $at_desc ..."
+  $as_echo "1625. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303669,13 +304658,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1621
-#AT_START_1622
-at_fn_group_banner 1622 'ovsdb-execution.at:147' \
+#AT_STOP_1625
+#AT_START_1626
+at_fn_group_banner 1626 'ovsdb-execution.at:147' \
   "block insert on read only DB" "                   " 83
 at_xfail=no
 (
-  $as_echo "1622. $at_setup_line: testing $at_desc ..."
+  $as_echo "1626. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303720,13 +304709,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1622
-#AT_START_1623
-at_fn_group_banner 1623 'ovsdb-execution.at:156' \
+#AT_STOP_1626
+#AT_START_1627
+at_fn_group_banner 1627 'ovsdb-execution.at:156' \
   "allow select on read only DB" "                   " 83
 at_xfail=no
 (
-  $as_echo "1623. $at_setup_line: testing $at_desc ..."
+  $as_echo "1627. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303771,13 +304760,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1623
-#AT_START_1624
-at_fn_group_banner 1624 'ovsdb-execution.at:185' \
+#AT_STOP_1627
+#AT_START_1628
+at_fn_group_banner 1628 'ovsdb-execution.at:185' \
   "uuid-name must be <id>" "                         " 83
 at_xfail=no
 (
-  $as_echo "1624. $at_setup_line: testing $at_desc ..."
+  $as_echo "1628. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303824,13 +304813,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1624
-#AT_START_1625
-at_fn_group_banner 1625 'ovsdb-execution.at:195' \
+#AT_STOP_1628
+#AT_START_1629
+at_fn_group_banner 1629 'ovsdb-execution.at:195' \
   "named-uuid must be <id>" "                        " 83
 at_xfail=no
 (
-  $as_echo "1625. $at_setup_line: testing $at_desc ..."
+  $as_echo "1629. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303875,13 +304864,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1625
-#AT_START_1626
-at_fn_group_banner 1626 'ovsdb-execution.at:204' \
+#AT_STOP_1629
+#AT_START_1630
+at_fn_group_banner 1630 'ovsdb-execution.at:204' \
   "duplicate uuid-name not allowed" "                " 83
 at_xfail=no
 (
-  $as_echo "1626. $at_setup_line: testing $at_desc ..."
+  $as_echo "1630. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303936,13 +304925,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1626
-#AT_START_1627
-at_fn_group_banner 1627 'ovsdb-execution.at:1164' \
+#AT_STOP_1630
+#AT_START_1631
+at_fn_group_banner 1631 'ovsdb-execution.at:1164' \
   "insert default row, query table" "                " 83
 at_xfail=no
 (
-  $as_echo "1627. $at_setup_line: testing $at_desc ..."
+  $as_echo "1631. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -303994,13 +304983,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1627
-#AT_START_1628
-at_fn_group_banner 1628 'ovsdb-execution.at:1164' \
+#AT_STOP_1631
+#AT_START_1632
+at_fn_group_banner 1632 'ovsdb-execution.at:1164' \
   "insert row, query table" "                        " 83
 at_xfail=no
 (
-  $as_echo "1628. $at_setup_line: testing $at_desc ..."
+  $as_echo "1632. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304052,13 +305041,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1628
-#AT_START_1629
-at_fn_group_banner 1629 'ovsdb-execution.at:1164' \
+#AT_STOP_1632
+#AT_START_1633
+at_fn_group_banner 1633 'ovsdb-execution.at:1164' \
   "insert row with uuid, query table" "              " 83
 at_xfail=no
 (
-  $as_echo "1629. $at_setup_line: testing $at_desc ..."
+  $as_echo "1633. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304121,13 +305110,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1629
-#AT_START_1630
-at_fn_group_banner 1630 'ovsdb-execution.at:1164' \
+#AT_STOP_1633
+#AT_START_1634
+at_fn_group_banner 1634 'ovsdb-execution.at:1164' \
   "insert rows, query by value" "                    " 83
 at_xfail=no
 (
-  $as_echo "1630. $at_setup_line: testing $at_desc ..."
+  $as_echo "1634. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304193,13 +305182,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1630
-#AT_START_1631
-at_fn_group_banner 1631 'ovsdb-execution.at:1164' \
+#AT_STOP_1634
+#AT_START_1635
+at_fn_group_banner 1635 'ovsdb-execution.at:1164' \
   "insert rows, query by named-uuid" "               " 83
 at_xfail=no
 (
-  $as_echo "1631. $at_setup_line: testing $at_desc ..."
+  $as_echo "1635. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304266,13 +305255,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1631
-#AT_START_1632
-at_fn_group_banner 1632 'ovsdb-execution.at:1164' \
+#AT_STOP_1635
+#AT_START_1636
+at_fn_group_banner 1636 'ovsdb-execution.at:1164' \
   "insert rows, update rows by value" "              " 83
 at_xfail=no
 (
-  $as_echo "1632. $at_setup_line: testing $at_desc ..."
+  $as_echo "1636. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304346,13 +305335,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1632
-#AT_START_1633
-at_fn_group_banner 1633 'ovsdb-execution.at:1164' \
+#AT_STOP_1636
+#AT_START_1637
+at_fn_group_banner 1637 'ovsdb-execution.at:1164' \
   "insert rows, mutate rows" "                       " 83
 at_xfail=no
 (
-  $as_echo "1633. $at_setup_line: testing $at_desc ..."
+  $as_echo "1637. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304426,13 +305415,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1633
-#AT_START_1634
-at_fn_group_banner 1634 'ovsdb-execution.at:1164' \
+#AT_STOP_1637
+#AT_START_1638
+at_fn_group_banner 1638 'ovsdb-execution.at:1164' \
   "insert rows, delete by named-uuid" "              " 83
 at_xfail=no
 (
-  $as_echo "1634. $at_setup_line: testing $at_desc ..."
+  $as_echo "1638. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304501,13 +305490,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1634
-#AT_START_1635
-at_fn_group_banner 1635 'ovsdb-execution.at:1164' \
+#AT_STOP_1638
+#AT_START_1639
+at_fn_group_banner 1639 'ovsdb-execution.at:1164' \
   "insert rows, delete rows by value" "              " 83
 at_xfail=no
 (
-  $as_echo "1635. $at_setup_line: testing $at_desc ..."
+  $as_echo "1639. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304577,13 +305566,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1635
-#AT_START_1636
-at_fn_group_banner 1636 'ovsdb-execution.at:1164' \
+#AT_STOP_1639
+#AT_START_1640
+at_fn_group_banner 1640 'ovsdb-execution.at:1164' \
   "insert rows, delete by (non-matching) value" "    " 83
 at_xfail=no
 (
-  $as_echo "1636. $at_setup_line: testing $at_desc ..."
+  $as_echo "1640. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304655,13 +305644,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1636
-#AT_START_1637
-at_fn_group_banner 1637 'ovsdb-execution.at:1164' \
+#AT_STOP_1640
+#AT_START_1641
+at_fn_group_banner 1641 'ovsdb-execution.at:1164' \
   "insert rows, delete all" "                        " 83
 at_xfail=no
 (
-  $as_echo "1637. $at_setup_line: testing $at_desc ..."
+  $as_echo "1641. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304730,13 +305719,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1637
-#AT_START_1638
-at_fn_group_banner 1638 'ovsdb-execution.at:1164' \
+#AT_STOP_1641
+#AT_START_1642
+at_fn_group_banner 1642 'ovsdb-execution.at:1164' \
   "insert row, query table, commit" "                " 83
 at_xfail=no
 (
-  $as_echo "1638. $at_setup_line: testing $at_desc ..."
+  $as_echo "1642. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304791,13 +305780,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1638
-#AT_START_1639
-at_fn_group_banner 1639 'ovsdb-execution.at:1164' \
+#AT_STOP_1642
+#AT_START_1643
+at_fn_group_banner 1643 'ovsdb-execution.at:1164' \
   "insert row, query table, commit durably" "        " 83
 at_xfail=no
 (
-  $as_echo "1639. $at_setup_line: testing $at_desc ..."
+  $as_echo "1643. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304852,13 +305841,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1639
-#AT_START_1640
-at_fn_group_banner 1640 'ovsdb-execution.at:1164' \
+#AT_STOP_1643
+#AT_START_1644
+at_fn_group_banner 1644 'ovsdb-execution.at:1164' \
   "equality wait with correct rows" "                " 83
 at_xfail=no
 (
-  $as_echo "1640. $at_setup_line: testing $at_desc ..."
+  $as_echo "1644. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -304925,13 +305914,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1640
-#AT_START_1641
-at_fn_group_banner 1641 'ovsdb-execution.at:1164' \
+#AT_STOP_1644
+#AT_START_1645
+at_fn_group_banner 1645 'ovsdb-execution.at:1164' \
   "equality wait with extra row" "                   " 83
 at_xfail=no
 (
-  $as_echo "1641. $at_setup_line: testing $at_desc ..."
+  $as_echo "1645. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305000,13 +305989,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1641
-#AT_START_1642
-at_fn_group_banner 1642 'ovsdb-execution.at:1164' \
+#AT_STOP_1645
+#AT_START_1646
+at_fn_group_banner 1646 'ovsdb-execution.at:1164' \
   "equality wait with missing row" "                 " 83
 at_xfail=no
 (
-  $as_echo "1642. $at_setup_line: testing $at_desc ..."
+  $as_echo "1646. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305071,13 +306060,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1642
-#AT_START_1643
-at_fn_group_banner 1643 'ovsdb-execution.at:1164' \
+#AT_STOP_1646
+#AT_START_1647
+at_fn_group_banner 1647 'ovsdb-execution.at:1164' \
   "inequality wait with correct rows" "              " 83
 at_xfail=no
 (
-  $as_echo "1643. $at_setup_line: testing $at_desc ..."
+  $as_echo "1647. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305144,13 +306133,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1643
-#AT_START_1644
-at_fn_group_banner 1644 'ovsdb-execution.at:1164' \
+#AT_STOP_1647
+#AT_START_1648
+at_fn_group_banner 1648 'ovsdb-execution.at:1164' \
   "inequality wait with extra row" "                 " 83
 at_xfail=no
 (
-  $as_echo "1644. $at_setup_line: testing $at_desc ..."
+  $as_echo "1648. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305219,13 +306208,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1644
-#AT_START_1645
-at_fn_group_banner 1645 'ovsdb-execution.at:1164' \
+#AT_STOP_1648
+#AT_START_1649
+at_fn_group_banner 1649 'ovsdb-execution.at:1164' \
   "inequality wait with missing row" "               " 83
 at_xfail=no
 (
-  $as_echo "1645. $at_setup_line: testing $at_desc ..."
+  $as_echo "1649. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305290,13 +306279,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1645
-#AT_START_1646
-at_fn_group_banner 1646 'ovsdb-execution.at:1164' \
+#AT_STOP_1649
+#AT_START_1650
+at_fn_group_banner 1650 'ovsdb-execution.at:1164' \
   "insert and update constraints" "                  " 83
 at_xfail=no
 (
-  $as_echo "1646. $at_setup_line: testing $at_desc ..."
+  $as_echo "1650. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305371,13 +306360,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1646
-#AT_START_1647
-at_fn_group_banner 1647 'ovsdb-execution.at:1164' \
+#AT_STOP_1650
+#AT_START_1651
+at_fn_group_banner 1651 'ovsdb-execution.at:1164' \
   "index uniqueness checking" "                      " 83
 at_xfail=no
 (
-  $as_echo "1647. $at_setup_line: testing $at_desc ..."
+  $as_echo "1651. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305525,13 +306514,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1647
-#AT_START_1648
-at_fn_group_banner 1648 'ovsdb-execution.at:1164' \
+#AT_STOP_1651
+#AT_START_1652
+at_fn_group_banner 1652 'ovsdb-execution.at:1164' \
   "referential integrity -- simple" "                " 83
 at_xfail=no
 (
-  $as_echo "1648. $at_setup_line: testing $at_desc ..."
+  $as_echo "1652. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305660,13 +306649,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1648
-#AT_START_1649
-at_fn_group_banner 1649 'ovsdb-execution.at:1164' \
+#AT_STOP_1652
+#AT_START_1653
+at_fn_group_banner 1653 'ovsdb-execution.at:1164' \
   "referential integrity -- mutual references" "     " 83
 at_xfail=no
 (
-  $as_echo "1649. $at_setup_line: testing $at_desc ..."
+  $as_echo "1653. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -305777,13 +306766,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1649
-#AT_START_1650
-at_fn_group_banner 1650 'ovsdb-execution.at:1164' \
+#AT_STOP_1653
+#AT_START_1654
+at_fn_group_banner 1654 'ovsdb-execution.at:1164' \
   "weak references" "                                " 83
 at_xfail=no
 (
-  $as_echo "1650. $at_setup_line: testing $at_desc ..."
+  $as_echo "1654. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306022,13 +307011,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1650
-#AT_START_1651
-at_fn_group_banner 1651 'ovsdb-execution.at:1164' \
+#AT_STOP_1654
+#AT_START_1655
+at_fn_group_banner 1655 'ovsdb-execution.at:1164' \
   "immutable columns" "                              " 83
 at_xfail=no
 (
-  $as_echo "1651. $at_setup_line: testing $at_desc ..."
+  $as_echo "1655. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306111,13 +307100,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1651
-#AT_START_1652
-at_fn_group_banner 1652 'ovsdb-execution.at:1164' \
+#AT_STOP_1655
+#AT_START_1656
+at_fn_group_banner 1656 'ovsdb-execution.at:1164' \
   "garbage collection" "                             " 83
 at_xfail=no
 (
-  $as_echo "1652. $at_setup_line: testing $at_desc ..."
+  $as_echo "1656. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306365,13 +307354,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1652
-#AT_START_1653
-at_fn_group_banner 1653 'ovsdb-trigger.at:15' \
+#AT_STOP_1656
+#AT_START_1657
+at_fn_group_banner 1657 'ovsdb-trigger.at:15' \
   "trigger fires immediately" "                      " 84
 at_xfail=no
 (
-  $as_echo "1653. $at_setup_line: testing $at_desc ..."
+  $as_echo "1657. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306446,13 +307435,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1653
-#AT_START_1654
-at_fn_group_banner 1654 'ovsdb-trigger.at:38' \
+#AT_STOP_1657
+#AT_START_1658
+at_fn_group_banner 1658 'ovsdb-trigger.at:38' \
   "trigger times out" "                              " 84
 at_xfail=no
 (
-  $as_echo "1654. $at_setup_line: testing $at_desc ..."
+  $as_echo "1658. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306526,13 +307515,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1654
-#AT_START_1655
-at_fn_group_banner 1655 'ovsdb-trigger.at:61' \
+#AT_STOP_1658
+#AT_START_1659
+at_fn_group_banner 1659 'ovsdb-trigger.at:61' \
   "trigger fires after delay" "                      " 84
 at_xfail=no
 (
-  $as_echo "1655. $at_setup_line: testing $at_desc ..."
+  $as_echo "1659. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306620,13 +307609,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1655
-#AT_START_1656
-at_fn_group_banner 1656 'ovsdb-trigger.at:92' \
+#AT_STOP_1659
+#AT_START_1660
+at_fn_group_banner 1660 'ovsdb-trigger.at:92' \
   "delayed trigger modifies database" "              " 84
 at_xfail=no
 (
-  $as_echo "1656. $at_setup_line: testing $at_desc ..."
+  $as_echo "1660. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306731,13 +307720,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1656
-#AT_START_1657
-at_fn_group_banner 1657 'ovsdb-trigger.at:132' \
+#AT_STOP_1660
+#AT_START_1661
+at_fn_group_banner 1661 'ovsdb-trigger.at:132' \
   "one delayed trigger wakes up another" "           " 84
 at_xfail=no
 (
-  $as_echo "1657. $at_setup_line: testing $at_desc ..."
+  $as_echo "1661. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306872,13 +307861,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1657
-#AT_START_1658
-at_fn_group_banner 1658 'ovsdb-tool.at:29' \
+#AT_STOP_1661
+#AT_START_1662
+at_fn_group_banner 1662 'ovsdb-tool.at:29' \
   "insert default row, query table" "                " 85
 at_xfail=no
 (
-  $as_echo "1658. $at_setup_line: testing $at_desc ..."
+  $as_echo "1662. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -306961,13 +307950,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1658
-#AT_START_1659
-at_fn_group_banner 1659 'ovsdb-tool.at:29' \
+#AT_STOP_1662
+#AT_START_1663
+at_fn_group_banner 1663 'ovsdb-tool.at:29' \
   "insert row, query table" "                        " 85
 at_xfail=no
 (
-  $as_echo "1659. $at_setup_line: testing $at_desc ..."
+  $as_echo "1663. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -307050,13 +308039,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1659
-#AT_START_1660
-at_fn_group_banner 1660 'ovsdb-tool.at:29' \
+#AT_STOP_1663
+#AT_START_1664
+at_fn_group_banner 1664 'ovsdb-tool.at:29' \
   "insert row with uuid, query table" "              " 85
 at_xfail=no
 (
-  $as_echo "1660. $at_setup_line: testing $at_desc ..."
+  $as_echo "1664. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -307164,13 +308153,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1660
-#AT_START_1661
-at_fn_group_banner 1661 'ovsdb-tool.at:29' \
+#AT_STOP_1664
+#AT_START_1665
+at_fn_group_banner 1665 'ovsdb-tool.at:29' \
   "insert rows, query by value" "                    " 85
 at_xfail=no
 (
-  $as_echo "1661. $at_setup_line: testing $at_desc ..."
+  $as_echo "1665. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -307295,13 +308284,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1661
-#AT_START_1662
-at_fn_group_banner 1662 'ovsdb-tool.at:29' \
+#AT_STOP_1665
+#AT_START_1666
+at_fn_group_banner 1666 'ovsdb-tool.at:29' \
   "insert rows, query by named-uuid" "               " 85
 at_xfail=no
 (
-  $as_echo "1662. $at_setup_line: testing $at_desc ..."
+  $as_echo "1666. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -307385,13 +308374,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1662
-#AT_START_1663
-at_fn_group_banner 1663 'ovsdb-tool.at:29' \
+#AT_STOP_1666
+#AT_START_1667
+at_fn_group_banner 1667 'ovsdb-tool.at:29' \
   "insert rows, update rows by value" "              " 85
 at_xfail=no
 (
-  $as_echo "1663. $at_setup_line: testing $at_desc ..."
+  $as_echo "1667. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -307524,13 +308513,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1663
-#AT_START_1664
-at_fn_group_banner 1664 'ovsdb-tool.at:29' \
+#AT_STOP_1667
+#AT_START_1668
+at_fn_group_banner 1668 'ovsdb-tool.at:29' \
   "insert rows, mutate rows" "                       " 85
 at_xfail=no
 (
-  $as_echo "1664. $at_setup_line: testing $at_desc ..."
+  $as_echo "1668. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -307663,13 +308652,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1664
-#AT_START_1665
-at_fn_group_banner 1665 'ovsdb-tool.at:29' \
+#AT_STOP_1668
+#AT_START_1669
+at_fn_group_banner 1669 'ovsdb-tool.at:29' \
   "insert rows, delete by named-uuid" "              " 85
 at_xfail=no
 (
-  $as_echo "1665. $at_setup_line: testing $at_desc ..."
+  $as_echo "1669. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -307755,13 +308744,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1665
-#AT_START_1666
-at_fn_group_banner 1666 'ovsdb-tool.at:29' \
+#AT_STOP_1669
+#AT_START_1670
+at_fn_group_banner 1670 'ovsdb-tool.at:29' \
   "insert rows, delete rows by value" "              " 85
 at_xfail=no
 (
-  $as_echo "1666. $at_setup_line: testing $at_desc ..."
+  $as_echo "1670. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -307890,13 +308879,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1666
-#AT_START_1667
-at_fn_group_banner 1667 'ovsdb-tool.at:29' \
+#AT_STOP_1670
+#AT_START_1671
+at_fn_group_banner 1671 'ovsdb-tool.at:29' \
   "insert rows, delete by (non-matching) value" "    " 85
 at_xfail=no
 (
-  $as_echo "1667. $at_setup_line: testing $at_desc ..."
+  $as_echo "1671. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308027,13 +309016,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1667
-#AT_START_1668
-at_fn_group_banner 1668 'ovsdb-tool.at:29' \
+#AT_STOP_1671
+#AT_START_1672
+at_fn_group_banner 1672 'ovsdb-tool.at:29' \
   "insert rows, delete all" "                        " 85
 at_xfail=no
 (
-  $as_echo "1668. $at_setup_line: testing $at_desc ..."
+  $as_echo "1672. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308119,13 +309108,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1668
-#AT_START_1669
-at_fn_group_banner 1669 'ovsdb-tool.at:29' \
+#AT_STOP_1672
+#AT_START_1673
+at_fn_group_banner 1673 'ovsdb-tool.at:29' \
   "insert row, query table, commit" "                " 85
 at_xfail=no
 (
-  $as_echo "1669. $at_setup_line: testing $at_desc ..."
+  $as_echo "1673. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308197,13 +309186,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1669
-#AT_START_1670
-at_fn_group_banner 1670 'ovsdb-tool.at:29' \
+#AT_STOP_1673
+#AT_START_1674
+at_fn_group_banner 1674 'ovsdb-tool.at:29' \
   "insert row, query table, commit durably" "        " 85
 at_xfail=no
 (
-  $as_echo "1670. $at_setup_line: testing $at_desc ..."
+  $as_echo "1674. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308275,13 +309264,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1670
-#AT_START_1671
-at_fn_group_banner 1671 'ovsdb-tool.at:29' \
+#AT_STOP_1674
+#AT_START_1675
+at_fn_group_banner 1675 'ovsdb-tool.at:29' \
   "equality wait with correct rows" "                " 85
 at_xfail=no
 (
-  $as_echo "1671. $at_setup_line: testing $at_desc ..."
+  $as_echo "1675. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308365,13 +309354,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1671
-#AT_START_1672
-at_fn_group_banner 1672 'ovsdb-tool.at:29' \
+#AT_STOP_1675
+#AT_START_1676
+at_fn_group_banner 1676 'ovsdb-tool.at:29' \
   "equality wait with extra row" "                   " 85
 at_xfail=no
 (
-  $as_echo "1672. $at_setup_line: testing $at_desc ..."
+  $as_echo "1676. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308457,13 +309446,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1672
-#AT_START_1673
-at_fn_group_banner 1673 'ovsdb-tool.at:29' \
+#AT_STOP_1676
+#AT_START_1677
+at_fn_group_banner 1677 'ovsdb-tool.at:29' \
   "equality wait with missing row" "                 " 85
 at_xfail=no
 (
-  $as_echo "1673. $at_setup_line: testing $at_desc ..."
+  $as_echo "1677. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308545,13 +309534,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1673
-#AT_START_1674
-at_fn_group_banner 1674 'ovsdb-tool.at:29' \
+#AT_STOP_1677
+#AT_START_1678
+at_fn_group_banner 1678 'ovsdb-tool.at:29' \
   "inequality wait with correct rows" "              " 85
 at_xfail=no
 (
-  $as_echo "1674. $at_setup_line: testing $at_desc ..."
+  $as_echo "1678. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308635,13 +309624,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1674
-#AT_START_1675
-at_fn_group_banner 1675 'ovsdb-tool.at:29' \
+#AT_STOP_1678
+#AT_START_1679
+at_fn_group_banner 1679 'ovsdb-tool.at:29' \
   "inequality wait with extra row" "                 " 85
 at_xfail=no
 (
-  $as_echo "1675. $at_setup_line: testing $at_desc ..."
+  $as_echo "1679. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308727,13 +309716,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1675
-#AT_START_1676
-at_fn_group_banner 1676 'ovsdb-tool.at:29' \
+#AT_STOP_1679
+#AT_START_1680
+at_fn_group_banner 1680 'ovsdb-tool.at:29' \
   "inequality wait with missing row" "               " 85
 at_xfail=no
 (
-  $as_echo "1676. $at_setup_line: testing $at_desc ..."
+  $as_echo "1680. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308815,13 +309804,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1676
-#AT_START_1677
-at_fn_group_banner 1677 'ovsdb-tool.at:29' \
+#AT_STOP_1680
+#AT_START_1681
+at_fn_group_banner 1681 'ovsdb-tool.at:29' \
   "insert and update constraints" "                  " 85
 at_xfail=no
 (
-  $as_echo "1677. $at_setup_line: testing $at_desc ..."
+  $as_echo "1681. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -308969,13 +309958,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1677
-#AT_START_1678
-at_fn_group_banner 1678 'ovsdb-tool.at:29' \
+#AT_STOP_1681
+#AT_START_1682
+at_fn_group_banner 1682 'ovsdb-tool.at:29' \
   "index uniqueness checking" "                      " 85
 at_xfail=no
 (
-  $as_echo "1678. $at_setup_line: testing $at_desc ..."
+  $as_echo "1682. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -309238,13 +310227,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1678
-#AT_START_1679
-at_fn_group_banner 1679 'ovsdb-tool.at:29' \
+#AT_STOP_1682
+#AT_START_1683
+at_fn_group_banner 1683 'ovsdb-tool.at:29' \
   "referential integrity -- simple" "                " 85
 at_xfail=no
 (
-  $as_echo "1679. $at_setup_line: testing $at_desc ..."
+  $as_echo "1683. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -309502,13 +310491,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1679
-#AT_START_1680
-at_fn_group_banner 1680 'ovsdb-tool.at:29' \
+#AT_STOP_1683
+#AT_START_1684
+at_fn_group_banner 1684 'ovsdb-tool.at:29' \
   "referential integrity -- mutual references" "     " 85
 at_xfail=no
 (
-  $as_echo "1680. $at_setup_line: testing $at_desc ..."
+  $as_echo "1684. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -309720,13 +310709,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1680
-#AT_START_1681
-at_fn_group_banner 1681 'ovsdb-tool.at:29' \
+#AT_STOP_1684
+#AT_START_1685
+at_fn_group_banner 1685 'ovsdb-tool.at:29' \
   "weak references" "                                " 85
 at_xfail=no
 (
-  $as_echo "1681. $at_setup_line: testing $at_desc ..."
+  $as_echo "1685. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -310178,13 +311167,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1681
-#AT_START_1682
-at_fn_group_banner 1682 'ovsdb-tool.at:29' \
+#AT_STOP_1685
+#AT_START_1686
+at_fn_group_banner 1686 'ovsdb-tool.at:29' \
   "immutable columns" "                              " 85
 at_xfail=no
 (
-  $as_echo "1682. $at_setup_line: testing $at_desc ..."
+  $as_echo "1686. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -310340,13 +311329,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1682
-#AT_START_1683
-at_fn_group_banner 1683 'ovsdb-tool.at:29' \
+#AT_STOP_1686
+#AT_START_1687
+at_fn_group_banner 1687 'ovsdb-tool.at:29' \
   "garbage collection" "                             " 85
 at_xfail=no
 (
-  $as_echo "1683. $at_setup_line: testing $at_desc ..."
+  $as_echo "1687. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -310821,13 +311810,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1683
-#AT_START_1684
-at_fn_group_banner 1684 'ovsdb-tool.at:31' \
+#AT_STOP_1687
+#AT_START_1688
+at_fn_group_banner 1688 'ovsdb-tool.at:31' \
   "transaction comments" "                           " 85
 at_xfail=no
 (
-  $as_echo "1684. $at_setup_line: testing $at_desc ..."
+  $as_echo "1688. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -310906,13 +311895,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1684
-#AT_START_1685
-at_fn_group_banner 1685 'ovsdb-tool.at:49' \
+#AT_STOP_1688
+#AT_START_1689
+at_fn_group_banner 1689 'ovsdb-tool.at:49' \
   "ovsdb-tool compact" "                             " 85
 at_xfail=no
 (
-  $as_echo "1685. $at_setup_line: testing $at_desc ..."
+  $as_echo "1689. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -311327,13 +312316,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1685
-#AT_START_1686
-at_fn_group_banner 1686 'ovsdb-tool.at:172' \
+#AT_STOP_1689
+#AT_START_1690
+at_fn_group_banner 1690 'ovsdb-tool.at:172' \
   "ovsdb-tool convert -- removing a column" "        " 85
 at_xfail=no
 (
-  $as_echo "1686. $at_setup_line: testing $at_desc ..."
+  $as_echo "1690. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -311602,13 +312591,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1686
-#AT_START_1687
-at_fn_group_banner 1687 'ovsdb-tool.at:239' \
+#AT_STOP_1690
+#AT_START_1691
+at_fn_group_banner 1691 'ovsdb-tool.at:239' \
   "ovsdb-tool convert -- adding a column" "          " 85
 at_xfail=no
 (
-  $as_echo "1687. $at_setup_line: testing $at_desc ..."
+  $as_echo "1691. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -311875,13 +312864,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1687
-#AT_START_1688
-at_fn_group_banner 1688 'ovsdb-tool.at:305' \
+#AT_STOP_1691
+#AT_START_1692
+at_fn_group_banner 1692 'ovsdb-tool.at:305' \
   "ovsdb-tool unsupported cluster operations" "      " 85
 at_xfail=no
 (
-  $as_echo "1688. $at_setup_line: testing $at_desc ..."
+  $as_echo "1692. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -311981,13 +312970,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1688
-#AT_START_1689
-at_fn_group_banner 1689 'ovsdb-tool.at:321' \
+#AT_STOP_1692
+#AT_START_1693
+at_fn_group_banner 1693 'ovsdb-tool.at:321' \
   "ovsdb-tool schema-version, schema-cksum, schema-name" "" 85
 at_xfail=no
 (
-  $as_echo "1689. $at_setup_line: testing $at_desc ..."
+  $as_echo "1693. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -312044,13 +313033,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1689
-#AT_START_1690
-at_fn_group_banner 1690 'ovsdb-tool.at:332' \
+#AT_STOP_1693
+#AT_START_1694
+at_fn_group_banner 1694 'ovsdb-tool.at:332' \
   "ovsdb-tool database inspection commands - standalone" "" 85
 at_xfail=no
 (
-  $as_echo "1690. $at_setup_line: testing $at_desc ..."
+  $as_echo "1694. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -312166,13 +313155,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1690
-#AT_START_1691
-at_fn_group_banner 1691 'ovsdb-tool.at:351' \
+#AT_STOP_1694
+#AT_START_1695
+at_fn_group_banner 1695 'ovsdb-tool.at:351' \
   "ovsdb-tool database inspection commands - clustered" "" 85
 at_xfail=no
 (
-  $as_echo "1691. $at_setup_line: testing $at_desc ..."
+  $as_echo "1695. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -312274,13 +313263,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1691
-#AT_START_1692
-at_fn_group_banner 1692 'ovsdb-tool.at:369' \
+#AT_STOP_1695
+#AT_START_1696
+at_fn_group_banner 1696 'ovsdb-tool.at:369' \
   "ovsdb-tool database inspection commands - joining a cluster" "" 85
 at_xfail=no
 (
-  $as_echo "1692. $at_setup_line: testing $at_desc ..."
+  $as_echo "1696. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -312421,13 +313410,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1692
-#AT_START_1693
-at_fn_group_banner 1693 'ovsdb-tool.at:400' \
+#AT_STOP_1696
+#AT_START_1697
+at_fn_group_banner 1697 'ovsdb-tool.at:400' \
   "ovsdb-tool needs-conversion (no conversion needed)" "" 85
 at_xfail=no
 (
-  $as_echo "1693. $at_setup_line: testing $at_desc ..."
+  $as_echo "1697. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -312468,13 +313457,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1693
-#AT_START_1694
-at_fn_group_banner 1694 'ovsdb-tool.at:409' \
+#AT_STOP_1697
+#AT_START_1698
+at_fn_group_banner 1698 'ovsdb-tool.at:409' \
   "ovsdb-tool needs-conversion (conversion needed)" "" 85
 at_xfail=no
 (
-  $as_echo "1694. $at_setup_line: testing $at_desc ..."
+  $as_echo "1698. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -312529,13 +313518,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1694
-#AT_START_1695
-at_fn_group_banner 1695 'ovsdb-tool.at:420' \
+#AT_STOP_1698
+#AT_START_1699
+at_fn_group_banner 1699 'ovsdb-tool.at:420' \
   "ovsdb-tool create-cluster with initial data" "    " 85
 at_xfail=no
 (
-  $as_echo "1695. $at_setup_line: testing $at_desc ..."
+  $as_echo "1699. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -312747,13 +313736,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1695
-#AT_START_1696
-at_fn_group_banner 1696 'ovsdb-tool.at:463' \
+#AT_STOP_1699
+#AT_START_1700
+at_fn_group_banner 1700 'ovsdb-tool.at:463' \
   "ovsdb-tool convert-to-standalone" "               " 85
 at_xfail=no
 (
-  $as_echo "1696. $at_setup_line: testing $at_desc ..."
+  $as_echo "1700. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -312976,13 +313965,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1696
-#AT_START_1697
-at_fn_group_banner 1697 'ovsdb-server.at:41' \
+#AT_STOP_1700
+#AT_START_1701
+at_fn_group_banner 1701 'ovsdb-server.at:41' \
   "insert default row, query table" "                " 87
 at_xfail=no
 (
-  $as_echo "1697. $at_setup_line: testing $at_desc ..."
+  $as_echo "1701. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -313122,13 +314111,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1697
-#AT_START_1698
-at_fn_group_banner 1698 'ovsdb-server.at:41' \
+#AT_STOP_1701
+#AT_START_1702
+at_fn_group_banner 1702 'ovsdb-server.at:41' \
   "insert row, query table" "                        " 87
 at_xfail=no
 (
-  $as_echo "1698. $at_setup_line: testing $at_desc ..."
+  $as_echo "1702. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -313268,13 +314257,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1698
-#AT_START_1699
-at_fn_group_banner 1699 'ovsdb-server.at:41' \
+#AT_STOP_1702
+#AT_START_1703
+at_fn_group_banner 1703 'ovsdb-server.at:41' \
   "insert row with uuid, query table" "              " 87
 at_xfail=no
 (
-  $as_echo "1699. $at_setup_line: testing $at_desc ..."
+  $as_echo "1703. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -313442,13 +314431,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1699
-#AT_START_1700
-at_fn_group_banner 1700 'ovsdb-server.at:41' \
+#AT_STOP_1703
+#AT_START_1704
+at_fn_group_banner 1704 'ovsdb-server.at:41' \
   "insert rows, query by value" "                    " 87
 at_xfail=no
 (
-  $as_echo "1700. $at_setup_line: testing $at_desc ..."
+  $as_echo "1704. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -313636,13 +314625,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1700
-#AT_START_1701
-at_fn_group_banner 1701 'ovsdb-server.at:41' \
+#AT_STOP_1704
+#AT_START_1705
+at_fn_group_banner 1705 'ovsdb-server.at:41' \
   "insert rows, query by named-uuid" "               " 87
 at_xfail=no
 (
-  $as_echo "1701. $at_setup_line: testing $at_desc ..."
+  $as_echo "1705. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -313780,13 +314769,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1701
-#AT_START_1702
-at_fn_group_banner 1702 'ovsdb-server.at:41' \
+#AT_STOP_1705
+#AT_START_1706
+at_fn_group_banner 1706 'ovsdb-server.at:41' \
   "insert rows, update rows by value" "              " 87
 at_xfail=no
 (
-  $as_echo "1702. $at_setup_line: testing $at_desc ..."
+  $as_echo "1706. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -313982,13 +314971,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1702
-#AT_START_1703
-at_fn_group_banner 1703 'ovsdb-server.at:41' \
+#AT_STOP_1706
+#AT_START_1707
+at_fn_group_banner 1707 'ovsdb-server.at:41' \
   "insert rows, mutate rows" "                       " 87
 at_xfail=no
 (
-  $as_echo "1703. $at_setup_line: testing $at_desc ..."
+  $as_echo "1707. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -314184,13 +315173,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1703
-#AT_START_1704
-at_fn_group_banner 1704 'ovsdb-server.at:41' \
+#AT_STOP_1707
+#AT_START_1708
+at_fn_group_banner 1708 'ovsdb-server.at:41' \
   "insert rows, delete by named-uuid" "              " 87
 at_xfail=no
 (
-  $as_echo "1704. $at_setup_line: testing $at_desc ..."
+  $as_echo "1708. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -314330,13 +315319,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1704
-#AT_START_1705
-at_fn_group_banner 1705 'ovsdb-server.at:41' \
+#AT_STOP_1708
+#AT_START_1709
+at_fn_group_banner 1709 'ovsdb-server.at:41' \
   "insert rows, delete rows by value" "              " 87
 at_xfail=no
 (
-  $as_echo "1705. $at_setup_line: testing $at_desc ..."
+  $as_echo "1709. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -314528,13 +315517,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1705
-#AT_START_1706
-at_fn_group_banner 1706 'ovsdb-server.at:41' \
+#AT_STOP_1709
+#AT_START_1710
+at_fn_group_banner 1710 'ovsdb-server.at:41' \
   "insert rows, delete by (non-matching) value" "    " 87
 at_xfail=no
 (
-  $as_echo "1706. $at_setup_line: testing $at_desc ..."
+  $as_echo "1710. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -314728,13 +315717,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1706
-#AT_START_1707
-at_fn_group_banner 1707 'ovsdb-server.at:41' \
+#AT_STOP_1710
+#AT_START_1711
+at_fn_group_banner 1711 'ovsdb-server.at:41' \
   "insert rows, delete all" "                        " 87
 at_xfail=no
 (
-  $as_echo "1707. $at_setup_line: testing $at_desc ..."
+  $as_echo "1711. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -314874,13 +315863,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1707
-#AT_START_1708
-at_fn_group_banner 1708 'ovsdb-server.at:41' \
+#AT_STOP_1711
+#AT_START_1712
+at_fn_group_banner 1712 'ovsdb-server.at:41' \
   "insert row, query table, commit" "                " 87
 at_xfail=no
 (
-  $as_echo "1708. $at_setup_line: testing $at_desc ..."
+  $as_echo "1712. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -315006,13 +315995,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1708
-#AT_START_1709
-at_fn_group_banner 1709 'ovsdb-server.at:41' \
+#AT_STOP_1712
+#AT_START_1713
+at_fn_group_banner 1713 'ovsdb-server.at:41' \
   "insert row, query table, commit durably" "        " 87
 at_xfail=no
 (
-  $as_echo "1709. $at_setup_line: testing $at_desc ..."
+  $as_echo "1713. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -315138,13 +316127,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1709
-#AT_START_1710
-at_fn_group_banner 1710 'ovsdb-server.at:41' \
+#AT_STOP_1713
+#AT_START_1714
+at_fn_group_banner 1714 'ovsdb-server.at:41' \
   "equality wait with correct rows" "                " 87
 at_xfail=no
 (
-  $as_echo "1710. $at_setup_line: testing $at_desc ..."
+  $as_echo "1714. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -315282,13 +316271,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1710
-#AT_START_1711
-at_fn_group_banner 1711 'ovsdb-server.at:41' \
+#AT_STOP_1714
+#AT_START_1715
+at_fn_group_banner 1715 'ovsdb-server.at:41' \
   "equality wait with extra row" "                   " 87
 at_xfail=no
 (
-  $as_echo "1711. $at_setup_line: testing $at_desc ..."
+  $as_echo "1715. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -315428,13 +316417,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1711
-#AT_START_1712
-at_fn_group_banner 1712 'ovsdb-server.at:41' \
+#AT_STOP_1715
+#AT_START_1716
+at_fn_group_banner 1716 'ovsdb-server.at:41' \
   "equality wait with missing row" "                 " 87
 at_xfail=no
 (
-  $as_echo "1712. $at_setup_line: testing $at_desc ..."
+  $as_echo "1716. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -315570,13 +316559,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1712
-#AT_START_1713
-at_fn_group_banner 1713 'ovsdb-server.at:41' \
+#AT_STOP_1716
+#AT_START_1717
+at_fn_group_banner 1717 'ovsdb-server.at:41' \
   "inequality wait with correct rows" "              " 87
 at_xfail=no
 (
-  $as_echo "1713. $at_setup_line: testing $at_desc ..."
+  $as_echo "1717. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -315714,13 +316703,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1713
-#AT_START_1714
-at_fn_group_banner 1714 'ovsdb-server.at:41' \
+#AT_STOP_1717
+#AT_START_1718
+at_fn_group_banner 1718 'ovsdb-server.at:41' \
   "inequality wait with extra row" "                 " 87
 at_xfail=no
 (
-  $as_echo "1714. $at_setup_line: testing $at_desc ..."
+  $as_echo "1718. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -315860,13 +316849,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1714
-#AT_START_1715
-at_fn_group_banner 1715 'ovsdb-server.at:41' \
+#AT_STOP_1718
+#AT_START_1719
+at_fn_group_banner 1719 'ovsdb-server.at:41' \
   "inequality wait with missing row" "               " 87
 at_xfail=no
 (
-  $as_echo "1715. $at_setup_line: testing $at_desc ..."
+  $as_echo "1719. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -316002,13 +316991,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1715
-#AT_START_1716
-at_fn_group_banner 1716 'ovsdb-server.at:41' \
+#AT_STOP_1719
+#AT_START_1720
+at_fn_group_banner 1720 'ovsdb-server.at:41' \
   "insert and update constraints" "                  " 87
 at_xfail=no
 (
-  $as_echo "1716. $at_setup_line: testing $at_desc ..."
+  $as_echo "1720. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -316222,13 +317211,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1716
-#AT_START_1717
-at_fn_group_banner 1717 'ovsdb-server.at:41' \
+#AT_STOP_1720
+#AT_START_1721
+at_fn_group_banner 1721 'ovsdb-server.at:41' \
   "index uniqueness checking" "                      " 87
 at_xfail=no
 (
-  $as_echo "1717. $at_setup_line: testing $at_desc ..."
+  $as_echo "1721. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -316564,15 +317553,15 @@
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_1717
-#AT_START_1718
-at_fn_group_banner 1718 'ovsdb-server.at:41' \
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_1721
+#AT_START_1722
+at_fn_group_banner 1722 'ovsdb-server.at:41' \
   "referential integrity -- simple" "                " 87
 at_xfail=no
 (
-  $as_echo "1718. $at_setup_line: testing $at_desc ..."
+  $as_echo "1722. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -316908,13 +317897,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1718
-#AT_START_1719
-at_fn_group_banner 1719 'ovsdb-server.at:41' \
+#AT_STOP_1722
+#AT_START_1723
+at_fn_group_banner 1723 'ovsdb-server.at:41' \
   "referential integrity -- mutual references" "     " 87
 at_xfail=no
 (
-  $as_echo "1719. $at_setup_line: testing $at_desc ..."
+  $as_echo "1723. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -317198,13 +318187,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1719
-#AT_START_1720
-at_fn_group_banner 1720 'ovsdb-server.at:41' \
+#AT_STOP_1723
+#AT_START_1724
+at_fn_group_banner 1724 'ovsdb-server.at:41' \
   "weak references" "                                " 87
 at_xfail=no
 (
-  $as_echo "1720. $at_setup_line: testing $at_desc ..."
+  $as_echo "1724. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -317752,13 +318741,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1720
-#AT_START_1721
-at_fn_group_banner 1721 'ovsdb-server.at:41' \
+#AT_STOP_1724
+#AT_START_1725
+at_fn_group_banner 1725 'ovsdb-server.at:41' \
   "immutable columns" "                              " 87
 at_xfail=no
 (
-  $as_echo "1721. $at_setup_line: testing $at_desc ..."
+  $as_echo "1725. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -317980,13 +318969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1721
-#AT_START_1722
-at_fn_group_banner 1722 'ovsdb-server.at:41' \
+#AT_STOP_1725
+#AT_START_1726
+at_fn_group_banner 1726 'ovsdb-server.at:41' \
   "garbage collection" "                             " 87
 at_xfail=no
 (
-  $as_echo "1722. $at_setup_line: testing $at_desc ..."
+  $as_echo "1726. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -318560,13 +319549,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1722
-#AT_START_1723
-at_fn_group_banner 1723 'ovsdb-server.at:45' \
+#AT_STOP_1726
+#AT_START_1727
+at_fn_group_banner 1727 'ovsdb-server.at:45' \
   "truncating corrupted database log" "              " 88
 at_xfail=no
 (
-  $as_echo "1723. $at_setup_line: testing $at_desc ..."
+  $as_echo "1727. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -318695,13 +319684,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1723
-#AT_START_1724
-at_fn_group_banner 1724 'ovsdb-server.at:92' \
+#AT_STOP_1727
+#AT_START_1728
+at_fn_group_banner 1728 'ovsdb-server.at:92' \
   "truncating database log with bad transaction" "   " 88
 at_xfail=no
 (
-  $as_echo "1724. $at_setup_line: testing $at_desc ..."
+  $as_echo "1728. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -318831,13 +319820,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1724
-#AT_START_1725
-at_fn_group_banner 1725 'ovsdb-server.at:153' \
+#AT_STOP_1728
+#AT_START_1729
+at_fn_group_banner 1729 'ovsdb-server.at:153' \
   "database multiplexing implementation" "           " 88
 at_xfail=no
 (
-  $as_echo "1725. $at_setup_line: testing $at_desc ..."
+  $as_echo "1729. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -318978,13 +319967,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1725
-#AT_START_1726
-at_fn_group_banner 1726 'ovsdb-server.at:170' \
+#AT_STOP_1729
+#AT_START_1730
+at_fn_group_banner 1730 'ovsdb-server.at:170' \
   "ovsdb-server/add-db and remove-db" "              " 88
 at_xfail=no
 (
-  $as_echo "1726. $at_setup_line: testing $at_desc ..."
+  $as_echo "1730. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -319797,13 +320786,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1726
-#AT_START_1727
-at_fn_group_banner 1727 'ovsdb-server.at:285' \
+#AT_STOP_1730
+#AT_START_1731
+at_fn_group_banner 1731 'ovsdb-server.at:285' \
   "ovsdb-server/add-db with --monitor" "             " 88
 at_xfail=no
 (
-  $as_echo "1727. $at_setup_line: testing $at_desc ..."
+  $as_echo "1731. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -320029,13 +321018,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1727
-#AT_START_1728
-at_fn_group_banner 1728 'ovsdb-server.at:320' \
+#AT_STOP_1731
+#AT_START_1732
+at_fn_group_banner 1732 'ovsdb-server.at:320' \
   "ovsdb-server/add-db and remove-db with --monitor" "" 88
 at_xfail=no
 (
-  $as_echo "1728. $at_setup_line: testing $at_desc ..."
+  $as_echo "1732. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -320257,13 +321246,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1728
-#AT_START_1729
-at_fn_group_banner 1729 'ovsdb-server.at:353' \
+#AT_STOP_1732
+#AT_START_1733
+at_fn_group_banner 1733 'ovsdb-server.at:353' \
   "--remote=db: implementation" "                    " 88
 at_xfail=no
 (
-  $as_echo "1729. $at_setup_line: testing $at_desc ..."
+  $as_echo "1733. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -320443,13 +321432,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1729
-#AT_START_1730
-at_fn_group_banner 1730 'ovsdb-server.at:417' \
+#AT_STOP_1733
+#AT_START_1734
+at_fn_group_banner 1734 'ovsdb-server.at:417' \
   "ovsdb-server/add-remote and remove-remote" "      " 88
 at_xfail=no
 (
-  $as_echo "1730. $at_setup_line: testing $at_desc ..."
+  $as_echo "1734. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -320784,13 +321773,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1730
-#AT_START_1731
-at_fn_group_banner 1731 'ovsdb-server.at:470' \
+#AT_STOP_1734
+#AT_START_1735
+at_fn_group_banner 1735 'ovsdb-server.at:470' \
   "ovsdb-server/add-remote with --monitor" "         " 88
 at_xfail=no
 (
-  $as_echo "1731. $at_setup_line: testing $at_desc ..."
+  $as_echo "1735. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -320980,13 +321969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1731
-#AT_START_1732
-at_fn_group_banner 1732 'ovsdb-server.at:505' \
+#AT_STOP_1735
+#AT_START_1736
+at_fn_group_banner 1736 'ovsdb-server.at:505' \
   "ovsdb-server/add-remote and remove-remote with --monitor" "" 88
 at_xfail=no
 (
-  $as_echo "1732. $at_setup_line: testing $at_desc ..."
+  $as_echo "1736. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -321216,13 +322205,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1732
-#AT_START_1733
-at_fn_group_banner 1733 'ovsdb-server.at:544' \
+#AT_STOP_1736
+#AT_START_1737
+at_fn_group_banner 1737 'ovsdb-server.at:544' \
   "SSL db: implementation" "                         " 88
 at_xfail=no
 (
-  $as_echo "1733. $at_setup_line: testing $at_desc ..."
+  $as_echo "1737. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -321543,13 +322532,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1733
-#AT_START_1734
-at_fn_group_banner 1734 'ovsdb-server.at:835' \
+#AT_STOP_1737
+#AT_START_1738
+at_fn_group_banner 1738 'ovsdb-server.at:835' \
   "compacting online - standalone" "                 " 88
 at_xfail=no
 (
-  $as_echo "1734. $at_setup_line: testing $at_desc ..."
+  $as_echo "1738. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -321562,13 +322551,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1734
-#AT_START_1735
-at_fn_group_banner 1735 'ovsdb-server.at:840' \
+#AT_STOP_1738
+#AT_START_1739
+at_fn_group_banner 1739 'ovsdb-server.at:840' \
   "compacting online - cluster" "                    " 88
 at_xfail=no
 (
-  $as_echo "1735. $at_setup_line: testing $at_desc ..."
+  $as_echo "1739. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -321581,13 +322570,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1735
-#AT_START_1736
-at_fn_group_banner 1736 'ovsdb-server.at:1121' \
+#AT_STOP_1739
+#AT_START_1740
+at_fn_group_banner 1740 'ovsdb-server.at:1121' \
   "schema conversion online - standalone" "          " 88
 at_xfail=no
 (
-  $as_echo "1736. $at_setup_line: testing $at_desc ..."
+  $as_echo "1740. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -321600,13 +322589,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1736
-#AT_START_1737
-at_fn_group_banner 1737 'ovsdb-server.at:1126' \
+#AT_STOP_1740
+#AT_START_1741
+at_fn_group_banner 1741 'ovsdb-server.at:1126' \
   "schema conversion online - clustered" "           " 88
 at_xfail=no
 (
-  $as_echo "1737. $at_setup_line: testing $at_desc ..."
+  $as_echo "1741. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -321619,13 +322608,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1737
-#AT_START_1738
-at_fn_group_banner 1738 'ovsdb-server.at:1131' \
+#AT_STOP_1741
+#AT_START_1742
+at_fn_group_banner 1742 'ovsdb-server.at:1131' \
   "ovsdb-server combines updates on backlogged connections" "" 88
 at_xfail=no
 (
-  $as_echo "1738. $at_setup_line: testing $at_desc ..."
+  $as_echo "1742. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -321983,13 +322972,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1738
-#AT_START_1739
-at_fn_group_banner 1739 'ovsdb-server.at:1264' \
+#AT_STOP_1742
+#AT_START_1743
+at_fn_group_banner 1743 'ovsdb-server.at:1264' \
   "insert default row, query table" "                " 89
 at_xfail=no
 (
-  $as_echo "1739. $at_setup_line: testing $at_desc ..."
+  $as_echo "1743. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -322142,13 +323131,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1739
-#AT_START_1740
-at_fn_group_banner 1740 'ovsdb-server.at:1264' \
+#AT_STOP_1743
+#AT_START_1744
+at_fn_group_banner 1744 'ovsdb-server.at:1264' \
   "insert row, query table" "                        " 89
 at_xfail=no
 (
-  $as_echo "1740. $at_setup_line: testing $at_desc ..."
+  $as_echo "1744. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -322301,13 +323290,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1740
-#AT_START_1741
-at_fn_group_banner 1741 'ovsdb-server.at:1264' \
+#AT_STOP_1744
+#AT_START_1745
+at_fn_group_banner 1745 'ovsdb-server.at:1264' \
   "insert row with uuid, query table" "              " 89
 at_xfail=no
 (
-  $as_echo "1741. $at_setup_line: testing $at_desc ..."
+  $as_echo "1745. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -322488,13 +323477,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1741
-#AT_START_1742
-at_fn_group_banner 1742 'ovsdb-server.at:1264' \
+#AT_STOP_1745
+#AT_START_1746
+at_fn_group_banner 1746 'ovsdb-server.at:1264' \
   "insert rows, query by value" "                    " 89
 at_xfail=no
 (
-  $as_echo "1742. $at_setup_line: testing $at_desc ..."
+  $as_echo "1746. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -322695,13 +323684,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1742
-#AT_START_1743
-at_fn_group_banner 1743 'ovsdb-server.at:1264' \
+#AT_STOP_1746
+#AT_START_1747
+at_fn_group_banner 1747 'ovsdb-server.at:1264' \
   "insert rows, query by named-uuid" "               " 89
 at_xfail=no
 (
-  $as_echo "1743. $at_setup_line: testing $at_desc ..."
+  $as_echo "1747. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -322852,13 +323841,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1743
-#AT_START_1744
-at_fn_group_banner 1744 'ovsdb-server.at:1264' \
+#AT_STOP_1747
+#AT_START_1748
+at_fn_group_banner 1748 'ovsdb-server.at:1264' \
   "insert rows, update rows by value" "              " 89
 at_xfail=no
 (
-  $as_echo "1744. $at_setup_line: testing $at_desc ..."
+  $as_echo "1748. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -323067,13 +324056,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1744
-#AT_START_1745
-at_fn_group_banner 1745 'ovsdb-server.at:1264' \
+#AT_STOP_1748
+#AT_START_1749
+at_fn_group_banner 1749 'ovsdb-server.at:1264' \
   "insert rows, mutate rows" "                       " 89
 at_xfail=no
 (
-  $as_echo "1745. $at_setup_line: testing $at_desc ..."
+  $as_echo "1749. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -323282,13 +324271,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1745
-#AT_START_1746
-at_fn_group_banner 1746 'ovsdb-server.at:1264' \
+#AT_STOP_1749
+#AT_START_1750
+at_fn_group_banner 1750 'ovsdb-server.at:1264' \
   "insert rows, delete by named-uuid" "              " 89
 at_xfail=no
 (
-  $as_echo "1746. $at_setup_line: testing $at_desc ..."
+  $as_echo "1750. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -323441,13 +324430,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1746
-#AT_START_1747
-at_fn_group_banner 1747 'ovsdb-server.at:1264' \
+#AT_STOP_1750
+#AT_START_1751
+at_fn_group_banner 1751 'ovsdb-server.at:1264' \
   "insert rows, delete rows by value" "              " 89
 at_xfail=no
 (
-  $as_echo "1747. $at_setup_line: testing $at_desc ..."
+  $as_echo "1751. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -323652,13 +324641,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1747
-#AT_START_1748
-at_fn_group_banner 1748 'ovsdb-server.at:1264' \
+#AT_STOP_1751
+#AT_START_1752
+at_fn_group_banner 1752 'ovsdb-server.at:1264' \
   "insert rows, delete by (non-matching) value" "    " 89
 at_xfail=no
 (
-  $as_echo "1748. $at_setup_line: testing $at_desc ..."
+  $as_echo "1752. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -323865,13 +324854,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1748
-#AT_START_1749
-at_fn_group_banner 1749 'ovsdb-server.at:1264' \
+#AT_STOP_1752
+#AT_START_1753
+at_fn_group_banner 1753 'ovsdb-server.at:1264' \
   "insert rows, delete all" "                        " 89
 at_xfail=no
 (
-  $as_echo "1749. $at_setup_line: testing $at_desc ..."
+  $as_echo "1753. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -324024,13 +325013,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1749
-#AT_START_1750
-at_fn_group_banner 1750 'ovsdb-server.at:1264' \
+#AT_STOP_1753
+#AT_START_1754
+at_fn_group_banner 1754 'ovsdb-server.at:1264' \
   "insert row, query table, commit" "                " 89
 at_xfail=no
 (
-  $as_echo "1750. $at_setup_line: testing $at_desc ..."
+  $as_echo "1754. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -324169,13 +325158,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1750
-#AT_START_1751
-at_fn_group_banner 1751 'ovsdb-server.at:1264' \
+#AT_STOP_1754
+#AT_START_1755
+at_fn_group_banner 1755 'ovsdb-server.at:1264' \
   "insert row, query table, commit durably" "        " 89
 at_xfail=no
 (
-  $as_echo "1751. $at_setup_line: testing $at_desc ..."
+  $as_echo "1755. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -324314,13 +325303,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1751
-#AT_START_1752
-at_fn_group_banner 1752 'ovsdb-server.at:1264' \
+#AT_STOP_1755
+#AT_START_1756
+at_fn_group_banner 1756 'ovsdb-server.at:1264' \
   "equality wait with correct rows" "                " 89
 at_xfail=no
 (
-  $as_echo "1752. $at_setup_line: testing $at_desc ..."
+  $as_echo "1756. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -324471,13 +325460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1752
-#AT_START_1753
-at_fn_group_banner 1753 'ovsdb-server.at:1264' \
+#AT_STOP_1756
+#AT_START_1757
+at_fn_group_banner 1757 'ovsdb-server.at:1264' \
   "equality wait with extra row" "                   " 89
 at_xfail=no
 (
-  $as_echo "1753. $at_setup_line: testing $at_desc ..."
+  $as_echo "1757. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -324630,13 +325619,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1753
-#AT_START_1754
-at_fn_group_banner 1754 'ovsdb-server.at:1264' \
+#AT_STOP_1757
+#AT_START_1758
+at_fn_group_banner 1758 'ovsdb-server.at:1264' \
   "equality wait with missing row" "                 " 89
 at_xfail=no
 (
-  $as_echo "1754. $at_setup_line: testing $at_desc ..."
+  $as_echo "1758. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -324785,13 +325774,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1754
-#AT_START_1755
-at_fn_group_banner 1755 'ovsdb-server.at:1264' \
+#AT_STOP_1758
+#AT_START_1759
+at_fn_group_banner 1759 'ovsdb-server.at:1264' \
   "inequality wait with correct rows" "              " 89
 at_xfail=no
 (
-  $as_echo "1755. $at_setup_line: testing $at_desc ..."
+  $as_echo "1759. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -324942,13 +325931,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1755
-#AT_START_1756
-at_fn_group_banner 1756 'ovsdb-server.at:1264' \
+#AT_STOP_1759
+#AT_START_1760
+at_fn_group_banner 1760 'ovsdb-server.at:1264' \
   "inequality wait with extra row" "                 " 89
 at_xfail=no
 (
-  $as_echo "1756. $at_setup_line: testing $at_desc ..."
+  $as_echo "1760. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -325101,13 +326090,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1756
-#AT_START_1757
-at_fn_group_banner 1757 'ovsdb-server.at:1264' \
+#AT_STOP_1760
+#AT_START_1761
+at_fn_group_banner 1761 'ovsdb-server.at:1264' \
   "inequality wait with missing row" "               " 89
 at_xfail=no
 (
-  $as_echo "1757. $at_setup_line: testing $at_desc ..."
+  $as_echo "1761. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -325256,13 +326245,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1757
-#AT_START_1758
-at_fn_group_banner 1758 'ovsdb-server.at:1264' \
+#AT_STOP_1761
+#AT_START_1762
+at_fn_group_banner 1762 'ovsdb-server.at:1264' \
   "insert and update constraints" "                  " 89
 at_xfail=no
 (
-  $as_echo "1758. $at_setup_line: testing $at_desc ..."
+  $as_echo "1762. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -325489,13 +326478,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1758
-#AT_START_1759
-at_fn_group_banner 1759 'ovsdb-server.at:1264' \
+#AT_STOP_1762
+#AT_START_1763
+at_fn_group_banner 1763 'ovsdb-server.at:1264' \
   "index uniqueness checking" "                      " 89
 at_xfail=no
 (
-  $as_echo "1759. $at_setup_line: testing $at_desc ..."
+  $as_echo "1763. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -325846,13 +326835,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1759
-#AT_START_1760
-at_fn_group_banner 1760 'ovsdb-server.at:1264' \
+#AT_STOP_1763
+#AT_START_1764
+at_fn_group_banner 1764 'ovsdb-server.at:1264' \
   "referential integrity -- simple" "                " 89
 at_xfail=no
 (
-  $as_echo "1760. $at_setup_line: testing $at_desc ..."
+  $as_echo "1764. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -326201,13 +327190,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1760
-#AT_START_1761
-at_fn_group_banner 1761 'ovsdb-server.at:1264' \
+#AT_STOP_1764
+#AT_START_1765
+at_fn_group_banner 1765 'ovsdb-server.at:1264' \
   "referential integrity -- mutual references" "     " 89
 at_xfail=no
 (
-  $as_echo "1761. $at_setup_line: testing $at_desc ..."
+  $as_echo "1765. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -326504,13 +327493,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1761
-#AT_START_1762
-at_fn_group_banner 1762 'ovsdb-server.at:1264' \
+#AT_STOP_1765
+#AT_START_1766
+at_fn_group_banner 1766 'ovsdb-server.at:1264' \
   "weak references" "                                " 89
 at_xfail=no
 (
-  $as_echo "1762. $at_setup_line: testing $at_desc ..."
+  $as_echo "1766. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -327071,13 +328060,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1762
-#AT_START_1763
-at_fn_group_banner 1763 'ovsdb-server.at:1264' \
+#AT_STOP_1766
+#AT_START_1767
+at_fn_group_banner 1767 'ovsdb-server.at:1264' \
   "immutable columns" "                              " 89
 at_xfail=no
 (
-  $as_echo "1763. $at_setup_line: testing $at_desc ..."
+  $as_echo "1767. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -327312,13 +328301,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1763
-#AT_START_1764
-at_fn_group_banner 1764 'ovsdb-server.at:1264' \
+#AT_STOP_1767
+#AT_START_1768
+at_fn_group_banner 1768 'ovsdb-server.at:1264' \
   "garbage collection" "                             " 89
 at_xfail=no
 (
-  $as_echo "1764. $at_setup_line: testing $at_desc ..."
+  $as_echo "1768. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -327905,13 +328894,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1764
-#AT_START_1765
-at_fn_group_banner 1765 'ovsdb-server.at:1302' \
+#AT_STOP_1768
+#AT_START_1769
+at_fn_group_banner 1769 'ovsdb-server.at:1302' \
   "insert default row, query table" "                " 90
 at_xfail=no
 (
-  $as_echo "1765. $at_setup_line: testing $at_desc ..."
+  $as_echo "1769. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -328067,13 +329056,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1765
-#AT_START_1766
-at_fn_group_banner 1766 'ovsdb-server.at:1338' \
+#AT_STOP_1769
+#AT_START_1770
+at_fn_group_banner 1770 'ovsdb-server.at:1338' \
   "insert default row, query table" "                " 91
 at_xfail=no
 (
-  $as_echo "1766. $at_setup_line: testing $at_desc ..."
+  $as_echo "1770. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -328223,13 +329212,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1766
-#AT_START_1767
-at_fn_group_banner 1767 'ovsdb-server.at:1338' \
+#AT_STOP_1770
+#AT_START_1771
+at_fn_group_banner 1771 'ovsdb-server.at:1338' \
   "insert row, query table" "                        " 91
 at_xfail=no
 (
-  $as_echo "1767. $at_setup_line: testing $at_desc ..."
+  $as_echo "1771. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -328379,13 +329368,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1767
-#AT_START_1768
-at_fn_group_banner 1768 'ovsdb-server.at:1338' \
+#AT_STOP_1771
+#AT_START_1772
+at_fn_group_banner 1772 'ovsdb-server.at:1338' \
   "insert row with uuid, query table" "              " 91
 at_xfail=no
 (
-  $as_echo "1768. $at_setup_line: testing $at_desc ..."
+  $as_echo "1772. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -328563,13 +329552,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1768
-#AT_START_1769
-at_fn_group_banner 1769 'ovsdb-server.at:1338' \
+#AT_STOP_1772
+#AT_START_1773
+at_fn_group_banner 1773 'ovsdb-server.at:1338' \
   "insert rows, query by value" "                    " 91
 at_xfail=no
 (
-  $as_echo "1769. $at_setup_line: testing $at_desc ..."
+  $as_echo "1773. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -328767,13 +329756,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1769
-#AT_START_1770
-at_fn_group_banner 1770 'ovsdb-server.at:1338' \
+#AT_STOP_1773
+#AT_START_1774
+at_fn_group_banner 1774 'ovsdb-server.at:1338' \
   "insert rows, query by named-uuid" "               " 91
 at_xfail=no
 (
-  $as_echo "1770. $at_setup_line: testing $at_desc ..."
+  $as_echo "1774. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -328921,13 +329910,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1770
-#AT_START_1771
-at_fn_group_banner 1771 'ovsdb-server.at:1338' \
+#AT_STOP_1774
+#AT_START_1775
+at_fn_group_banner 1775 'ovsdb-server.at:1338' \
   "insert rows, update rows by value" "              " 91
 at_xfail=no
 (
-  $as_echo "1771. $at_setup_line: testing $at_desc ..."
+  $as_echo "1775. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -329133,13 +330122,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1771
-#AT_START_1772
-at_fn_group_banner 1772 'ovsdb-server.at:1338' \
+#AT_STOP_1775
+#AT_START_1776
+at_fn_group_banner 1776 'ovsdb-server.at:1338' \
   "insert rows, mutate rows" "                       " 91
 at_xfail=no
 (
-  $as_echo "1772. $at_setup_line: testing $at_desc ..."
+  $as_echo "1776. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -329345,13 +330334,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1772
-#AT_START_1773
-at_fn_group_banner 1773 'ovsdb-server.at:1338' \
+#AT_STOP_1776
+#AT_START_1777
+at_fn_group_banner 1777 'ovsdb-server.at:1338' \
   "insert rows, delete by named-uuid" "              " 91
 at_xfail=no
 (
-  $as_echo "1773. $at_setup_line: testing $at_desc ..."
+  $as_echo "1777. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -329501,13 +330490,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1773
-#AT_START_1774
-at_fn_group_banner 1774 'ovsdb-server.at:1338' \
+#AT_STOP_1777
+#AT_START_1778
+at_fn_group_banner 1778 'ovsdb-server.at:1338' \
   "insert rows, delete rows by value" "              " 91
 at_xfail=no
 (
-  $as_echo "1774. $at_setup_line: testing $at_desc ..."
+  $as_echo "1778. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -329709,13 +330698,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1774
-#AT_START_1775
-at_fn_group_banner 1775 'ovsdb-server.at:1338' \
+#AT_STOP_1778
+#AT_START_1779
+at_fn_group_banner 1779 'ovsdb-server.at:1338' \
   "insert rows, delete by (non-matching) value" "    " 91
 at_xfail=no
 (
-  $as_echo "1775. $at_setup_line: testing $at_desc ..."
+  $as_echo "1779. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -329919,13 +330908,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1775
-#AT_START_1776
-at_fn_group_banner 1776 'ovsdb-server.at:1338' \
+#AT_STOP_1779
+#AT_START_1780
+at_fn_group_banner 1780 'ovsdb-server.at:1338' \
   "insert rows, delete all" "                        " 91
 at_xfail=no
 (
-  $as_echo "1776. $at_setup_line: testing $at_desc ..."
+  $as_echo "1780. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -330075,13 +331064,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1776
-#AT_START_1777
-at_fn_group_banner 1777 'ovsdb-server.at:1338' \
+#AT_STOP_1780
+#AT_START_1781
+at_fn_group_banner 1781 'ovsdb-server.at:1338' \
   "insert row, query table, commit" "                " 91
 at_xfail=no
 (
-  $as_echo "1777. $at_setup_line: testing $at_desc ..."
+  $as_echo "1781. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -330217,13 +331206,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1777
-#AT_START_1778
-at_fn_group_banner 1778 'ovsdb-server.at:1338' \
+#AT_STOP_1781
+#AT_START_1782
+at_fn_group_banner 1782 'ovsdb-server.at:1338' \
   "insert row, query table, commit durably" "        " 91
 at_xfail=no
 (
-  $as_echo "1778. $at_setup_line: testing $at_desc ..."
+  $as_echo "1782. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -330359,13 +331348,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1778
-#AT_START_1779
-at_fn_group_banner 1779 'ovsdb-server.at:1338' \
+#AT_STOP_1782
+#AT_START_1783
+at_fn_group_banner 1783 'ovsdb-server.at:1338' \
   "equality wait with correct rows" "                " 91
 at_xfail=no
 (
-  $as_echo "1779. $at_setup_line: testing $at_desc ..."
+  $as_echo "1783. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -330513,13 +331502,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1779
-#AT_START_1780
-at_fn_group_banner 1780 'ovsdb-server.at:1338' \
+#AT_STOP_1783
+#AT_START_1784
+at_fn_group_banner 1784 'ovsdb-server.at:1338' \
   "equality wait with extra row" "                   " 91
 at_xfail=no
 (
-  $as_echo "1780. $at_setup_line: testing $at_desc ..."
+  $as_echo "1784. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -330669,13 +331658,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1780
-#AT_START_1781
-at_fn_group_banner 1781 'ovsdb-server.at:1338' \
+#AT_STOP_1784
+#AT_START_1785
+at_fn_group_banner 1785 'ovsdb-server.at:1338' \
   "equality wait with missing row" "                 " 91
 at_xfail=no
 (
-  $as_echo "1781. $at_setup_line: testing $at_desc ..."
+  $as_echo "1785. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -330821,13 +331810,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1781
-#AT_START_1782
-at_fn_group_banner 1782 'ovsdb-server.at:1338' \
+#AT_STOP_1785
+#AT_START_1786
+at_fn_group_banner 1786 'ovsdb-server.at:1338' \
   "inequality wait with correct rows" "              " 91
 at_xfail=no
 (
-  $as_echo "1782. $at_setup_line: testing $at_desc ..."
+  $as_echo "1786. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -330975,13 +331964,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1782
-#AT_START_1783
-at_fn_group_banner 1783 'ovsdb-server.at:1338' \
+#AT_STOP_1786
+#AT_START_1787
+at_fn_group_banner 1787 'ovsdb-server.at:1338' \
   "inequality wait with extra row" "                 " 91
 at_xfail=no
 (
-  $as_echo "1783. $at_setup_line: testing $at_desc ..."
+  $as_echo "1787. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -331131,13 +332120,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1783
-#AT_START_1784
-at_fn_group_banner 1784 'ovsdb-server.at:1338' \
+#AT_STOP_1787
+#AT_START_1788
+at_fn_group_banner 1788 'ovsdb-server.at:1338' \
   "inequality wait with missing row" "               " 91
 at_xfail=no
 (
-  $as_echo "1784. $at_setup_line: testing $at_desc ..."
+  $as_echo "1788. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -331283,13 +332272,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1784
-#AT_START_1785
-at_fn_group_banner 1785 'ovsdb-server.at:1338' \
+#AT_STOP_1788
+#AT_START_1789
+at_fn_group_banner 1789 'ovsdb-server.at:1338' \
   "insert and update constraints" "                  " 91
 at_xfail=no
 (
-  $as_echo "1785. $at_setup_line: testing $at_desc ..."
+  $as_echo "1789. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -331513,13 +332502,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1785
-#AT_START_1786
-at_fn_group_banner 1786 'ovsdb-server.at:1338' \
+#AT_STOP_1789
+#AT_START_1790
+at_fn_group_banner 1790 'ovsdb-server.at:1338' \
   "index uniqueness checking" "                      " 91
 at_xfail=no
 (
-  $as_echo "1786. $at_setup_line: testing $at_desc ..."
+  $as_echo "1790. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -331867,13 +332856,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1786
-#AT_START_1787
-at_fn_group_banner 1787 'ovsdb-server.at:1338' \
+#AT_STOP_1790
+#AT_START_1791
+at_fn_group_banner 1791 'ovsdb-server.at:1338' \
   "referential integrity -- simple" "                " 91
 at_xfail=no
 (
-  $as_echo "1787. $at_setup_line: testing $at_desc ..."
+  $as_echo "1791. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -332219,13 +333208,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1787
-#AT_START_1788
-at_fn_group_banner 1788 'ovsdb-server.at:1338' \
+#AT_STOP_1791
+#AT_START_1792
+at_fn_group_banner 1792 'ovsdb-server.at:1338' \
   "referential integrity -- mutual references" "     " 91
 at_xfail=no
 (
-  $as_echo "1788. $at_setup_line: testing $at_desc ..."
+  $as_echo "1792. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -332519,13 +333508,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1788
-#AT_START_1789
-at_fn_group_banner 1789 'ovsdb-server.at:1338' \
+#AT_STOP_1792
+#AT_START_1793
+at_fn_group_banner 1793 'ovsdb-server.at:1338' \
   "weak references" "                                " 91
 at_xfail=no
 (
-  $as_echo "1789. $at_setup_line: testing $at_desc ..."
+  $as_echo "1793. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -333083,13 +334072,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1789
-#AT_START_1790
-at_fn_group_banner 1790 'ovsdb-server.at:1338' \
+#AT_STOP_1793
+#AT_START_1794
+at_fn_group_banner 1794 'ovsdb-server.at:1338' \
   "immutable columns" "                              " 91
 at_xfail=no
 (
-  $as_echo "1790. $at_setup_line: testing $at_desc ..."
+  $as_echo "1794. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -333321,13 +334310,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1790
-#AT_START_1791
-at_fn_group_banner 1791 'ovsdb-server.at:1338' \
+#AT_STOP_1794
+#AT_START_1795
+at_fn_group_banner 1795 'ovsdb-server.at:1338' \
   "garbage collection" "                             " 91
 at_xfail=no
 (
-  $as_echo "1791. $at_setup_line: testing $at_desc ..."
+  $as_echo "1795. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -333911,13 +334900,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1791
-#AT_START_1792
-at_fn_group_banner 1792 'ovsdb-server.at:1375' \
+#AT_STOP_1795
+#AT_START_1796
+at_fn_group_banner 1796 'ovsdb-server.at:1375' \
   "insert default row, query table" "                " 92
 at_xfail=no
 (
-  $as_echo "1792. $at_setup_line: testing $at_desc ..."
+  $as_echo "1796. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334070,13 +335059,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1792
-#AT_START_1793
-at_fn_group_banner 1793 'ovsdb-server.at:1411' \
+#AT_STOP_1796
+#AT_START_1797
+at_fn_group_banner 1797 'ovsdb-server.at:1411' \
   "insert default row, query table" "                " 93
 at_xfail=no
 (
-  $as_echo "1793. $at_setup_line: testing $at_desc ..."
+  $as_echo "1797. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334163,13 +335152,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1793
-#AT_START_1794
-at_fn_group_banner 1794 'ovsdb-server.at:1411' \
+#AT_STOP_1797
+#AT_START_1798
+at_fn_group_banner 1798 'ovsdb-server.at:1411' \
   "insert row, query table" "                        " 93
 at_xfail=no
 (
-  $as_echo "1794. $at_setup_line: testing $at_desc ..."
+  $as_echo "1798. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334256,13 +335245,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1794
-#AT_START_1795
-at_fn_group_banner 1795 'ovsdb-server.at:1411' \
+#AT_STOP_1798
+#AT_START_1799
+at_fn_group_banner 1799 'ovsdb-server.at:1411' \
   "insert row with uuid, query table" "              " 93
 at_xfail=no
 (
-  $as_echo "1795. $at_setup_line: testing $at_desc ..."
+  $as_echo "1799. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334373,13 +335362,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1795
-#AT_START_1796
-at_fn_group_banner 1796 'ovsdb-server.at:1411' \
+#AT_STOP_1799
+#AT_START_1800
+at_fn_group_banner 1800 'ovsdb-server.at:1411' \
   "insert rows, query by value" "                    " 93
 at_xfail=no
 (
-  $as_echo "1796. $at_setup_line: testing $at_desc ..."
+  $as_echo "1800. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334510,13 +335499,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1796
-#AT_START_1797
-at_fn_group_banner 1797 'ovsdb-server.at:1411' \
+#AT_STOP_1800
+#AT_START_1801
+at_fn_group_banner 1801 'ovsdb-server.at:1411' \
   "insert rows, query by named-uuid" "               " 93
 at_xfail=no
 (
-  $as_echo "1797. $at_setup_line: testing $at_desc ..."
+  $as_echo "1801. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334592,13 +335581,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1797
-#AT_START_1798
-at_fn_group_banner 1798 'ovsdb-server.at:1411' \
+#AT_STOP_1801
+#AT_START_1802
+at_fn_group_banner 1802 'ovsdb-server.at:1411' \
   "insert rows, update rows by value" "              " 93
 at_xfail=no
 (
-  $as_echo "1798. $at_setup_line: testing $at_desc ..."
+  $as_echo "1802. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334733,13 +335722,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1798
-#AT_START_1799
-at_fn_group_banner 1799 'ovsdb-server.at:1411' \
+#AT_STOP_1802
+#AT_START_1803
+at_fn_group_banner 1803 'ovsdb-server.at:1411' \
   "insert rows, mutate rows" "                       " 93
 at_xfail=no
 (
-  $as_echo "1799. $at_setup_line: testing $at_desc ..."
+  $as_echo "1803. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334874,13 +335863,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1799
-#AT_START_1800
-at_fn_group_banner 1800 'ovsdb-server.at:1411' \
+#AT_STOP_1803
+#AT_START_1804
+at_fn_group_banner 1804 'ovsdb-server.at:1411' \
   "insert rows, delete by named-uuid" "              " 93
 at_xfail=no
 (
-  $as_echo "1800. $at_setup_line: testing $at_desc ..."
+  $as_echo "1804. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -334957,13 +335946,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1800
-#AT_START_1801
-at_fn_group_banner 1801 'ovsdb-server.at:1411' \
+#AT_STOP_1804
+#AT_START_1805
+at_fn_group_banner 1805 'ovsdb-server.at:1411' \
   "insert rows, delete rows by value" "              " 93
 at_xfail=no
 (
-  $as_echo "1801. $at_setup_line: testing $at_desc ..."
+  $as_echo "1805. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335096,13 +336085,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1801
-#AT_START_1802
-at_fn_group_banner 1802 'ovsdb-server.at:1411' \
+#AT_STOP_1805
+#AT_START_1806
+at_fn_group_banner 1806 'ovsdb-server.at:1411' \
   "insert rows, delete by (non-matching) value" "    " 93
 at_xfail=no
 (
-  $as_echo "1802. $at_setup_line: testing $at_desc ..."
+  $as_echo "1806. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335236,13 +336225,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1802
-#AT_START_1803
-at_fn_group_banner 1803 'ovsdb-server.at:1411' \
+#AT_STOP_1806
+#AT_START_1807
+at_fn_group_banner 1807 'ovsdb-server.at:1411' \
   "insert rows, delete all" "                        " 93
 at_xfail=no
 (
-  $as_echo "1803. $at_setup_line: testing $at_desc ..."
+  $as_echo "1807. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335319,13 +336308,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1803
-#AT_START_1804
-at_fn_group_banner 1804 'ovsdb-server.at:1411' \
+#AT_STOP_1807
+#AT_START_1808
+at_fn_group_banner 1808 'ovsdb-server.at:1411' \
   "insert row, query table, commit" "                " 93
 at_xfail=no
 (
-  $as_echo "1804. $at_setup_line: testing $at_desc ..."
+  $as_echo "1808. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335395,13 +336384,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1804
-#AT_START_1805
-at_fn_group_banner 1805 'ovsdb-server.at:1411' \
+#AT_STOP_1808
+#AT_START_1809
+at_fn_group_banner 1809 'ovsdb-server.at:1411' \
   "insert row, query table, commit durably" "        " 93
 at_xfail=no
 (
-  $as_echo "1805. $at_setup_line: testing $at_desc ..."
+  $as_echo "1809. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335471,13 +336460,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1805
-#AT_START_1806
-at_fn_group_banner 1806 'ovsdb-server.at:1411' \
+#AT_STOP_1809
+#AT_START_1810
+at_fn_group_banner 1810 'ovsdb-server.at:1411' \
   "equality wait with correct rows" "                " 93
 at_xfail=no
 (
-  $as_echo "1806. $at_setup_line: testing $at_desc ..."
+  $as_echo "1810. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335553,13 +336542,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1806
-#AT_START_1807
-at_fn_group_banner 1807 'ovsdb-server.at:1411' \
+#AT_STOP_1810
+#AT_START_1811
+at_fn_group_banner 1811 'ovsdb-server.at:1411' \
   "equality wait with extra row" "                   " 93
 at_xfail=no
 (
-  $as_echo "1807. $at_setup_line: testing $at_desc ..."
+  $as_echo "1811. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335636,13 +336625,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1807
-#AT_START_1808
-at_fn_group_banner 1808 'ovsdb-server.at:1411' \
+#AT_STOP_1811
+#AT_START_1812
+at_fn_group_banner 1812 'ovsdb-server.at:1411' \
   "equality wait with missing row" "                 " 93
 at_xfail=no
 (
-  $as_echo "1808. $at_setup_line: testing $at_desc ..."
+  $as_echo "1812. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335717,13 +336706,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1808
-#AT_START_1809
-at_fn_group_banner 1809 'ovsdb-server.at:1411' \
+#AT_STOP_1812
+#AT_START_1813
+at_fn_group_banner 1813 'ovsdb-server.at:1411' \
   "inequality wait with correct rows" "              " 93
 at_xfail=no
 (
-  $as_echo "1809. $at_setup_line: testing $at_desc ..."
+  $as_echo "1813. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335799,13 +336788,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1809
-#AT_START_1810
-at_fn_group_banner 1810 'ovsdb-server.at:1411' \
+#AT_STOP_1813
+#AT_START_1814
+at_fn_group_banner 1814 'ovsdb-server.at:1411' \
   "inequality wait with extra row" "                 " 93
 at_xfail=no
 (
-  $as_echo "1810. $at_setup_line: testing $at_desc ..."
+  $as_echo "1814. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335882,13 +336871,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1810
-#AT_START_1811
-at_fn_group_banner 1811 'ovsdb-server.at:1411' \
+#AT_STOP_1814
+#AT_START_1815
+at_fn_group_banner 1815 'ovsdb-server.at:1411' \
   "inequality wait with missing row" "               " 93
 at_xfail=no
 (
-  $as_echo "1811. $at_setup_line: testing $at_desc ..."
+  $as_echo "1815. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -335963,13 +336952,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1811
-#AT_START_1812
-at_fn_group_banner 1812 'ovsdb-server.at:1411' \
+#AT_STOP_1815
+#AT_START_1816
+at_fn_group_banner 1816 'ovsdb-server.at:1411' \
   "insert and update constraints" "                  " 93
 at_xfail=no
 (
-  $as_echo "1812. $at_setup_line: testing $at_desc ..."
+  $as_echo "1816. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -336123,13 +337112,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1812
-#AT_START_1813
-at_fn_group_banner 1813 'ovsdb-server.at:1411' \
+#AT_STOP_1816
+#AT_START_1817
+at_fn_group_banner 1817 'ovsdb-server.at:1411' \
   "index uniqueness checking" "                      " 93
 at_xfail=no
 (
-  $as_echo "1813. $at_setup_line: testing $at_desc ..."
+  $as_echo "1817. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -336375,13 +337364,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1813
-#AT_START_1814
-at_fn_group_banner 1814 'ovsdb-server.at:1411' \
+#AT_STOP_1817
+#AT_START_1818
+at_fn_group_banner 1818 'ovsdb-server.at:1411' \
   "referential integrity -- simple" "                " 93
 at_xfail=no
 (
-  $as_echo "1814. $at_setup_line: testing $at_desc ..."
+  $as_echo "1818. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -336636,13 +337625,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1814
-#AT_START_1815
-at_fn_group_banner 1815 'ovsdb-server.at:1411' \
+#AT_STOP_1818
+#AT_START_1819
+at_fn_group_banner 1819 'ovsdb-server.at:1411' \
   "referential integrity -- mutual references" "     " 93
 at_xfail=no
 (
-  $as_echo "1815. $at_setup_line: testing $at_desc ..."
+  $as_echo "1819. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -336851,13 +337840,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1815
-#AT_START_1816
-at_fn_group_banner 1816 'ovsdb-server.at:1411' \
+#AT_STOP_1819
+#AT_START_1820
+at_fn_group_banner 1820 'ovsdb-server.at:1411' \
   "weak references" "                                " 93
 at_xfail=no
 (
-  $as_echo "1816. $at_setup_line: testing $at_desc ..."
+  $as_echo "1820. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -337278,13 +338267,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1816
-#AT_START_1817
-at_fn_group_banner 1817 'ovsdb-server.at:1411' \
+#AT_STOP_1820
+#AT_START_1821
+at_fn_group_banner 1821 'ovsdb-server.at:1411' \
   "immutable columns" "                              " 93
 at_xfail=no
 (
-  $as_echo "1817. $at_setup_line: testing $at_desc ..."
+  $as_echo "1821. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -337442,13 +338431,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1817
-#AT_START_1818
-at_fn_group_banner 1818 'ovsdb-server.at:1411' \
+#AT_STOP_1821
+#AT_START_1822
+at_fn_group_banner 1822 'ovsdb-server.at:1411' \
   "garbage collection" "                             " 93
 at_xfail=no
 (
-  $as_echo "1818. $at_setup_line: testing $at_desc ..."
+  $as_echo "1822. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -337892,13 +338881,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1818
-#AT_START_1819
-at_fn_group_banner 1819 'ovsdb-server.at:1451' \
+#AT_STOP_1822
+#AT_START_1823
+at_fn_group_banner 1823 'ovsdb-server.at:1451' \
   "insert default row, query table" "                " 94
 at_xfail=no
 (
-  $as_echo "1819. $at_setup_line: testing $at_desc ..."
+  $as_echo "1823. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -338090,13 +339079,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1819
-#AT_START_1820
-at_fn_group_banner 1820 'ovsdb-server.at:1451' \
+#AT_STOP_1823
+#AT_START_1824
+at_fn_group_banner 1824 'ovsdb-server.at:1451' \
   "insert row, query table" "                        " 94
 at_xfail=no
 (
-  $as_echo "1820. $at_setup_line: testing $at_desc ..."
+  $as_echo "1824. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -338288,13 +339277,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1820
-#AT_START_1821
-at_fn_group_banner 1821 'ovsdb-server.at:1451' \
+#AT_STOP_1824
+#AT_START_1825
+at_fn_group_banner 1825 'ovsdb-server.at:1451' \
   "insert row with uuid, query table" "              " 94
 at_xfail=no
 (
-  $as_echo "1821. $at_setup_line: testing $at_desc ..."
+  $as_echo "1825. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -338509,13 +339498,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1821
-#AT_START_1822
-at_fn_group_banner 1822 'ovsdb-server.at:1451' \
+#AT_STOP_1825
+#AT_START_1826
+at_fn_group_banner 1826 'ovsdb-server.at:1451' \
   "insert rows, query by value" "                    " 94
 at_xfail=no
 (
-  $as_echo "1822. $at_setup_line: testing $at_desc ..."
+  $as_echo "1826. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -338745,13 +339734,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1822
-#AT_START_1823
-at_fn_group_banner 1823 'ovsdb-server.at:1451' \
+#AT_STOP_1826
+#AT_START_1827
+at_fn_group_banner 1827 'ovsdb-server.at:1451' \
   "insert rows, query by named-uuid" "               " 94
 at_xfail=no
 (
-  $as_echo "1823. $at_setup_line: testing $at_desc ..."
+  $as_echo "1827. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -338946,13 +339935,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1823
-#AT_START_1824
-at_fn_group_banner 1824 'ovsdb-server.at:1451' \
+#AT_STOP_1827
+#AT_START_1828
+at_fn_group_banner 1828 'ovsdb-server.at:1451' \
   "insert rows, update rows by value" "              " 94
 at_xfail=no
 (
-  $as_echo "1824. $at_setup_line: testing $at_desc ..."
+  $as_echo "1828. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -339190,13 +340179,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1824
-#AT_START_1825
-at_fn_group_banner 1825 'ovsdb-server.at:1451' \
+#AT_STOP_1828
+#AT_START_1829
+at_fn_group_banner 1829 'ovsdb-server.at:1451' \
   "insert rows, mutate rows" "                       " 94
 at_xfail=no
 (
-  $as_echo "1825. $at_setup_line: testing $at_desc ..."
+  $as_echo "1829. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -339434,13 +340423,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1825
-#AT_START_1826
-at_fn_group_banner 1826 'ovsdb-server.at:1451' \
+#AT_STOP_1829
+#AT_START_1830
+at_fn_group_banner 1830 'ovsdb-server.at:1451' \
   "insert rows, delete by named-uuid" "              " 94
 at_xfail=no
 (
-  $as_echo "1826. $at_setup_line: testing $at_desc ..."
+  $as_echo "1830. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -339637,13 +340626,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1826
-#AT_START_1827
-at_fn_group_banner 1827 'ovsdb-server.at:1451' \
+#AT_STOP_1830
+#AT_START_1831
+at_fn_group_banner 1831 'ovsdb-server.at:1451' \
   "insert rows, delete rows by value" "              " 94
 at_xfail=no
 (
-  $as_echo "1827. $at_setup_line: testing $at_desc ..."
+  $as_echo "1831. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -339877,13 +340866,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1827
-#AT_START_1828
-at_fn_group_banner 1828 'ovsdb-server.at:1451' \
+#AT_STOP_1831
+#AT_START_1832
+at_fn_group_banner 1832 'ovsdb-server.at:1451' \
   "insert rows, delete by (non-matching) value" "    " 94
 at_xfail=no
 (
-  $as_echo "1828. $at_setup_line: testing $at_desc ..."
+  $as_echo "1832. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -340119,13 +341108,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1828
-#AT_START_1829
-at_fn_group_banner 1829 'ovsdb-server.at:1451' \
+#AT_STOP_1832
+#AT_START_1833
+at_fn_group_banner 1833 'ovsdb-server.at:1451' \
   "insert rows, delete all" "                        " 94
 at_xfail=no
 (
-  $as_echo "1829. $at_setup_line: testing $at_desc ..."
+  $as_echo "1833. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -340322,13 +341311,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1829
-#AT_START_1830
-at_fn_group_banner 1830 'ovsdb-server.at:1451' \
+#AT_STOP_1833
+#AT_START_1834
+at_fn_group_banner 1834 'ovsdb-server.at:1451' \
   "insert row, query table, commit" "                " 94
 at_xfail=no
 (
-  $as_echo "1830. $at_setup_line: testing $at_desc ..."
+  $as_echo "1834. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -340511,13 +341500,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1830
-#AT_START_1831
-at_fn_group_banner 1831 'ovsdb-server.at:1451' \
+#AT_STOP_1834
+#AT_START_1835
+at_fn_group_banner 1835 'ovsdb-server.at:1451' \
   "insert row, query table, commit durably" "        " 94
 at_xfail=no
 (
-  $as_echo "1831. $at_setup_line: testing $at_desc ..."
+  $as_echo "1835. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -340700,13 +341689,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1831
-#AT_START_1832
-at_fn_group_banner 1832 'ovsdb-server.at:1451' \
+#AT_STOP_1835
+#AT_START_1836
+at_fn_group_banner 1836 'ovsdb-server.at:1451' \
   "equality wait with correct rows" "                " 94
 at_xfail=no
 (
-  $as_echo "1832. $at_setup_line: testing $at_desc ..."
+  $as_echo "1836. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -340901,13 +341890,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1832
-#AT_START_1833
-at_fn_group_banner 1833 'ovsdb-server.at:1451' \
+#AT_STOP_1836
+#AT_START_1837
+at_fn_group_banner 1837 'ovsdb-server.at:1451' \
   "equality wait with extra row" "                   " 94
 at_xfail=no
 (
-  $as_echo "1833. $at_setup_line: testing $at_desc ..."
+  $as_echo "1837. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -341104,13 +342093,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1833
-#AT_START_1834
-at_fn_group_banner 1834 'ovsdb-server.at:1451' \
+#AT_STOP_1837
+#AT_START_1838
+at_fn_group_banner 1838 'ovsdb-server.at:1451' \
   "equality wait with missing row" "                 " 94
 at_xfail=no
 (
-  $as_echo "1834. $at_setup_line: testing $at_desc ..."
+  $as_echo "1838. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -341303,13 +342292,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1834
-#AT_START_1835
-at_fn_group_banner 1835 'ovsdb-server.at:1451' \
+#AT_STOP_1838
+#AT_START_1839
+at_fn_group_banner 1839 'ovsdb-server.at:1451' \
   "inequality wait with correct rows" "              " 94
 at_xfail=no
 (
-  $as_echo "1835. $at_setup_line: testing $at_desc ..."
+  $as_echo "1839. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -341504,13 +342493,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1835
-#AT_START_1836
-at_fn_group_banner 1836 'ovsdb-server.at:1451' \
+#AT_STOP_1839
+#AT_START_1840
+at_fn_group_banner 1840 'ovsdb-server.at:1451' \
   "inequality wait with extra row" "                 " 94
 at_xfail=no
 (
-  $as_echo "1836. $at_setup_line: testing $at_desc ..."
+  $as_echo "1840. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -341707,13 +342696,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1836
-#AT_START_1837
-at_fn_group_banner 1837 'ovsdb-server.at:1451' \
+#AT_STOP_1840
+#AT_START_1841
+at_fn_group_banner 1841 'ovsdb-server.at:1451' \
   "inequality wait with missing row" "               " 94
 at_xfail=no
 (
-  $as_echo "1837. $at_setup_line: testing $at_desc ..."
+  $as_echo "1841. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -341906,13 +342895,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1837
-#AT_START_1838
-at_fn_group_banner 1838 'ovsdb-server.at:1451' \
+#AT_STOP_1841
+#AT_START_1842
+at_fn_group_banner 1842 'ovsdb-server.at:1451' \
   "insert and update constraints" "                  " 94
 at_xfail=no
 (
-  $as_echo "1838. $at_setup_line: testing $at_desc ..."
+  $as_echo "1842. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -342163,13 +343152,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1838
-#AT_START_1839
-at_fn_group_banner 1839 'ovsdb-server.at:1451' \
+#AT_STOP_1842
+#AT_START_1843
+at_fn_group_banner 1843 'ovsdb-server.at:1451' \
   "index uniqueness checking" "                      " 94
 at_xfail=no
 (
-  $as_echo "1839. $at_setup_line: testing $at_desc ..."
+  $as_echo "1843. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -342529,13 +343518,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1839
-#AT_START_1840
-at_fn_group_banner 1840 'ovsdb-server.at:1451' \
+#AT_STOP_1843
+#AT_START_1844
+at_fn_group_banner 1844 'ovsdb-server.at:1451' \
   "referential integrity -- simple" "                " 94
 at_xfail=no
 (
-  $as_echo "1840. $at_setup_line: testing $at_desc ..."
+  $as_echo "1844. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -342888,13 +343877,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1840
-#AT_START_1841
-at_fn_group_banner 1841 'ovsdb-server.at:1451' \
+#AT_STOP_1844
+#AT_START_1845
+at_fn_group_banner 1845 'ovsdb-server.at:1451' \
   "referential integrity -- mutual references" "     " 94
 at_xfail=no
 (
-  $as_echo "1841. $at_setup_line: testing $at_desc ..."
+  $as_echo "1845. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -343205,13 +344194,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1841
-#AT_START_1842
-at_fn_group_banner 1842 'ovsdb-server.at:1451' \
+#AT_STOP_1845
+#AT_START_1846
+at_fn_group_banner 1846 'ovsdb-server.at:1451' \
   "weak references" "                                " 94
 at_xfail=no
 (
-  $as_echo "1842. $at_setup_line: testing $at_desc ..."
+  $as_echo "1846. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -343746,13 +344735,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1842
-#AT_START_1843
-at_fn_group_banner 1843 'ovsdb-server.at:1451' \
+#AT_STOP_1846
+#AT_START_1847
+at_fn_group_banner 1847 'ovsdb-server.at:1451' \
   "immutable columns" "                              " 94
 at_xfail=no
 (
-  $as_echo "1843. $at_setup_line: testing $at_desc ..."
+  $as_echo "1847. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -344011,13 +345000,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1843
-#AT_START_1844
-at_fn_group_banner 1844 'ovsdb-server.at:1451' \
+#AT_STOP_1847
+#AT_START_1848
+at_fn_group_banner 1848 'ovsdb-server.at:1451' \
   "garbage collection" "                             " 94
 at_xfail=no
 (
-  $as_echo "1844. $at_setup_line: testing $at_desc ..."
+  $as_echo "1848. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -344573,13 +345562,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1844
-#AT_START_1845
-at_fn_group_banner 1845 'ovsdb-server.at:1505' \
+#AT_STOP_1848
+#AT_START_1849
+at_fn_group_banner 1849 'ovsdb-server.at:1505' \
   "insert monitored table, insert excluded table" "  " 95
 at_xfail=no
 (
-  $as_echo "1845. $at_setup_line: testing $at_desc ..."
+  $as_echo "1849. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -344845,13 +345834,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1845
-#AT_START_1846
-at_fn_group_banner 1846 'ovsdb-server.at:1505' \
+#AT_STOP_1849
+#AT_START_1850
+at_fn_group_banner 1850 'ovsdb-server.at:1505' \
   "insert monitored table, update excluded table" "  " 95
 at_xfail=no
 (
-  $as_echo "1846. $at_setup_line: testing $at_desc ..."
+  $as_echo "1850. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -345138,13 +346127,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1846
-#AT_START_1847
-at_fn_group_banner 1847 'ovsdb-server.at:1505' \
+#AT_STOP_1850
+#AT_START_1851
+at_fn_group_banner 1851 'ovsdb-server.at:1505' \
   "update monitored table, insert excluded table" "  " 95
 at_xfail=no
 (
-  $as_echo "1847. $at_setup_line: testing $at_desc ..."
+  $as_echo "1851. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -345412,13 +346401,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1847
-#AT_START_1848
-at_fn_group_banner 1848 'ovsdb-server.at:1505' \
+#AT_STOP_1851
+#AT_START_1852
+at_fn_group_banner 1852 'ovsdb-server.at:1505' \
   "update monitored table, update excluded table" "  " 95
 at_xfail=no
 (
-  $as_echo "1848. $at_setup_line: testing $at_desc ..."
+  $as_echo "1852. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -345707,13 +346696,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1848
-#AT_START_1849
-at_fn_group_banner 1849 'ovsdb-server.at:1505' \
+#AT_STOP_1852
+#AT_START_1853
+at_fn_group_banner 1853 'ovsdb-server.at:1505' \
   "delete monitored table, insert excluded table" "  " 95
 at_xfail=no
 (
-  $as_echo "1849. $at_setup_line: testing $at_desc ..."
+  $as_echo "1853. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -345998,13 +346987,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1849
-#AT_START_1850
-at_fn_group_banner 1850 'ovsdb-server.at:1505' \
+#AT_STOP_1853
+#AT_START_1854
+at_fn_group_banner 1854 'ovsdb-server.at:1505' \
   "delete monitored table, update excluded table" "  " 95
 at_xfail=no
 (
-  $as_echo "1850. $at_setup_line: testing $at_desc ..."
+  $as_echo "1854. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -346310,13 +347299,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1850
-#AT_START_1851
-at_fn_group_banner 1851 'ovsdb-server.at:1510' \
+#AT_STOP_1854
+#AT_START_1855
+at_fn_group_banner 1855 'ovsdb-server.at:1510' \
   "ovsdb-server/get-active-ovsdb-server" "           " 96
 at_xfail=no
 (
-  $as_echo "1851. $at_setup_line: testing $at_desc ..."
+  $as_echo "1855. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -346371,13 +347360,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1851
-#AT_START_1852
-at_fn_group_banner 1852 'ovsdb-server.at:1523' \
+#AT_STOP_1855
+#AT_START_1856
+at_fn_group_banner 1856 'ovsdb-server.at:1523' \
   "ovsdb-server/set-active-ovsdb-server" "           " 96
 at_xfail=no
 (
-  $as_echo "1852. $at_setup_line: testing $at_desc ..."
+  $as_echo "1856. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -346445,13 +347434,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1852
-#AT_START_1853
-at_fn_group_banner 1853 'ovsdb-server.at:1537' \
+#AT_STOP_1856
+#AT_START_1857
+at_fn_group_banner 1857 'ovsdb-server.at:1537' \
   "ovsdb-server/get-sync-exclude-tables" "           " 96
 at_xfail=no
 (
-  $as_echo "1853. $at_setup_line: testing $at_desc ..."
+  $as_echo "1857. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -346506,13 +347495,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1853
-#AT_START_1854
-at_fn_group_banner 1854 'ovsdb-server.at:1550' \
+#AT_STOP_1857
+#AT_START_1858
+at_fn_group_banner 1858 'ovsdb-server.at:1550' \
   "ovsdb-server/set-sync-exclude-tables" "           " 96
 at_xfail=no
 (
-  $as_echo "1854. $at_setup_line: testing $at_desc ..."
+  $as_echo "1858. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -346770,13 +347759,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1854
-#AT_START_1855
-at_fn_group_banner 1855 'ovsdb-server.at:1600' \
+#AT_STOP_1858
+#AT_START_1859
+at_fn_group_banner 1859 'ovsdb-server.at:1600' \
   "ovsdb-server/connect-active-server" "             " 96
 at_xfail=no
 (
-  $as_echo "1855. $at_setup_line: testing $at_desc ..."
+  $as_echo "1859. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -347021,13 +348010,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1855
-#AT_START_1856
-at_fn_group_banner 1856 'ovsdb-server.at:1639' \
+#AT_STOP_1859
+#AT_START_1860
+at_fn_group_banner 1860 'ovsdb-server.at:1639' \
   "ovsdb-server/disconnect-active-server" "          " 96
 at_xfail=no
 (
-  $as_echo "1856. $at_setup_line: testing $at_desc ..."
+  $as_echo "1860. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -347383,13 +348372,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1856
-#AT_START_1857
-at_fn_group_banner 1857 'ovsdb-server.at:1725' \
+#AT_STOP_1860
+#AT_START_1861
+at_fn_group_banner 1861 'ovsdb-server.at:1725' \
   "ovsdb-server/active-backup-role-switching" "      " 96
 at_xfail=no
 (
-  $as_echo "1857. $at_setup_line: testing $at_desc ..."
+  $as_echo "1861. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -347724,13 +348713,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1857
-#AT_START_1858
-at_fn_group_banner 1858 'ovsdb-server.at:1809' \
+#AT_STOP_1861
+#AT_START_1862
+at_fn_group_banner 1862 'ovsdb-server.at:1809' \
   "ovsdb-server prevent self replicating" "          " 96
 at_xfail=no
 (
-  $as_echo "1858. $at_setup_line: testing $at_desc ..."
+  $as_echo "1862. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -347863,13 +348852,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1858
-#AT_START_1859
-at_fn_group_banner 1859 'ovsdb-server.at:1840' \
+#AT_STOP_1862
+#AT_START_1863
+at_fn_group_banner 1863 'ovsdb-server.at:1840' \
   "ovsdb-server/read-only db:ptcp connection" "      " 96
 at_xfail=no
 (
-  $as_echo "1859. $at_setup_line: testing $at_desc ..."
+  $as_echo "1863. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -348075,13 +349064,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1859
-#AT_START_1860
-at_fn_group_banner 1860 'ovsdb-server.at:1907' \
+#AT_STOP_1863
+#AT_START_1864
+at_fn_group_banner 1864 'ovsdb-server.at:1907' \
   "ovsdb-server replication with schema mismatch" "  " 96
 at_xfail=no
 (
-  $as_echo "1860. $at_setup_line: testing $at_desc ..."
+  $as_echo "1864. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -348484,13 +349473,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1860
-#AT_START_1861
-at_fn_group_banner 1861 'ovsdb-client.at:3' \
+#AT_STOP_1864
+#AT_START_1865
+at_fn_group_banner 1865 'ovsdb-client.at:3' \
   "ovsdb-client get-schema-version and get-schema-cksum" "" 97
 at_xfail=no
 (
-  $as_echo "1861. $at_setup_line: testing $at_desc ..."
+  $as_echo "1865. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -348594,13 +349583,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1861
-#AT_START_1862
-at_fn_group_banner 1862 'ovsdb-client.at:15' \
+#AT_STOP_1865
+#AT_START_1866
+at_fn_group_banner 1866 'ovsdb-client.at:15' \
   "ovsdb-client backup and restore" "                " 97
 at_xfail=no
 (
-  $as_echo "1862. $at_setup_line: testing $at_desc ..."
+  $as_echo "1866. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -348919,13 +349908,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1862
-#AT_START_1863
-at_fn_group_banner 1863 'ovsdb-client.at:122' \
+#AT_STOP_1866
+#AT_START_1867
+at_fn_group_banner 1867 'ovsdb-client.at:122' \
   "ovsdb-client query" "                             " 97
 at_xfail=no
 (
-  $as_echo "1863. $at_setup_line: testing $at_desc ..."
+  $as_echo "1867. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349082,13 +350071,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1863
-#AT_START_1864
-at_fn_group_banner 1864 'ovsdb-monitor.at:111' \
+#AT_STOP_1867
+#AT_START_1868
+at_fn_group_banner 1868 'ovsdb-monitor.at:111' \
   "monitor insert into empty table" "                " 98
 at_xfail=no
 (
-  $as_echo "1864. $at_setup_line: testing $at_desc ..."
+  $as_echo "1868. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349113,13 +350102,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1864
-#AT_START_1865
-at_fn_group_banner 1865 'ovsdb-monitor.at:123' \
+#AT_STOP_1868
+#AT_START_1869
+at_fn_group_banner 1869 'ovsdb-monitor.at:123' \
   "monitor insert into populated table" "            " 98
 at_xfail=no
 (
-  $as_echo "1865. $at_setup_line: testing $at_desc ..."
+  $as_echo "1869. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349150,13 +350139,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1865
-#AT_START_1866
-at_fn_group_banner 1866 'ovsdb-monitor.at:141' \
+#AT_STOP_1869
+#AT_START_1870
+at_fn_group_banner 1870 'ovsdb-monitor.at:141' \
   "monitor delete" "                                 " 98
 at_xfail=no
 (
-  $as_echo "1866. $at_setup_line: testing $at_desc ..."
+  $as_echo "1870. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349187,13 +350176,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1866
-#AT_START_1867
-at_fn_group_banner 1867 'ovsdb-monitor.at:159' \
+#AT_STOP_1870
+#AT_START_1871
+at_fn_group_banner 1871 'ovsdb-monitor.at:159' \
   "monitor row update" "                             " 98
 at_xfail=no
 (
-  $as_echo "1867. $at_setup_line: testing $at_desc ..."
+  $as_echo "1871. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349226,13 +350215,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1867
-#AT_START_1868
-at_fn_group_banner 1868 'ovsdb-monitor.at:179' \
+#AT_STOP_1871
+#AT_START_1872
+at_fn_group_banner 1872 'ovsdb-monitor.at:179' \
   "monitor no-op row updates" "                      " 98
 at_xfail=no
 (
-  $as_echo "1868. $at_setup_line: testing $at_desc ..."
+  $as_echo "1872. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349267,13 +350256,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1868
-#AT_START_1869
-at_fn_group_banner 1869 'ovsdb-monitor.at:202' \
+#AT_STOP_1872
+#AT_START_1873
+at_fn_group_banner 1873 'ovsdb-monitor.at:202' \
   "monitor insert-and-update transaction" "          " 98
 at_xfail=no
 (
-  $as_echo "1869. $at_setup_line: testing $at_desc ..."
+  $as_echo "1873. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349309,13 +350298,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1869
-#AT_START_1870
-at_fn_group_banner 1870 'ovsdb-monitor.at:225' \
+#AT_STOP_1873
+#AT_START_1874
+at_fn_group_banner 1874 'ovsdb-monitor.at:225' \
   "monitor insert-update-and-delete transaction" "   " 98
 at_xfail=no
 (
-  $as_echo "1870. $at_setup_line: testing $at_desc ..."
+  $as_echo "1874. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349357,13 +350346,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1870
-#AT_START_1871
-at_fn_group_banner 1871 'ovsdb-monitor.at:254' \
+#AT_STOP_1874
+#AT_START_1875
+at_fn_group_banner 1875 'ovsdb-monitor.at:254' \
   "monitor weak reference change" "                  " 98
 at_xfail=no
 (
-  $as_echo "1871. $at_setup_line: testing $at_desc ..."
+  $as_echo "1875. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349411,13 +350400,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1871
-#AT_START_1872
-at_fn_group_banner 1872 'ovsdb-monitor.at:289' \
+#AT_STOP_1875
+#AT_START_1876
+at_fn_group_banner 1876 'ovsdb-monitor.at:289' \
   "monitor insert-update-and-delete transaction" "   " 98
 at_xfail=no
 (
-  $as_echo "1872. $at_setup_line: testing $at_desc ..."
+  $as_echo "1876. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349459,13 +350448,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1872
-#AT_START_1873
-at_fn_group_banner 1873 'ovsdb-monitor.at:340' \
+#AT_STOP_1876
+#AT_START_1877
+at_fn_group_banner 1877 'ovsdb-monitor.at:340' \
   "monitor all operations" "                         " 99
 at_xfail=no
 (
-  $as_echo "1873. $at_setup_line: testing $at_desc ..."
+  $as_echo "1877. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349511,13 +350500,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1873
-#AT_START_1874
-at_fn_group_banner 1874 'ovsdb-monitor.at:360' \
+#AT_STOP_1877
+#AT_START_1878
+at_fn_group_banner 1878 'ovsdb-monitor.at:360' \
   "monitor initial only" "                           " 99
 at_xfail=no
 (
-  $as_echo "1874. $at_setup_line: testing $at_desc ..."
+  $as_echo "1878. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349552,13 +350541,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1874
-#AT_START_1875
-at_fn_group_banner 1875 'ovsdb-monitor.at:367' \
+#AT_STOP_1878
+#AT_START_1879
+at_fn_group_banner 1879 'ovsdb-monitor.at:367' \
   "monitor insert only" "                            " 99
 at_xfail=no
 (
-  $as_echo "1875. $at_setup_line: testing $at_desc ..."
+  $as_echo "1879. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349593,13 +350582,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1875
-#AT_START_1876
-at_fn_group_banner 1876 'ovsdb-monitor.at:374' \
+#AT_STOP_1879
+#AT_START_1880
+at_fn_group_banner 1880 'ovsdb-monitor.at:374' \
   "monitor delete only" "                            " 99
 at_xfail=no
 (
-  $as_echo "1876. $at_setup_line: testing $at_desc ..."
+  $as_echo "1880. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349635,13 +350624,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1876
-#AT_START_1877
-at_fn_group_banner 1877 'ovsdb-monitor.at:382' \
+#AT_STOP_1880
+#AT_START_1881
+at_fn_group_banner 1881 'ovsdb-monitor.at:382' \
   "monitor modify only" "                            " 99
 at_xfail=no
 (
-  $as_echo "1877. $at_setup_line: testing $at_desc ..."
+  $as_echo "1881. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349677,13 +350666,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1877
-#AT_START_1878
-at_fn_group_banner 1878 'ovsdb-monitor.at:392' \
+#AT_STOP_1881
+#AT_START_1882
+at_fn_group_banner 1882 'ovsdb-monitor.at:392' \
   "monitor-cond empty condition" "                   " 100
 at_xfail=no
 (
-  $as_echo "1878. $at_setup_line: testing $at_desc ..."
+  $as_echo "1882. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -349864,13 +350853,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1878
-#AT_START_1879
-at_fn_group_banner 1879 'ovsdb-monitor.at:423' \
+#AT_STOP_1882
+#AT_START_1883
+at_fn_group_banner 1883 'ovsdb-monitor.at:423' \
   "monitor-cond multiple conditions" "               " 100
 at_xfail=no
 (
-  $as_echo "1879. $at_setup_line: testing $at_desc ..."
+  $as_echo "1883. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -350048,13 +351037,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1879
-#AT_START_1880
-at_fn_group_banner 1880 'ovsdb-monitor.at:451' \
+#AT_STOP_1883
+#AT_START_1884
+at_fn_group_banner 1884 'ovsdb-monitor.at:451' \
   "monitor-cond delete from populated table" "       " 100
 at_xfail=no
 (
-  $as_echo "1880. $at_setup_line: testing $at_desc ..."
+  $as_echo "1884. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -350229,13 +351218,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1880
-#AT_START_1881
-at_fn_group_banner 1881 'ovsdb-monitor.at:476' \
+#AT_STOP_1884
+#AT_START_1885
+at_fn_group_banner 1885 'ovsdb-monitor.at:476' \
   "monitor-cond insert due to modify" "              " 100
 at_xfail=no
 (
-  $as_echo "1881. $at_setup_line: testing $at_desc ..."
+  $as_echo "1885. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -350408,13 +351397,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1881
-#AT_START_1882
-at_fn_group_banner 1882 'ovsdb-monitor.at:500' \
+#AT_STOP_1885
+#AT_START_1886
+at_fn_group_banner 1886 'ovsdb-monitor.at:500' \
   "monitor-cond delete due to modify" "              " 100
 at_xfail=no
 (
-  $as_echo "1882. $at_setup_line: testing $at_desc ..."
+  $as_echo "1886. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -350587,13 +351576,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1882
-#AT_START_1883
-at_fn_group_banner 1883 'ovsdb-monitor.at:524' \
+#AT_STOP_1886
+#AT_START_1887
+at_fn_group_banner 1887 'ovsdb-monitor.at:524' \
   "monitor-cond condition non-monitored columns" "   " 100
 at_xfail=no
 (
-  $as_echo "1883. $at_setup_line: testing $at_desc ..."
+  $as_echo "1887. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -350771,13 +351760,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1883
-#AT_START_1884
-at_fn_group_banner 1884 'ovsdb-monitor.at:553' \
+#AT_STOP_1887
+#AT_START_1888
+at_fn_group_banner 1888 'ovsdb-monitor.at:553' \
   "monitor-cond-change" "                            " 100
 at_xfail=no
 (
-  $as_echo "1884. $at_setup_line: testing $at_desc ..."
+  $as_echo "1888. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -350962,13 +351951,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1884
-#AT_START_1885
-at_fn_group_banner 1885 'ovsdb-monitor.at:594' \
+#AT_STOP_1888
+#AT_START_1889
+at_fn_group_banner 1889 'ovsdb-monitor.at:594' \
   "monitor-cond-change with many sessions pending" " " 100
 at_xfail=no
 (
-  $as_echo "1885. $at_setup_line: testing $at_desc ..."
+  $as_echo "1889. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -351193,13 +352182,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1885
-#AT_START_1886
-at_fn_group_banner 1886 'ovsdb-monitor.at:665' \
+#AT_STOP_1889
+#AT_START_1890
+at_fn_group_banner 1890 'ovsdb-monitor.at:665' \
   "monitor-cond-since not found" "                   " 100
 at_xfail=no
 (
-  $as_echo "1886. $at_setup_line: testing $at_desc ..."
+  $as_echo "1890. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -351367,13 +352356,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1886
-#AT_START_1887
-at_fn_group_banner 1887 'ovsdb-monitor.at:719' \
+#AT_STOP_1890
+#AT_START_1891
+at_fn_group_banner 1891 'ovsdb-monitor.at:719' \
   "monitor-cond-since db restart" "                  " 100
 at_xfail=no
 (
-  $as_echo "1887. $at_setup_line: testing $at_desc ..."
+  $as_echo "1891. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -351593,13 +352582,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1887
-#AT_START_1888
-at_fn_group_banner 1888 'ovsdb-monitor.at:783' \
+#AT_STOP_1891
+#AT_START_1892
+at_fn_group_banner 1892 'ovsdb-monitor.at:783' \
   "monitor-cond-since found but no new rows" "       " 100
 at_xfail=no
 (
-  $as_echo "1888. $at_setup_line: testing $at_desc ..."
+  $as_echo "1892. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -351769,13 +352758,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1888
-#AT_START_1889
-at_fn_group_banner 1889 'ovsdb-monitor.at:824' \
+#AT_STOP_1892
+#AT_START_1893
+at_fn_group_banner 1893 'ovsdb-monitor.at:824' \
   "monitor-cond-since empty db" "                    " 100
 at_xfail=no
 (
-  $as_echo "1889. $at_setup_line: testing $at_desc ..."
+  $as_echo "1893. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -351894,13 +352883,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1889
-#AT_START_1890
-at_fn_group_banner 1890 'ovsdb-monitor.at:847' \
+#AT_STOP_1893
+#AT_START_1894
+at_fn_group_banner 1894 'ovsdb-monitor.at:847' \
   "monitor-cond-since condition change" "            " 100
 at_xfail=no
 (
-  $as_echo "1890. $at_setup_line: testing $at_desc ..."
+  $as_echo "1894. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -352072,13 +353061,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1890
-#AT_START_1891
-at_fn_group_banner 1891 'ovsdb-monitor.at:908' \
+#AT_STOP_1894
+#AT_START_1895
+at_fn_group_banner 1895 'ovsdb-monitor.at:908' \
   "monitor-cond-since non-cluster" "                 " 100
 at_xfail=no
 (
-  $as_echo "1891. $at_setup_line: testing $at_desc ..."
+  $as_echo "1895. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -352247,13 +353236,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1891
-#AT_START_1892
-at_fn_group_banner 1892 'ovsdb-monitor.at:961' \
+#AT_STOP_1895
+#AT_START_1896
+at_fn_group_banner 1896 'ovsdb-monitor.at:961' \
   "monitor-cond-since non-cluster non-zero last_id" "" 100
 at_xfail=no
 (
-  $as_echo "1892. $at_setup_line: testing $at_desc ..."
+  $as_echo "1896. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -352424,13 +353413,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1892
-#AT_START_1893
-at_fn_group_banner 1893 'ovsdb-idl.at:280' \
+#AT_STOP_1896
+#AT_START_1897
+at_fn_group_banner 1897 'ovsdb-idl.at:290' \
   "simple passive idl, initially empty, select empty - Python3 - ptcp" "" 101
 at_xfail=no
 (
-  $as_echo "1893. $at_setup_line: testing $at_desc ..."
+  $as_echo "1897. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -352438,15 +353427,15 @@
 
    # find free TCP port
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:280: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:280"
+$as_echo "$at_srcdir/ovsdb-idl.at:290: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:290"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:280"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352457,32 +353446,32 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:280" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:290" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:280: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:280"
+$as_echo "$at_srcdir/ovsdb-idl.at:290: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:290"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:280"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:280: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:280"
+$as_echo "$at_srcdir/ovsdb-idl.at:290: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:290"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:280"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352493,40 +353482,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:280" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:290" "while kill -0 \$TMPPID 2>/dev/null"
 
    rm -f db
 
    # start OVSDB server in passive mode
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:280: ovsdb_start_idltest \"tcp:127.0.0.1:\$TCP_PORT\""
-at_fn_check_prepare_dynamic "ovsdb_start_idltest \"tcp:127.0.0.1:$TCP_PORT\"" "ovsdb-idl.at:280"
+$as_echo "$at_srcdir/ovsdb-idl.at:290: ovsdb_start_idltest \"tcp:127.0.0.1:\$TCP_PORT\""
+at_fn_check_prepare_dynamic "ovsdb_start_idltest \"tcp:127.0.0.1:$TCP_PORT\"" "ovsdb-idl.at:290"
 ( $at_check_trace; ovsdb_start_idltest "tcp:127.0.0.1:$TCP_PORT"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:280"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:280: \$PYTHON3 \$srcdir/test-ovsdb.py -t10 idl_passive \$srcdir/idltest.ovsschema ptcp:127.0.0.1:\$TCP_PORT '[\"idltest\",{\"op\":\"select\",\"table\":\"link1\",\"where\":[]}]'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py -t10 idl_passive $srcdir/idltest.ovsschema ptcp:127.0.0.1:$TCP_PORT '[\"idltest\",{\"op\":\"select\",\"table\":\"link1\",\"where\":[]}]'" "ovsdb-idl.at:280"
+$as_echo "$at_srcdir/ovsdb-idl.at:290: \$PYTHON3 \$srcdir/test-ovsdb.py -t10 idl_passive \$srcdir/idltest.ovsschema ptcp:127.0.0.1:\$TCP_PORT '[\"idltest\",{\"op\":\"select\",\"table\":\"link1\",\"where\":[]}]'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py -t10 idl_passive $srcdir/idltest.ovsschema ptcp:127.0.0.1:$TCP_PORT '[\"idltest\",{\"op\":\"select\",\"table\":\"link1\",\"where\":[]}]'" "ovsdb-idl.at:290"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py -t10 idl_passive $srcdir/idltest.ovsschema ptcp:127.0.0.1:$TCP_PORT '["idltest",{"op":"select","table":"link1","where":[]}]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:280"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:280: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:280"
+$as_echo "$at_srcdir/ovsdb-idl.at:290: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:290"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -352537,34 +353526,34 @@
 002: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:280"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:280: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:280"
+$as_echo "$at_srcdir/ovsdb-idl.at:290: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:290"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:280"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:280: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:280"
+$as_echo "$at_srcdir/ovsdb-idl.at:290: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:290"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:280"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:290"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352575,55 +353564,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:280" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:290" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1893
-#AT_START_1894
-at_fn_group_banner 1894 'ovsdb-idl.at:288' \
+#AT_STOP_1897
+#AT_START_1898
+at_fn_group_banner 1898 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - C" "        " 101
 at_xfail=no
 (
-  $as_echo "1894. $at_setup_line: testing $at_desc ..."
+  $as_echo "1898. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket "
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket "
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -352633,34 +353622,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352671,35 +353660,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1894
-#AT_START_1895
-at_fn_group_banner 1895 'ovsdb-idl.at:288' \
+#AT_STOP_1898
+#AT_START_1899
+at_fn_group_banner 1899 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - C - tcp" "  " 101
 at_xfail=no
 (
-  $as_echo "1895. $at_setup_line: testing $at_desc ..."
+  $as_echo "1899. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352710,26 +353699,26 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:298" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT "
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT "
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -352739,34 +353728,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352777,41 +353766,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1895
-#AT_START_1896
-at_fn_group_banner 1896 'ovsdb-idl.at:288' \
+#AT_STOP_1899
+#AT_START_1900
+at_fn_group_banner 1900 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - C - tcp6" " " 101
 at_xfail=no
 (
-  $as_echo "1896. $at_setup_line: testing $at_desc ..."
+  $as_echo "1900. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:288" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:298" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:288"
-   $as_echo "ovsdb-idl.at:288" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:298"
+   $as_echo "ovsdb-idl.at:298" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:288"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:298"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352822,26 +353811,26 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:298" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT "
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT "
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -352851,34 +353840,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352889,55 +353878,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1896
-#AT_START_1897
-at_fn_group_banner 1897 'ovsdb-idl.at:288' \
+#AT_STOP_1900
+#AT_START_1901
+at_fn_group_banner 1901 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - Python3" "  " 101
 at_xfail=no
 (
-  $as_echo "1897. $at_setup_line: testing $at_desc ..."
+  $as_echo "1901. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket "
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket " "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket "
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket " "ovsdb-idl.at:298"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -352947,34 +353936,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -352985,55 +353974,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1897
-#AT_START_1898
-at_fn_group_banner 1898 'ovsdb-idl.at:288' \
+#AT_STOP_1901
+#AT_START_1902
+at_fn_group_banner 1902 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1898. $at_setup_line: testing $at_desc ..."
+  $as_echo "1902. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name "
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name " "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name "
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name " "ovsdb-idl.at:298"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -353043,34 +354032,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353081,35 +354070,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1898
-#AT_START_1899
-at_fn_group_banner 1899 'ovsdb-idl.at:288' \
+#AT_STOP_1902
+#AT_START_1903
+at_fn_group_banner 1903 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1899. $at_setup_line: testing $at_desc ..."
+  $as_echo "1903. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353120,26 +354109,26 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:298" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT "
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT " "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT "
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT " "ovsdb-idl.at:298"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -353149,34 +354138,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353187,35 +354176,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1899
-#AT_START_1900
-at_fn_group_banner 1900 'ovsdb-idl.at:288' \
+#AT_STOP_1903
+#AT_START_1904
+at_fn_group_banner 1904 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1900. $at_setup_line: testing $at_desc ..."
+  $as_echo "1904. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353226,28 +354215,28 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:298" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote "
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote " "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote "
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote " "ovsdb-idl.at:298"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -353257,34 +354246,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353295,41 +354284,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1900
-#AT_START_1901
-at_fn_group_banner 1901 'ovsdb-idl.at:288' \
+#AT_STOP_1904
+#AT_START_1905
+at_fn_group_banner 1905 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1901. $at_setup_line: testing $at_desc ..."
+  $as_echo "1905. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:288" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:298" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:288"
-   $as_echo "ovsdb-idl.at:288" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:298"
+   $as_echo "ovsdb-idl.at:298" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:288"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:298"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353340,27 +354329,27 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:298" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT "
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT " "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT "
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT " "ovsdb-idl.at:298"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -353370,34 +354359,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353408,41 +354397,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1901
-#AT_START_1902
-at_fn_group_banner 1902 'ovsdb-idl.at:288' \
+#AT_STOP_1905
+#AT_START_1906
+at_fn_group_banner 1906 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1902. $at_setup_line: testing $at_desc ..."
+  $as_echo "1906. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:288" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:298" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:288"
-   $as_echo "ovsdb-idl.at:288" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:298"
+   $as_echo "ovsdb-idl.at:298" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:288"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:298"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353453,28 +354442,28 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:298" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote "
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote " "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote "
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote " "ovsdb-idl.at:298"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -353484,34 +354473,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353522,55 +354511,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1902
-#AT_START_1903
-at_fn_group_banner 1903 'ovsdb-idl.at:288' \
+#AT_STOP_1906
+#AT_START_1907
+at_fn_group_banner 1907 'ovsdb-idl.at:298' \
   "simple idl, initially empty, no ops - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "1903. $at_setup_line: testing $at_desc ..."
+  $as_echo "1907. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:288" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:298" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:288"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:298"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:288" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:298" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:288"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:298"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:288"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:298"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -353582,7 +354571,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353594,14 +354583,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:298" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:298: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:288"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:298"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem
@@ -353610,13 +354599,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:298"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -353626,34 +354615,34 @@
 001: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:288: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:288"
+$as_echo "$at_srcdir/ovsdb-idl.at:298: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:298"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:288"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:298"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353664,41 +354653,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:288" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:298" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1903
-#AT_START_1904
-at_fn_group_banner 1904 'ovsdb-idl.at:295' \
+#AT_STOP_1907
+#AT_START_1908
+at_fn_group_banner 1908 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - C" "   " 101
 at_xfail=no
 (
-  $as_echo "1904. $at_setup_line: testing $at_desc ..."
+  $as_echo "1908. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -353747,7 +354736,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -353802,13 +354791,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -353841,34 +354830,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353879,35 +354868,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1904
-#AT_START_1905
-at_fn_group_banner 1905 'ovsdb-idl.at:295' \
+#AT_STOP_1908
+#AT_START_1909
+at_fn_group_banner 1909 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1905. $at_setup_line: testing $at_desc ..."
+  $as_echo "1909. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -353918,12 +354907,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:305" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -353972,7 +354961,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -354027,13 +355016,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -354066,34 +355055,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -354104,41 +355093,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1905
-#AT_START_1906
-at_fn_group_banner 1906 'ovsdb-idl.at:295' \
+#AT_STOP_1909
+#AT_START_1910
+at_fn_group_banner 1910 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1906. $at_setup_line: testing $at_desc ..."
+  $as_echo "1910. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:295" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:305" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:295"
-   $as_echo "ovsdb-idl.at:295" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:305"
+   $as_echo "ovsdb-idl.at:305" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:295"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:305"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -354149,12 +355138,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:305" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -354203,7 +355192,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -354258,13 +355247,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -354297,34 +355286,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -354335,41 +355324,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1906
-#AT_START_1907
-at_fn_group_banner 1907 'ovsdb-idl.at:295' \
+#AT_STOP_1910
+#AT_START_1911
+at_fn_group_banner 1911 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "1907. $at_setup_line: testing $at_desc ..."
+  $as_echo "1911. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -354418,7 +355407,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -354473,13 +355462,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -354512,34 +355501,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -354550,41 +355539,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1907
-#AT_START_1908
-at_fn_group_banner 1908 'ovsdb-idl.at:295' \
+#AT_STOP_1911
+#AT_START_1912
+at_fn_group_banner 1912 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1908. $at_setup_line: testing $at_desc ..."
+  $as_echo "1912. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -354633,7 +355622,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -354688,13 +355677,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -354727,34 +355716,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -354765,35 +355754,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1908
-#AT_START_1909
-at_fn_group_banner 1909 'ovsdb-idl.at:295' \
+#AT_STOP_1912
+#AT_START_1913
+at_fn_group_banner 1913 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1909. $at_setup_line: testing $at_desc ..."
+  $as_echo "1913. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -354804,12 +355793,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:305" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -354858,7 +355847,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -354913,13 +355902,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -354952,34 +355941,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -354990,35 +355979,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1909
-#AT_START_1910
-at_fn_group_banner 1910 'ovsdb-idl.at:295' \
+#AT_STOP_1913
+#AT_START_1914
+at_fn_group_banner 1914 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1910. $at_setup_line: testing $at_desc ..."
+  $as_echo "1914. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -355029,14 +356018,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:305" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -355085,7 +356074,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -355140,13 +356129,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -355179,34 +356168,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -355217,41 +356206,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1910
-#AT_START_1911
-at_fn_group_banner 1911 'ovsdb-idl.at:295' \
+#AT_STOP_1914
+#AT_START_1915
+at_fn_group_banner 1915 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1911. $at_setup_line: testing $at_desc ..."
+  $as_echo "1915. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:295" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:305" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:295"
-   $as_echo "ovsdb-idl.at:295" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:305"
+   $as_echo "ovsdb-idl.at:305" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:295"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:305"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -355262,13 +356251,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:305" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -355317,7 +356306,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -355372,13 +356361,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -355411,34 +356400,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -355449,41 +356438,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1911
-#AT_START_1912
-at_fn_group_banner 1912 'ovsdb-idl.at:295' \
+#AT_STOP_1915
+#AT_START_1916
+at_fn_group_banner 1916 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1912. $at_setup_line: testing $at_desc ..."
+  $as_echo "1916. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:295" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:305" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:295"
-   $as_echo "ovsdb-idl.at:295" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:305"
+   $as_echo "ovsdb-idl.at:305" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:295"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:305"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -355494,14 +356483,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:305" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:305: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -355550,7 +356539,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -355605,13 +356594,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -355644,34 +356633,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -355682,55 +356671,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1912
-#AT_START_1913
-at_fn_group_banner 1913 'ovsdb-idl.at:295' \
+#AT_STOP_1916
+#AT_START_1917
+at_fn_group_banner 1917 'ovsdb-idl.at:305' \
   "simple idl, initially empty, various ops - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "1913. $at_setup_line: testing $at_desc ..."
+  $as_echo "1917. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:295" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:305" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:295"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:305"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:295" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:305" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:295"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:305"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -355742,7 +356731,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -355754,11 +356743,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:305" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:305: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem '[\"idltest\",
       {\"op\": \"insert\",
@@ -355809,7 +356798,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:295"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:305"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem '["idltest",
@@ -355866,13 +356855,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:305"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -355905,34 +356894,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:295: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:295"
+$as_echo "$at_srcdir/ovsdb-idl.at:305: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:305"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:295"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:305"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -355943,40 +356932,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:295" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:305" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1913
-#AT_START_1914
-at_fn_group_banner 1914 'ovsdb-idl.at:373' \
+#AT_STOP_1917
+#AT_START_1918
+at_fn_group_banner 1918 'ovsdb-idl.at:383' \
   "simple idl, initially populated - C" "            " 101
 at_xfail=no
 (
-  $as_echo "1914. $at_setup_line: testing $at_desc ..."
+  $as_echo "1918. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -355993,7 +356982,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -356016,17 +357005,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '["idltest",
       {"op": "update",
        "table": "simple",
@@ -356037,13 +357026,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -356057,34 +357046,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356095,35 +357084,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1914
-#AT_START_1915
-at_fn_group_banner 1915 'ovsdb-idl.at:373' \
+#AT_STOP_1918
+#AT_START_1919
+at_fn_group_banner 1919 'ovsdb-idl.at:383' \
   "simple idl, initially populated - C - tcp" "      " 101
 at_xfail=no
 (
-  $as_echo "1915. $at_setup_line: testing $at_desc ..."
+  $as_echo "1919. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356134,11 +357123,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:383" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -356155,7 +357144,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -356178,17 +357167,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "update",
        "table": "simple",
@@ -356199,13 +357188,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -356219,34 +357208,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356257,41 +357246,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1915
-#AT_START_1916
-at_fn_group_banner 1916 'ovsdb-idl.at:373' \
+#AT_STOP_1919
+#AT_START_1920
+at_fn_group_banner 1920 'ovsdb-idl.at:383' \
   "simple idl, initially populated - C - tcp6" "     " 101
 at_xfail=no
 (
-  $as_echo "1916. $at_setup_line: testing $at_desc ..."
+  $as_echo "1920. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:373" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:383" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:373"
-   $as_echo "ovsdb-idl.at:373" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:383"
+   $as_echo "ovsdb-idl.at:383" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:373"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:383"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356302,11 +357291,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:383" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -356323,7 +357312,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -356346,17 +357335,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "update",
        "table": "simple",
@@ -356367,13 +357356,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -356387,34 +357376,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356425,40 +357414,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1916
-#AT_START_1917
-at_fn_group_banner 1917 'ovsdb-idl.at:373' \
+#AT_STOP_1920
+#AT_START_1921
+at_fn_group_banner 1921 'ovsdb-idl.at:383' \
   "simple idl, initially populated - Python3" "      " 101
 at_xfail=no
 (
-  $as_echo "1917. $at_setup_line: testing $at_desc ..."
+  $as_echo "1921. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -356475,7 +357464,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -356498,17 +357487,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket '["idltest",
       {"op": "update",
        "table": "simple",
@@ -356519,13 +357508,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -356539,34 +357528,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356577,40 +357566,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1917
-#AT_START_1918
-at_fn_group_banner 1918 'ovsdb-idl.at:373' \
+#AT_STOP_1921
+#AT_START_1922
+at_fn_group_banner 1922 'ovsdb-idl.at:383' \
   "simple idl, initially populated - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1918. $at_setup_line: testing $at_desc ..."
+  $as_echo "1922. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -356627,7 +357616,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -356650,17 +357639,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '["idltest",
       {"op": "update",
        "table": "simple",
@@ -356671,13 +357660,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -356691,34 +357680,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356729,35 +357718,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1918
-#AT_START_1919
-at_fn_group_banner 1919 'ovsdb-idl.at:373' \
+#AT_STOP_1922
+#AT_START_1923
+at_fn_group_banner 1923 'ovsdb-idl.at:383' \
   "simple idl, initially populated - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1919. $at_setup_line: testing $at_desc ..."
+  $as_echo "1923. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356768,11 +357757,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:383" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -356789,7 +357778,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -356812,17 +357801,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "update",
        "table": "simple",
@@ -356833,13 +357822,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -356853,34 +357842,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356891,35 +357880,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1919
-#AT_START_1920
-at_fn_group_banner 1920 'ovsdb-idl.at:373' \
+#AT_STOP_1923
+#AT_START_1924
+at_fn_group_banner 1924 'ovsdb-idl.at:383' \
   "simple idl, initially populated - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1920. $at_setup_line: testing $at_desc ..."
+  $as_echo "1924. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -356930,13 +357919,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:383" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -356953,7 +357942,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -356976,17 +357965,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "update",
        "table": "simple",
@@ -356997,13 +357986,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -357017,34 +358006,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357055,41 +358044,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1920
-#AT_START_1921
-at_fn_group_banner 1921 'ovsdb-idl.at:373' \
+#AT_STOP_1924
+#AT_START_1925
+at_fn_group_banner 1925 'ovsdb-idl.at:383' \
   "simple idl, initially populated - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1921. $at_setup_line: testing $at_desc ..."
+  $as_echo "1925. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:373" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:383" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:373"
-   $as_echo "ovsdb-idl.at:373" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:383"
+   $as_echo "ovsdb-idl.at:383" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:373"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:383"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357100,12 +358089,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:383" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -357122,7 +358111,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -357145,17 +358134,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "update",
        "table": "simple",
@@ -357166,13 +358155,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -357186,34 +358175,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357224,41 +358213,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1921
-#AT_START_1922
-at_fn_group_banner 1922 'ovsdb-idl.at:373' \
+#AT_STOP_1925
+#AT_START_1926
+at_fn_group_banner 1926 'ovsdb-idl.at:383' \
   "simple idl, initially populated - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1922. $at_setup_line: testing $at_desc ..."
+  $as_echo "1926. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:373" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:383" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:373"
-   $as_echo "ovsdb-idl.at:373" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:383"
+   $as_echo "ovsdb-idl.at:383" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:373"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:383"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357269,13 +358258,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:383" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -357292,7 +358281,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -357315,17 +358304,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:383: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "update",
        "table": "simple",
@@ -357336,13 +358325,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -357356,34 +358345,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357394,55 +358383,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1922
-#AT_START_1923
-at_fn_group_banner 1923 'ovsdb-idl.at:373' \
+#AT_STOP_1926
+#AT_START_1927
+at_fn_group_banner 1927 'ovsdb-idl.at:383' \
   "simple idl, initially populated - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "1923. $at_setup_line: testing $at_desc ..."
+  $as_echo "1927. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:373" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:383" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:373"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:383"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:373" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:383" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:373"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:383"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -357454,7 +358443,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357466,10 +358455,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:383" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -357490,7 +358479,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -357517,19 +358506,19 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:383: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:373"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:383"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem '["idltest",
@@ -357542,13 +358531,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:383"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -357562,34 +358551,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:373: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:373"
+$as_echo "$at_srcdir/ovsdb-idl.at:383: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:383"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:373"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:383"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357600,40 +358589,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:373" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:383" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1923
-#AT_START_1924
-at_fn_group_banner 1924 'ovsdb-idl.at:404' \
+#AT_STOP_1927
+#AT_START_1928
+at_fn_group_banner 1928 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - C" "                " 101
 at_xfail=no
 (
-  $as_echo "1924. $at_setup_line: testing $at_desc ..."
+  $as_echo "1928. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -357650,7 +358639,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -357673,14 +358662,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -357688,13 +358677,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -357711,34 +358700,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357749,35 +358738,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1924
-#AT_START_1925
-at_fn_group_banner 1925 'ovsdb-idl.at:404' \
+#AT_STOP_1928
+#AT_START_1929
+at_fn_group_banner 1929 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - C - tcp" "          " 101
 at_xfail=no
 (
-  $as_echo "1925. $at_setup_line: testing $at_desc ..."
+  $as_echo "1929. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357788,11 +358777,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:414" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -357809,7 +358798,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -357832,14 +358821,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -357847,13 +358836,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -357870,34 +358859,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357908,41 +358897,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1925
-#AT_START_1926
-at_fn_group_banner 1926 'ovsdb-idl.at:404' \
+#AT_STOP_1929
+#AT_START_1930
+at_fn_group_banner 1930 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - C - tcp6" "         " 101
 at_xfail=no
 (
-  $as_echo "1926. $at_setup_line: testing $at_desc ..."
+  $as_echo "1930. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:404" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:414" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:404"
-   $as_echo "ovsdb-idl.at:404" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:414"
+   $as_echo "ovsdb-idl.at:414" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:404"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:414"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -357953,11 +358942,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:414" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -357974,7 +358963,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -357997,14 +358986,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -358012,13 +359001,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -358035,34 +359024,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358073,40 +359062,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1926
-#AT_START_1927
-at_fn_group_banner 1927 'ovsdb-idl.at:404' \
+#AT_STOP_1930
+#AT_START_1931
+at_fn_group_banner 1931 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - Python3" "          " 101
 at_xfail=no
 (
-  $as_echo "1927. $at_setup_line: testing $at_desc ..."
+  $as_echo "1931. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -358123,7 +359112,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -358146,14 +359135,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -358161,13 +359150,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -358184,34 +359173,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358222,40 +359211,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1927
-#AT_START_1928
-at_fn_group_banner 1928 'ovsdb-idl.at:404' \
+#AT_STOP_1931
+#AT_START_1932
+at_fn_group_banner 1932 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1928. $at_setup_line: testing $at_desc ..."
+  $as_echo "1932. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -358272,7 +359261,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -358295,14 +359284,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -358310,13 +359299,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -358333,34 +359322,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358371,35 +359360,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1928
-#AT_START_1929
-at_fn_group_banner 1929 'ovsdb-idl.at:404' \
+#AT_STOP_1932
+#AT_START_1933
+at_fn_group_banner 1933 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - Python3 - tcp" "    " 101
 at_xfail=no
 (
-  $as_echo "1929. $at_setup_line: testing $at_desc ..."
+  $as_echo "1933. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358410,11 +359399,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:414" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -358431,7 +359420,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -358454,14 +359443,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -358469,13 +359458,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -358492,34 +359481,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358530,35 +359519,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1929
-#AT_START_1930
-at_fn_group_banner 1930 'ovsdb-idl.at:404' \
+#AT_STOP_1933
+#AT_START_1934
+at_fn_group_banner 1934 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1930. $at_setup_line: testing $at_desc ..."
+  $as_echo "1934. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358569,13 +359558,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:414" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -358592,7 +359581,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -358615,14 +359604,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -358630,13 +359619,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -358653,34 +359642,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358691,41 +359680,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1930
-#AT_START_1931
-at_fn_group_banner 1931 'ovsdb-idl.at:404' \
+#AT_STOP_1934
+#AT_START_1935
+at_fn_group_banner 1935 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - Python3 - tcp6" "   " 101
 at_xfail=no
 (
-  $as_echo "1931. $at_setup_line: testing $at_desc ..."
+  $as_echo "1935. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:404" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:414" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:404"
-   $as_echo "ovsdb-idl.at:404" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:414"
+   $as_echo "ovsdb-idl.at:414" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:404"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:414"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358736,12 +359725,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:414" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -358758,7 +359747,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -358781,14 +359770,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -358796,13 +359785,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -358819,34 +359808,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358857,41 +359846,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1931
-#AT_START_1932
-at_fn_group_banner 1932 'ovsdb-idl.at:404' \
+#AT_STOP_1935
+#AT_START_1936
+at_fn_group_banner 1936 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - Python3 - tcp6" "   " 101
 at_xfail=no
 (
-  $as_echo "1932. $at_setup_line: testing $at_desc ..."
+  $as_echo "1936. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:404" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:414" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:404"
-   $as_echo "ovsdb-idl.at:404" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:414"
+   $as_echo "ovsdb-idl.at:414" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:404"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:414"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -358902,13 +359891,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:414" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -358925,7 +359914,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -358948,14 +359937,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
     'insert 2, verify 2 i, verify 1 b, delete 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -358963,13 +359952,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -358986,34 +359975,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359024,55 +360013,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1932
-#AT_START_1933
-at_fn_group_banner 1933 'ovsdb-idl.at:404' \
+#AT_STOP_1936
+#AT_START_1937
+at_fn_group_banner 1937 'ovsdb-idl.at:414' \
   "simple idl, writing via IDL - Python3 - SSL" "    " 101
 at_xfail=no
 (
-  $as_echo "1933. $at_setup_line: testing $at_desc ..."
+  $as_echo "1937. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:404" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:414" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:404"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:414"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:404" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:414" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:404"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:414"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -359084,7 +360073,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359096,10 +360085,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:414" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -359120,7 +360109,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -359147,16 +360136,16 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:414: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \\
     'insert 2, verify 2 i, verify 1 b, delete 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:404"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:414"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'verify 0 b, verify 1 r, set 0 b 1, set 1 r 3.5' \
@@ -359166,13 +360155,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:414"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -359189,34 +360178,34 @@
 005: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:404: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:404"
+$as_echo "$at_srcdir/ovsdb-idl.at:414: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:414"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:404"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:414"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359227,44 +360216,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:404" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:414" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1933
-#AT_START_1934
-at_fn_group_banner 1934 'ovsdb-idl.at:435' \
+#AT_STOP_1937
+#AT_START_1938
+at_fn_group_banner 1938 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - C" "   " 101
 at_xfail=no
 (
-  $as_echo "1934. $at_setup_line: testing $at_desc ..."
+  $as_echo "1938. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -359274,26 +360263,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -359306,34 +360295,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359344,35 +360333,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1934
-#AT_START_1935
-at_fn_group_banner 1935 'ovsdb-idl.at:435' \
+#AT_STOP_1938
+#AT_START_1939
+at_fn_group_banner 1939 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1935. $at_setup_line: testing $at_desc ..."
+  $as_echo "1939. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359383,15 +360372,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:445" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -359401,26 +360390,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -359433,34 +360422,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359471,41 +360460,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1935
-#AT_START_1936
-at_fn_group_banner 1936 'ovsdb-idl.at:435' \
+#AT_STOP_1939
+#AT_START_1940
+at_fn_group_banner 1940 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1936. $at_setup_line: testing $at_desc ..."
+  $as_echo "1940. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:435" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:445" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:435"
-   $as_echo "ovsdb-idl.at:435" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:445"
+   $as_echo "ovsdb-idl.at:445" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:435"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:445"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359516,15 +360505,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:445" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -359534,26 +360523,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -359566,34 +360555,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359604,44 +360593,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1936
-#AT_START_1937
-at_fn_group_banner 1937 'ovsdb-idl.at:435' \
+#AT_STOP_1940
+#AT_START_1941
+at_fn_group_banner 1941 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "1937. $at_setup_line: testing $at_desc ..."
+  $as_echo "1941. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -359651,26 +360640,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:445"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -359683,34 +360672,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359721,44 +360710,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1937
-#AT_START_1938
-at_fn_group_banner 1938 'ovsdb-idl.at:435' \
+#AT_STOP_1941
+#AT_START_1942
+at_fn_group_banner 1942 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1938. $at_setup_line: testing $at_desc ..."
+  $as_echo "1942. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -359768,26 +360757,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:445"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -359800,34 +360789,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359838,35 +360827,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1938
-#AT_START_1939
-at_fn_group_banner 1939 'ovsdb-idl.at:435' \
+#AT_STOP_1942
+#AT_START_1943
+at_fn_group_banner 1943 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1939. $at_setup_line: testing $at_desc ..."
+  $as_echo "1943. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359877,15 +360866,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:445" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -359895,26 +360884,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:445"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -359927,34 +360916,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -359965,35 +360954,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1939
-#AT_START_1940
-at_fn_group_banner 1940 'ovsdb-idl.at:435' \
+#AT_STOP_1943
+#AT_START_1944
+at_fn_group_banner 1944 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1940. $at_setup_line: testing $at_desc ..."
+  $as_echo "1944. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360004,17 +360993,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:445" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -360024,26 +361013,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:445"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -360056,34 +361045,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360094,41 +361083,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1940
-#AT_START_1941
-at_fn_group_banner 1941 'ovsdb-idl.at:435' \
+#AT_STOP_1944
+#AT_START_1945
+at_fn_group_banner 1945 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1941. $at_setup_line: testing $at_desc ..."
+  $as_echo "1945. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:435" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:445" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:435"
-   $as_echo "ovsdb-idl.at:435" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:445"
+   $as_echo "ovsdb-idl.at:445" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:435"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:445"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360139,16 +361128,16 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:445" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -360158,26 +361147,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:445"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -360190,34 +361179,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360228,41 +361217,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1941
-#AT_START_1942
-at_fn_group_banner 1942 'ovsdb-idl.at:435' \
+#AT_STOP_1945
+#AT_START_1946
+at_fn_group_banner 1946 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1942. $at_setup_line: testing $at_desc ..."
+  $as_echo "1946. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:435" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:445" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:435"
-   $as_echo "ovsdb-idl.at:435" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:445"
+   $as_echo "ovsdb-idl.at:445" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:435"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:445"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360273,17 +361262,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:445" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -360293,26 +361282,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'" "ovsdb-idl.at:445"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -360325,34 +361314,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360363,55 +361352,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1942
-#AT_START_1943
-at_fn_group_banner 1943 'ovsdb-idl.at:435' \
+#AT_STOP_1946
+#AT_START_1947
+at_fn_group_banner 1947 'ovsdb-idl.at:445' \
   "simple idl, writing via IDL with unicode - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "1943. $at_setup_line: testing $at_desc ..."
+  $as_echo "1947. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:435" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:445" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:435"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:445"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:435" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:445" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:435"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:445"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -360423,7 +361412,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360435,10 +361424,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:445" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -360446,7 +361435,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"(╯°□°）╯︵ ┻━┻\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -360460,15 +361449,15 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:445: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'set 0 b 1, insert 1, set 1 s \"¯\\_(ツ)_/¯\"'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:435"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:445"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'set 0 b 1, insert 1, set 1 s "¯\_(ツ)_/¯"'
@@ -360477,13 +361466,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:445"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -360496,34 +361485,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:435: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:435"
+$as_echo "$at_srcdir/ovsdb-idl.at:445: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:445"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:435"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:445"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360534,44 +361523,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:435" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:445" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1943
-#AT_START_1944
-at_fn_group_banner 1944 'ovsdb-idl.at:462' \
+#AT_STOP_1947
+#AT_START_1948
+at_fn_group_banner 1948 'ovsdb-idl.at:472' \
   "simple idl, writing large data via IDL with unicode - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "1944. $at_setup_line: testing $at_desc ..."
+  $as_echo "1948. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:462: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:462"
+$as_echo "$at_srcdir/ovsdb-idl.at:472: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:472"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:462"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:462: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:472: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"s\": \"'\$(printf \"测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s\" {1..50})'\"}}]'"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "ovsdb-idl.at:462"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "ovsdb-idl.at:472"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -360581,20 +361570,20 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:462"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:462: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 b 1, insert 1, set 1 s '\$(printf \"测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s\" {1..100})''"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "ovsdb-idl.at:462"
+$as_echo "$at_srcdir/ovsdb-idl.at:472: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 b 1, insert 1, set 1 s '\$(printf \"测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s\" {1..100})''"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "ovsdb-idl.at:472"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 b 1, insert 1, set 1 s '$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..100})''
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:462"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360604,42 +361593,42 @@
 002: i=1 r=0 b=false s=$(printf "测试超过四千零九十六个字节的中文字符串以使解码出现问题。%.0s" {1..100}) u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
 003: done" > expout
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:462: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:462"
+$as_echo "$at_srcdir/ovsdb-idl.at:472: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:472"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 $at_diff expout "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:462"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:462: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:462"
+$as_echo "$at_srcdir/ovsdb-idl.at:472: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:472"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:462"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:462: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:462"
+$as_echo "$at_srcdir/ovsdb-idl.at:472: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:472"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:462"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:472"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360650,40 +361639,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:462" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:472" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1944
-#AT_START_1945
-at_fn_group_banner 1945 'ovsdb-idl.at:474' \
+#AT_STOP_1948
+#AT_START_1949
+at_fn_group_banner 1949 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - C" "  " 101
 at_xfail=no
 (
-  $as_echo "1945. $at_setup_line: testing $at_desc ..."
+  $as_echo "1949. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -360691,7 +361680,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -360705,12 +361694,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -360719,7 +361708,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -360734,13 +361723,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -360759,34 +361748,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360797,35 +361786,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1945
-#AT_START_1946
-at_fn_group_banner 1946 'ovsdb-idl.at:474' \
+#AT_STOP_1949
+#AT_START_1950
+at_fn_group_banner 1950 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1946. $at_setup_line: testing $at_desc ..."
+  $as_echo "1950. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360836,11 +361825,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:484" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -360848,7 +361837,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -360862,12 +361851,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -360876,7 +361865,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -360891,13 +361880,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -360916,34 +361905,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360954,41 +361943,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1946
-#AT_START_1947
-at_fn_group_banner 1947 'ovsdb-idl.at:474' \
+#AT_STOP_1950
+#AT_START_1951
+at_fn_group_banner 1951 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1947. $at_setup_line: testing $at_desc ..."
+  $as_echo "1951. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:474" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:484" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:474"
-   $as_echo "ovsdb-idl.at:474" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:484"
+   $as_echo "ovsdb-idl.at:484" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:474"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:484"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -360999,11 +361988,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:484" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -361011,7 +362000,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -361025,12 +362014,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -361039,7 +362028,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -361054,13 +362043,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -361079,34 +362068,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361117,40 +362106,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1947
-#AT_START_1948
-at_fn_group_banner 1948 'ovsdb-idl.at:474' \
+#AT_STOP_1951
+#AT_START_1952
+at_fn_group_banner 1952 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "1948. $at_setup_line: testing $at_desc ..."
+  $as_echo "1952. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -361158,7 +362147,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -361172,12 +362161,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -361186,7 +362175,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -361201,13 +362190,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -361226,34 +362215,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361264,40 +362253,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1948
-#AT_START_1949
-at_fn_group_banner 1949 'ovsdb-idl.at:474' \
+#AT_STOP_1952
+#AT_START_1953
+at_fn_group_banner 1953 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1949. $at_setup_line: testing $at_desc ..."
+  $as_echo "1953. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -361305,7 +362294,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -361319,12 +362308,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -361333,7 +362322,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -361348,13 +362337,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -361373,34 +362362,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361411,35 +362400,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1949
-#AT_START_1950
-at_fn_group_banner 1950 'ovsdb-idl.at:474' \
+#AT_STOP_1953
+#AT_START_1954
+at_fn_group_banner 1954 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1950. $at_setup_line: testing $at_desc ..."
+  $as_echo "1954. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361450,11 +362439,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:484" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -361462,7 +362451,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -361476,12 +362465,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -361490,7 +362479,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -361505,13 +362494,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -361530,34 +362519,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361568,35 +362557,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1950
-#AT_START_1951
-at_fn_group_banner 1951 'ovsdb-idl.at:474' \
+#AT_STOP_1954
+#AT_START_1955
+at_fn_group_banner 1955 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1951. $at_setup_line: testing $at_desc ..."
+  $as_echo "1955. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361607,13 +362596,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:484" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -361621,7 +362610,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -361635,12 +362624,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -361649,7 +362638,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -361664,13 +362653,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -361689,34 +362678,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361727,41 +362716,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1951
-#AT_START_1952
-at_fn_group_banner 1952 'ovsdb-idl.at:474' \
+#AT_STOP_1955
+#AT_START_1956
+at_fn_group_banner 1956 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1952. $at_setup_line: testing $at_desc ..."
+  $as_echo "1956. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:474" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:484" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:474"
-   $as_echo "ovsdb-idl.at:474" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:484"
+   $as_echo "ovsdb-idl.at:484" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:474"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:484"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361772,12 +362761,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:484" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -361785,7 +362774,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -361799,12 +362788,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -361813,7 +362802,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -361828,13 +362817,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -361853,34 +362842,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361891,41 +362880,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1952
-#AT_START_1953
-at_fn_group_banner 1953 'ovsdb-idl.at:474' \
+#AT_STOP_1956
+#AT_START_1957
+at_fn_group_banner 1957 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1953. $at_setup_line: testing $at_desc ..."
+  $as_echo "1957. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:474" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:484" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:474"
-   $as_echo "ovsdb-idl.at:474" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:484"
+   $as_echo "ovsdb-idl.at:484" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:474"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:484"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -361936,13 +362925,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:484" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -361950,7 +362939,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -361964,12 +362953,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 b 1' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 b 1' \\
     '+[\"idltest\",
        {\"op\": \"update\",
         \"table\": \"simple\",
@@ -361978,7 +362967,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 b 1' \
     '+["idltest",
        {"op": "update",
@@ -361993,13 +362982,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -362018,34 +363007,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362056,55 +363045,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1953
-#AT_START_1954
-at_fn_group_banner 1954 'ovsdb-idl.at:474' \
+#AT_STOP_1957
+#AT_START_1958
+at_fn_group_banner 1958 'ovsdb-idl.at:484' \
   "simple idl, handling verification failure - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "1954. $at_setup_line: testing $at_desc ..."
+  $as_echo "1958. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:474" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:484" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:474"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:484"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:474" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:484" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:474"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:484"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -362116,7 +363105,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362128,10 +363117,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:484" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -362143,7 +363132,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -362161,12 +363150,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:484: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'set 0 b 1' \\
     '+[\"idltest\",
@@ -362177,7 +363166,7 @@
     '+verify 1 r, set 1 r 3' \\
     'verify 1 r, set 1 r 3' \\
     "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:474"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:484"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'set 0 b 1' \
@@ -362194,13 +363183,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:484"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -362219,34 +363208,34 @@
 007: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:474: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:474"
+$as_echo "$at_srcdir/ovsdb-idl.at:484: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:484"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:474"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:484"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362257,44 +363246,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:474" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:484" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1954
-#AT_START_1955
-at_fn_group_banner 1955 'ovsdb-idl.at:505' \
+#AT_STOP_1958
+#AT_START_1959
+at_fn_group_banner 1959 'ovsdb-idl.at:515' \
   "simple idl, increment operation - C" "            " 101
 at_xfail=no
 (
-  $as_echo "1955. $at_setup_line: testing $at_desc ..."
+  $as_echo "1959. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -362304,26 +363293,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -362335,34 +363324,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362373,35 +363362,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1955
-#AT_START_1956
-at_fn_group_banner 1956 'ovsdb-idl.at:505' \
+#AT_STOP_1959
+#AT_START_1960
+at_fn_group_banner 1960 'ovsdb-idl.at:515' \
   "simple idl, increment operation - C - tcp" "      " 101
 at_xfail=no
 (
-  $as_echo "1956. $at_setup_line: testing $at_desc ..."
+  $as_echo "1960. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362412,15 +363401,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:515" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -362430,26 +363419,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -362461,34 +363450,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362499,41 +363488,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1956
-#AT_START_1957
-at_fn_group_banner 1957 'ovsdb-idl.at:505' \
+#AT_STOP_1960
+#AT_START_1961
+at_fn_group_banner 1961 'ovsdb-idl.at:515' \
   "simple idl, increment operation - C - tcp6" "     " 101
 at_xfail=no
 (
-  $as_echo "1957. $at_setup_line: testing $at_desc ..."
+  $as_echo "1961. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:505" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:515" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:505"
-   $as_echo "ovsdb-idl.at:505" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:515"
+   $as_echo "ovsdb-idl.at:515" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:505"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:515"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362544,15 +363533,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:515" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -362562,26 +363551,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -362593,34 +363582,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362631,44 +363620,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1957
-#AT_START_1958
-at_fn_group_banner 1958 'ovsdb-idl.at:505' \
+#AT_STOP_1961
+#AT_START_1962
+at_fn_group_banner 1962 'ovsdb-idl.at:515' \
   "simple idl, increment operation - Python3" "      " 101
 at_xfail=no
 (
-  $as_echo "1958. $at_setup_line: testing $at_desc ..."
+  $as_echo "1962. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -362678,26 +363667,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:515"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -362709,34 +363698,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362747,44 +363736,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1958
-#AT_START_1959
-at_fn_group_banner 1959 'ovsdb-idl.at:505' \
+#AT_STOP_1962
+#AT_START_1963
+at_fn_group_banner 1963 'ovsdb-idl.at:515' \
   "simple idl, increment operation - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1959. $at_setup_line: testing $at_desc ..."
+  $as_echo "1963. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -362794,26 +363783,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:515"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -362825,34 +363814,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362863,35 +363852,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1959
-#AT_START_1960
-at_fn_group_banner 1960 'ovsdb-idl.at:505' \
+#AT_STOP_1963
+#AT_START_1964
+at_fn_group_banner 1964 'ovsdb-idl.at:515' \
   "simple idl, increment operation - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1960. $at_setup_line: testing $at_desc ..."
+  $as_echo "1964. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362902,15 +363891,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:515" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -362920,26 +363909,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:515"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -362951,34 +363940,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -362989,35 +363978,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1960
-#AT_START_1961
-at_fn_group_banner 1961 'ovsdb-idl.at:505' \
+#AT_STOP_1964
+#AT_START_1965
+at_fn_group_banner 1965 'ovsdb-idl.at:515' \
   "simple idl, increment operation - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1961. $at_setup_line: testing $at_desc ..."
+  $as_echo "1965. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363028,17 +364017,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:515" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -363048,26 +364037,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:515"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -363079,34 +364068,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363117,41 +364106,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1961
-#AT_START_1962
-at_fn_group_banner 1962 'ovsdb-idl.at:505' \
+#AT_STOP_1965
+#AT_START_1966
+at_fn_group_banner 1966 'ovsdb-idl.at:515' \
   "simple idl, increment operation - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1962. $at_setup_line: testing $at_desc ..."
+  $as_echo "1966. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:505" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:515" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:505"
-   $as_echo "ovsdb-idl.at:505" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:515"
+   $as_echo "ovsdb-idl.at:515" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:505"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:515"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363162,16 +364151,16 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:515" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -363181,26 +364170,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:515"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -363212,34 +364201,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363250,41 +364239,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1962
-#AT_START_1963
-at_fn_group_banner 1963 'ovsdb-idl.at:505' \
+#AT_STOP_1966
+#AT_START_1967
+at_fn_group_banner 1967 'ovsdb-idl.at:515' \
   "simple idl, increment operation - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1963. $at_setup_line: testing $at_desc ..."
+  $as_echo "1967. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:505" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:515" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:505"
-   $as_echo "ovsdb-idl.at:505" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:515"
+   $as_echo "ovsdb-idl.at:515" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:505"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:515"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363295,17 +364284,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:515" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -363315,26 +364304,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, increment 0'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, increment 0'" "ovsdb-idl.at:515"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, increment 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -363346,34 +364335,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363384,55 +364373,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1963
-#AT_START_1964
-at_fn_group_banner 1964 'ovsdb-idl.at:505' \
+#AT_STOP_1967
+#AT_START_1968
+at_fn_group_banner 1968 'ovsdb-idl.at:515' \
   "simple idl, increment operation - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "1964. $at_setup_line: testing $at_desc ..."
+  $as_echo "1968. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:505" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:515" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:505"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:515"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:505" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:515" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:505"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:515"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -363444,7 +364433,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363456,10 +364445,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:515" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -363467,7 +364456,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -363481,15 +364470,15 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:515: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'set 0 r 2.0, increment 0'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:505"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:515"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'set 0 r 2.0, increment 0'
@@ -363498,13 +364487,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:515"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -363516,34 +364505,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:505: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:505"
+$as_echo "$at_srcdir/ovsdb-idl.at:515: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:515"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:505"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:515"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363554,44 +364543,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:505" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:515" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1964
-#AT_START_1965
-at_fn_group_banner 1965 'ovsdb-idl.at:517' \
+#AT_STOP_1968
+#AT_START_1969
+at_fn_group_banner 1969 'ovsdb-idl.at:527' \
   "simple idl, aborting - C" "                       " 101
 at_xfail=no
 (
-  $as_echo "1965. $at_setup_line: testing $at_desc ..."
+  $as_echo "1969. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -363601,14 +364590,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -363616,13 +364605,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -363635,34 +364624,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363673,35 +364662,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1965
-#AT_START_1966
-at_fn_group_banner 1966 'ovsdb-idl.at:517' \
+#AT_STOP_1969
+#AT_START_1970
+at_fn_group_banner 1970 'ovsdb-idl.at:527' \
   "simple idl, aborting - C - tcp" "                 " 101
 at_xfail=no
 (
-  $as_echo "1966. $at_setup_line: testing $at_desc ..."
+  $as_echo "1970. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363712,15 +364701,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:527" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -363730,14 +364719,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -363745,13 +364734,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -363764,34 +364753,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363802,41 +364791,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1966
-#AT_START_1967
-at_fn_group_banner 1967 'ovsdb-idl.at:517' \
+#AT_STOP_1970
+#AT_START_1971
+at_fn_group_banner 1971 'ovsdb-idl.at:527' \
   "simple idl, aborting - C - tcp6" "                " 101
 at_xfail=no
 (
-  $as_echo "1967. $at_setup_line: testing $at_desc ..."
+  $as_echo "1971. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:517" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:527" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:517"
-   $as_echo "ovsdb-idl.at:517" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:527"
+   $as_echo "ovsdb-idl.at:527" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:517"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:527"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363847,15 +364836,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:527" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -363865,14 +364854,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -363880,13 +364869,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -363899,34 +364888,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -363937,44 +364926,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1967
-#AT_START_1968
-at_fn_group_banner 1968 'ovsdb-idl.at:517' \
+#AT_STOP_1971
+#AT_START_1972
+at_fn_group_banner 1972 'ovsdb-idl.at:527' \
   "simple idl, aborting - Python3" "                 " 101
 at_xfail=no
 (
-  $as_echo "1968. $at_setup_line: testing $at_desc ..."
+  $as_echo "1972. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -363984,14 +364973,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -363999,13 +364988,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -364018,34 +365007,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364056,44 +365045,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1968
-#AT_START_1969
-at_fn_group_banner 1969 'ovsdb-idl.at:517' \
+#AT_STOP_1972
+#AT_START_1973
+at_fn_group_banner 1973 'ovsdb-idl.at:527' \
   "simple idl, aborting - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1969. $at_setup_line: testing $at_desc ..."
+  $as_echo "1973. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -364103,14 +365092,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -364118,13 +365107,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -364137,34 +365126,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364175,35 +365164,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1969
-#AT_START_1970
-at_fn_group_banner 1970 'ovsdb-idl.at:517' \
+#AT_STOP_1973
+#AT_START_1974
+at_fn_group_banner 1974 'ovsdb-idl.at:527' \
   "simple idl, aborting - Python3 - tcp" "           " 101
 at_xfail=no
 (
-  $as_echo "1970. $at_setup_line: testing $at_desc ..."
+  $as_echo "1974. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364214,15 +365203,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:527" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -364232,14 +365221,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -364247,13 +365236,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -364266,34 +365255,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364304,35 +365293,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1970
-#AT_START_1971
-at_fn_group_banner 1971 'ovsdb-idl.at:517' \
+#AT_STOP_1974
+#AT_START_1975
+at_fn_group_banner 1975 'ovsdb-idl.at:527' \
   "simple idl, aborting - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1971. $at_setup_line: testing $at_desc ..."
+  $as_echo "1975. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364343,17 +365332,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:527" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -364363,14 +365352,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -364378,13 +365367,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -364397,34 +365386,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364435,41 +365424,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1971
-#AT_START_1972
-at_fn_group_banner 1972 'ovsdb-idl.at:517' \
+#AT_STOP_1975
+#AT_START_1976
+at_fn_group_banner 1976 'ovsdb-idl.at:527' \
   "simple idl, aborting - Python3 - tcp6" "          " 101
 at_xfail=no
 (
-  $as_echo "1972. $at_setup_line: testing $at_desc ..."
+  $as_echo "1976. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:517" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:527" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:517"
-   $as_echo "ovsdb-idl.at:517" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:527"
+   $as_echo "ovsdb-idl.at:527" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:517"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:527"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364480,16 +365469,16 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:527" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -364499,14 +365488,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -364514,13 +365503,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -364533,34 +365522,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364571,41 +365560,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1972
-#AT_START_1973
-at_fn_group_banner 1973 'ovsdb-idl.at:517' \
+#AT_STOP_1976
+#AT_START_1977
+at_fn_group_banner 1977 'ovsdb-idl.at:527' \
   "simple idl, aborting - Python3 - tcp6" "          " 101
 at_xfail=no
 (
-  $as_echo "1973. $at_setup_line: testing $at_desc ..."
+  $as_echo "1977. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:517" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:527" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:517"
-   $as_echo "ovsdb-idl.at:517" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:527"
+   $as_echo "ovsdb-idl.at:527" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:517"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:527"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364616,17 +365605,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:527" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -364636,14 +365625,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, abort' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, abort' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -364651,13 +365640,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -364670,34 +365659,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364708,55 +365697,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1973
-#AT_START_1974
-at_fn_group_banner 1974 'ovsdb-idl.at:517' \
+#AT_STOP_1977
+#AT_START_1978
+at_fn_group_banner 1978 'ovsdb-idl.at:527' \
   "simple idl, aborting - Python3 - SSL" "           " 101
 at_xfail=no
 (
-  $as_echo "1974. $at_setup_line: testing $at_desc ..."
+  $as_echo "1978. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:517" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:527" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:517"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:527"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:517" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:527" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:517"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:527"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -364768,7 +365757,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364780,10 +365769,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:527" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -364791,7 +365780,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -364805,16 +365794,16 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:527: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'set 0 r 2.0, abort' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:517"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:527"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'set 0 r 2.0, abort' \
@@ -364824,13 +365813,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:527"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -364843,34 +365832,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:517: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:517"
+$as_echo "$at_srcdir/ovsdb-idl.at:527: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:527"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:517"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:527"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -364881,44 +365870,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:517" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:527" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1974
-#AT_START_1975
-at_fn_group_banner 1975 'ovsdb-idl.at:531' \
+#AT_STOP_1978
+#AT_START_1979
+at_fn_group_banner 1979 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - C" "" 101
 at_xfail=no
 (
-  $as_echo "1975. $at_setup_line: testing $at_desc ..."
+  $as_echo "1979. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -364928,14 +365917,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -364943,13 +365932,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -364962,34 +365951,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365000,35 +365989,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1975
-#AT_START_1976
-at_fn_group_banner 1976 'ovsdb-idl.at:531' \
+#AT_STOP_1979
+#AT_START_1980
+at_fn_group_banner 1980 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1976. $at_setup_line: testing $at_desc ..."
+  $as_echo "1980. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365039,15 +366028,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:541" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -365057,14 +366046,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -365072,13 +366061,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -365091,34 +366080,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365129,41 +366118,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1976
-#AT_START_1977
-at_fn_group_banner 1977 'ovsdb-idl.at:531' \
+#AT_STOP_1980
+#AT_START_1981
+at_fn_group_banner 1981 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1977. $at_setup_line: testing $at_desc ..."
+  $as_echo "1981. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:531" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:541" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:531"
-   $as_echo "ovsdb-idl.at:531" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:541"
+   $as_echo "ovsdb-idl.at:541" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:531"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:541"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365174,15 +366163,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:541" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -365192,14 +366181,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -365207,13 +366196,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -365226,34 +366215,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365264,44 +366253,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1977
-#AT_START_1978
-at_fn_group_banner 1978 'ovsdb-idl.at:531' \
+#AT_STOP_1981
+#AT_START_1982
+at_fn_group_banner 1982 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "1978. $at_setup_line: testing $at_desc ..."
+  $as_echo "1982. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -365311,14 +366300,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -365326,13 +366315,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -365345,34 +366334,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365383,44 +366372,44 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1978
-#AT_START_1979
-at_fn_group_banner 1979 'ovsdb-idl.at:531' \
+#AT_STOP_1982
+#AT_START_1983
+at_fn_group_banner 1983 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1979. $at_setup_line: testing $at_desc ..."
+  $as_echo "1983. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -365430,14 +366419,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -365445,13 +366434,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -365464,34 +366453,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365502,35 +366491,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1979
-#AT_START_1980
-at_fn_group_banner 1980 'ovsdb-idl.at:531' \
+#AT_STOP_1983
+#AT_START_1984
+at_fn_group_banner 1984 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1980. $at_setup_line: testing $at_desc ..."
+  $as_echo "1984. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365541,15 +366530,15 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:541" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -365559,14 +366548,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -365574,13 +366563,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -365593,34 +366582,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365631,35 +366620,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1980
-#AT_START_1981
-at_fn_group_banner 1981 'ovsdb-idl.at:531' \
+#AT_STOP_1984
+#AT_START_1985
+at_fn_group_banner 1985 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1981. $at_setup_line: testing $at_desc ..."
+  $as_echo "1985. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365670,17 +366659,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:541" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -365690,14 +366679,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -365705,13 +366694,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -365724,34 +366713,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365762,41 +366751,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1981
-#AT_START_1982
-at_fn_group_banner 1982 'ovsdb-idl.at:531' \
+#AT_STOP_1985
+#AT_START_1986
+at_fn_group_banner 1986 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1982. $at_setup_line: testing $at_desc ..."
+  $as_echo "1986. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:531" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:541" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:531"
-   $as_echo "ovsdb-idl.at:531" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:541"
+   $as_echo "ovsdb-idl.at:541" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:531"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:541"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365807,16 +366796,16 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:541" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -365826,14 +366815,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -365841,13 +366830,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -365860,34 +366849,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365898,41 +366887,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1982
-#AT_START_1983
-at_fn_group_banner 1983 'ovsdb-idl.at:531' \
+#AT_STOP_1986
+#AT_START_1987
+at_fn_group_banner 1987 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1983. $at_setup_line: testing $at_desc ..."
+  $as_echo "1987. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:531" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:541" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:531"
-   $as_echo "ovsdb-idl.at:531" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:541"
+   $as_echo "ovsdb-idl.at:541" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:531"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:541"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -365943,17 +366932,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:541" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -365963,14 +366952,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, destroy' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'set 0 r 2.0, destroy' \
 '+set 0 b 1'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -365978,13 +366967,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -365997,34 +366986,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366035,55 +367024,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1983
-#AT_START_1984
-at_fn_group_banner 1984 'ovsdb-idl.at:531' \
+#AT_STOP_1987
+#AT_START_1988
+at_fn_group_banner 1988 'ovsdb-idl.at:541' \
   "simple idl, destroy without commit or abort - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "1984. $at_setup_line: testing $at_desc ..."
+  $as_echo "1988. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:531" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:541" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:531"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:541"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:531" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:541" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:531"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:541"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -366095,7 +367084,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366107,10 +367096,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:541" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -366118,7 +367107,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -366132,16 +367121,16 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:541: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'set 0 r 2.0, destroy' \\
 '+set 0 b 1'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:531"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:541"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'set 0 r 2.0, destroy' \
@@ -366151,13 +367140,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:541"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -366170,34 +367159,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:531: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:531"
+$as_echo "$at_srcdir/ovsdb-idl.at:541: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:541"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:531"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:541"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366208,46 +367197,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:531" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:541" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1984
-#AT_START_1985
-at_fn_group_banner 1985 'ovsdb-idl.at:545' \
+#AT_STOP_1988
+#AT_START_1989
+at_fn_group_banner 1989 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - C" "   " 101
 at_xfail=no
 (
-  $as_echo "1985. $at_setup_line: testing $at_desc ..."
+  $as_echo "1989. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -366259,14 +367248,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -366274,13 +367263,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -366293,34 +367282,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366331,35 +367320,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1985
-#AT_START_1986
-at_fn_group_banner 1986 'ovsdb-idl.at:545' \
+#AT_STOP_1989
+#AT_START_1990
+at_fn_group_banner 1990 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1986. $at_setup_line: testing $at_desc ..."
+  $as_echo "1990. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366370,17 +367359,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:555" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -366392,14 +367381,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -366407,13 +367396,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -366426,34 +367415,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366464,41 +367453,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1986
-#AT_START_1987
-at_fn_group_banner 1987 'ovsdb-idl.at:545' \
+#AT_STOP_1990
+#AT_START_1991
+at_fn_group_banner 1991 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1987. $at_setup_line: testing $at_desc ..."
+  $as_echo "1991. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:545" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:555" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:545"
-   $as_echo "ovsdb-idl.at:545" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:555"
+   $as_echo "ovsdb-idl.at:555" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:545"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:555"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366509,17 +367498,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:555" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -366531,14 +367520,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -366546,13 +367535,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -366565,34 +367554,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366603,46 +367592,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1987
-#AT_START_1988
-at_fn_group_banner 1988 'ovsdb-idl.at:545' \
+#AT_STOP_1991
+#AT_START_1992
+at_fn_group_banner 1992 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "1988. $at_setup_line: testing $at_desc ..."
+  $as_echo "1992. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -366654,14 +367643,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -366669,13 +367658,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -366688,34 +367677,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366726,46 +367715,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1988
-#AT_START_1989
-at_fn_group_banner 1989 'ovsdb-idl.at:545' \
+#AT_STOP_1992
+#AT_START_1993
+at_fn_group_banner 1993 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1989. $at_setup_line: testing $at_desc ..."
+  $as_echo "1993. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -366777,14 +367766,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -366792,13 +367781,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -366811,34 +367800,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366849,35 +367838,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1989
-#AT_START_1990
-at_fn_group_banner 1990 'ovsdb-idl.at:545' \
+#AT_STOP_1993
+#AT_START_1994
+at_fn_group_banner 1994 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1990. $at_setup_line: testing $at_desc ..."
+  $as_echo "1994. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366888,17 +367877,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:555" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -366910,14 +367899,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -366925,13 +367914,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -366944,34 +367933,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -366982,35 +367971,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1990
-#AT_START_1991
-at_fn_group_banner 1991 'ovsdb-idl.at:545' \
+#AT_STOP_1994
+#AT_START_1995
+at_fn_group_banner 1995 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1991. $at_setup_line: testing $at_desc ..."
+  $as_echo "1995. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367021,19 +368010,19 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:555" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -367045,14 +368034,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -367060,13 +368049,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -367079,34 +368068,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367117,41 +368106,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1991
-#AT_START_1992
-at_fn_group_banner 1992 'ovsdb-idl.at:545' \
+#AT_STOP_1995
+#AT_START_1996
+at_fn_group_banner 1996 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1992. $at_setup_line: testing $at_desc ..."
+  $as_echo "1996. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:545" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:555" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:545"
-   $as_echo "ovsdb-idl.at:545" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:555"
+   $as_echo "ovsdb-idl.at:555" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:545"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:555"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367162,18 +368151,18 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:555" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -367185,14 +368174,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -367200,13 +368189,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -367219,34 +368208,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367257,41 +368246,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1992
-#AT_START_1993
-at_fn_group_banner 1993 'ovsdb-idl.at:545' \
+#AT_STOP_1996
+#AT_START_1997
+at_fn_group_banner 1997 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1993. $at_setup_line: testing $at_desc ..."
+  $as_echo "1997. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:545" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:555" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:545"
-   $as_echo "ovsdb-idl.at:545" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:555"
+   $as_echo "ovsdb-idl.at:555" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:545"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:555"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367302,19 +368291,19 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:555" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -367326,14 +368315,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -367341,13 +368330,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -367360,34 +368349,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367398,55 +368387,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1993
-#AT_START_1994
-at_fn_group_banner 1994 'ovsdb-idl.at:545' \
+#AT_STOP_1997
+#AT_START_1998
+at_fn_group_banner 1998 'ovsdb-idl.at:555' \
   "simple idl, conditional, false condition - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "1994. $at_setup_line: testing $at_desc ..."
+  $as_echo "1998. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:545" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:555" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:545"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:555"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:545" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:555" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:545"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:555"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -367458,7 +368447,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367470,10 +368459,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:555" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -367483,7 +368472,7 @@
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -367499,16 +368488,16 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:555: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:545"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:555"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'condition simple []' \
@@ -367518,13 +368507,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:555"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -367537,34 +368526,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:545: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:545"
+$as_echo "$at_srcdir/ovsdb-idl.at:555: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:555"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:545"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:555"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367575,46 +368564,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:545" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:555" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1994
-#AT_START_1995
-at_fn_group_banner 1995 'ovsdb-idl.at:561' \
+#AT_STOP_1998
+#AT_START_1999
+at_fn_group_banner 1999 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - C" "    " 101
 at_xfail=no
 (
-  $as_echo "1995. $at_setup_line: testing $at_desc ..."
+  $as_echo "1999. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -367626,14 +368615,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -367641,13 +368630,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -367660,34 +368649,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367698,35 +368687,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1995
-#AT_START_1996
-at_fn_group_banner 1996 'ovsdb-idl.at:561' \
+#AT_STOP_1999
+#AT_START_2000
+at_fn_group_banner 2000 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "1996. $at_setup_line: testing $at_desc ..."
+  $as_echo "2000. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367737,17 +368726,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:571" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -367759,14 +368748,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -367774,13 +368763,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -367793,34 +368782,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367831,41 +368820,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1996
-#AT_START_1997
-at_fn_group_banner 1997 'ovsdb-idl.at:561' \
+#AT_STOP_2000
+#AT_START_2001
+at_fn_group_banner 2001 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "1997. $at_setup_line: testing $at_desc ..."
+  $as_echo "2001. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:561" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:571" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:561"
-   $as_echo "ovsdb-idl.at:561" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:571"
+   $as_echo "ovsdb-idl.at:571" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:561"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:571"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367876,17 +368865,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:571" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -367898,14 +368887,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -367913,13 +368902,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -367932,34 +368921,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -367970,46 +368959,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1997
-#AT_START_1998
-at_fn_group_banner 1998 'ovsdb-idl.at:561' \
+#AT_STOP_2001
+#AT_START_2002
+at_fn_group_banner 2002 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "1998. $at_setup_line: testing $at_desc ..."
+  $as_echo "2002. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -368021,14 +369010,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -368036,13 +369025,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -368055,34 +369044,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368093,46 +369082,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1998
-#AT_START_1999
-at_fn_group_banner 1999 'ovsdb-idl.at:561' \
+#AT_STOP_2002
+#AT_START_2003
+at_fn_group_banner 2003 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "1999. $at_setup_line: testing $at_desc ..."
+  $as_echo "2003. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -368144,14 +369133,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -368159,13 +369148,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -368178,34 +369167,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368216,35 +369205,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_1999
-#AT_START_2000
-at_fn_group_banner 2000 'ovsdb-idl.at:561' \
+#AT_STOP_2003
+#AT_START_2004
+at_fn_group_banner 2004 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2000. $at_setup_line: testing $at_desc ..."
+  $as_echo "2004. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368255,17 +369244,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:571" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -368277,14 +369266,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -368292,13 +369281,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -368311,34 +369300,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368349,35 +369338,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2000
-#AT_START_2001
-at_fn_group_banner 2001 'ovsdb-idl.at:561' \
+#AT_STOP_2004
+#AT_START_2005
+at_fn_group_banner 2005 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2001. $at_setup_line: testing $at_desc ..."
+  $as_echo "2005. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368388,19 +369377,19 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:571" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -368412,14 +369401,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -368427,13 +369416,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -368446,34 +369435,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368484,41 +369473,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2001
-#AT_START_2002
-at_fn_group_banner 2002 'ovsdb-idl.at:561' \
+#AT_STOP_2005
+#AT_START_2006
+at_fn_group_banner 2006 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2002. $at_setup_line: testing $at_desc ..."
+  $as_echo "2006. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:561" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:571" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:561"
-   $as_echo "ovsdb-idl.at:561" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:571"
+   $as_echo "ovsdb-idl.at:571" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:561"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:571"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368529,18 +369518,18 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:571" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -368552,14 +369541,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -368567,13 +369556,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -368586,34 +369575,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368624,41 +369613,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2002
-#AT_START_2003
-at_fn_group_banner 2003 'ovsdb-idl.at:561' \
+#AT_STOP_2006
+#AT_START_2007
+at_fn_group_banner 2007 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2003. $at_setup_line: testing $at_desc ..."
+  $as_echo "2007. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:561" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:571" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:561"
-   $as_echo "ovsdb-idl.at:561" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:571"
+   $as_echo "ovsdb-idl.at:571" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:561"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:571"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368669,19 +369658,19 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:571" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -368693,14 +369682,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [true]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -368708,13 +369697,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -368727,34 +369716,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368765,55 +369754,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2003
-#AT_START_2004
-at_fn_group_banner 2004 'ovsdb-idl.at:561' \
+#AT_STOP_2007
+#AT_START_2008
+at_fn_group_banner 2008 'ovsdb-idl.at:571' \
   "simple idl, conditional, true condition - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "2004. $at_setup_line: testing $at_desc ..."
+  $as_echo "2008. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:561" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:571" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:561"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:571"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:561" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:571" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:561"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:571"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -368825,7 +369814,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368837,10 +369826,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:571" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -368850,7 +369839,7 @@
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -368866,16 +369855,16 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:571: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'condition simple []' \\
     'condition simple [true]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:561"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:571"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'condition simple []' \
@@ -368885,13 +369874,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:571"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -368904,34 +369893,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:561: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:561"
+$as_echo "$at_srcdir/ovsdb-idl.at:571: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:571"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:561"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:571"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -368942,40 +369931,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:561" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:571" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2004
-#AT_START_2005
-at_fn_group_banner 2005 'ovsdb-idl.at:577' \
+#AT_STOP_2008
+#AT_START_2009
+at_fn_group_banner 2009 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - C" "" 101
 at_xfail=no
 (
-  $as_echo "2005. $at_setup_line: testing $at_desc ..."
+  $as_echo "2009. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -368986,7 +369975,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -369003,14 +369992,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -369018,13 +370007,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -369038,34 +370027,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369076,35 +370065,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2005
-#AT_START_2006
-at_fn_group_banner 2006 'ovsdb-idl.at:577' \
+#AT_STOP_2009
+#AT_START_2010
+at_fn_group_banner 2010 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2006. $at_setup_line: testing $at_desc ..."
+  $as_echo "2010. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369115,11 +370104,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:587" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -369130,7 +370119,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -369147,14 +370136,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -369162,13 +370151,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -369182,34 +370171,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369220,41 +370209,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2006
-#AT_START_2007
-at_fn_group_banner 2007 'ovsdb-idl.at:577' \
+#AT_STOP_2010
+#AT_START_2011
+at_fn_group_banner 2011 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2007. $at_setup_line: testing $at_desc ..."
+  $as_echo "2011. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:577" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:587" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:577"
-   $as_echo "ovsdb-idl.at:577" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:587"
+   $as_echo "ovsdb-idl.at:587" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:577"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:587"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369265,11 +370254,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:587" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -369280,7 +370269,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -369297,14 +370286,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -369312,13 +370301,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -369332,34 +370321,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369370,40 +370359,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2007
-#AT_START_2008
-at_fn_group_banner 2008 'ovsdb-idl.at:577' \
+#AT_STOP_2011
+#AT_START_2012
+at_fn_group_banner 2012 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "2008. $at_setup_line: testing $at_desc ..."
+  $as_echo "2012. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -369414,7 +370403,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -369431,14 +370420,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -369446,13 +370435,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -369466,34 +370455,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369504,40 +370493,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2008
-#AT_START_2009
-at_fn_group_banner 2009 'ovsdb-idl.at:577' \
+#AT_STOP_2012
+#AT_START_2013
+at_fn_group_banner 2013 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2009. $at_setup_line: testing $at_desc ..."
+  $as_echo "2013. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -369548,7 +370537,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -369565,14 +370554,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -369580,13 +370569,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -369600,34 +370589,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369638,35 +370627,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2009
-#AT_START_2010
-at_fn_group_banner 2010 'ovsdb-idl.at:577' \
+#AT_STOP_2013
+#AT_START_2014
+at_fn_group_banner 2014 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2010. $at_setup_line: testing $at_desc ..."
+  $as_echo "2014. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369677,11 +370666,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:587" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -369692,7 +370681,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -369709,14 +370698,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -369724,13 +370713,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -369744,34 +370733,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369782,35 +370771,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2010
-#AT_START_2011
-at_fn_group_banner 2011 'ovsdb-idl.at:577' \
+#AT_STOP_2014
+#AT_START_2015
+at_fn_group_banner 2015 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2011. $at_setup_line: testing $at_desc ..."
+  $as_echo "2015. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369821,13 +370810,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:587" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -369838,7 +370827,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -369855,14 +370844,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -369870,13 +370859,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -369890,34 +370879,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369928,41 +370917,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2011
-#AT_START_2012
-at_fn_group_banner 2012 'ovsdb-idl.at:577' \
+#AT_STOP_2015
+#AT_START_2016
+at_fn_group_banner 2016 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2012. $at_setup_line: testing $at_desc ..."
+  $as_echo "2016. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:577" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:587" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:577"
-   $as_echo "ovsdb-idl.at:577" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:587"
+   $as_echo "ovsdb-idl.at:587" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:577"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:587"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -369973,12 +370962,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:587" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -369989,7 +370978,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -370006,14 +370995,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -370021,13 +371010,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -370041,34 +371030,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370079,41 +371068,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2012
-#AT_START_2013
-at_fn_group_banner 2013 'ovsdb-idl.at:577' \
+#AT_STOP_2016
+#AT_START_2017
+at_fn_group_banner 2017 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2013. $at_setup_line: testing $at_desc ..."
+  $as_echo "2017. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:577" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:587" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:577"
-   $as_echo "ovsdb-idl.at:577" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:587"
+   $as_echo "ovsdb-idl.at:587" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:577"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:587"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370124,13 +371113,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:587" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -370141,7 +371130,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -370158,14 +371147,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -370173,13 +371162,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -370193,34 +371182,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370231,55 +371220,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2013
-#AT_START_2014
-at_fn_group_banner 2014 'ovsdb-idl.at:577' \
+#AT_STOP_2017
+#AT_START_2018
+at_fn_group_banner 2018 'ovsdb-idl.at:587' \
   "simple idl, conditional, multiple clauses in condition - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "2014. $at_setup_line: testing $at_desc ..."
+  $as_echo "2018. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:577" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:587" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:577"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:587"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:577" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:587" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:577"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:587"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -370291,7 +371280,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370303,10 +371292,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:587" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -370321,7 +371310,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -370342,16 +371331,16 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:587: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:577"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:587"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'condition simple []' \
@@ -370361,13 +371350,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:587"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -370381,34 +371370,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:577: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:577"
+$as_echo "$at_srcdir/ovsdb-idl.at:587: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:587"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:577"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:587"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370419,46 +371408,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:577" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:587" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2014
-#AT_START_2015
-at_fn_group_banner 2015 'ovsdb-idl.at:599' \
+#AT_STOP_2018
+#AT_START_2019
+at_fn_group_banner 2019 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - C" "" 101
 at_xfail=no
 (
-  $as_echo "2015. $at_setup_line: testing $at_desc ..."
+  $as_echo "2019. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -370470,14 +371459,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -370485,13 +371474,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -370504,34 +371493,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370542,35 +371531,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2015
-#AT_START_2016
-at_fn_group_banner 2016 'ovsdb-idl.at:599' \
+#AT_STOP_2019
+#AT_START_2020
+at_fn_group_banner 2020 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2016. $at_setup_line: testing $at_desc ..."
+  $as_echo "2020. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370581,17 +371570,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:609" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -370603,14 +371592,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -370618,13 +371607,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -370637,34 +371626,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370675,41 +371664,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2016
-#AT_START_2017
-at_fn_group_banner 2017 'ovsdb-idl.at:599' \
+#AT_STOP_2020
+#AT_START_2021
+at_fn_group_banner 2021 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2017. $at_setup_line: testing $at_desc ..."
+  $as_echo "2021. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:599" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:609" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:599"
-   $as_echo "ovsdb-idl.at:599" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:609"
+   $as_echo "ovsdb-idl.at:609" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:599"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:609"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370720,17 +371709,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:609" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -370742,14 +371731,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -370757,13 +371746,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -370776,34 +371765,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370814,46 +371803,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2017
-#AT_START_2018
-at_fn_group_banner 2018 'ovsdb-idl.at:599' \
+#AT_STOP_2021
+#AT_START_2022
+at_fn_group_banner 2022 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "2018. $at_setup_line: testing $at_desc ..."
+  $as_echo "2022. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -370865,14 +371854,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -370880,13 +371869,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -370899,34 +371888,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -370937,46 +371926,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2018
-#AT_START_2019
-at_fn_group_banner 2019 'ovsdb-idl.at:599' \
+#AT_STOP_2022
+#AT_START_2023
+at_fn_group_banner 2023 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2019. $at_setup_line: testing $at_desc ..."
+  $as_echo "2023. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -370988,14 +371977,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -371003,13 +371992,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -371022,34 +372011,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371060,35 +372049,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2019
-#AT_START_2020
-at_fn_group_banner 2020 'ovsdb-idl.at:599' \
+#AT_STOP_2023
+#AT_START_2024
+at_fn_group_banner 2024 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2020. $at_setup_line: testing $at_desc ..."
+  $as_echo "2024. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371099,17 +372088,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:609" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -371121,14 +372110,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -371136,13 +372125,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -371155,34 +372144,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371193,35 +372182,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2020
-#AT_START_2021
-at_fn_group_banner 2021 'ovsdb-idl.at:599' \
+#AT_STOP_2024
+#AT_START_2025
+at_fn_group_banner 2025 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2021. $at_setup_line: testing $at_desc ..."
+  $as_echo "2025. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371232,19 +372221,19 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:609" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -371256,14 +372245,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -371271,13 +372260,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -371290,34 +372279,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371328,41 +372317,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2021
-#AT_START_2022
-at_fn_group_banner 2022 'ovsdb-idl.at:599' \
+#AT_STOP_2025
+#AT_START_2026
+at_fn_group_banner 2026 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2022. $at_setup_line: testing $at_desc ..."
+  $as_echo "2026. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:599" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:609" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:599"
-   $as_echo "ovsdb-idl.at:599" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:609"
+   $as_echo "ovsdb-idl.at:609" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:599"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:609"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371373,18 +372362,18 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:609" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -371396,14 +372385,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -371411,13 +372400,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -371430,34 +372419,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371468,41 +372457,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2022
-#AT_START_2023
-at_fn_group_banner 2023 'ovsdb-idl.at:599' \
+#AT_STOP_2026
+#AT_START_2027
+at_fn_group_banner 2027 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2023. $at_setup_line: testing $at_desc ..."
+  $as_echo "2027. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:599" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:609" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:599"
-   $as_echo "ovsdb-idl.at:599" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:609"
+   $as_echo "ovsdb-idl.at:609" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:599"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:609"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371513,19 +372502,19 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:609" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -371537,14 +372526,14 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [["i","==",1]]'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
@@ -371552,13 +372541,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -371571,34 +372560,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371609,55 +372598,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2023
-#AT_START_2024
-at_fn_group_banner 2024 'ovsdb-idl.at:599' \
+#AT_STOP_2027
+#AT_START_2028
+at_fn_group_banner 2028 'ovsdb-idl.at:609' \
   "simple idl, conditional, modify as insert due to condition - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "2024. $at_setup_line: testing $at_desc ..."
+  $as_echo "2028. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:599" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:609" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:599"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:609"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:599" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:609" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:599"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:609"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -371669,7 +372658,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371681,10 +372670,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:609" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -371694,7 +372683,7 @@
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -371710,16 +372699,16 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:609: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1]]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:599"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:609"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'condition simple []' \
@@ -371729,13 +372718,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:609"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -371748,34 +372737,34 @@
 004: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:599: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:599"
+$as_echo "$at_srcdir/ovsdb-idl.at:609: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:609"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:599"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:609"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371786,46 +372775,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:599" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:609" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2024
-#AT_START_2025
-at_fn_group_banner 2025 'ovsdb-idl.at:615' \
+#AT_STOP_2028
+#AT_START_2029
+at_fn_group_banner 2029 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - C" "" 101
 at_xfail=no
 (
-  $as_echo "2025. $at_setup_line: testing $at_desc ..."
+  $as_echo "2029. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -371837,12 +372826,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -371851,7 +372840,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -371866,13 +372855,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -371889,34 +372878,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371927,35 +372916,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2025
-#AT_START_2026
-at_fn_group_banner 2026 'ovsdb-idl.at:615' \
+#AT_STOP_2029
+#AT_START_2030
+at_fn_group_banner 2030 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2026. $at_setup_line: testing $at_desc ..."
+  $as_echo "2030. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -371966,17 +372955,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:625" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -371988,12 +372977,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -372002,7 +372991,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -372017,13 +373006,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -372040,34 +373029,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372078,41 +373067,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2026
-#AT_START_2027
-at_fn_group_banner 2027 'ovsdb-idl.at:615' \
+#AT_STOP_2030
+#AT_START_2031
+at_fn_group_banner 2031 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2027. $at_setup_line: testing $at_desc ..."
+  $as_echo "2031. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:615" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:625" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:615"
-   $as_echo "ovsdb-idl.at:615" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:625"
+   $as_echo "ovsdb-idl.at:625" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:615"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:625"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372123,17 +373112,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:625" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -372145,12 +373134,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -372159,7 +373148,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -372174,13 +373163,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -372197,34 +373186,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372235,46 +373224,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_2027
-#AT_START_2028
-at_fn_group_banner 2028 'ovsdb-idl.at:615' \
+read at_status <"$at_status_file"
+#AT_STOP_2031
+#AT_START_2032
+at_fn_group_banner 2032 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "2028. $at_setup_line: testing $at_desc ..."
+  $as_echo "2032. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -372286,12 +373275,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -372300,7 +373289,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -372315,13 +373304,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -372338,34 +373327,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372376,46 +373365,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2028
-#AT_START_2029
-at_fn_group_banner 2029 'ovsdb-idl.at:615' \
+#AT_STOP_2032
+#AT_START_2033
+at_fn_group_banner 2033 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2029. $at_setup_line: testing $at_desc ..."
+  $as_echo "2033. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -372427,12 +373416,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -372441,7 +373430,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -372456,13 +373445,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -372479,34 +373468,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372517,35 +373506,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2029
-#AT_START_2030
-at_fn_group_banner 2030 'ovsdb-idl.at:615' \
+#AT_STOP_2033
+#AT_START_2034
+at_fn_group_banner 2034 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2030. $at_setup_line: testing $at_desc ..."
+  $as_echo "2034. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372556,17 +373545,17 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:625" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -372578,12 +373567,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -372592,7 +373581,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -372607,13 +373596,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -372630,34 +373619,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372668,35 +373657,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2030
-#AT_START_2031
-at_fn_group_banner 2031 'ovsdb-idl.at:615' \
+#AT_STOP_2034
+#AT_START_2035
+at_fn_group_banner 2035 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2031. $at_setup_line: testing $at_desc ..."
+  $as_echo "2035. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372707,19 +373696,19 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:625" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -372731,12 +373720,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -372745,7 +373734,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -372760,13 +373749,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -372783,34 +373772,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372821,41 +373810,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2031
-#AT_START_2032
-at_fn_group_banner 2032 'ovsdb-idl.at:615' \
+#AT_STOP_2035
+#AT_START_2036
+at_fn_group_banner 2036 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2032. $at_setup_line: testing $at_desc ..."
+  $as_echo "2036. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:615" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:625" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:615"
-   $as_echo "ovsdb-idl.at:615" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:625"
+   $as_echo "ovsdb-idl.at:625" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:615"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:625"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372866,18 +373855,18 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:625" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -372889,12 +373878,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -372903,7 +373892,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -372918,13 +373907,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -372941,34 +373930,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -372979,41 +373968,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2032
-#AT_START_2033
-at_fn_group_banner 2033 'ovsdb-idl.at:615' \
+#AT_STOP_2036
+#AT_START_2037
+at_fn_group_banner 2037 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2033. $at_setup_line: testing $at_desc ..."
+  $as_echo "2037. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:615" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:625" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:615"
-   $as_echo "ovsdb-idl.at:615" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:625"
+   $as_echo "ovsdb-idl.at:625" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:615"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:625"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373024,19 +374013,19 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:625" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -373048,12 +374037,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     '[\"idltest\",
@@ -373062,7 +374051,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple []' \
     'condition simple [["i","==",1],["i","==",2]]' \
     'condition simple [["i","==",2]]' \
@@ -373077,13 +374066,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -373100,34 +374089,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373138,55 +374127,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2033
-#AT_START_2034
-at_fn_group_banner 2034 'ovsdb-idl.at:615' \
+#AT_STOP_2037
+#AT_START_2038
+at_fn_group_banner 2038 'ovsdb-idl.at:625' \
   "simple idl, conditional, modify as delete due to condition - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "2034. $at_setup_line: testing $at_desc ..."
+  $as_echo "2038. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:615" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:625" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:615"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:625"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:615" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:625" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:615"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:625"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -373198,7 +374187,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373210,10 +374199,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:625" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -373223,7 +374212,7 @@
        \"row\": {\"i\": 1,
                \"r\": 2.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -373239,12 +374228,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:625: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'condition simple []' \\
     'condition simple [[\"i\",\"==\",1],[\"i\",\"==\",2]]' \\
@@ -373255,7 +374244,7 @@
        \"row\": {\"i\": 2,
                \"r\": 3.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:615"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:625"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'condition simple []' \
@@ -373272,13 +374261,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:625"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -373295,34 +374284,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:615: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:615"
+$as_echo "$at_srcdir/ovsdb-idl.at:625: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:625"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:615"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:625"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373333,40 +374322,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:615" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:625" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2034
-#AT_START_2035
-at_fn_group_banner 2035 'ovsdb-idl.at:642' \
+#AT_STOP_2038
+#AT_START_2039
+at_fn_group_banner 2039 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - C" "   " 101
 at_xfail=no
 (
-  $as_echo "2035. $at_setup_line: testing $at_desc ..."
+  $as_echo "2039. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -373380,7 +374369,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -373400,12 +374389,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -373414,7 +374403,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -373429,13 +374418,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -373456,34 +374445,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373494,35 +374483,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2035
-#AT_START_2036
-at_fn_group_banner 2036 'ovsdb-idl.at:642' \
+#AT_STOP_2039
+#AT_START_2040
+at_fn_group_banner 2040 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2036. $at_setup_line: testing $at_desc ..."
+  $as_echo "2040. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373533,11 +374522,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:652" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -373551,7 +374540,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -373571,12 +374560,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -373585,7 +374574,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -373600,13 +374589,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -373627,34 +374616,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373665,41 +374654,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2036
-#AT_START_2037
-at_fn_group_banner 2037 'ovsdb-idl.at:642' \
+#AT_STOP_2040
+#AT_START_2041
+at_fn_group_banner 2041 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2037. $at_setup_line: testing $at_desc ..."
+  $as_echo "2041. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:642" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:652" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:642"
-   $as_echo "ovsdb-idl.at:642" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:652"
+   $as_echo "ovsdb-idl.at:652" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:642"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:652"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373710,11 +374699,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:652" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact tcp:[::1]:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -373728,7 +374717,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact tcp:[::1]:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -373748,12 +374737,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -373762,7 +374751,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -373777,13 +374766,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -373804,34 +374793,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -373842,40 +374831,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2037
-#AT_START_2038
-at_fn_group_banner 2038 'ovsdb-idl.at:642' \
+#AT_STOP_2041
+#AT_START_2042
+at_fn_group_banner 2042 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - Python3" "" 101
 at_xfail=no
 (
-  $as_echo "2038. $at_setup_line: testing $at_desc ..."
+  $as_echo "2042. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -373889,7 +374878,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -373909,12 +374898,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -373923,7 +374912,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -373938,13 +374927,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -373965,34 +374954,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374003,40 +374992,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2038
-#AT_START_2039
-at_fn_group_banner 2039 'ovsdb-idl.at:642' \
+#AT_STOP_2042
+#AT_START_2043
+at_fn_group_banner 2043 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2039. $at_setup_line: testing $at_desc ..."
+  $as_echo "2043. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact unix:socket '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -374050,7 +375039,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -374070,12 +375059,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -374084,7 +375073,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -374099,13 +375088,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -374126,34 +375115,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374164,35 +375153,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2039
-#AT_START_2040
-at_fn_group_banner 2040 'ovsdb-idl.at:642' \
+#AT_STOP_2043
+#AT_START_2044
+at_fn_group_banner 2044 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2040. $at_setup_line: testing $at_desc ..."
+  $as_echo "2044. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374203,11 +375192,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:652" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -374221,7 +375210,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -374241,12 +375230,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -374255,7 +375244,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -374270,13 +375259,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -374297,34 +375286,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374335,35 +375324,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2040
-#AT_START_2041
-at_fn_group_banner 2041 'ovsdb-idl.at:642' \
+#AT_STOP_2044
+#AT_START_2045
+at_fn_group_banner 2045 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2041. $at_setup_line: testing $at_desc ..."
+  $as_echo "2045. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374374,13 +375363,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:652" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -374394,7 +375383,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact tcp:127.0.0.1:$TCP_PORT '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -374414,12 +375403,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -374428,7 +375417,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -374443,13 +375432,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -374470,34 +375459,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374508,41 +375497,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2041
-#AT_START_2042
-at_fn_group_banner 2042 'ovsdb-idl.at:642' \
+#AT_STOP_2045
+#AT_START_2046
+at_fn_group_banner 2046 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2042. $at_setup_line: testing $at_desc ..."
+  $as_echo "2046. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:642" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:652" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:642"
-   $as_echo "ovsdb-idl.at:642" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:652"
+   $as_echo "ovsdb-idl.at:652" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:642"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:652"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374553,12 +375542,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:652" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -374572,7 +375561,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -374592,12 +375581,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -374606,7 +375595,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -374621,13 +375610,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -374648,34 +375637,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374686,41 +375675,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2042
-#AT_START_2043
-at_fn_group_banner 2043 'ovsdb-idl.at:642' \
+#AT_STOP_2046
+#AT_START_2047
+at_fn_group_banner 2047 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2043. $at_setup_line: testing $at_desc ..."
+  $as_echo "2047. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:642" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:652" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:642"
-   $as_echo "ovsdb-idl.at:642" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:652"
+   $as_echo "ovsdb-idl.at:652" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:642"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:652"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374731,13 +375720,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:652" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client transact \"tcp:[::1]:\$TCP_PORT\" '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -374751,7 +375740,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client transact "tcp:[::1]:$TCP_PORT" '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -374771,12 +375760,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple [];link1 [];link2 []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     'condition link1 [[\"i\",\"==\",0]]' \\
     'condition link2 [[\"i\",\"==\",3]]' \\
@@ -374785,7 +375774,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote 'condition simple [];link1 [];link2 []' \
     'condition simple [["i","==",1]]' \
     'condition link1 [["i","==",0]]' \
@@ -374800,13 +375789,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -374827,34 +375816,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374865,55 +375854,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2043
-#AT_START_2044
-at_fn_group_banner 2044 'ovsdb-idl.at:642' \
+#AT_STOP_2047
+#AT_START_2048
+at_fn_group_banner 2048 'ovsdb-idl.at:652' \
   "simple idl, conditional, multiple tables - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "2044. $at_setup_line: testing $at_desc ..."
+  $as_echo "2048. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:642" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:652" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:642"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:652"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:642" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:652" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:642"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:652"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -374925,7 +375914,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -374937,10 +375926,10 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:652" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovsdb-client \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovsdb-client \\
                 --private-key=\$PKIDIR/testpki-privkey2.pem \\
                 --certificate=\$PKIDIR/testpki-cert2.pem \\
                 --ca-cert=\$PKIDIR/testpki-cacert.pem \\
@@ -374958,7 +375947,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 2},
        \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; ovsdb-client \
                 --private-key=$PKIDIR/testpki-privkey2.pem \
                 --certificate=$PKIDIR/testpki-cert2.pem \
@@ -374982,12 +375971,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:652: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'condition simple [];link1 [];link2 []' \\
     'condition simple [[\"i\",\"==\",1]]' \\
@@ -374998,7 +375987,7 @@
        \"table\": \"link2\",
        \"row\": {\"i\": 3},
         \"uuid-name\": \"row0\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:642"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:652"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'condition simple [];link1 [];link2 []' \
@@ -375015,13 +376004,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:652"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -375042,34 +376031,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:642: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:642"
+$as_echo "$at_srcdir/ovsdb-idl.at:652: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:652"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:642"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:652"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375080,41 +376069,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:642" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:652" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2044
-#AT_START_2045
-at_fn_group_banner 2045 'ovsdb-idl.at:681' \
+#AT_STOP_2048
+#AT_START_2049
+at_fn_group_banner 2049 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - C" "           " 101
 at_xfail=no
 (
-  $as_echo "2045. $at_setup_line: testing $at_desc ..."
+  $as_echo "2049. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -375138,7 +376127,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -375168,13 +376157,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -375198,34 +376187,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375236,35 +376225,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2045
-#AT_START_2046
-at_fn_group_banner 2046 'ovsdb-idl.at:681' \
+#AT_STOP_2049
+#AT_START_2050
+at_fn_group_banner 2050 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - C - tcp" "     " 101
 at_xfail=no
 (
-  $as_echo "2046. $at_setup_line: testing $at_desc ..."
+  $as_echo "2050. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375275,12 +376264,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:691" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -375304,7 +376293,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -375334,13 +376323,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -375364,34 +376353,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375402,41 +376391,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2046
-#AT_START_2047
-at_fn_group_banner 2047 'ovsdb-idl.at:681' \
+#AT_STOP_2050
+#AT_START_2051
+at_fn_group_banner 2051 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - C - tcp6" "    " 101
 at_xfail=no
 (
-  $as_echo "2047. $at_setup_line: testing $at_desc ..."
+  $as_echo "2051. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:681" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:691" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:681"
-   $as_echo "ovsdb-idl.at:681" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:691"
+   $as_echo "ovsdb-idl.at:691" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:681"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:691"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375447,12 +376436,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:691" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -375476,7 +376465,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -375506,13 +376495,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -375536,34 +376525,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375574,41 +376563,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2047
-#AT_START_2048
-at_fn_group_banner 2048 'ovsdb-idl.at:681' \
+#AT_STOP_2051
+#AT_START_2052
+at_fn_group_banner 2052 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - Python3" "     " 101
 at_xfail=no
 (
-  $as_echo "2048. $at_setup_line: testing $at_desc ..."
+  $as_echo "2052. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -375632,7 +376621,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -375662,13 +376651,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -375692,34 +376681,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375730,41 +376719,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2048
-#AT_START_2049
-at_fn_group_banner 2049 'ovsdb-idl.at:681' \
+#AT_STOP_2052
+#AT_START_2053
+at_fn_group_banner 2053 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2049. $at_setup_line: testing $at_desc ..."
+  $as_echo "2053. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -375788,7 +376777,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -375818,13 +376807,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -375848,34 +376837,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375886,35 +376875,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2049
-#AT_START_2050
-at_fn_group_banner 2050 'ovsdb-idl.at:681' \
+#AT_STOP_2053
+#AT_START_2054
+at_fn_group_banner 2054 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2050. $at_setup_line: testing $at_desc ..."
+  $as_echo "2054. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -375925,12 +376914,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:691" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -375954,7 +376943,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -375984,13 +376973,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -376014,34 +377003,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376052,35 +377041,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2050
-#AT_START_2051
-at_fn_group_banner 2051 'ovsdb-idl.at:681' \
+#AT_STOP_2054
+#AT_START_2055
+at_fn_group_banner 2055 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2051. $at_setup_line: testing $at_desc ..."
+  $as_echo "2055. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376091,14 +377080,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:691" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -376122,7 +377111,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -376152,13 +377141,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -376182,34 +377171,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376220,41 +377209,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2051
-#AT_START_2052
-at_fn_group_banner 2052 'ovsdb-idl.at:681' \
+#AT_STOP_2055
+#AT_START_2056
+at_fn_group_banner 2056 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2052. $at_setup_line: testing $at_desc ..."
+  $as_echo "2056. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:681" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:691" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:681"
-   $as_echo "ovsdb-idl.at:681" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:691"
+   $as_echo "ovsdb-idl.at:691" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:681"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:691"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376265,13 +377254,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:691" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -376295,7 +377284,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -376325,13 +377314,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -376355,34 +377344,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376393,41 +377382,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2052
-#AT_START_2053
-at_fn_group_banner 2053 'ovsdb-idl.at:681' \
+#AT_STOP_2056
+#AT_START_2057
+at_fn_group_banner 2057 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2053. $at_setup_line: testing $at_desc ..."
+  $as_echo "2057. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:681" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:691" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:681"
-   $as_echo "ovsdb-idl.at:681" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:691"
+   $as_echo "ovsdb-idl.at:691" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:681"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:691"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376438,14 +377427,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:691" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:691: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -376469,7 +377458,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -376499,13 +377488,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -376529,34 +377518,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376567,55 +377556,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2053
-#AT_START_2054
-at_fn_group_banner 2054 'ovsdb-idl.at:681' \
+#AT_STOP_2057
+#AT_START_2058
+at_fn_group_banner 2058 'ovsdb-idl.at:691' \
   "self-linking idl, consistent ops - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "2054. $at_setup_line: testing $at_desc ..."
+  $as_echo "2058. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:681" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:691" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:681"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:691"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:681" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:691" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:681"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:691"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -376627,7 +377616,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376639,11 +377628,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:691" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:691: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem '[\"idltest\",
       {\"op\": \"insert\",
@@ -376669,7 +377658,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:681"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:691"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem '["idltest",
@@ -376701,13 +377690,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:691"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -376731,34 +377720,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:681: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:681"
+$as_echo "$at_srcdir/ovsdb-idl.at:691: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:691"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:681"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:691"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376769,41 +377758,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:681" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:691" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2054
-#AT_START_2055
-at_fn_group_banner 2055 'ovsdb-idl.at:725' \
+#AT_STOP_2058
+#AT_START_2059
+at_fn_group_banner 2059 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - C" "         " 101
 at_xfail=no
 (
-  $as_echo "2055. $at_setup_line: testing $at_desc ..."
+  $as_echo "2059. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -376833,7 +377822,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -376869,13 +377858,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -376895,34 +377884,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376933,35 +377922,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2055
-#AT_START_2056
-at_fn_group_banner 2056 'ovsdb-idl.at:725' \
+#AT_STOP_2059
+#AT_START_2060
+at_fn_group_banner 2060 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - C - tcp" "   " 101
 at_xfail=no
 (
-  $as_echo "2056. $at_setup_line: testing $at_desc ..."
+  $as_echo "2060. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -376972,12 +377961,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:735" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -377007,7 +377996,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -377043,13 +378032,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -377069,34 +378058,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377107,41 +378096,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2056
-#AT_START_2057
-at_fn_group_banner 2057 'ovsdb-idl.at:725' \
+#AT_STOP_2060
+#AT_START_2061
+at_fn_group_banner 2061 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - C - tcp6" "  " 101
 at_xfail=no
 (
-  $as_echo "2057. $at_setup_line: testing $at_desc ..."
+  $as_echo "2061. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:725" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:735" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:725"
-   $as_echo "ovsdb-idl.at:725" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:735"
+   $as_echo "ovsdb-idl.at:735" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:725"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:735"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377152,12 +378141,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:735" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -377187,7 +378176,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -377223,13 +378212,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -377249,34 +378238,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377287,41 +378276,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2057
-#AT_START_2058
-at_fn_group_banner 2058 'ovsdb-idl.at:725' \
+#AT_STOP_2061
+#AT_START_2062
+at_fn_group_banner 2062 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - Python3" "   " 101
 at_xfail=no
 (
-  $as_echo "2058. $at_setup_line: testing $at_desc ..."
+  $as_echo "2062. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -377351,7 +378340,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -377387,13 +378376,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -377413,34 +378402,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377451,41 +378440,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2058
-#AT_START_2059
-at_fn_group_banner 2059 'ovsdb-idl.at:725' \
+#AT_STOP_2062
+#AT_START_2063
+at_fn_group_banner 2063 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2059. $at_setup_line: testing $at_desc ..."
+  $as_echo "2063. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -377515,7 +378504,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -377551,13 +378540,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -377577,34 +378566,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377615,35 +378604,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2059
-#AT_START_2060
-at_fn_group_banner 2060 'ovsdb-idl.at:725' \
+#AT_STOP_2063
+#AT_START_2064
+at_fn_group_banner 2064 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2060. $at_setup_line: testing $at_desc ..."
+  $as_echo "2064. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377654,12 +378643,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:735" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -377689,7 +378678,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -377725,13 +378714,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -377751,34 +378740,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377789,35 +378778,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2060
-#AT_START_2061
-at_fn_group_banner 2061 'ovsdb-idl.at:725' \
+#AT_STOP_2064
+#AT_START_2065
+at_fn_group_banner 2065 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2061. $at_setup_line: testing $at_desc ..."
+  $as_echo "2065. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377828,14 +378817,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:735" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -377865,7 +378854,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -377901,13 +378890,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -377927,34 +378916,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -377965,41 +378954,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2061
-#AT_START_2062
-at_fn_group_banner 2062 'ovsdb-idl.at:725' \
+#AT_STOP_2065
+#AT_START_2066
+at_fn_group_banner 2066 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2062. $at_setup_line: testing $at_desc ..."
+  $as_echo "2066. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:725" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:735" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:725"
-   $as_echo "ovsdb-idl.at:725" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:735"
+   $as_echo "ovsdb-idl.at:735" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:725"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:735"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378010,13 +378999,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:735" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -378046,7 +379035,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -378082,13 +379071,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -378108,34 +379097,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378146,41 +379135,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2062
-#AT_START_2063
-at_fn_group_banner 2063 'ovsdb-idl.at:725' \
+#AT_STOP_2066
+#AT_START_2067
+at_fn_group_banner 2067 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2063. $at_setup_line: testing $at_desc ..."
+  $as_echo "2067. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:725" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:735" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:725"
-   $as_echo "ovsdb-idl.at:725" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:735"
+   $as_echo "ovsdb-idl.at:735" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:725"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:735"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378191,14 +379180,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:735" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:735: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"uuid\", \"cf197cc5-c8c9-42f5-82d5-c71a9f2cb96b\"]}}]' \\
@@ -378228,7 +379217,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -378264,13 +379253,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -378290,34 +379279,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378328,55 +379317,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2063
-#AT_START_2064
-at_fn_group_banner 2064 'ovsdb-idl.at:725' \
+#AT_STOP_2067
+#AT_START_2068
+at_fn_group_banner 2068 'ovsdb-idl.at:735' \
   "self-linking idl, inconsistent ops - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "2064. $at_setup_line: testing $at_desc ..."
+  $as_echo "2068. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:725" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:735" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:725"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:735"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:725" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:735" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:725"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:735"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -378388,7 +379377,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378400,11 +379389,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:735" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:735: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem '[\"idltest\",
       {\"op\": \"insert\",
@@ -378436,7 +379425,7 @@
        \"table\": \"link1\",
        \"where\": []}]' \\
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:725"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:735"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem '["idltest",
@@ -378474,13 +379463,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:735"
 ( $at_check_trace; sort stdout | uuidfilt| sed -e '/004:/s/row <[23]> references/row <x> references/'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -378500,34 +379489,34 @@
 010: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:725: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:725"
+$as_echo "$at_srcdir/ovsdb-idl.at:735: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:735"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:725"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:735"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378538,41 +379527,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:725" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:735" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2064
-#AT_START_2065
-at_fn_group_banner 2065 'ovsdb-idl.at:773' \
+#AT_STOP_2068
+#AT_START_2069
+at_fn_group_banner 2069 'ovsdb-idl.at:783' \
   "self-linking idl, sets - C" "                     " 101
 at_xfail=no
 (
-  $as_echo "2065. $at_setup_line: testing $at_desc ..."
+  $as_echo "2069. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -378603,7 +379592,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -378640,13 +379629,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -378669,34 +379658,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378707,35 +379696,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2065
-#AT_START_2066
-at_fn_group_banner 2066 'ovsdb-idl.at:773' \
+#AT_STOP_2069
+#AT_START_2070
+at_fn_group_banner 2070 'ovsdb-idl.at:783' \
   "self-linking idl, sets - C - tcp" "               " 101
 at_xfail=no
 (
-  $as_echo "2066. $at_setup_line: testing $at_desc ..."
+  $as_echo "2070. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378746,12 +379735,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:783" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -378782,7 +379771,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -378819,13 +379808,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -378848,34 +379837,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378886,41 +379875,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2066
-#AT_START_2067
-at_fn_group_banner 2067 'ovsdb-idl.at:773' \
+#AT_STOP_2070
+#AT_START_2071
+at_fn_group_banner 2071 'ovsdb-idl.at:783' \
   "self-linking idl, sets - C - tcp6" "              " 101
 at_xfail=no
 (
-  $as_echo "2067. $at_setup_line: testing $at_desc ..."
+  $as_echo "2071. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:773" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:783" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:773"
-   $as_echo "ovsdb-idl.at:773" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:783"
+   $as_echo "ovsdb-idl.at:783" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:773"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:783"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -378931,12 +379920,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:783" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -378967,7 +379956,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -379004,13 +379993,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -379033,34 +380022,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379071,41 +380060,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2067
-#AT_START_2068
-at_fn_group_banner 2068 'ovsdb-idl.at:773' \
+#AT_STOP_2071
+#AT_START_2072
+at_fn_group_banner 2072 'ovsdb-idl.at:783' \
   "self-linking idl, sets - Python3" "               " 101
 at_xfail=no
 (
-  $as_echo "2068. $at_setup_line: testing $at_desc ..."
+  $as_echo "2072. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -379136,7 +380125,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -379173,13 +380162,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -379202,34 +380191,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379240,41 +380229,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2068
-#AT_START_2069
-at_fn_group_banner 2069 'ovsdb-idl.at:773' \
+#AT_STOP_2072
+#AT_START_2073
+at_fn_group_banner 2073 'ovsdb-idl.at:783' \
   "self-linking idl, sets - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2069. $at_setup_line: testing $at_desc ..."
+  $as_echo "2073. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -379305,7 +380294,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -379342,13 +380331,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -379371,34 +380360,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379409,35 +380398,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2069
-#AT_START_2070
-at_fn_group_banner 2070 'ovsdb-idl.at:773' \
+#AT_STOP_2073
+#AT_START_2074
+at_fn_group_banner 2074 'ovsdb-idl.at:783' \
   "self-linking idl, sets - Python3 - tcp" "         " 101
 at_xfail=no
 (
-  $as_echo "2070. $at_setup_line: testing $at_desc ..."
+  $as_echo "2074. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379448,12 +380437,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:783" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -379484,7 +380473,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -379521,13 +380510,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -379550,34 +380539,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379588,35 +380577,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2070
-#AT_START_2071
-at_fn_group_banner 2071 'ovsdb-idl.at:773' \
+#AT_STOP_2074
+#AT_START_2075
+at_fn_group_banner 2075 'ovsdb-idl.at:783' \
   "self-linking idl, sets - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2071. $at_setup_line: testing $at_desc ..."
+  $as_echo "2075. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379627,14 +380616,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:783" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -379665,7 +380654,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -379702,13 +380691,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -379731,34 +380720,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379769,41 +380758,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2071
-#AT_START_2072
-at_fn_group_banner 2072 'ovsdb-idl.at:773' \
+#AT_STOP_2075
+#AT_START_2076
+at_fn_group_banner 2076 'ovsdb-idl.at:783' \
   "self-linking idl, sets - Python3 - tcp6" "        " 101
 at_xfail=no
 (
-  $as_echo "2072. $at_setup_line: testing $at_desc ..."
+  $as_echo "2076. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:773" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:783" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:773"
-   $as_echo "ovsdb-idl.at:773" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:783"
+   $as_echo "ovsdb-idl.at:783" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:773"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:783"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379814,13 +380803,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:783" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -379851,7 +380840,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -379888,13 +380877,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -379917,34 +380906,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -379955,41 +380944,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2072
-#AT_START_2073
-at_fn_group_banner 2073 'ovsdb-idl.at:773' \
+#AT_STOP_2076
+#AT_START_2077
+at_fn_group_banner 2077 'ovsdb-idl.at:783' \
   "self-linking idl, sets - Python3 - tcp6" "        " 101
 at_xfail=no
 (
-  $as_echo "2073. $at_setup_line: testing $at_desc ..."
+  $as_echo "2077. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:773" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:783" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:773"
-   $as_echo "ovsdb-idl.at:773" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:783"
+   $as_echo "ovsdb-idl.at:783" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:773"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:783"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380000,14 +380989,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:783" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:783: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"i0\"], \"ka\": [\"set\", [[\"named-uuid\", \"i0\"]]]},
@@ -380038,7 +381027,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -380075,13 +381064,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -380104,34 +381093,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380142,55 +381131,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2073
-#AT_START_2074
-at_fn_group_banner 2074 'ovsdb-idl.at:773' \
+#AT_STOP_2077
+#AT_START_2078
+at_fn_group_banner 2078 'ovsdb-idl.at:783' \
   "self-linking idl, sets - Python3 - SSL" "         " 101
 at_xfail=no
 (
-  $as_echo "2074. $at_setup_line: testing $at_desc ..."
+  $as_echo "2078. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:773" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:783" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:773"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:783"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:773" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:783" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:773"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:783"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -380202,7 +381191,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380214,11 +381203,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:783" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:783: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem '[\"idltest\",
       {\"op\": \"insert\",
@@ -380251,7 +381240,7 @@
       {\"op\": \"delete\",
        \"table\": \"link1\",
        \"where\": []}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:773"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:783"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem '["idltest",
@@ -380290,13 +381279,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:783"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -380319,34 +381308,34 @@
 008: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:773: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:773"
+$as_echo "$at_srcdir/ovsdb-idl.at:783: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:783"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:773"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:783"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380357,41 +381346,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:773" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:783" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2074
-#AT_START_2075
-at_fn_group_banner 2075 'ovsdb-idl.at:823' \
+#AT_STOP_2078
+#AT_START_2079
+at_fn_group_banner 2079 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - C" "       " 101
 at_xfail=no
 (
-  $as_echo "2075. $at_setup_line: testing $at_desc ..."
+  $as_echo "2079. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -380400,7 +381389,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -380415,13 +381404,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -380434,34 +381423,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380472,35 +381461,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2075
-#AT_START_2076
-at_fn_group_banner 2076 'ovsdb-idl.at:823' \
+#AT_STOP_2079
+#AT_START_2080
+at_fn_group_banner 2080 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - C - tcp" " " 101
 at_xfail=no
 (
-  $as_echo "2076. $at_setup_line: testing $at_desc ..."
+  $as_echo "2080. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380511,12 +381500,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:833" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -380525,7 +381514,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -380540,13 +381529,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -380559,34 +381548,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380597,41 +381586,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2076
-#AT_START_2077
-at_fn_group_banner 2077 'ovsdb-idl.at:823' \
+#AT_STOP_2080
+#AT_START_2081
+at_fn_group_banner 2081 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - C - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2077. $at_setup_line: testing $at_desc ..."
+  $as_echo "2081. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:823" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:833" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:823"
-   $as_echo "ovsdb-idl.at:823" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:833"
+   $as_echo "ovsdb-idl.at:833" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:823"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:833"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380642,12 +381631,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:833" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -380656,7 +381645,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -380671,13 +381660,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -380690,34 +381679,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380728,41 +381717,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2077
-#AT_START_2078
-at_fn_group_banner 2078 'ovsdb-idl.at:823' \
+#AT_STOP_2081
+#AT_START_2082
+at_fn_group_banner 2082 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - Python3" " " 101
 at_xfail=no
 (
-  $as_echo "2078. $at_setup_line: testing $at_desc ..."
+  $as_echo "2082. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -380771,7 +381760,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -380786,13 +381775,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -380805,34 +381794,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380843,41 +381832,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2078
-#AT_START_2079
-at_fn_group_banner 2079 'ovsdb-idl.at:823' \
+#AT_STOP_2082
+#AT_START_2083
+at_fn_group_banner 2083 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2079. $at_setup_line: testing $at_desc ..."
+  $as_echo "2083. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -380886,7 +381875,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -380901,13 +381890,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -380920,34 +381909,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380958,35 +381947,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2079
-#AT_START_2080
-at_fn_group_banner 2080 'ovsdb-idl.at:823' \
+#AT_STOP_2083
+#AT_START_2084
+at_fn_group_banner 2084 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - Python3 - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2080. $at_setup_line: testing $at_desc ..."
+  $as_echo "2084. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -380997,12 +381986,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:833" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -381011,7 +382000,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -381026,13 +382015,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -381045,34 +382034,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381083,35 +382072,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2080
-#AT_START_2081
-at_fn_group_banner 2081 'ovsdb-idl.at:823' \
+#AT_STOP_2084
+#AT_START_2085
+at_fn_group_banner 2085 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2081. $at_setup_line: testing $at_desc ..."
+  $as_echo "2085. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381122,14 +382111,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:833" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -381138,7 +382127,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -381153,13 +382142,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -381172,34 +382161,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381210,41 +382199,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2081
-#AT_START_2082
-at_fn_group_banner 2082 'ovsdb-idl.at:823' \
+#AT_STOP_2085
+#AT_START_2086
+at_fn_group_banner 2086 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2082. $at_setup_line: testing $at_desc ..."
+  $as_echo "2086. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:823" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:833" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:823"
-   $as_echo "ovsdb-idl.at:823" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:833"
+   $as_echo "ovsdb-idl.at:833" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:823"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:833"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381255,13 +382244,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:833" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -381270,7 +382259,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -381285,13 +382274,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -381304,34 +382293,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381342,41 +382331,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2082
-#AT_START_2083
-at_fn_group_banner 2083 'ovsdb-idl.at:823' \
+#AT_STOP_2086
+#AT_START_2087
+at_fn_group_banner 2087 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - Python3 - tcp6" "" 101
 at_xfail=no
 (
-  $as_echo "2083. $at_setup_line: testing $at_desc ..."
+  $as_echo "2087. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:823" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:833" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:823"
-   $as_echo "ovsdb-idl.at:823" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:833"
+   $as_echo "ovsdb-idl.at:833" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:823"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:833"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381387,14 +382376,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:833" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:833: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link2\",
        \"row\": {\"i\": 0},
@@ -381403,7 +382392,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "link2",
@@ -381418,13 +382407,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -381437,34 +382426,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381475,55 +382464,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2083
-#AT_START_2084
-at_fn_group_banner 2084 'ovsdb-idl.at:823' \
+#AT_STOP_2087
+#AT_START_2088
+at_fn_group_banner 2088 'ovsdb-idl.at:833' \
   "external-linking idl, consistent ops - Python3 - SSL" "" 101
 at_xfail=no
 (
-  $as_echo "2084. $at_setup_line: testing $at_desc ..."
+  $as_echo "2088. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:823" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:833" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:823"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:833"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:823" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:833" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:823"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:833"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -381535,7 +382524,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381547,11 +382536,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:833" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:833: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem '[\"idltest\",
       {\"op\": \"insert\",
@@ -381562,7 +382551,7 @@
        \"table\": \"link1\",
        \"row\": {\"i\": 1, \"k\": [\"named-uuid\", \"row1\"], \"l2\": [\"set\", [[\"named-uuid\", \"row0\"]]]},
        \"uuid-name\": \"row1\"}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:823"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:833"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem '["idltest",
@@ -381579,13 +382568,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:833"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -381598,34 +382587,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:823: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:823"
+$as_echo "$at_srcdir/ovsdb-idl.at:833: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:833"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:823"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:833"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381636,41 +382625,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:823" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:833" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2084
-#AT_START_2085
-at_fn_group_banner 2085 'ovsdb-idl.at:841' \
+#AT_STOP_2088
+#AT_START_2089
+at_fn_group_banner 2089 'ovsdb-idl.at:851' \
   "singleton idl, constraints - C" "                 " 101
 at_xfail=no
 (
-  $as_echo "2085. $at_setup_line: testing $at_desc ..."
+  $as_echo "2089. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -381685,7 +382674,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -381706,13 +382695,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -381727,34 +382716,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381765,35 +382754,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2085
-#AT_START_2086
-at_fn_group_banner 2086 'ovsdb-idl.at:841' \
+#AT_STOP_2089
+#AT_START_2090
+at_fn_group_banner 2090 'ovsdb-idl.at:851' \
   "singleton idl, constraints - C - tcp" "           " 101
 at_xfail=no
 (
-  $as_echo "2086. $at_setup_line: testing $at_desc ..."
+  $as_echo "2090. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381804,12 +382793,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:851" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -381824,7 +382813,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -381845,13 +382834,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -381866,34 +382855,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381904,41 +382893,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2086
-#AT_START_2087
-at_fn_group_banner 2087 'ovsdb-idl.at:841' \
+#AT_STOP_2090
+#AT_START_2091
+at_fn_group_banner 2091 'ovsdb-idl.at:851' \
   "singleton idl, constraints - C - tcp6" "          " 101
 at_xfail=no
 (
-  $as_echo "2087. $at_setup_line: testing $at_desc ..."
+  $as_echo "2091. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:841" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:851" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:841"
-   $as_echo "ovsdb-idl.at:841" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:851"
+   $as_echo "ovsdb-idl.at:851" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:841"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:851"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -381949,12 +382938,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:851" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -381969,7 +382958,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -381990,13 +382979,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -382011,34 +383000,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382049,41 +383038,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2087
-#AT_START_2088
-at_fn_group_banner 2088 'ovsdb-idl.at:841' \
+#AT_STOP_2091
+#AT_START_2092
+at_fn_group_banner 2092 'ovsdb-idl.at:851' \
   "singleton idl, constraints - Python3" "           " 101
 at_xfail=no
 (
-  $as_echo "2088. $at_setup_line: testing $at_desc ..."
+  $as_echo "2092. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -382098,7 +383087,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -382119,13 +383108,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -382140,34 +383129,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382178,41 +383167,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2088
-#AT_START_2089
-at_fn_group_banner 2089 'ovsdb-idl.at:841' \
+#AT_STOP_2092
+#AT_START_2093
+at_fn_group_banner 2093 'ovsdb-idl.at:851' \
   "singleton idl, constraints - Python3 - register_columns" "" 101
 at_xfail=no
 (
-  $as_echo "2089. $at_setup_line: testing $at_desc ..."
+  $as_echo "2093. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -382227,7 +383216,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:b,ba,i,ia,r,ra,s,sa,u,ua?link1:i,k,ka,l2?link2:i,l1?singleton:name '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -382248,13 +383237,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -382269,34 +383258,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382307,35 +383296,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2089
-#AT_START_2090
-at_fn_group_banner 2090 'ovsdb-idl.at:841' \
+#AT_STOP_2093
+#AT_START_2094
+at_fn_group_banner 2094 'ovsdb-idl.at:851' \
   "singleton idl, constraints - Python3 - tcp" "     " 101
 at_xfail=no
 (
-  $as_echo "2090. $at_setup_line: testing $at_desc ..."
+  $as_echo "2094. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382346,12 +383335,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:851" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:127.0.0.1:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -382366,7 +383355,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:127.0.0.1:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -382387,13 +383376,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -382408,34 +383397,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382446,35 +383435,35 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2090
-#AT_START_2091
-at_fn_group_banner 2091 'ovsdb-idl.at:841' \
+#AT_STOP_2094
+#AT_START_2095
+at_fn_group_banner 2095 'ovsdb-idl.at:851' \
   "singleton idl, constraints - Python3 (multiple remotes) - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2091. $at_setup_line: testing $at_desc ..."
+  $as_echo "2095. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382485,14 +383474,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:851" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote=tcp:127.0.0.1:$WRONG_PORT_1,tcp:127.0.0.1:$TCP_PORT,tcp:127.0.0.1:$WRONG_PORT_2
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -382507,7 +383496,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -382528,13 +383517,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -382549,34 +383538,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382587,41 +383576,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2091
-#AT_START_2092
-at_fn_group_banner 2092 'ovsdb-idl.at:841' \
+#AT_STOP_2095
+#AT_START_2096
+at_fn_group_banner 2096 'ovsdb-idl.at:851' \
   "singleton idl, constraints - Python3 - tcp6" "    " 101
 at_xfail=no
 (
-  $as_echo "2092. $at_setup_line: testing $at_desc ..."
+  $as_echo "2096. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:841" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:851" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:841"
-   $as_echo "ovsdb-idl.at:841" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:851"
+   $as_echo "ovsdb-idl.at:851" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:841"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:851"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382632,13 +383621,13 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:851" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    echo "TCP_PORT=$TCP_PORT"
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema tcp:[::1]:\$TCP_PORT '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -382653,7 +383642,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema tcp:[::1]:$TCP_PORT '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -382674,13 +383663,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -382695,34 +383684,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382733,41 +383722,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2092
-#AT_START_2093
-at_fn_group_banner 2093 'ovsdb-idl.at:841' \
+#AT_STOP_2096
+#AT_START_2097
+at_fn_group_banner 2097 'ovsdb-idl.at:851' \
   "singleton idl, constraints - Python3 - tcp6" "    " 101
 at_xfail=no
 (
-  $as_echo "2093. $at_setup_line: testing $at_desc ..."
+  $as_echo "2097. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:841" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:851" >"$at_check_line_file"
 (test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:841"
-   $as_echo "ovsdb-idl.at:841" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:851"
+   $as_echo "ovsdb-idl.at:851" >"$at_check_line_file"
 (test $HAVE_IPV6 = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:841"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:851"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382778,14 +383767,14 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:851" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT_1=$((TCP_PORT + 101))
    WRONG_PORT_2=$((TCP_PORT + 102))
    remote="tcp:[::1]:$WRONG_PORT_1,tcp:[::1]:$TCP_PORT,tcp:[::1]:$WRONG_PORT_2"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:851: \$PYTHON3 \$srcdir/test-ovsdb.py  -t20 idl \$srcdir/idltest.ovsschema \$remote '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"foo\"}}]' \\
@@ -382800,7 +383789,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t20 idl $srcdir/idltest.ovsschema $remote '["idltest",
       {"op": "insert",
        "table": "singleton",
@@ -382821,13 +383810,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -382842,34 +383831,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382880,55 +383869,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2093
-#AT_START_2094
-at_fn_group_banner 2094 'ovsdb-idl.at:841' \
+#AT_STOP_2097
+#AT_START_2098
+at_fn_group_banner 2098 'ovsdb-idl.at:851' \
   "singleton idl, constraints - Python3 - SSL" "     " 101
 at_xfail=no
 (
-  $as_echo "2094. $at_setup_line: testing $at_desc ..."
+  $as_echo "2098. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:841" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:851" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:841"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:851"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:841" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:851" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:841"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:851"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -382940,7 +383929,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -382952,11 +383941,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:851" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:851: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem '[\"idltest\",
       {\"op\": \"insert\",
@@ -382973,7 +383962,7 @@
       {\"op\": \"insert\",
        \"table\": \"singleton\",
        \"row\": {\"name\": \"bar\"}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:841"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:851"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem '["idltest",
@@ -382996,13 +383985,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:851"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383017,34 +384006,34 @@
 006: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:841: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:841"
+$as_echo "$at_srcdir/ovsdb-idl.at:851: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:851"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:841"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:851"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -383055,55 +384044,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:841" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:851" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2094
-#AT_START_2095
-at_fn_group_banner 2095 'ovsdb-idl.at:867' \
+#AT_STOP_2098
+#AT_START_2099
+at_fn_group_banner 2099 'ovsdb-idl.at:877' \
   "external-linking idl, insert ops - Python3" "     " 101
 at_xfail=no
 (
-  $as_echo "2095. $at_setup_line: testing $at_desc ..."
+  $as_echo "2099. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:867: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:867"
+$as_echo "$at_srcdir/ovsdb-idl.at:877: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:877"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:867"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:867: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'linktest'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'linktest'" "ovsdb-idl.at:867"
+$as_echo "$at_srcdir/ovsdb-idl.at:877: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'linktest'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'linktest'" "ovsdb-idl.at:877"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'linktest'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:867"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:867: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:867"
+$as_echo "$at_srcdir/ovsdb-idl.at:877: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:877"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383116,34 +384105,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:867"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:867: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:867"
+$as_echo "$at_srcdir/ovsdb-idl.at:877: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:877"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:867"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:867: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:867"
+$as_echo "$at_srcdir/ovsdb-idl.at:877: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:877"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:867"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -383154,55 +384143,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:867" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:877" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2095
-#AT_START_2096
-at_fn_group_banner 2096 'ovsdb-idl.at:877' \
+#AT_STOP_2099
+#AT_START_2100
+at_fn_group_banner 2100 'ovsdb-idl.at:887' \
   "getattr idl, insert ops - Python3" "              " 101
 at_xfail=no
 (
-  $as_echo "2096. $at_setup_line: testing $at_desc ..."
+  $as_echo "2100. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:877: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:877"
+$as_echo "$at_srcdir/ovsdb-idl.at:887: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:887"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:877: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'getattrtest'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'getattrtest'" "ovsdb-idl.at:877"
+$as_echo "$at_srcdir/ovsdb-idl.at:887: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'getattrtest'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'getattrtest'" "ovsdb-idl.at:887"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'getattrtest'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:877: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:877"
+$as_echo "$at_srcdir/ovsdb-idl.at:887: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:887"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383214,34 +384203,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:877: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:877"
+$as_echo "$at_srcdir/ovsdb-idl.at:887: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:887"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:877: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:877"
+$as_echo "$at_srcdir/ovsdb-idl.at:887: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:887"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:877"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -383252,47 +384241,47 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:877" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:887" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2096
-#AT_START_2097
-at_fn_group_banner 2097 'ovsdb-idl.at:886' \
+#AT_STOP_2100
+#AT_START_2101
+at_fn_group_banner 2101 'ovsdb-idl.at:896' \
   "row-from-json idl, whats this - Python3" "        " 101
 at_xfail=no
 (
-  $as_echo "2097. $at_setup_line: testing $at_desc ..."
+  $as_echo "2101. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:886: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:886"
+$as_echo "$at_srcdir/ovsdb-idl.at:896: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:896"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:886"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:896"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:886: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:896: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1}},
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:886"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:896"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -383305,26 +384294,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:886"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:896"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:886: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'notifytest insert 2, notifytest set 1 b 1, notifytest delete 0'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'notifytest insert 2, notifytest set 1 b 1, notifytest delete 0'" "ovsdb-idl.at:886"
+$as_echo "$at_srcdir/ovsdb-idl.at:896: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'notifytest insert 2, notifytest set 1 b 1, notifytest delete 0'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'notifytest insert 2, notifytest set 1 b 1, notifytest delete 0'" "ovsdb-idl.at:896"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'notifytest insert 2, notifytest set 1 b 1, notifytest delete 0'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:886"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:896"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:886: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:886"
+$as_echo "$at_srcdir/ovsdb-idl.at:896: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:896"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383338,34 +384327,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:886"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:896"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:886: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:886"
+$as_echo "$at_srcdir/ovsdb-idl.at:896: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:896"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:886"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:896"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:886: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:886"
+$as_echo "$at_srcdir/ovsdb-idl.at:896: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:896"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:886"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:896"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -383376,20 +384365,20 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:886" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:896" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2097
-#AT_START_2098
-at_fn_group_banner 2098 'ovsdb-idl.at:903' \
+#AT_STOP_2101
+#AT_START_2102
+at_fn_group_banner 2102 'ovsdb-idl.at:913' \
   "idl handling of missing tables and columns - C" " " 101
 at_xfail=no
 (
-  $as_echo "2098. $at_setup_line: testing $at_desc ..."
+  $as_echo "2102. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -383401,20 +384390,20 @@
 # expects them to be there, so this test checks that it properly
 # tolerates them being missing.
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:910: ovsdb_start_idltest \"\" \"\$abs_srcdir/idltest2.ovsschema\""
-at_fn_check_prepare_dynamic "ovsdb_start_idltest \"\" \"$abs_srcdir/idltest2.ovsschema\"" "ovsdb-idl.at:910"
+$as_echo "$at_srcdir/ovsdb-idl.at:920: ovsdb_start_idltest \"\" \"\$abs_srcdir/idltest2.ovsschema\""
+at_fn_check_prepare_dynamic "ovsdb_start_idltest \"\" \"$abs_srcdir/idltest2.ovsschema\"" "ovsdb-idl.at:920"
 ( $at_check_trace; ovsdb_start_idltest "" "$abs_srcdir/idltest2.ovsschema"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:910"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:920"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:911: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:921: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"link1\",
        \"row\": {\"i\": 0, \"k\": [\"named-uuid\", \"self\"]},
@@ -383438,7 +384427,7 @@
        \"table\": \"link1\",
        \"where\": [],
        \"row\": {\"k\": [\"uuid\", \"#0#\"]}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:911"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:921"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl unix:socket '["idltest",
       {"op": "insert",
        "table": "link1",
@@ -383468,13 +384457,13 @@
 $at_check_filter
 echo stderr:; tee stderr <"$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:911"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:921"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:936: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:936"
+$as_echo "$at_srcdir/ovsdb-idl.at:946: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:946"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383498,26 +384487,29 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:936"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:946"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
 # Check that ovsdb-idl figured out that table link2 and column l2 are missing.
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:956: grep ovsdb_idl stderr | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:956"
+$as_echo "$at_srcdir/ovsdb-idl.at:966: grep ovsdb_idl stderr | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:966"
 ( $at_check_trace; grep ovsdb_idl stderr | sort
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "test-ovsdb|ovsdb_idl|idltest database lacks link2 table (database needs upgrade?)
+echo >>"$at_stdout"; $as_echo "test-ovsdb|ovsdb_idl|idltest database lacks indexed table (database needs upgrade?)
+test-ovsdb|ovsdb_idl|idltest database lacks link2 table (database needs upgrade?)
+test-ovsdb|ovsdb_idl|idltest database lacks simple5 table (database needs upgrade?)
+test-ovsdb|ovsdb_idl|idltest database lacks simple6 table (database needs upgrade?)
 test-ovsdb|ovsdb_idl|idltest database lacks singleton table (database needs upgrade?)
 test-ovsdb|ovsdb_idl|link1 table in idltest database lacks l2 column (database needs upgrade?)
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:956"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:966"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -383526,8 +384518,8 @@
 # mention that table or column, and (for paranoia) that it did mention another
 # table and column.
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:965: grep -c '\"monitor\\|monitor_cond\"' stderr"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:965"
+$as_echo "$at_srcdir/ovsdb-idl.at:978: grep -c '\"monitor\\|monitor_cond\"' stderr"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:978"
 ( $at_check_trace; grep -c '"monitor\|monitor_cond"' stderr
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383536,39 +384528,39 @@
 echo >>"$at_stdout"; $as_echo "2
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:965"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:978"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:967: grep '\"monitor\\|monitor_cond\"' stderr | grep link2"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:967"
+$as_echo "$at_srcdir/ovsdb-idl.at:980: grep '\"monitor\\|monitor_cond\"' stderr | grep link2"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:980"
 ( $at_check_trace; grep '"monitor\|monitor_cond"' stderr | grep link2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:967"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:980"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:968: grep '\"monitor\\|monitor_cond\"' stderr | grep l2"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:968"
+$as_echo "$at_srcdir/ovsdb-idl.at:981: grep '\"monitor\\|monitor_cond\"' stderr | grep l2"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:981"
 ( $at_check_trace; grep '"monitor\|monitor_cond"' stderr | grep l2
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:968"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:981"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:969: grep '\"monitor\\|monitor_cond\"' stderr | grep -c '\"link1\"'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:969"
+$as_echo "$at_srcdir/ovsdb-idl.at:982: grep '\"monitor\\|monitor_cond\"' stderr | grep -c '\"link1\"'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:982"
 ( $at_check_trace; grep '"monitor\|monitor_cond"' stderr | grep -c '"link1"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383577,13 +384569,13 @@
 echo >>"$at_stdout"; $as_echo "1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:969"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:982"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:971: grep '\"monitor\\|monitor_cond\"' stderr | grep -c '\"ua\"'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:971"
+$as_echo "$at_srcdir/ovsdb-idl.at:984: grep '\"monitor\\|monitor_cond\"' stderr | grep -c '\"ua\"'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:984"
 ( $at_check_trace; grep '"monitor\|monitor_cond"' stderr | grep -c '"ua"'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383592,34 +384584,34 @@
 echo >>"$at_stdout"; $as_echo "1
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:971"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:984"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:973: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:973"
+$as_echo "$at_srcdir/ovsdb-idl.at:986: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:986"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:973"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:986"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:973: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:973"
+$as_echo "$at_srcdir/ovsdb-idl.at:986: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:986"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:973"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:986"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -383630,40 +384622,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:973" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:986" "while kill -0 \$TMPPID 2>/dev/null"
 
 ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2098
-#AT_START_2099
-at_fn_group_banner 2099 'ovsdb-idl.at:992' \
+#AT_STOP_2102
+#AT_START_2103
+at_fn_group_banner 2103 'ovsdb-idl.at:1005' \
   "simple idl, initially populated - Python3 - fetch" "" 101
 at_xfail=no
 (
-  $as_echo "2099. $at_setup_line: testing $at_desc ..."
+  $as_echo "2103. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:992: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:992"
+$as_echo "$at_srcdir/ovsdb-idl.at:1005: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1005"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:992"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1005"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:992: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1005: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -383680,7 +384672,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:992"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1005"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -383703,26 +384695,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:992"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1005"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:992: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:i,r! 'fetch 0 r'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:i,r! 'fetch 0 r'" "ovsdb-idl.at:992"
+$as_echo "$at_srcdir/ovsdb-idl.at:1005: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple:i,r! 'fetch 0 r'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:i,r! 'fetch 0 r'" "ovsdb-idl.at:1005"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple:i,r! 'fetch 0 r'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:992"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1005"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:992: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:992"
+$as_echo "$at_srcdir/ovsdb-idl.at:1005: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1005"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383736,34 +384728,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:992"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1005"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:992: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:992"
+$as_echo "$at_srcdir/ovsdb-idl.at:1005: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1005"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:992"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1005"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:992: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:992"
+$as_echo "$at_srcdir/ovsdb-idl.at:1005: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1005"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:992"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1005"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -383774,53 +384766,53 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:992" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1005" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2099
-#AT_START_2100
-at_fn_group_banner 2100 'ovsdb-idl.at:1036' \
+#AT_STOP_2103
+#AT_START_2104
+at_fn_group_banner 2104 'ovsdb-idl.at:1049' \
   "simple idl disable monitor-cond - Python3" "      " 101
 at_xfail=no
 (
-  $as_echo "2100. $at_setup_line: testing $at_desc ..."
+  $as_echo "2104. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1036: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1036"
+$as_echo "$at_srcdir/ovsdb-idl.at:1049: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1049"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1036"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1049"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1036: ovs-appctl -t ovsdb-server ovsdb-server/disable-monitor-cond"
-at_fn_check_prepare_trace "ovsdb-idl.at:1036"
+$as_echo "$at_srcdir/ovsdb-idl.at:1049: ovs-appctl -t ovsdb-server ovsdb-server/disable-monitor-cond"
+at_fn_check_prepare_trace "ovsdb-idl.at:1049"
 ( $at_check_trace; ovs-appctl -t ovsdb-server ovsdb-server/disable-monitor-cond
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1036"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1049"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1036: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1049: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -383869,7 +384861,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1036"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1049"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -383924,13 +384916,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1036"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1049"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1036: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1036"
+$as_echo "$at_srcdir/ovsdb-idl.at:1049: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1049"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -383963,34 +384955,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1036"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1049"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1036: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1036"
+$as_echo "$at_srcdir/ovsdb-idl.at:1049: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1049"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1036"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1049"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1036: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1036"
+$as_echo "$at_srcdir/ovsdb-idl.at:1049: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1049"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1036"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1049"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -384001,40 +384993,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1036" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1049" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2100
-#AT_START_2101
-at_fn_group_banner 2101 'ovsdb-idl.at:1129' \
+#AT_STOP_2104
+#AT_START_2105
+at_fn_group_banner 2105 'ovsdb-idl.at:1142' \
   "track, simple idl, initially populated - C" "     " 101
 at_xfail=no
 (
-  $as_echo "2101. $at_setup_line: testing $at_desc ..."
+  $as_echo "2105. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1129: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1129"
+$as_echo "$at_srcdir/ovsdb-idl.at:1142: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1142"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1129"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1142"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1129: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1142: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -384051,7 +385043,7 @@
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1129"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1142"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -384074,17 +385066,17 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1129"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1142"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1129: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1142: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket '[\"idltest\",
       {\"op\": \"update\",
        \"table\": \"simple\",
        \"where\": [],
        \"row\": {\"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1129"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1142"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket '["idltest",
       {"op": "update",
        "table": "simple",
@@ -384095,19 +385087,20 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1129"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1142"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1129: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1129"
+$as_echo "$at_srcdir/ovsdb-idl.at:1142: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1142"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo >>"$at_stdout"; $as_echo "000: i=1 r=2 b=true s=mystring u=<0> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<1> <2>] uuid=<3>
+000: inserted row: uuid=<3>
 000: updated columns: b ba i ia r ra s sa u ua
 001: {\"error\":null,\"result\":[{\"count\":2}]}
 002: i=0 r=0 b=true s= u=<4> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<5>
@@ -384116,34 +385109,34 @@
 003: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1129"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1142"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1129: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1129"
+$as_echo "$at_srcdir/ovsdb-idl.at:1142: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1142"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1129"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1142"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1129: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1129"
+$as_echo "$at_srcdir/ovsdb-idl.at:1142: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1142"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1129"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1142"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -384154,41 +385147,393 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1129" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1142" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2101
-#AT_START_2102
-at_fn_group_banner 2102 'ovsdb-idl.at:1161' \
+#AT_STOP_2105
+#AT_START_2106
+at_fn_group_banner 2106 'ovsdb-idl.at:1178' \
+  "track, simple idl, initially populated, orphan weak references - C" "" 101
+at_xfail=no
+(
+  $as_echo "2106. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1178: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1178"
+( $at_check_trace; ovsdb_start_idltest
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1178"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1178: ovsdb-client transact unix:socket '[\"idltest\",
+      {\"op\": \"insert\",
+       \"table\": \"simple\",
+       \"row\": {\"s\": \"row0_s\"},
+       \"uuid-name\": \"weak_row0\"},
+      {\"op\": \"insert\",
+       \"table\": \"simple\",
+       \"row\": {\"s\": \"row1_s\"},
+       \"uuid-name\": \"weak_row1\"},
+      {\"op\": \"insert\",
+       \"table\": \"simple\",
+       \"row\": {\"s\": \"row2_s\"},
+       \"uuid-name\": \"weak_row2\"},
+      {\"op\": \"insert\",
+       \"table\": \"simple6\",
+       \"row\": {\"name\": \"first_row\",
+               \"weak_ref\": [\"set\",
+                             [[\"named-uuid\", \"weak_row0\"],
+                              [\"named-uuid\", \"weak_row1\"],
+                              [\"named-uuid\", \"weak_row2\"]]
+                           ]}}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1178"
+( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row0_s"},
+       "uuid-name": "weak_row0"},
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row1_s"},
+       "uuid-name": "weak_row1"},
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row2_s"},
+       "uuid-name": "weak_row2"},
+      {"op": "insert",
+       "table": "simple6",
+       "row": {"name": "first_row",
+               "weak_ref": ["set",
+                             [["named-uuid", "weak_row0"],
+                              ["named-uuid", "weak_row1"],
+                              ["named-uuid", "weak_row2"]]
+                           ]}}]'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1178"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1178: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket 'condition simple []' \\
+    'condition simple [[\"s\",\"==\",\"row1_s\"]]' \\
+    '[\"idltest\",
+      {\"op\": \"update\",
+      \"table\": \"simple6\",
+      \"where\": [],
+      \"row\": {\"name\": \"new_name\"}}]' \\
+    '[\"idltest\",
+      {\"op\": \"delete\",
+      \"table\": \"simple6\",
+      \"where\": []}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1178"
+( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket 'condition simple []' \
+    'condition simple [["s","==","row1_s"]]' \
+    '["idltest",
+      {"op": "update",
+      "table": "simple6",
+      "where": [],
+      "row": {"name": "new_name"}}]' \
+    '["idltest",
+      {"op": "delete",
+      "table": "simple6",
+      "where": []}]'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1178"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1178: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1178"
+( $at_check_trace; sort stdout | uuidfilt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "000: change conditions
+001: inserted row: uuid=<0>
+001: name=first_row weak_ref=[] uuid=<0>
+001: updated columns: name weak_ref
+002: change conditions
+003: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+003: inserted row: uuid=<2>
+003: name=first_row weak_ref=[<2>] uuid=<0>
+003: updated columns: s
+004: {\"error\":null,\"result\":[{\"count\":1}]}
+005: name=new_name weak_ref=[<2>] uuid=<0>
+005: updated columns: name
+006: {\"error\":null,\"result\":[{\"count\":1}]}
+007: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+008: done
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1178"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1178: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1178"
+( $at_check_trace; test -e ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1178"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   TMPPID=$(cat ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1178: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1178"
+( $at_check_trace; ovs-appctl --target=ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1178"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1178" "while kill -0 \$TMPPID 2>/dev/null"
+
+   ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_2106
+#AT_START_2107
+at_fn_group_banner 2107 'ovsdb-idl.at:1231' \
+  "track, simple idl, initially populated, orphan rows, conditional - C" "" 101
+at_xfail=no
+(
+  $as_echo "2107. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1231: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1231"
+( $at_check_trace; ovsdb_start_idltest
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1231"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1231: ovsdb-client transact unix:socket '[\"idltest\",
+      {\"op\": \"insert\",
+       \"table\": \"simple\",
+       \"row\": {\"s\": \"row0_s\"},
+       \"uuid-name\": \"weak_row0\"},
+      {\"op\": \"insert\",
+       \"table\": \"simple\",
+       \"row\": {\"s\": \"row1_s\"},
+       \"uuid-name\": \"weak_row1\"},
+      {\"op\": \"insert\",
+       \"table\": \"simple6\",
+       \"row\": {\"name\": \"first_row\",
+               \"weak_ref\": [\"set\",
+                             [[\"named-uuid\", \"weak_row0\"]]
+                           ]}}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1231"
+( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row0_s"},
+       "uuid-name": "weak_row0"},
+      {"op": "insert",
+       "table": "simple",
+       "row": {"s": "row1_s"},
+       "uuid-name": "weak_row1"},
+      {"op": "insert",
+       "table": "simple6",
+       "row": {"name": "first_row",
+               "weak_ref": ["set",
+                             [["named-uuid", "weak_row0"]]
+                           ]}}]'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1231"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1231: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket 'condition simple []' \\
+    'condition simple [[\"s\",\"==\",\"row0_s\"]]' \\
+    'condition simple [[\"s\",\"==\",\"row1_s\"]]' \\
+    'condition simple [[\"s\",\"==\",\"row0_s\"]]' \\
+    '[\"idltest\",
+      {\"op\": \"delete\",
+      \"table\": \"simple6\",
+      \"where\": []}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1231"
+( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket 'condition simple []' \
+    'condition simple [["s","==","row0_s"]]' \
+    'condition simple [["s","==","row1_s"]]' \
+    'condition simple [["s","==","row0_s"]]' \
+    '["idltest",
+      {"op": "delete",
+      "table": "simple6",
+      "where": []}]'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1231"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1231: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1231"
+( $at_check_trace; sort stdout | uuidfilt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "000: change conditions
+001: inserted row: uuid=<0>
+001: name=first_row weak_ref=[] uuid=<0>
+001: updated columns: name weak_ref
+002: change conditions
+003: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+003: inserted row: uuid=<2>
+003: name=first_row weak_ref=[<2>] uuid=<0>
+003: updated columns: s
+004: change conditions
+005: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3>
+005: inserted row: uuid=<3>
+005: updated columns: s
+006: change conditions
+007: deleted row: uuid=<3>
+007: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+007: i=0 r=0 b=false s=row1_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<3>
+007: inserted row: uuid=<2>
+007: name=first_row weak_ref=[<2>] uuid=<0>
+007: updated columns: s
+008: {\"error\":null,\"result\":[{\"count\":1}]}
+009: i=0 r=0 b=false s=row0_s u=<1> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2>
+010: done
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1231"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1231: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1231"
+( $at_check_trace; test -e ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1231"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   TMPPID=$(cat ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1231: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1231"
+( $at_check_trace; ovs-appctl --target=ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1231"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1231" "while kill -0 \$TMPPID 2>/dev/null"
+
+   ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_2107
+#AT_START_2108
+at_fn_group_banner 2108 'ovsdb-idl.at:1280' \
   "track, simple idl, initially empty, various ops - C" "" 101
 at_xfail=no
 (
-  $as_echo "2102. $at_setup_line: testing $at_desc ..."
+  $as_echo "2108. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1161: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1161"
+$as_echo "$at_srcdir/ovsdb-idl.at:1280: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1280"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1161"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1280"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1161: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1280: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -384237,7 +385582,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1161"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1280"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl unix:socket '["idltest",
       {"op": "insert",
        "table": "simple",
@@ -384292,13 +385637,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1161"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1280"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1161: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1161"
+$as_echo "$at_srcdir/ovsdb-idl.at:1280: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1280"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -384307,6 +385652,7 @@
 echo >>"$at_stdout"; $as_echo "000: empty
 001: {\"error\":null,\"result\":[{\"uuid\":[\"uuid\",\"<0>\"]},{\"uuid\":[\"uuid\",\"<1>\"]}]}
 002: i=1 r=2 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0>
+002: inserted row: uuid=<0>
 002: updated columns: b ba i ia r ra s sa u ua
 003: {\"error\":null,\"result\":[{\"count\":2}]}
 004: i=0 r=0 b=true s= u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1>
@@ -384318,6 +385664,7 @@
 006: updated columns: r
 007: {\"error\":null,\"result\":[{\"uuid\":[\"uuid\",\"<6>\"]}]}
 008: i=-1 r=125 b=false s= u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6>
+008: inserted row: uuid=<6>
 008: updated columns: ba i ia r ra
 009: {\"error\":null,\"result\":[{\"count\":2}]}
 010: i=-1 r=125 b=false s=newstring u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6>
@@ -384325,7 +385672,8 @@
 010: updated columns: s
 010: updated columns: s
 011: {\"error\":null,\"result\":[{\"count\":1}]}
-012: ##deleted## uuid=<1>
+012: deleted row: uuid=<1>
+012: i=0 r=123.5 b=true s=newstring u=<5> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<1>
 013: reconnect
 014: i=-1 r=125 b=false s=newstring u=<5> ia=[1] ra=[1.5] ba=[false] sa=[] ua=[] uuid=<6>
 014: i=1 r=123.5 b=true s=mystring u=<2> ia=[1 2 3] ra=[-0.5] ba=[true] sa=[abc def] ua=[<3> <4>] uuid=<0>
@@ -384334,34 +385682,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1161"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1280"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1161: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1161"
+$as_echo "$at_srcdir/ovsdb-idl.at:1280: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1280"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1161"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1280"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1161: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1161"
+$as_echo "$at_srcdir/ovsdb-idl.at:1280: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1280"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1161"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1280"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -384372,43 +385720,43 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1161" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1280" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2102
-#AT_START_2103
-at_fn_group_banner 2103 'ovsdb-idl.at:1255' \
+#AT_STOP_2108
+#AT_START_2109
+at_fn_group_banner 2109 'ovsdb-idl.at:1377' \
   "map, simple2 idl-partial-update-map-column, initially populated - C" "" 101
 at_xfail=no
 (
-  $as_echo "2103. $at_setup_line: testing $at_desc ..."
+  $as_echo "2109. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1255: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1255"
+$as_echo "$at_srcdir/ovsdb-idl.at:1377: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1377"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1255"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1255: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple2\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1377: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple2\",
                 \"row\":{\"name\":\"myString1\",\"smap\":[\"map\",[[\"key1\",\"value1\"],[\"key2\",\"value2\"]]]} }]'
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1255"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1377"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest", {"op":"insert", "table":"simple2",
                 "row":{"name":"myString1","smap":["map",[["key1","value1"],["key2","value2"]]]} }]'
 
@@ -384417,26 +385765,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1255"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1255: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-partial-update-map-column unix:socket "
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1255"
+$as_echo "$at_srcdir/ovsdb-idl.at:1377: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-partial-update-map-column unix:socket "
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1377"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-partial-update-map-column unix:socket
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1255"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1255: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1255"
+$as_echo "$at_srcdir/ovsdb-idl.at:1377: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1377"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -384455,34 +385803,34 @@
 010: End test
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1255"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1255: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1255"
+$as_echo "$at_srcdir/ovsdb-idl.at:1377: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1377"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1255"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1255: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1255"
+$as_echo "$at_srcdir/ovsdb-idl.at:1377: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1377"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1255"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1377"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -384493,43 +385841,43 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1255" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1377" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2103
-#AT_START_2104
-at_fn_group_banner 2104 'ovsdb-idl.at:1273' \
+#AT_STOP_2109
+#AT_START_2110
+at_fn_group_banner 2110 'ovsdb-idl.at:1395' \
   "partial-map idl - Python3" "                      " 101
 at_xfail=no
 (
-  $as_echo "2104. $at_setup_line: testing $at_desc ..."
+  $as_echo "2110. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1273: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1273"
+$as_echo "$at_srcdir/ovsdb-idl.at:1395: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1395"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1273"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1395"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1273: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple2\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1395: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple2\",
                 \"row\":{\"name\":\"myString1\",\"smap\":[\"map\",[[\"key1\",\"value1\"],[\"key2\",\"value2\"]]]} }]'
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1273"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1395"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest", {"op":"insert", "table":"simple2",
                 "row":{"name":"myString1","smap":["map",[["key1","value1"],["key2","value2"]]]} }]'
 
@@ -384538,26 +385886,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1273"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1395"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1273: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple2:name,smap,imap 'partialmapinsertelement' 'partialmapinsertmultipleelements' 'partialmapdelelements' 'partialmapmutatenew'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple2:name,smap,imap 'partialmapinsertelement' 'partialmapinsertmultipleelements' 'partialmapdelelements' 'partialmapmutatenew'" "ovsdb-idl.at:1273"
+$as_echo "$at_srcdir/ovsdb-idl.at:1395: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket ?simple2:name,smap,imap 'partialmapinsertelement' 'partialmapinsertmultipleelements' 'partialmapdelelements' 'partialmapmutatenew'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple2:name,smap,imap 'partialmapinsertelement' 'partialmapinsertmultipleelements' 'partialmapdelelements' 'partialmapmutatenew'" "ovsdb-idl.at:1395"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket ?simple2:name,smap,imap 'partialmapinsertelement' 'partialmapinsertmultipleelements' 'partialmapdelelements' 'partialmapmutatenew'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1273"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1395"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1273: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1273"
+$as_echo "$at_srcdir/ovsdb-idl.at:1395: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1395"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -384576,34 +385924,34 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1273"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1395"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1273: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1273"
+$as_echo "$at_srcdir/ovsdb-idl.at:1395: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1395"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1273"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1395"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1273: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1273"
+$as_echo "$at_srcdir/ovsdb-idl.at:1395: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1395"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1273"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1395"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -384614,43 +385962,157 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1273" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1395" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2104
-#AT_START_2105
-at_fn_group_banner 2105 'ovsdb-idl.at:1304' \
+#AT_STOP_2110
+#AT_START_2111
+at_fn_group_banner 2111 'ovsdb-idl.at:1413' \
+  "partial-map update set refmap idl - Python3" "    " 101
+at_xfail=no
+(
+  $as_echo "2111. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1413: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1413"
+( $at_check_trace; ovsdb_start_idltest
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1413"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1413: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple3\", \"row\":{\"name\":\"myString1\"}},
+               {\"op\":\"insert\", \"table\":\"simple5\", \"row\":{\"name\":\"myString2\"}}]'"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1413"
+( $at_check_trace; ovsdb-client transact unix:socket '["idltest", {"op":"insert", "table":"simple3", "row":{"name":"myString1"}},
+               {"op":"insert", "table":"simple5", "row":{"name":"myString2"}}]'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1413"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1413: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'partialmapmutateirefmap'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'partialmapmutateirefmap'" "ovsdb-idl.at:1413"
+( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'partialmapmutateirefmap'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; tee stdout <"$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1413"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1413: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1413"
+( $at_check_trace; sort stdout | uuidfilt
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo >>"$at_stdout"; $as_echo "000: name=myString1 uset=[]
+000: name=myString2 irefmap=[]
+001: commit, status=success
+002: name=myString1 uset=[]
+002: name=myString2 irefmap=[(1 <0>)]
+003: done
+" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1413"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1413: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1413"
+( $at_check_trace; test -e ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1413"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   TMPPID=$(cat ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1413: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1413"
+( $at_check_trace; ovs-appctl --target=ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1413"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1413" "while kill -0 \$TMPPID 2>/dev/null"
+
+   ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_2111
+#AT_START_2112
+at_fn_group_banner 2112 'ovsdb-idl.at:1438' \
   "set, simple3 idl-partial-update-set-column, initially populated - C" "" 101
 at_xfail=no
 (
-  $as_echo "2105. $at_setup_line: testing $at_desc ..."
+  $as_echo "2112. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1304: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1304"
+$as_echo "$at_srcdir/ovsdb-idl.at:1438: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1438"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1438"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1304: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple3\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1438: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple3\",
                 \"row\":{\"name\":\"mySet1\",\"uset\":[\"set\", [[ \"uuid\", \"0005b872-f9e5-43be-ae02-3184b9680e75\" ], [ \"uuid\", \"000d2f6a-76af-412f-b59d-e7bcd3e84eff\" ]]]} }]'
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1304"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1438"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest", {"op":"insert", "table":"simple3",
                 "row":{"name":"mySet1","uset":["set", [[ "uuid", "0005b872-f9e5-43be-ae02-3184b9680e75" ], [ "uuid", "000d2f6a-76af-412f-b59d-e7bcd3e84eff" ]]]} }]'
 
@@ -384659,26 +386121,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1438"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1304: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-partial-update-set-column unix:socket "
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1304"
+$as_echo "$at_srcdir/ovsdb-idl.at:1438: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-partial-update-set-column unix:socket "
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1438"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-partial-update-set-column unix:socket
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1438"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1304: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1304"
+$as_echo "$at_srcdir/ovsdb-idl.at:1438: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1438"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -384699,34 +386161,34 @@
 012: End test
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1438"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1304: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1304"
+$as_echo "$at_srcdir/ovsdb-idl.at:1438: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1438"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1438"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1304: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1304"
+$as_echo "$at_srcdir/ovsdb-idl.at:1438: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1438"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1304"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1438"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -384737,46 +386199,46 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1304" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1438" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2105
-#AT_START_2106
-at_fn_group_banner 2106 'ovsdb-idl.at:1324' \
+#AT_STOP_2112
+#AT_START_2113
+at_fn_group_banner 2113 'ovsdb-idl.at:1458' \
   "partial-set idl - Python3" "                      " 101
 at_xfail=no
 (
-  $as_echo "2106. $at_setup_line: testing $at_desc ..."
+  $as_echo "2113. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1324: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1324"
+$as_echo "$at_srcdir/ovsdb-idl.at:1458: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1458"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1324"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1458"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1324: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple3\", \"uuid-name\":\"newrow\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1458: ovsdb-client transact unix:socket '[\"idltest\", {\"op\":\"insert\", \"table\":\"simple3\", \"uuid-name\":\"newrow\",
                     \"row\":{\"name\":\"mySet1\",\"uset\":[\"set\", [[ \"uuid\", \"0005b872-f9e5-43be-ae02-3184b9680e75\" ]]]} },
                {\"op\":\"insert\", \"table\":\"simple4\", \"row\":{\"name\":\"seed\"}},
                {\"op\":\"mutate\", \"table\":\"simple3\", \"where\":[[\"_uuid\", \"==\", [\"named-uuid\", \"newrow\"]]],
                     \"mutations\": [[\"uset\", \"insert\", [\"set\", [[\"uuid\", \"000d2f6a-76af-412f-b59d-e7bcd3e84eff\"]]]]]}]'
 "
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1324"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1458"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest", {"op":"insert", "table":"simple3", "uuid-name":"newrow",
                     "row":{"name":"mySet1","uset":["set", [[ "uuid", "0005b872-f9e5-43be-ae02-3184b9680e75" ]]]} },
                {"op":"insert", "table":"simple4", "row":{"name":"seed"}},
@@ -384788,26 +386250,26 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1324"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1458"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1324: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'partialrenamesetadd' 'partialduplicateadd' 'partialsetdel' 'partialsetref' 'partialsetoverrideops' 'partialsetadddelete' 'partialsetmutatenew'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'partialrenamesetadd' 'partialduplicateadd' 'partialsetdel' 'partialsetref' 'partialsetoverrideops' 'partialsetadddelete' 'partialsetmutatenew'" "ovsdb-idl.at:1324"
+$as_echo "$at_srcdir/ovsdb-idl.at:1458: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'partialrenamesetadd' 'partialduplicateadd' 'partialsetdel' 'partialsetref' 'partialsetoverrideops' 'partialsetadddelete' 'partialsetmutatenew'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'partialrenamesetadd' 'partialduplicateadd' 'partialsetdel' 'partialsetref' 'partialsetoverrideops' 'partialsetadddelete' 'partialsetmutatenew'" "ovsdb-idl.at:1458"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'partialrenamesetadd' 'partialduplicateadd' 'partialsetdel' 'partialsetref' 'partialsetoverrideops' 'partialsetadddelete' 'partialsetmutatenew'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1324"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1458"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1324: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1324"
+$as_echo "$at_srcdir/ovsdb-idl.at:1458: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1458"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -384832,34 +386294,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1324"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1458"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1324: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1324"
+$as_echo "$at_srcdir/ovsdb-idl.at:1458: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1458"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1324"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1458"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1324: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1324"
+$as_echo "$at_srcdir/ovsdb-idl.at:1458: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1458"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1324"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1458"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -384870,41 +386332,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1324" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1458" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2106
-#AT_START_2107
-at_fn_group_banner 2107 'ovsdb-idl.at:1355' \
+#AT_STOP_2113
+#AT_START_2114
+at_fn_group_banner 2114 'ovsdb-idl.at:1489' \
   "simple idl verify notify - Python3" "             " 101
 at_xfail=no
 (
-  $as_echo "2107. $at_setup_line: testing $at_desc ..."
+  $as_echo "2114. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1355"
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1489"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'track-notify' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema unix:socket 'track-notify' \\
     '[\"idltest\",
       {\"op\": \"insert\",
        \"table\": \"simple\",
@@ -384954,7 +386416,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1355"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1489"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema unix:socket 'track-notify' \
     '["idltest",
       {"op": "insert",
@@ -385010,13 +386472,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1355"
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1489"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385064,34 +386526,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1355"
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1489"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1355"
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1489"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -385102,55 +386564,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1355" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1489" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2107
-#AT_START_2108
-at_fn_group_banner 2108 'ovsdb-idl.at:1355' \
+#AT_STOP_2114
+#AT_START_2115
+at_fn_group_banner 2115 'ovsdb-idl.at:1489' \
   "simple idl verify notify - Python3 - SSL" "       " 101
 at_xfail=no
 (
-  $as_echo "2108. $at_setup_line: testing $at_desc ..."
+  $as_echo "2115. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:1355" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:1489" >"$at_check_line_file"
 (test "$HAVE_OPENSSL" = no) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1355"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1489"
    $PYTHON3 -c "import OpenSSL.SSL"
    SSL_PRESENT=$?
-   $as_echo "ovsdb-idl.at:1355" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:1489" >"$at_check_line_file"
 (test $SSL_PRESENT != 0) \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1355"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1489"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
-at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:1355"
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: ovsdb-tool create db \$abs_srcdir/idltest.ovsschema"
+at_fn_check_prepare_dynamic "ovsdb-tool create db $abs_srcdir/idltest.ovsschema" "ovsdb-idl.at:1489"
 ( $at_check_trace; ovsdb-tool create db $abs_srcdir/idltest.ovsschema
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    PKIDIR=$abs_top_builddir/tests
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: ovsdb-server -vconsole:warn --log-file --detach --no-chdir \\
              --pidfile \\
              --private-key=\$PKIDIR/testpki-privkey2.pem \\
              --certificate=\$PKIDIR/testpki-cert2.pem \\
              --ca-cert=\$PKIDIR/testpki-cacert.pem \\
              --remote=pssl:0:127.0.0.1 db"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1355"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1489"
 ( $at_check_trace; ovsdb-server -vconsole:warn --log-file --detach --no-chdir \
              --pidfile \
              --private-key=$PKIDIR/testpki-privkey2.pem \
@@ -385162,7 +386624,7 @@
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -385174,11 +386636,11 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1355" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:1489" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: \$PYTHON3 \$srcdir/test-ovsdb.py  -t10 idl \$srcdir/idltest.ovsschema \\
              ssl:127.0.0.1:\$TCP_PORT \$PKIDIR/testpki-privkey.pem \\
              \$PKIDIR/testpki-cert.pem \$PKIDIR/testpki-cacert.pem 'track-notify' \\
     '[\"idltest\",
@@ -385230,7 +386692,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 0]]}]' \\
     'reconnect'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1355"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1489"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t10 idl $srcdir/idltest.ovsschema \
              ssl:127.0.0.1:$TCP_PORT $PKIDIR/testpki-privkey.pem \
              $PKIDIR/testpki-cert.pem $PKIDIR/testpki-cacert.pem 'track-notify' \
@@ -385288,13 +386750,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1355"
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1489"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385342,34 +386804,34 @@
 015: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1355"
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1489"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1355: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1355"
+$as_echo "$at_srcdir/ovsdb-idl.at:1489: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1489"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1355"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1489"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -385380,40 +386842,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1355" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1489" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2108
-#AT_START_2109
-at_fn_group_banner 2109 'ovsdb-idl.at:1482' \
+#AT_STOP_2115
+#AT_START_2116
+at_fn_group_banner 2116 'ovsdb-idl.at:1616' \
   "Compound_index, single column test  - C" "        " 101
 at_xfail=no
 (
-  $as_echo "2109. $at_setup_line: testing $at_desc ..."
+  $as_echo "2116. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1482"
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1616"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List000\", \"i\": 1, \"b\":true, \"r\":101.0}},
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List000\", \"i\": 2, \"b\":false, \"r\":102.0}},
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List000\", \"i\": 10, \"b\":true, \"r\":110.0}},
@@ -385425,7 +386887,7 @@
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List020\", \"i\": 20, \"b\":true, \"r\":220.0}},
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List020\", \"i\": 19, \"b\":true, \"r\":219.0}}
       ]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1482"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1616"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert", "table": "simple", "row": {"s":"List000", "i": 1, "b":true, "r":101.0}},
       {"op": "insert", "table": "simple", "row": {"s":"List000", "i": 2, "b":false, "r":102.0}},
@@ -385443,29 +386905,29 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Generate the data to be tested.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index unix:socket idl_compound_index_single_column"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1482"
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index unix:socket idl_compound_index_single_column"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1616"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index unix:socket idl_compound_index_single_column
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Filter the rows of data that corresponds to the string index eliminating the extra columns of data.
 # This is done to verifiy that the output data is in the correct and expected order.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: cat stdout | grep -oh '[0-9]\\{3\\}: s=.*' | sed -e 's/ i=.*//g'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1482"
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: cat stdout | grep -oh '[0-9]\\{3\\}: s=.*' | sed -e 's/ i=.*//g'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1616"
 ( $at_check_trace; cat stdout | grep -oh '[0-9]\{3\}: s=.*' | sed -e 's/ i=.*//g'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385487,15 +386949,15 @@
 003: s=List001
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Here, the data is filtered and sorted in order to have all the rows in the index and be
 # able to determined that all the involved rows are present.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: cat stdout | grep -oh '[0-9]\\{3\\}: s=.*' | sort -k 1,1n -k 2,2 -k 3,3"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1482"
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: cat stdout | grep -oh '[0-9]\\{3\\}: s=.*' | sort -k 1,1n -k 2,2 -k 3,3"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1616"
 ( $at_check_trace; cat stdout | grep -oh '[0-9]\{3\}: s=.*' | sort -k 1,1n -k 2,2 -k 3,3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385517,15 +386979,15 @@
 003: s=List001 i=4 b=True r=130.000000
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Filter the rows of data that corresponds to the integer index eliminating the extra columns of data.
 # This is done to verifiy that the output data is in the correct and expected order.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: cat stdout | grep -oh '[0-9]\\{3\\}: i=.*' | sed -e 's/ s=.*//g'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1482"
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: cat stdout | grep -oh '[0-9]\\{3\\}: i=.*' | sed -e 's/ s=.*//g'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1616"
 ( $at_check_trace; cat stdout | grep -oh '[0-9]\{3\}: i=.*' | sed -e 's/ s=.*//g'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385566,15 +387028,15 @@
 008: i=54
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Here again, the data is filtered and sorted in order to have all the rows in the index and be
 # able to determined that all the involved rows are present.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: cat stdout | grep -oh '[0-9]\\{3\\}: i=.*' | sort -k 1,1n -k 2,2 -k 3,3"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1482"
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: cat stdout | grep -oh '[0-9]\\{3\\}: i=.*' | sort -k 1,1n -k 2,2 -k 3,3"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1616"
 ( $at_check_trace; cat stdout | grep -oh '[0-9]\{3\}: i=.*' | sort -k 1,1n -k 2,2 -k 3,3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385615,34 +387077,34 @@
 008: i=54 s=Lista054 b=False r=0.000000
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1482"
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1616"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1482: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1482"
+$as_echo "$at_srcdir/ovsdb-idl.at:1616: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1616"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1482"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1616"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -385653,40 +387115,40 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1482" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1616" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2109
-#AT_START_2110
-at_fn_group_banner 2110 'ovsdb-idl.at:1629' \
+#AT_STOP_2116
+#AT_START_2117
+at_fn_group_banner 2117 'ovsdb-idl.at:1763' \
   "Compound_index, double column test  - C" "        " 101
 at_xfail=no
 (
-  $as_echo "2110. $at_setup_line: testing $at_desc ..."
+  $as_echo "2117. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1629"
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1763"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: ovsdb-client transact unix:socket '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: ovsdb-client transact unix:socket '[\"idltest\",
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List000\", \"i\": 1, \"b\":true, \"r\":101.0}},
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List000\", \"i\": 2, \"b\":false, \"r\":102.0}},
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List000\", \"i\": 10, \"b\":true, \"r\":110.0}},
@@ -385698,7 +387160,7 @@
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List020\", \"i\": 20, \"b\":true, \"r\":220.0}},
       {\"op\": \"insert\", \"table\": \"simple\", \"row\": {\"s\":\"List020\", \"i\": 19, \"b\":true, \"r\":219.0}}
       ]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1629"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1763"
 ( $at_check_trace; ovsdb-client transact unix:socket '["idltest",
       {"op": "insert", "table": "simple", "row": {"s":"List000", "i": 1, "b":true, "r":101.0}},
       {"op": "insert", "table": "simple", "row": {"s":"List000", "i": 2, "b":false, "r":102.0}},
@@ -385716,29 +387178,29 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Generate the data to be tested.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index unix:socket idl_compound_index_double_column"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1629"
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index unix:socket idl_compound_index_double_column"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1763"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index unix:socket idl_compound_index_double_column
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Filter the rows of data that corresponds to the string-integer index eliminating the extra columns of data.
 # This is done to verifiy that the output data is in the correct and expected order.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: cat stdout | grep -oh '[0-9]\\{3\\}: s=.*' | sed -e 's/ b=.*//g'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1629"
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: cat stdout | grep -oh '[0-9]\\{3\\}: s=.*' | sed -e 's/ b=.*//g'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1763"
 ( $at_check_trace; cat stdout | grep -oh '[0-9]\{3\}: s=.*' | sed -e 's/ b=.*//g'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385772,15 +387234,15 @@
 004: s=List005 i=5
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Here, the data is filtered and sorted in order to have all the rows in the index and be
 # able to determined that all the involved rows are present.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: cat stdout | grep -oh '[0-9]\\{3\\}: s=.*' | sort -k 1,1n -k 2,2 -k 3,3"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1629"
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: cat stdout | grep -oh '[0-9]\\{3\\}: s=.*' | sort -k 1,1n -k 2,2 -k 3,3"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1763"
 ( $at_check_trace; cat stdout | grep -oh '[0-9]\{3\}: s=.*' | sort -k 1,1n -k 2,2 -k 3,3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385814,15 +387276,15 @@
 004: s=List005 i=5 b=True r=130.000000
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Filter the rows of data that corresponds to the integer index eliminating the extra columns of data.
 # This is done to verifiy that the output data is in the correct and expected order.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: cat stdout | grep -oh '[0-9]\\{3\\}: i=.*' | sed -e 's/ b=.*//g'"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1629"
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: cat stdout | grep -oh '[0-9]\\{3\\}: i=.*' | sed -e 's/ b=.*//g'"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1763"
 ( $at_check_trace; cat stdout | grep -oh '[0-9]\{3\}: i=.*' | sed -e 's/ b=.*//g'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385850,15 +387312,15 @@
 006: i=1 s=List001
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 # Here again, the data is filtered and sorted in order to have all the rows in the index and be
 # able to determined that all the involved rows are present.
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: cat stdout | grep -oh '[0-9]\\{3\\}: i=.*' | sort -k 1,1n -k 2,2 -k 3,3"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1629"
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: cat stdout | grep -oh '[0-9]\\{3\\}: i=.*' | sort -k 1,1n -k 2,2 -k 3,3"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1763"
 ( $at_check_trace; cat stdout | grep -oh '[0-9]\{3\}: i=.*' | sort -k 1,1n -k 2,2 -k 3,3
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385886,34 +387348,34 @@
 006: i=5 s=List005 b=True r=130.000000
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1629"
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1763"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1629: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1629"
+$as_echo "$at_srcdir/ovsdb-idl.at:1763: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1763"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1629"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1763"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -385924,55 +387386,55 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1629" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1763" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2110
-#AT_START_2111
-at_fn_group_banner 2111 'ovsdb-idl.at:1753' \
+#AT_STOP_2117
+#AT_START_2118
+at_fn_group_banner 2118 'ovsdb-idl.at:1887' \
   "set, simple3 idl-compound-index-with-ref, initially populated - C" "" 101
 at_xfail=no
 (
-  $as_echo "2111. $at_setup_line: testing $at_desc ..."
+  $as_echo "2118. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1753: ovsdb_start_idltest"
-at_fn_check_prepare_trace "ovsdb-idl.at:1753"
+$as_echo "$at_srcdir/ovsdb-idl.at:1887: ovsdb_start_idltest"
+at_fn_check_prepare_trace "ovsdb-idl.at:1887"
 ( $at_check_trace; ovsdb_start_idltest
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1753"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1753: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index-with-ref unix:socket "
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1753"
+$as_echo "$at_srcdir/ovsdb-idl.at:1887: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index-with-ref unix:socket "
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1887"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 -c idl-compound-index-with-ref unix:socket
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1753"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1753: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1753"
+$as_echo "$at_srcdir/ovsdb-idl.at:1887: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1887"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -385988,34 +387450,34 @@
 008: End test
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1753"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1753: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1753"
+$as_echo "$at_srcdir/ovsdb-idl.at:1887: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1887"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1753"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1753: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1753"
+$as_echo "$at_srcdir/ovsdb-idl.at:1887: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1887"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1753"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1887"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386026,41 +387488,41 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1753" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1887" "while kill -0 \$TMPPID 2>/dev/null"
 
    ovs_cleanup
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2111
-#AT_START_2112
-at_fn_group_banner 2112 'ovsdb-idl.at:1780' \
-  "Check Stream open block - C - tcp" "              " 101
+#AT_STOP_2118
+#AT_START_2119
+at_fn_group_banner 2119 'ovsdb-idl.at:1914' \
+  "Check stream open block - C - tcp" "              " 101
 at_xfail=no
 (
-  $as_echo "2112. $at_setup_line: testing $at_desc ..."
+  $as_echo "2119. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:1780" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:1914" >"$at_check_line_file"
 (test "tcp" = "tcp6" && test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1780"
-   $as_echo "ovsdb-idl.at:1780" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1914"
+   $as_echo "ovsdb-idl.at:1914" >"$at_check_line_file"
 (test "tcp" = "tcp6" && test "$HAVE_IPV6" = "no") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1780"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1914"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1780: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
-at_fn_check_prepare_trace "ovsdb-idl.at:1780"
+$as_echo "$at_srcdir/ovsdb-idl.at:1914: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:1914"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1780"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1914"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386071,59 +387533,59 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1780" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:1914" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT=$(($TCP_PORT + 101))
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1780: test-stream tcp:127.0.0.1:\$TCP_PORT"
-at_fn_check_prepare_dynamic "test-stream tcp:127.0.0.1:$TCP_PORT" "ovsdb-idl.at:1780"
+$as_echo "$at_srcdir/ovsdb-idl.at:1914: test-stream tcp:127.0.0.1:\$TCP_PORT"
+at_fn_check_prepare_dynamic "test-stream tcp:127.0.0.1:$TCP_PORT" "ovsdb-idl.at:1914"
 ( $at_check_trace; test-stream tcp:127.0.0.1:$TCP_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1780"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1914"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1780: test-stream tcp:127.0.0.1:\$WRONG_PORT"
-at_fn_check_prepare_dynamic "test-stream tcp:127.0.0.1:$WRONG_PORT" "ovsdb-idl.at:1780"
+$as_echo "$at_srcdir/ovsdb-idl.at:1914: test-stream tcp:127.0.0.1:\$WRONG_PORT"
+at_fn_check_prepare_dynamic "test-stream tcp:127.0.0.1:$WRONG_PORT" "ovsdb-idl.at:1914"
 ( $at_check_trace; test-stream tcp:127.0.0.1:$WRONG_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1780"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1914"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1780: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1780"
+$as_echo "$at_srcdir/ovsdb-idl.at:1914: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1914"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1780"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1914"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1780: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1780"
+$as_echo "$at_srcdir/ovsdb-idl.at:1914: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1914"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1780"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1914"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386134,18 +387596,18 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1780" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1914" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1780: test-stream tcp:127.0.0.1:\$TCP_PORT"
-at_fn_check_prepare_dynamic "test-stream tcp:127.0.0.1:$TCP_PORT" "ovsdb-idl.at:1780"
+$as_echo "$at_srcdir/ovsdb-idl.at:1914: test-stream tcp:127.0.0.1:\$TCP_PORT"
+at_fn_check_prepare_dynamic "test-stream tcp:127.0.0.1:$TCP_PORT" "ovsdb-idl.at:1914"
 ( $at_check_trace; test-stream tcp:127.0.0.1:$TCP_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1780"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1914"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386154,34 +387616,276 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2112
-#AT_START_2113
-at_fn_group_banner 2113 'ovsdb-idl.at:1781' \
-  "Check Stream open block - C - tcp6" "             " 101
+#AT_STOP_2119
+#AT_START_2120
+at_fn_group_banner 2120 'ovsdb-idl.at:1915' \
+  "Check stream open block - C - tcp6" "             " 101
+at_xfail=no
+(
+  $as_echo "2120. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+   $as_echo "ovsdb-idl.at:1915" >"$at_check_line_file"
+(test "tcp6" = "tcp6" && test "$IS_WIN32" = "yes") \
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1915"
+   $as_echo "ovsdb-idl.at:1915" >"$at_check_line_file"
+(test "tcp6" = "tcp6" && test "$HAVE_IPV6" = "no") \
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1915"
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1915: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:1915"
+( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1915"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_wait_cond () {
+    TCP_PORT=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "ovsdb-server.log"` && test X != X"$TCP_PORT"
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1915" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+
+   WRONG_PORT=$(($TCP_PORT + 101))
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1915: test-stream tcp:[::1]:\$TCP_PORT"
+at_fn_check_prepare_dynamic "test-stream tcp:[::1]:$TCP_PORT" "ovsdb-idl.at:1915"
+( $at_check_trace; test-stream tcp:[::1]:$TCP_PORT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1915"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1915: test-stream tcp:[::1]:\$WRONG_PORT"
+at_fn_check_prepare_dynamic "test-stream tcp:[::1]:$WRONG_PORT" "ovsdb-idl.at:1915"
+( $at_check_trace; test-stream tcp:[::1]:$WRONG_PORT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1915"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1915: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1915"
+( $at_check_trace; test -e ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1915"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   TMPPID=$(cat ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1915: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1915"
+( $at_check_trace; ovs-appctl --target=ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1915"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1915" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1915: test-stream tcp:[::1]:\$TCP_PORT"
+at_fn_check_prepare_dynamic "test-stream tcp:[::1]:$TCP_PORT" "ovsdb-idl.at:1915"
+( $at_check_trace; test-stream tcp:[::1]:$TCP_PORT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1915"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_2120
+#AT_START_2121
+at_fn_group_banner 2121 'ovsdb-idl.at:1916' \
+  "Check stream open block - Python3 - tcp" "        " 101
+at_xfail=no
+(
+  $as_echo "2121. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+ovs_init
+
+   $as_echo "ovsdb-idl.at:1916" >"$at_check_line_file"
+(test "tcp" = "tcp6" && test "$IS_WIN32" = "yes") \
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1916"
+   $as_echo "ovsdb-idl.at:1916" >"$at_check_line_file"
+(test "tcp" = "tcp6" && test "$HAVE_IPV6" = "no") \
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1916"
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1916: ovsdb_start_idltest \"ptcp:0:127.0.0.1\""
+at_fn_check_prepare_trace "ovsdb-idl.at:1916"
+( $at_check_trace; ovsdb_start_idltest "ptcp:0:127.0.0.1"
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1916"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_wait_cond () {
+    TCP_PORT=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "ovsdb-server.log"` && test X != X"$TCP_PORT"
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1916" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+
+   WRONG_PORT=$(($TCP_PORT + 101))
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1916: \$PYTHON3 \$srcdir/test-stream.py tcp:127.0.0.1:\$TCP_PORT"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-stream.py tcp:127.0.0.1:$TCP_PORT" "ovsdb-idl.at:1916"
+( $at_check_trace; $PYTHON3 $srcdir/test-stream.py tcp:127.0.0.1:$TCP_PORT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1916"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1916: \$PYTHON3 \$srcdir/test-stream.py tcp:127.0.0.1:\$WRONG_PORT"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-stream.py tcp:127.0.0.1:$WRONG_PORT" "ovsdb-idl.at:1916"
+( $at_check_trace; $PYTHON3 $srcdir/test-stream.py tcp:127.0.0.1:$WRONG_PORT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1916"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1916: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1916"
+( $at_check_trace; test -e ovsdb-server.pid
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1916"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   TMPPID=$(cat ovsdb-server.pid)
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1916: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1916"
+( $at_check_trace; ovs-appctl --target=ovsdb-server exit
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1916"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_wait_cond () {
+    if kill -0 $TMPPID 2>/dev/null; then return 1; else return 0; fi
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1916" "while kill -0 \$TMPPID 2>/dev/null"
+
+   { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1916: \$PYTHON3 \$srcdir/test-stream.py tcp:127.0.0.1:\$TCP_PORT"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-stream.py tcp:127.0.0.1:$TCP_PORT" "ovsdb-idl.at:1916"
+( $at_check_trace; $PYTHON3 $srcdir/test-stream.py tcp:127.0.0.1:$TCP_PORT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1916"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   ovs_cleanup
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_2121
+#AT_START_2122
+at_fn_group_banner 2122 'ovsdb-idl.at:1918' \
+  "Check stream open block - Python3 - tcp6" "       " 101
 at_xfail=no
 (
-  $as_echo "2113. $at_setup_line: testing $at_desc ..."
+  $as_echo "2122. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
-   $as_echo "ovsdb-idl.at:1781" >"$at_check_line_file"
+   $as_echo "ovsdb-idl.at:1918" >"$at_check_line_file"
 (test "tcp6" = "tcp6" && test "$IS_WIN32" = "yes") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1781"
-   $as_echo "ovsdb-idl.at:1781" >"$at_check_line_file"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1918"
+   $as_echo "ovsdb-idl.at:1918" >"$at_check_line_file"
 (test "tcp6" = "tcp6" && test "$HAVE_IPV6" = "no") \
-  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1781"
+  && at_fn_check_skip 77 "$at_srcdir/ovsdb-idl.at:1918"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1781: ovsdb_start_idltest \"ptcp:0:[::1]\""
-at_fn_check_prepare_trace "ovsdb-idl.at:1781"
+$as_echo "$at_srcdir/ovsdb-idl.at:1918: ovsdb_start_idltest \"ptcp:0:[::1]\""
+at_fn_check_prepare_trace "ovsdb-idl.at:1918"
 ( $at_check_trace; ovsdb_start_idltest "ptcp:0:[::1]"
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1781"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1918"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386192,59 +387896,59 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1781" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
+ovs_wait "ovsdb-idl.at:1918" "until TCP_PORT=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"ovsdb-server.log\"\` && test X != X\"\$TCP_PORT\""
 
    WRONG_PORT=$(($TCP_PORT + 101))
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1781: test-stream tcp:[::1]:\$TCP_PORT"
-at_fn_check_prepare_dynamic "test-stream tcp:[::1]:$TCP_PORT" "ovsdb-idl.at:1781"
-( $at_check_trace; test-stream tcp:[::1]:$TCP_PORT
+$as_echo "$at_srcdir/ovsdb-idl.at:1918: \$PYTHON3 \$srcdir/test-stream.py tcp:[::1]:\$TCP_PORT"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-stream.py tcp:[::1]:$TCP_PORT" "ovsdb-idl.at:1918"
+( $at_check_trace; $PYTHON3 $srcdir/test-stream.py tcp:[::1]:$TCP_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1781"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1918"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1781: test-stream tcp:[::1]:\$WRONG_PORT"
-at_fn_check_prepare_dynamic "test-stream tcp:[::1]:$WRONG_PORT" "ovsdb-idl.at:1781"
-( $at_check_trace; test-stream tcp:[::1]:$WRONG_PORT
+$as_echo "$at_srcdir/ovsdb-idl.at:1918: \$PYTHON3 \$srcdir/test-stream.py tcp:[::1]:\$WRONG_PORT"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-stream.py tcp:[::1]:$WRONG_PORT" "ovsdb-idl.at:1918"
+( $at_check_trace; $PYTHON3 $srcdir/test-stream.py tcp:[::1]:$WRONG_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1781"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1918"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1781: test -e ovsdb-server.pid"
-at_fn_check_prepare_trace "ovsdb-idl.at:1781"
+$as_echo "$at_srcdir/ovsdb-idl.at:1918: test -e ovsdb-server.pid"
+at_fn_check_prepare_trace "ovsdb-idl.at:1918"
 ( $at_check_trace; test -e ovsdb-server.pid
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1781"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1918"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    TMPPID=$(cat ovsdb-server.pid)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1781: ovs-appctl --target=ovsdb-server exit"
-at_fn_check_prepare_trace "ovsdb-idl.at:1781"
+$as_echo "$at_srcdir/ovsdb-idl.at:1918: ovs-appctl --target=ovsdb-server exit"
+at_fn_check_prepare_trace "ovsdb-idl.at:1918"
 ( $at_check_trace; ovs-appctl --target=ovsdb-server exit
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1781"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1918"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386255,18 +387959,18 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1781" "while kill -0 \$TMPPID 2>/dev/null"
+ovs_wait "ovsdb-idl.at:1918" "while kill -0 \$TMPPID 2>/dev/null"
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1781: test-stream tcp:[::1]:\$TCP_PORT"
-at_fn_check_prepare_dynamic "test-stream tcp:[::1]:$TCP_PORT" "ovsdb-idl.at:1781"
-( $at_check_trace; test-stream tcp:[::1]:$TCP_PORT
+$as_echo "$at_srcdir/ovsdb-idl.at:1918: \$PYTHON3 \$srcdir/test-stream.py tcp:[::1]:\$TCP_PORT"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-stream.py tcp:[::1]:$TCP_PORT" "ovsdb-idl.at:1918"
+( $at_check_trace; $PYTHON3 $srcdir/test-stream.py tcp:[::1]:$TCP_PORT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1781"
+at_fn_check_status 1 $at_status "$at_srcdir/ovsdb-idl.at:1918"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386275,32 +387979,91 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2113
-#AT_START_2114
-at_fn_group_banner 2114 'ovsdb-idl.at:1815' \
+#AT_STOP_2122
+#AT_START_2123
+at_fn_group_banner 2123 'ovsdb-idl.at:1941' \
   "Check Python IDL connects to leader - Python3 (leader only)" "" 101
 at_xfail=no
 (
-  $as_echo "2114. $at_setup_line: testing $at_desc ..."
+  $as_echo "2123. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
 
+   n=3
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1815: ovsdb_cluster_start_idltest 3 \"ptcp:0:\"127.0.0.1"
-at_fn_check_prepare_trace "ovsdb-idl.at:1815"
-( $at_check_trace; ovsdb_cluster_start_idltest 3 "ptcp:0:"127.0.0.1
+$as_echo "$at_srcdir/ovsdb-idl.at:1941: ovsdb-tool create-cluster s1.db \\
+                        \$abs_srcdir/idltest.ovsschema unix:s1.raft"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1941"
+( $at_check_trace; ovsdb-tool create-cluster s1.db \
+                        $abs_srcdir/idltest.ovsschema unix:s1.raft
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1941"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   cid=$(ovsdb-tool db-cid s1.db)
+   schema_name=$(ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema)
+   for i in $(seq 2 $n); do
+     { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1941: ovsdb-tool join-cluster s\$i.db \\
+                          \$schema_name unix:s\$i.raft unix:s1.raft"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1941"
+( $at_check_trace; ovsdb-tool join-cluster s$i.db \
+                          $schema_name unix:s$i.raft unix:s1.raft
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1941"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   done
+   on_exit 'kill $(cat s*.pid)'
+   for i in $(seq $n); do
+     { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1941: ovsdb-server -vraft -vconsole:warn --detach --no-chdir \\
+                   --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i \\
+                   --remote=punix:s\$i.ovsdb                           \\
+                   --remote=\"ptcp:0:\"127.0.0.1 s\$i.db"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1941"
+( $at_check_trace; ovsdb-server -vraft -vconsole:warn --detach --no-chdir \
+                   --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i \
+                   --remote=punix:s$i.ovsdb                           \
+                   --remote="ptcp:0:"127.0.0.1 s$i.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1815"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1941"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
+   done
+
+   for i in $(seq $n); do
+       ovs_wait_cond () {
+    ovs-appctl -t $(pwd)/s$i cluster/status ${schema_name} \
+                                           | grep -q 'Status: cluster member'
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1941" "until ovs-appctl -t \$(pwd)/s\$i cluster/status \${schema_name} \\
+                                           | grep -q 'Status: cluster member'"
+
+   done
+
    ovs_wait_cond () {
     TCP_PORT_1=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s2.log"` && test X != X"$TCP_PORT_1"
 }
@@ -386308,7 +388071,7 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1815" "until TCP_PORT_1=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s2.log\"\` && test X != X\"\$TCP_PORT_1\""
+ovs_wait "ovsdb-idl.at:1941" "until TCP_PORT_1=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s2.log\"\` && test X != X\"\$TCP_PORT_1\""
 
    ovs_wait_cond () {
     TCP_PORT_2=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s3.log"` && test X != X"$TCP_PORT_2"
@@ -386317,7 +388080,7 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1815" "until TCP_PORT_2=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s3.log\"\` && test X != X\"\$TCP_PORT_2\""
+ovs_wait "ovsdb-idl.at:1941" "until TCP_PORT_2=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s3.log\"\` && test X != X\"\$TCP_PORT_2\""
 
    ovs_wait_cond () {
     TCP_PORT_3=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s1.log"` && test X != X"$TCP_PORT_3"
@@ -386326,36 +388089,36 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1815" "until TCP_PORT_3=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s1.log\"\` && test X != X\"\$TCP_PORT_3\""
+ovs_wait "ovsdb-idl.at:1941" "until TCP_PORT_3=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s1.log\"\` && test X != X\"\$TCP_PORT_3\""
 
    remotes=tcp:127.0.0.1:$TCP_PORT_1,tcp:127.0.0.1:$TCP_PORT_2,tcp:127.0.0.1:$TCP_PORT_3
    pids=$(cat s2.pid s3.pid s1.pid | tr '\n' ',')
    echo $pids
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1815: \$PYTHON3 \$srcdir/test-ovsdb.py  -t30 idl-cluster \$srcdir/idltest.ovsschema \$remotes \$pids 'remote'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t30 idl-cluster $srcdir/idltest.ovsschema $remotes $pids 'remote'" "ovsdb-idl.at:1815"
+$as_echo "$at_srcdir/ovsdb-idl.at:1941: \$PYTHON3 \$srcdir/test-ovsdb.py  -t30 idl-cluster \$srcdir/idltest.ovsschema \$remotes \$pids 'remote'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t30 idl-cluster $srcdir/idltest.ovsschema $remotes $pids 'remote'" "ovsdb-idl.at:1941"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t30 idl-cluster $srcdir/idltest.ovsschema $remotes $pids 'remote'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1815"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1941"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    remote=$(ovsdb_cluster_leader $remotes "idltest")
    leader=$(echo $remote | cut -d'|' -f 1)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1815: grep -F -- \"\${leader}\" stdout"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:1815"
+$as_echo "$at_srcdir/ovsdb-idl.at:1941: grep -F -- \"\${leader}\" stdout"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:1941"
 ( $at_check_trace; grep -F -- "${leader}" stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1815"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1941"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386364,32 +388127,91 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2114
-#AT_START_2115
-at_fn_group_banner 2115 'ovsdb-idl.at:1816' \
+#AT_STOP_2123
+#AT_START_2124
+at_fn_group_banner 2124 'ovsdb-idl.at:1942' \
   "Check Python IDL reconnects to leader - Python3 (leader only)" "" 101
 at_xfail=no
 (
-  $as_echo "2115. $at_setup_line: testing $at_desc ..."
+  $as_echo "2124. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
 
+   n=3
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1816: ovsdb_cluster_start_idltest 3 \"ptcp:0:\"127.0.0.1"
-at_fn_check_prepare_trace "ovsdb-idl.at:1816"
-( $at_check_trace; ovsdb_cluster_start_idltest 3 "ptcp:0:"127.0.0.1
+$as_echo "$at_srcdir/ovsdb-idl.at:1942: ovsdb-tool create-cluster s1.db \\
+                        \$abs_srcdir/idltest.ovsschema unix:s1.raft"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1942"
+( $at_check_trace; ovsdb-tool create-cluster s1.db \
+                        $abs_srcdir/idltest.ovsschema unix:s1.raft
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1942"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   cid=$(ovsdb-tool db-cid s1.db)
+   schema_name=$(ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema)
+   for i in $(seq 2 $n); do
+     { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1942: ovsdb-tool join-cluster s\$i.db \\
+                          \$schema_name unix:s\$i.raft unix:s1.raft"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1942"
+( $at_check_trace; ovsdb-tool join-cluster s$i.db \
+                          $schema_name unix:s$i.raft unix:s1.raft
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1942"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   done
+   on_exit 'kill $(cat s*.pid)'
+   for i in $(seq $n); do
+     { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1942: ovsdb-server -vraft -vconsole:warn --detach --no-chdir \\
+                   --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i \\
+                   --remote=punix:s\$i.ovsdb                           \\
+                   --remote=\"ptcp:0:\"127.0.0.1 s\$i.db"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1942"
+( $at_check_trace; ovsdb-server -vraft -vconsole:warn --detach --no-chdir \
+                   --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i \
+                   --remote=punix:s$i.ovsdb                           \
+                   --remote="ptcp:0:"127.0.0.1 s$i.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1816"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1942"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
+   done
+
+   for i in $(seq $n); do
+       ovs_wait_cond () {
+    ovs-appctl -t $(pwd)/s$i cluster/status ${schema_name} \
+                                           | grep -q 'Status: cluster member'
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1942" "until ovs-appctl -t \$(pwd)/s\$i cluster/status \${schema_name} \\
+                                           | grep -q 'Status: cluster member'"
+
+   done
+
    ovs_wait_cond () {
     TCP_PORT_1=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s2.log"` && test X != X"$TCP_PORT_1"
 }
@@ -386397,7 +388219,7 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1816" "until TCP_PORT_1=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s2.log\"\` && test X != X\"\$TCP_PORT_1\""
+ovs_wait "ovsdb-idl.at:1942" "until TCP_PORT_1=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s2.log\"\` && test X != X\"\$TCP_PORT_1\""
 
    ovs_wait_cond () {
     TCP_PORT_2=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s3.log"` && test X != X"$TCP_PORT_2"
@@ -386406,7 +388228,7 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1816" "until TCP_PORT_2=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s3.log\"\` && test X != X\"\$TCP_PORT_2\""
+ovs_wait "ovsdb-idl.at:1942" "until TCP_PORT_2=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s3.log\"\` && test X != X\"\$TCP_PORT_2\""
 
    ovs_wait_cond () {
     TCP_PORT_3=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s1.log"` && test X != X"$TCP_PORT_3"
@@ -386415,36 +388237,36 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1816" "until TCP_PORT_3=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s1.log\"\` && test X != X\"\$TCP_PORT_3\""
+ovs_wait "ovsdb-idl.at:1942" "until TCP_PORT_3=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s1.log\"\` && test X != X\"\$TCP_PORT_3\""
 
    remotes=tcp:127.0.0.1:$TCP_PORT_1,tcp:127.0.0.1:$TCP_PORT_2,tcp:127.0.0.1:$TCP_PORT_3
    pids=$(cat s2.pid s3.pid s1.pid | tr '\n' ',')
    echo $pids
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1816: \$PYTHON3 \$srcdir/test-ovsdb.py  -t30 idl-cluster \$srcdir/idltest.ovsschema \$remotes \$pids 'remote' '+remotestop' 'remote'"
-at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t30 idl-cluster $srcdir/idltest.ovsschema $remotes $pids 'remote' '+remotestop' 'remote'" "ovsdb-idl.at:1816"
+$as_echo "$at_srcdir/ovsdb-idl.at:1942: \$PYTHON3 \$srcdir/test-ovsdb.py  -t30 idl-cluster \$srcdir/idltest.ovsschema \$remotes \$pids 'remote' '+remotestop' 'remote'"
+at_fn_check_prepare_dynamic "$PYTHON3 $srcdir/test-ovsdb.py  -t30 idl-cluster $srcdir/idltest.ovsschema $remotes $pids 'remote' '+remotestop' 'remote'" "ovsdb-idl.at:1942"
 ( $at_check_trace; $PYTHON3 $srcdir/test-ovsdb.py  -t30 idl-cluster $srcdir/idltest.ovsschema $remotes $pids 'remote' '+remotestop' 'remote'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1816"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1942"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    remote=$(ovsdb_cluster_leader $remotes "idltest")
    leader=$(echo $remote | cut -d'|' -f 1)
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1816: grep -F -- \"\${leader}\" stdout"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:1816"
+$as_echo "$at_srcdir/ovsdb-idl.at:1942: grep -F -- \"\${leader}\" stdout"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "ovsdb-idl.at:1942"
 ( $at_check_trace; grep -F -- "${leader}" stdout
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1816"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1942"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386453,32 +388275,91 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2115
-#AT_START_2116
-at_fn_group_banner 2116 'ovsdb-idl.at:1840' \
+#AT_STOP_2124
+#AT_START_2125
+at_fn_group_banner 2125 'ovsdb-idl.at:1966' \
   "simple idl, monitor_cond_since, cluster disconnect - C - tcp" "" 101
 at_xfail=no
 (
-  $as_echo "2116. $at_setup_line: testing $at_desc ..."
+  $as_echo "2125. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
 
 
 
+   n=3
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1840: ovsdb_cluster_start_idltest 3 \"ptcp:0:\"127.0.0.1"
-at_fn_check_prepare_trace "ovsdb-idl.at:1840"
-( $at_check_trace; ovsdb_cluster_start_idltest 3 "ptcp:0:"127.0.0.1
+$as_echo "$at_srcdir/ovsdb-idl.at:1966: ovsdb-tool create-cluster s1.db \\
+                        \$abs_srcdir/idltest.ovsschema unix:s1.raft"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1966"
+( $at_check_trace; ovsdb-tool create-cluster s1.db \
+                        $abs_srcdir/idltest.ovsschema unix:s1.raft
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1966"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   cid=$(ovsdb-tool db-cid s1.db)
+   schema_name=$(ovsdb-tool schema-name $abs_srcdir/idltest.ovsschema)
+   for i in $(seq 2 $n); do
+     { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1966: ovsdb-tool join-cluster s\$i.db \\
+                          \$schema_name unix:s\$i.raft unix:s1.raft"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1966"
+( $at_check_trace; ovsdb-tool join-cluster s$i.db \
+                          $schema_name unix:s$i.raft unix:s1.raft
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+at_fn_diff_devnull "$at_stderr" || at_failed=:
+at_fn_diff_devnull "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1966"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+   done
+   on_exit 'kill $(cat s*.pid)'
+   for i in $(seq $n); do
+     { set +x
+$as_echo "$at_srcdir/ovsdb-idl.at:1966: ovsdb-server -vraft -vconsole:warn --detach --no-chdir \\
+                   --log-file=s\$i.log --pidfile=s\$i.pid --unixctl=s\$i \\
+                   --remote=punix:s\$i.ovsdb                           \\
+                   --remote=\"ptcp:0:\"127.0.0.1 s\$i.db"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1966"
+( $at_check_trace; ovsdb-server -vraft -vconsole:warn --detach --no-chdir \
+                   --log-file=s$i.log --pidfile=s$i.pid --unixctl=s$i \
+                   --remote=punix:s$i.ovsdb                           \
+                   --remote="ptcp:0:"127.0.0.1 s$i.db
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 at_fn_diff_devnull "$at_stderr" || at_failed=:
 at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1840"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1966"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
+   done
+
+   for i in $(seq $n); do
+       ovs_wait_cond () {
+    ovs-appctl -t $(pwd)/s$i cluster/status ${schema_name} \
+                                           | grep -q 'Status: cluster member'
+}
+ovs_wait_failed () {
+    :
+
+}
+ovs_wait "ovsdb-idl.at:1966" "until ovs-appctl -t \$(pwd)/s\$i cluster/status \${schema_name} \\
+                                           | grep -q 'Status: cluster member'"
+
+   done
+
    ovs_wait_cond () {
     TCP_PORT_1=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s1.log"` && test X != X"$TCP_PORT_1"
 }
@@ -386486,7 +388367,7 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1840" "until TCP_PORT_1=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s1.log\"\` && test X != X\"\$TCP_PORT_1\""
+ovs_wait "ovsdb-idl.at:1966" "until TCP_PORT_1=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s1.log\"\` && test X != X\"\$TCP_PORT_1\""
 
    ovs_wait_cond () {
     TCP_PORT_2=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s2.log"` && test X != X"$TCP_PORT_2"
@@ -386495,7 +388376,7 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1840" "until TCP_PORT_2=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s2.log\"\` && test X != X\"\$TCP_PORT_2\""
+ovs_wait "ovsdb-idl.at:1966" "until TCP_PORT_2=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s2.log\"\` && test X != X\"\$TCP_PORT_2\""
 
    ovs_wait_cond () {
     TCP_PORT_3=`sed -n 's/.*0:.*: listening on port \([0-9]*\)$/\1/p' "s3.log"` && test X != X"$TCP_PORT_3"
@@ -386504,12 +388385,12 @@
     :
 
 }
-ovs_wait "ovsdb-idl.at:1840" "until TCP_PORT_3=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s3.log\"\` && test X != X\"\$TCP_PORT_3\""
+ovs_wait "ovsdb-idl.at:1966" "until TCP_PORT_3=\`sed -n 's/.*0:.*: listening on port \\([0-9]*\\)\$/\\1/p' \"s3.log\"\` && test X != X\"\$TCP_PORT_3\""
 
    remotes=tcp:127.0.0.1:$TCP_PORT_1,tcp:127.0.0.1:$TCP_PORT_2,tcp:127.0.0.1:$TCP_PORT_3
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1840: ovsdb-client transact \$remotes '[\"idltest\",
+$as_echo "$at_srcdir/ovsdb-idl.at:1966: ovsdb-client transact \$remotes '[\"idltest\",
        {\"op\": \"insert\",
        \"table\": \"simple\",
        \"row\": {\"i\": 1,
@@ -386520,7 +388401,7 @@
        \"row\": {\"i\": 2,
                \"r\": 1.0,
                \"b\": true}}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1840"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1966"
 ( $at_check_trace; ovsdb-client transact $remotes '["idltest",
        {"op": "insert",
        "table": "simple",
@@ -386537,12 +388418,12 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1840"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1966"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1840: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT_1 'condition simple []' \\
+$as_echo "$at_srcdir/ovsdb-idl.at:1966: test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:\$TCP_PORT_1 'condition simple []' \\
     'condition simple [[\"i\",\"==\",2]]' \\
     'condition simple [[\"i\",\"==\",1]]' \\
     '+reconnect' \\
@@ -386551,7 +388432,7 @@
        \"table\": \"simple\",
        \"where\": [[\"i\", \"==\", 1]],
        \"row\": {\"r\": 2.0 }}]'"
-at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1840"
+at_fn_check_prepare_notrace 'an embedded newline' "ovsdb-idl.at:1966"
 ( $at_check_trace; test-ovsdb '-vPATTERN:console:test-ovsdb|%c|%m' -vjsonrpc -t10 idl tcp:127.0.0.1:$TCP_PORT_1 'condition simple []' \
     'condition simple [["i","==",2]]' \
     'condition simple [["i","==",1]]' \
@@ -386566,13 +388447,13 @@
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1840"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1966"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
    { set +x
-$as_echo "$at_srcdir/ovsdb-idl.at:1840: sort stdout | uuidfilt"
-at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1840"
+$as_echo "$at_srcdir/ovsdb-idl.at:1966: sort stdout | uuidfilt"
+at_fn_check_prepare_notrace 'a shell pipeline' "ovsdb-idl.at:1966"
 ( $at_check_trace; sort stdout | uuidfilt
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
@@ -386590,7 +388471,7 @@
 009: done
 " | \
   $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1840"
+at_fn_check_status 0 $at_status "$at_srcdir/ovsdb-idl.at:1966"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -386599,13 +388480,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2116
-#AT_START_2117
-at_fn_group_banner 2117 'ovsdb-lock.at:21' \
+#AT_STOP_2125
+#AT_START_2126
+at_fn_group_banner 2126 'ovsdb-lock.at:21' \
   "ovsdb lock -- lock" "                             " 102
 at_xfail=no
 (
-  $as_echo "2117. $at_setup_line: testing $at_desc ..."
+  $as_echo "2126. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -386746,13 +388627,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2117
-#AT_START_2118
-at_fn_group_banner 2118 'ovsdb-lock.at:37' \
+#AT_STOP_2126
+#AT_START_2127
+at_fn_group_banner 2127 'ovsdb-lock.at:37' \
   "ovsdb lock -- unlock" "                           " 102
 at_xfail=no
 (
-  $as_echo "2118. $at_setup_line: testing $at_desc ..."
+  $as_echo "2127. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -386910,13 +388791,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2118
-#AT_START_2119
-at_fn_group_banner 2119 'ovsdb-lock.at:57' \
+#AT_STOP_2127
+#AT_START_2128
+at_fn_group_banner 2128 'ovsdb-lock.at:57' \
   "ovsdb lock -- steal" "                            " 102
 at_xfail=no
 (
-  $as_echo "2119. $at_setup_line: testing $at_desc ..."
+  $as_echo "2128. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -387076,13 +388957,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2119
-#AT_START_2120
-at_fn_group_banner 2120 'ovsdb-rbac.at:3' \
+#AT_STOP_2128
+#AT_START_2129
+at_fn_group_banner 2129 'ovsdb-rbac.at:3' \
   "ovsdb-server/rbac 2" "                            " 103
 at_xfail=no
 (
-  $as_echo "2120. $at_setup_line: testing $at_desc ..."
+  $as_echo "2129. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -388050,13 +389931,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2120
-#AT_START_2121
-at_fn_group_banner 2121 'ovs-vsctl.at:131' \
+#AT_STOP_2129
+#AT_START_2130
+at_fn_group_banner 2130 'ovs-vsctl.at:131' \
   "ovs-vsctl connection retry" "                     " 104
 at_xfail=no
 (
-  $as_echo "2121. $at_setup_line: testing $at_desc ..."
+  $as_echo "2130. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -388224,13 +390105,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2121
-#AT_START_2122
-at_fn_group_banner 2122 'ovs-vsctl.at:175' \
+#AT_STOP_2130
+#AT_START_2131
+at_fn_group_banner 2131 'ovs-vsctl.at:175' \
   "add-br a" "                                       " 105
 at_xfail=no
 (
-  $as_echo "2122. $at_setup_line: testing $at_desc ..."
+  $as_echo "2131. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -388566,13 +390447,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2122
-#AT_START_2123
-at_fn_group_banner 2123 'ovs-vsctl.at:185' \
+#AT_STOP_2131
+#AT_START_2132
+at_fn_group_banner 2132 'ovs-vsctl.at:185' \
   "add-br a, add-br a" "                             " 105
 at_xfail=no
 (
-  $as_echo "2123. $at_setup_line: testing $at_desc ..."
+  $as_echo "2132. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -388716,13 +390597,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2123
-#AT_START_2124
-at_fn_group_banner 2124 'ovs-vsctl.at:198' \
+#AT_STOP_2132
+#AT_START_2133
+at_fn_group_banner 2133 'ovs-vsctl.at:198' \
   "add-br a, add-br b" "                             " 105
 at_xfail=no
 (
-  $as_echo "2124. $at_setup_line: testing $at_desc ..."
+  $as_echo "2133. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -389250,13 +391131,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2124
-#AT_START_2125
-at_fn_group_banner 2125 'ovs-vsctl.at:213' \
+#AT_STOP_2133
+#AT_START_2134
+at_fn_group_banner 2134 'ovs-vsctl.at:213' \
   "add-br a, add-br b, del-br a" "                   " 105
 at_xfail=no
 (
-  $as_echo "2125. $at_setup_line: testing $at_desc ..."
+  $as_echo "2134. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -389596,13 +391477,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2125
-#AT_START_2126
-at_fn_group_banner 2126 'ovs-vsctl.at:223' \
+#AT_STOP_2134
+#AT_START_2135
+at_fn_group_banner 2135 'ovs-vsctl.at:223' \
   "add-br a, del-br a, add-br a" "                   " 105
 at_xfail=no
 (
-  $as_echo "2126. $at_setup_line: testing $at_desc ..."
+  $as_echo "2135. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -389942,13 +391823,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2126
-#AT_START_2127
-at_fn_group_banner 2127 'ovs-vsctl.at:243' \
+#AT_STOP_2135
+#AT_START_2136
+at_fn_group_banner 2136 'ovs-vsctl.at:243' \
   "add-br a, add-port a a1, add-port a a2" "         " 105
 at_xfail=no
 (
-  $as_echo "2127. $at_setup_line: testing $at_desc ..."
+  $as_echo "2136. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -390360,13 +392241,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2127
-#AT_START_2128
-at_fn_group_banner 2128 'ovs-vsctl.at:257' \
+#AT_STOP_2136
+#AT_START_2137
+at_fn_group_banner 2137 'ovs-vsctl.at:257' \
   "add-br a, add-port a a1, add-port a a1" "         " 105
 at_xfail=no
 (
-  $as_echo "2128. $at_setup_line: testing $at_desc ..."
+  $as_echo "2137. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -390512,13 +392393,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2128
-#AT_START_2129
-at_fn_group_banner 2129 'ovs-vsctl.at:272' \
+#AT_STOP_2137
+#AT_START_2138
+at_fn_group_banner 2138 'ovs-vsctl.at:272' \
   "add-br a b, add-port a a1, add-port b b1, del-br a" "" 105
 at_xfail=no
 (
-  $as_echo "2129. $at_setup_line: testing $at_desc ..."
+  $as_echo "2138. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -390895,13 +392776,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2129
-#AT_START_2130
-at_fn_group_banner 2130 'ovs-vsctl.at:294' \
+#AT_STOP_2138
+#AT_START_2139
+at_fn_group_banner 2139 'ovs-vsctl.at:294' \
   "add-br a, add-bond a bond0 a1 a2 a3" "            " 105
 at_xfail=no
 (
-  $as_echo "2130. $at_setup_line: testing $at_desc ..."
+  $as_echo "2139. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -391375,13 +393256,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2130
-#AT_START_2131
-at_fn_group_banner 2131 'ovs-vsctl.at:316' \
+#AT_STOP_2139
+#AT_START_2140
+at_fn_group_banner 2140 'ovs-vsctl.at:316' \
   "add-bond-iface and del-bond-iface" "              " 105
 at_xfail=no
 (
-  $as_echo "2131. $at_setup_line: testing $at_desc ..."
+  $as_echo "2140. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -393120,13 +395001,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2131
-#AT_START_2132
-at_fn_group_banner 2132 'ovs-vsctl.at:376' \
+#AT_STOP_2140
+#AT_START_2141
+at_fn_group_banner 2141 'ovs-vsctl.at:376' \
   "add-br a b, add-port a a1, add-port b b1, del-port a a1" "" 105
 at_xfail=no
 (
-  $as_echo "2132. $at_setup_line: testing $at_desc ..."
+  $as_echo "2141. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -393747,13 +395628,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2132
-#AT_START_2133
-at_fn_group_banner 2133 'ovs-vsctl.at:403' \
+#AT_STOP_2141
+#AT_START_2142
+at_fn_group_banner 2142 'ovs-vsctl.at:403' \
   "add-br a, add-bond a bond0 a1 a2 a3, del-port bond0" "" 105
 at_xfail=no
 (
-  $as_echo "2133. $at_setup_line: testing $at_desc ..."
+  $as_echo "2142. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -394059,13 +395940,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2133
-#AT_START_2134
-at_fn_group_banner 2134 'ovs-vsctl.at:420' \
+#AT_STOP_2142
+#AT_START_2143
+at_fn_group_banner 2143 'ovs-vsctl.at:420' \
   "external IDs" "                                   " 105
 at_xfail=no
 (
-  $as_echo "2134. $at_setup_line: testing $at_desc ..."
+  $as_echo "2143. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -394559,13 +396440,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2134
-#AT_START_2135
-at_fn_group_banner 2135 'ovs-vsctl.at:476' \
+#AT_STOP_2143
+#AT_START_2144
+at_fn_group_banner 2144 'ovs-vsctl.at:476' \
   "controllers" "                                    " 105
 at_xfail=no
 (
-  $as_echo "2135. $at_setup_line: testing $at_desc ..."
+  $as_echo "2144. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -394684,13 +396565,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2135
-#AT_START_2136
-at_fn_group_banner 2136 'ovs-vsctl.at:508' \
+#AT_STOP_2144
+#AT_START_2145
+at_fn_group_banner 2145 'ovs-vsctl.at:508' \
   "fail-mode" "                                      " 105
 at_xfail=no
 (
-  $as_echo "2136. $at_setup_line: testing $at_desc ..."
+  $as_echo "2145. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -394807,13 +396688,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2136
-#AT_START_2137
-at_fn_group_banner 2137 'ovs-vsctl.at:538' \
+#AT_STOP_2145
+#AT_START_2146
+at_fn_group_banner 2146 'ovs-vsctl.at:538' \
   "emer-reset" "                                     " 105
 at_xfail=no
 (
-  $as_echo "2137. $at_setup_line: testing $at_desc ..."
+  $as_echo "2146. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -395055,13 +396936,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2137
-#AT_START_2138
-at_fn_group_banner 2138 'ovs-vsctl.at:773' \
+#AT_STOP_2146
+#AT_START_2147
+at_fn_group_banner 2147 'ovs-vsctl.at:773' \
   "simple fake bridge (VLAN 9)" "                    " 106
 at_xfail=no
 (
-  $as_echo "2138. $at_setup_line: testing $at_desc ..."
+  $as_echo "2147. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -395722,13 +397603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2138
-#AT_START_2139
-at_fn_group_banner 2139 'ovs-vsctl.at:773' \
+#AT_STOP_2147
+#AT_START_2148
+at_fn_group_banner 2148 'ovs-vsctl.at:773' \
   "list bridges -- real and fake (VLAN 9)" "         " 106
 at_xfail=no
 (
-  $as_echo "2139. $at_setup_line: testing $at_desc ..."
+  $as_echo "2148. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -395901,13 +397782,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2139
-#AT_START_2140
-at_fn_group_banner 2140 'ovs-vsctl.at:773' \
+#AT_STOP_2148
+#AT_START_2149
+at_fn_group_banner 2149 'ovs-vsctl.at:773' \
   "simple fake bridge + del-br fake bridge (VLAN 9)" "" 106
 at_xfail=no
 (
-  $as_echo "2140. $at_setup_line: testing $at_desc ..."
+  $as_echo "2149. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -396306,13 +398187,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2140
-#AT_START_2141
-at_fn_group_banner 2141 'ovs-vsctl.at:773' \
+#AT_STOP_2149
+#AT_START_2150
+at_fn_group_banner 2150 'ovs-vsctl.at:773' \
   "simple fake bridge + del-br real bridge (VLAN 9)" "" 106
 at_xfail=no
 (
-  $as_echo "2141. $at_setup_line: testing $at_desc ..."
+  $as_echo "2150. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -396501,13 +398382,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2141
-#AT_START_2142
-at_fn_group_banner 2142 'ovs-vsctl.at:773' \
+#AT_STOP_2150
+#AT_START_2151
+at_fn_group_banner 2151 'ovs-vsctl.at:773' \
   "simple fake bridge + external IDs (VLAN 9)" "     " 106
 at_xfail=no
 (
-  $as_echo "2142. $at_setup_line: testing $at_desc ..."
+  $as_echo "2151. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -397120,13 +399001,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2142
-#AT_START_2143
-at_fn_group_banner 2143 'ovs-vsctl.at:773' \
+#AT_STOP_2151
+#AT_START_2152
+at_fn_group_banner 2152 'ovs-vsctl.at:773' \
   "simple fake bridge + del-port from parent (VLAN 9)" "" 106
 at_xfail=no
 (
-  $as_echo "2143. $at_setup_line: testing $at_desc ..."
+  $as_echo "2152. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -397640,13 +399521,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2143
-#AT_START_2144
-at_fn_group_banner 2144 'ovs-vsctl.at:774' \
+#AT_STOP_2152
+#AT_START_2153
+at_fn_group_banner 2153 'ovs-vsctl.at:774' \
   "simple fake bridge (VLAN 0)" "                    " 107
 at_xfail=no
 (
-  $as_echo "2144. $at_setup_line: testing $at_desc ..."
+  $as_echo "2153. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -398307,13 +400188,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2144
-#AT_START_2145
-at_fn_group_banner 2145 'ovs-vsctl.at:774' \
+#AT_STOP_2153
+#AT_START_2154
+at_fn_group_banner 2154 'ovs-vsctl.at:774' \
   "list bridges -- real and fake (VLAN 0)" "         " 107
 at_xfail=no
 (
-  $as_echo "2145. $at_setup_line: testing $at_desc ..."
+  $as_echo "2154. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -398486,13 +400367,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2145
-#AT_START_2146
-at_fn_group_banner 2146 'ovs-vsctl.at:774' \
+#AT_STOP_2154
+#AT_START_2155
+at_fn_group_banner 2155 'ovs-vsctl.at:774' \
   "simple fake bridge + del-br fake bridge (VLAN 0)" "" 107
 at_xfail=no
 (
-  $as_echo "2146. $at_setup_line: testing $at_desc ..."
+  $as_echo "2155. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -398891,13 +400772,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2146
-#AT_START_2147
-at_fn_group_banner 2147 'ovs-vsctl.at:774' \
+#AT_STOP_2155
+#AT_START_2156
+at_fn_group_banner 2156 'ovs-vsctl.at:774' \
   "simple fake bridge + del-br real bridge (VLAN 0)" "" 107
 at_xfail=no
 (
-  $as_echo "2147. $at_setup_line: testing $at_desc ..."
+  $as_echo "2156. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -399086,13 +400967,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2147
-#AT_START_2148
-at_fn_group_banner 2148 'ovs-vsctl.at:774' \
+#AT_STOP_2156
+#AT_START_2157
+at_fn_group_banner 2157 'ovs-vsctl.at:774' \
   "simple fake bridge + external IDs (VLAN 0)" "     " 107
 at_xfail=no
 (
-  $as_echo "2148. $at_setup_line: testing $at_desc ..."
+  $as_echo "2157. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -399705,13 +401586,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2148
-#AT_START_2149
-at_fn_group_banner 2149 'ovs-vsctl.at:774' \
+#AT_STOP_2157
+#AT_START_2158
+at_fn_group_banner 2158 'ovs-vsctl.at:774' \
   "simple fake bridge + del-port from parent (VLAN 0)" "" 107
 at_xfail=no
 (
-  $as_echo "2149. $at_setup_line: testing $at_desc ..."
+  $as_echo "2158. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -400225,13 +402106,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2149
-#AT_START_2150
-at_fn_group_banner 2150 'ovs-vsctl.at:785' \
+#AT_STOP_2158
+#AT_START_2159
+at_fn_group_banner 2159 'ovs-vsctl.at:785' \
   "fake bridge on bond" "                            " 107
 at_xfail=no
 (
-  $as_echo "2150. $at_setup_line: testing $at_desc ..."
+  $as_echo "2159. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -400835,13 +402716,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2150
-#AT_START_2151
-at_fn_group_banner 2151 'ovs-vsctl.at:797' \
+#AT_STOP_2159
+#AT_START_2160
+at_fn_group_banner 2160 'ovs-vsctl.at:797' \
   "fake bridge on bond + del-br fake bridge" "       " 107
 at_xfail=no
 (
-  $as_echo "2151. $at_setup_line: testing $at_desc ..."
+  $as_echo "2160. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -401253,13 +403134,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2151
-#AT_START_2152
-at_fn_group_banner 2152 'ovs-vsctl.at:809' \
+#AT_STOP_2160
+#AT_START_2161
+at_fn_group_banner 2161 'ovs-vsctl.at:809' \
   "fake bridge on bond + del-br real bridge" "       " 107
 at_xfail=no
 (
-  $as_echo "2152. $at_setup_line: testing $at_desc ..."
+  $as_echo "2161. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -401442,13 +403323,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2152
-#AT_START_2153
-at_fn_group_banner 2153 'ovs-vsctl.at:821' \
+#AT_STOP_2161
+#AT_START_2162
+at_fn_group_banner 2162 'ovs-vsctl.at:821' \
   "managers" "                                       " 108
 at_xfail=no
 (
-  $as_echo "2153. $at_setup_line: testing $at_desc ..."
+  $as_echo "2162. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -401567,13 +403448,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2153
-#AT_START_2154
-at_fn_group_banner 2154 'ovs-vsctl.at:851' \
+#AT_STOP_2162
+#AT_START_2163
+at_fn_group_banner 2163 'ovs-vsctl.at:851' \
   "database commands -- positive checks" "           " 109
 at_xfail=no
 (
-  $as_echo "2154. $at_setup_line: testing $at_desc ..."
+  $as_echo "2163. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -402244,13 +404125,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2154
-#AT_START_2155
-at_fn_group_banner 2155 'ovs-vsctl.at:983' \
+#AT_STOP_2163
+#AT_START_2164
+at_fn_group_banner 2164 'ovs-vsctl.at:983' \
   "database commands -- negative checks" "           " 109
 at_xfail=no
 (
-  $as_echo "2155. $at_setup_line: testing $at_desc ..."
+  $as_echo "2164. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -403151,13 +405032,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2155
-#AT_START_2156
-at_fn_group_banner 2156 'ovs-vsctl.at:1132' \
+#AT_STOP_2164
+#AT_START_2165
+at_fn_group_banner 2165 'ovs-vsctl.at:1132' \
   "database commands -- conditions" "                " 109
 at_xfail=no
 (
-  $as_echo "2156. $at_setup_line: testing $at_desc ..."
+  $as_echo "2165. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -404502,13 +406383,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2156
-#AT_START_2157
-at_fn_group_banner 2157 'ovs-vsctl.at:1266' \
+#AT_STOP_2165
+#AT_START_2166
+at_fn_group_banner 2166 'ovs-vsctl.at:1266' \
   "database commands -- wait-until immediately true" "" 109
 at_xfail=no
 (
-  $as_echo "2157. $at_setup_line: testing $at_desc ..."
+  $as_echo "2166. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -404682,13 +406563,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2157
-#AT_START_2158
-at_fn_group_banner 2158 'ovs-vsctl.at:1280' \
+#AT_STOP_2166
+#AT_START_2167
+at_fn_group_banner 2167 'ovs-vsctl.at:1280' \
   "database commands -- wait-until must wait" "      " 109
 at_xfail=no
 (
-  $as_echo "2158. $at_setup_line: testing $at_desc ..."
+  $as_echo "2167. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -404883,13 +406764,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2158
-#AT_START_2159
-at_fn_group_banner 2159 'ovs-vsctl.at:1313' \
+#AT_STOP_2167
+#AT_START_2168
+at_fn_group_banner 2168 'ovs-vsctl.at:1313' \
   "--id option on create, get commands" "            " 109
 at_xfail=no
 (
-  $as_echo "2159. $at_setup_line: testing $at_desc ..."
+  $as_echo "2168. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -405082,13 +406963,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2159
-#AT_START_2160
-at_fn_group_banner 2160 'ovs-vsctl.at:1360' \
+#AT_STOP_2168
+#AT_START_2169
+at_fn_group_banner 2169 'ovs-vsctl.at:1360' \
   "unreferenced record warnings" "                   " 109
 at_xfail=no
 (
-  $as_echo "2160. $at_setup_line: testing $at_desc ..."
+  $as_echo "2169. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -405251,13 +407132,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2160
-#AT_START_2161
-at_fn_group_banner 2161 'ovs-vsctl.at:1394' \
+#AT_STOP_2169
+#AT_START_2170
+at_fn_group_banner 2170 'ovs-vsctl.at:1394' \
   "created row UUID is wrong in same execution" "    " 109
 at_xfail=no
 (
-  $as_echo "2161. $at_setup_line: testing $at_desc ..."
+  $as_echo "2170. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -405405,13 +407286,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2161
-#AT_START_2162
-at_fn_group_banner 2162 'ovs-vsctl.at:1431' \
+#AT_STOP_2170
+#AT_START_2171
+at_fn_group_banner 2171 'ovs-vsctl.at:1431' \
   "--all option on destroy command" "                " 109
 at_xfail=no
 (
-  $as_echo "2162. $at_setup_line: testing $at_desc ..."
+  $as_echo "2171. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -405966,13 +407847,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2162
-#AT_START_2163
-at_fn_group_banner 2163 'ovs-vsctl.at:1480' \
+#AT_STOP_2171
+#AT_START_2172
+at_fn_group_banner 2172 'ovs-vsctl.at:1480' \
   "add-port -- reserved names 1" "                   " 110
 at_xfail=no
 (
-  $as_echo "2163. $at_setup_line: testing $at_desc ..."
+  $as_echo "2172. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -406695,13 +408576,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2163
-#AT_START_2164
-at_fn_group_banner 2164 'ovs-vsctl.at:1512' \
+#AT_STOP_2172
+#AT_START_2173
+at_fn_group_banner 2173 'ovs-vsctl.at:1512' \
   "add-port -- reserved names 2" "                   " 110
 at_xfail=no
 (
-  $as_echo "2164. $at_setup_line: testing $at_desc ..."
+  $as_echo "2173. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -407279,13 +409160,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2164
-#AT_START_2165
-at_fn_group_banner 2165 'ovs-vsctl.at:1550' \
+#AT_STOP_2173
+#AT_START_2174
+at_fn_group_banner 2174 'ovs-vsctl.at:1550' \
   "naming in db commands" "                          " 110
 at_xfail=no
 (
-  $as_echo "2165. $at_setup_line: testing $at_desc ..."
+  $as_echo "2174. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -407449,13 +409330,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2165
-#AT_START_2166
-at_fn_group_banner 2166 'ovs-vsctl.at:1569' \
+#AT_STOP_2174
+#AT_START_2175
+at_fn_group_banner 2175 'ovs-vsctl.at:1569' \
   "bootstrap ca cert" "                              " 110
 at_xfail=no
 (
-  $as_echo "2166. $at_setup_line: testing $at_desc ..."
+  $as_echo "2175. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -407635,13 +409516,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2166
-#AT_START_2167
-at_fn_group_banner 2167 'ovs-vsctl.at:1596' \
+#AT_STOP_2175
+#AT_START_2176
+at_fn_group_banner 2176 'ovs-vsctl.at:1596' \
   "peer ca cert" "                                   " 110
 at_xfail=no
 (
-  $as_echo "2167. $at_setup_line: testing $at_desc ..."
+  $as_echo "2176. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -407821,13 +409702,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2167
-#AT_START_2168
-at_fn_group_banner 2168 'ovs-vsctl.at:1623' \
+#AT_STOP_2176
+#AT_START_2177
+at_fn_group_banner 2177 'ovs-vsctl.at:1623' \
   "TLS server name indication (SNI)" "               " 110
 at_xfail=no
 (
-  $as_echo "2168. $at_setup_line: testing $at_desc ..."
+  $as_echo "2177. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -407975,13 +409856,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2168
-#AT_START_2169
-at_fn_group_banner 2169 'ovs-xapi-sync.at:3' \
+#AT_STOP_2177
+#AT_START_2178
+at_fn_group_banner 2178 'ovs-xapi-sync.at:3' \
   "ovs-xapi-sync" "                                  " 111
 at_xfail=no
 (
-  $as_echo "2169. $at_setup_line: testing $at_desc ..."
+  $as_echo "2178. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -408300,13 +410181,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2169
-#AT_START_2170
-at_fn_group_banner 2170 'interface-reconfigure.at:695' \
+#AT_STOP_2178
+#AT_START_2179
+at_fn_group_banner 2179 'interface-reconfigure.at:695' \
   "non-VLAN, non-bond" "                             " 112
 at_xfail=no
 (
-  $as_echo "2170. $at_setup_line: testing $at_desc ..."
+  $as_echo "2179. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -408467,13 +410348,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2170
-#AT_START_2171
-at_fn_group_banner 2171 'interface-reconfigure.at:771' \
+#AT_STOP_2179
+#AT_START_2180
+at_fn_group_banner 2180 'interface-reconfigure.at:771' \
   "VLAN, non-bond" "                                 " 112
 at_xfail=no
 (
-  $as_echo "2171. $at_setup_line: testing $at_desc ..."
+  $as_echo "2180. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -408632,13 +410513,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2171
-#AT_START_2172
-at_fn_group_banner 2172 'interface-reconfigure.at:845' \
+#AT_STOP_2180
+#AT_START_2181
+at_fn_group_banner 2181 'interface-reconfigure.at:845' \
   "Bond, non-VLAN" "                                 " 112
 at_xfail=no
 (
-  $as_echo "2172. $at_setup_line: testing $at_desc ..."
+  $as_echo "2181. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -408823,13 +410704,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2172
-#AT_START_2173
-at_fn_group_banner 2173 'interface-reconfigure.at:933' \
+#AT_STOP_2181
+#AT_START_2182
+at_fn_group_banner 2182 'interface-reconfigure.at:933' \
   "VLAN on bond" "                                   " 112
 at_xfail=no
 (
-  $as_echo "2173. $at_setup_line: testing $at_desc ..."
+  $as_echo "2182. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409021,13 +410902,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2173
-#AT_START_2174
-at_fn_group_banner 2174 'interface-reconfigure.at:1032' \
+#AT_STOP_2182
+#AT_START_2183
+at_fn_group_banner 2183 'interface-reconfigure.at:1032' \
   "Re-create port with different types" "            " 112
 at_xfail=no
 (
-  $as_echo "2174. $at_setup_line: testing $at_desc ..."
+  $as_echo "2183. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409304,13 +411185,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2174
-#AT_START_2175
-at_fn_group_banner 2175 'stp.at:3' \
+#AT_STOP_2183
+#AT_START_2184
+at_fn_group_banner 2184 'stp.at:3' \
   "STP example from IEEE 802.1D-1998" "              " 113
 at_xfail=no
 (
-  $as_echo "2175. $at_setup_line: testing $at_desc ..."
+  $as_echo "2184. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409354,13 +411235,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2175
-#AT_START_2176
-at_fn_group_banner 2176 'stp.at:27' \
+#AT_STOP_2184
+#AT_START_2185
+at_fn_group_banner 2185 'stp.at:27' \
   "STP example from IEEE 802.1D-2004 figures 17.4 and 17.5" "" 113
 at_xfail=no
 (
-  $as_echo "2176. $at_setup_line: testing $at_desc ..."
+  $as_echo "2185. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409423,13 +411304,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2176
-#AT_START_2177
-at_fn_group_banner 2177 'stp.at:70' \
+#AT_STOP_2185
+#AT_START_2186
+at_fn_group_banner 2186 'stp.at:70' \
   "STP example from IEEE 802.1D-2004 figure 17.6" "  " 113
 at_xfail=no
 (
-  $as_echo "2177. $at_setup_line: testing $at_desc ..."
+  $as_echo "2186. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409475,13 +411356,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2177
-#AT_START_2178
-at_fn_group_banner 2178 'stp.at:96' \
+#AT_STOP_2186
+#AT_START_2187
+at_fn_group_banner 2187 'stp.at:96' \
   "STP example from IEEE 802.1D-2004 figure 17.7" "  " 113
 at_xfail=no
 (
-  $as_echo "2178. $at_setup_line: testing $at_desc ..."
+  $as_echo "2187. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409530,13 +411411,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2178
-#AT_START_2179
-at_fn_group_banner 2179 'stp.at:125' \
+#AT_STOP_2187
+#AT_START_2188
+at_fn_group_banner 2188 'stp.at:125' \
   "STP.io.1.1: Link Failure" "                       " 113
 at_xfail=no
 (
-  $as_echo "2179. $at_setup_line: testing $at_desc ..."
+  $as_echo "2188. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409595,13 +411476,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2179
-#AT_START_2180
-at_fn_group_banner 2180 'stp.at:164' \
+#AT_STOP_2188
+#AT_START_2189
+at_fn_group_banner 2189 'stp.at:164' \
   "STP.io.1.2: Repeated Network" "                   " 113
 at_xfail=no
 (
-  $as_echo "2180. $at_setup_line: testing $at_desc ..."
+  $as_echo "2189. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409645,13 +411526,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2180
-#AT_START_2181
-at_fn_group_banner 2181 'stp.at:188' \
+#AT_STOP_2189
+#AT_START_2190
+at_fn_group_banner 2190 'stp.at:188' \
   "STP.io.1.4: Network Initialization" "             " 113
 at_xfail=no
 (
-  $as_echo "2181. $at_setup_line: testing $at_desc ..."
+  $as_echo "2190. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409697,13 +411578,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2181
-#AT_START_2182
-at_fn_group_banner 2182 'stp.at:214' \
+#AT_STOP_2190
+#AT_START_2191
+at_fn_group_banner 2191 'stp.at:214' \
   "STP.io.1.5: Topology Change" "                    " 113
 at_xfail=no
 (
-  $as_echo "2182. $at_setup_line: testing $at_desc ..."
+  $as_echo "2191. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409776,13 +411657,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2182
-#AT_START_2183
-at_fn_group_banner 2183 'stp.at:267' \
+#AT_STOP_2191
+#AT_START_2192
+at_fn_group_banner 2192 'stp.at:267' \
   "STP.op.1.1 and STP.op.1.2" "                      " 113
 at_xfail=no
 (
-  $as_echo "2183. $at_setup_line: testing $at_desc ..."
+  $as_echo "2192. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409816,13 +411697,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2183
-#AT_START_2184
-at_fn_group_banner 2184 'stp.at:281' \
+#AT_STOP_2192
+#AT_START_2193
+at_fn_group_banner 2193 'stp.at:281' \
   "STP.op.1.4: All Ports Initialized to Designated Ports" "" 113
 at_xfail=no
 (
-  $as_echo "2184. $at_setup_line: testing $at_desc ..."
+  $as_echo "2193. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409863,13 +411744,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2184
-#AT_START_2185
-at_fn_group_banner 2185 'stp.at:302' \
+#AT_STOP_2193
+#AT_START_2194
+at_fn_group_banner 2194 'stp.at:302' \
   "STP.op.3.1: Root Bridge Selection: Root ID Values" "" 113
 at_xfail=no
 (
-  $as_echo "2185. $at_setup_line: testing $at_desc ..."
+  $as_echo "2194. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409909,13 +411790,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2185
-#AT_START_2186
-at_fn_group_banner 2186 'stp.at:322' \
+#AT_STOP_2194
+#AT_START_2195
+at_fn_group_banner 2195 'stp.at:322' \
   "STP.op.3.3: Root Bridge Selection: Bridge ID Values" "" 113
 at_xfail=no
 (
-  $as_echo "2186. $at_setup_line: testing $at_desc ..."
+  $as_echo "2195. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -409958,13 +411839,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2186
-#AT_START_2187
-at_fn_group_banner 2187 'stp.at:345' \
+#AT_STOP_2195
+#AT_START_2196
+at_fn_group_banner 2196 'stp.at:345' \
   "STP.op.3.3: Root Bridge Selection: Bridge ID Values" "" 113
 at_xfail=no
 (
-  $as_echo "2187. $at_setup_line: testing $at_desc ..."
+  $as_echo "2196. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -410007,13 +411888,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2187
-#AT_START_2188
-at_fn_group_banner 2188 'stp.at:390' \
+#AT_STOP_2196
+#AT_START_2197
+at_fn_group_banner 2197 'stp.at:390' \
   "STP - dummy interface" "                          " 113
 at_xfail=no
 (
-  $as_echo "2188. $at_setup_line: testing $at_desc ..."
+  $as_echo "2197. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -410471,13 +412352,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2188
-#AT_START_2189
-at_fn_group_banner 2189 'stp.at:467' \
+#AT_STOP_2197
+#AT_START_2198
+at_fn_group_banner 2198 'stp.at:467' \
   "STP - flush the fdb and mdb when topology changed" "" 113
 at_xfail=no
 (
-  $as_echo "2189. $at_setup_line: testing $at_desc ..."
+  $as_echo "2198. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -411091,13 +412972,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2189
-#AT_START_2190
-at_fn_group_banner 2190 'stp.at:597' \
+#AT_STOP_2198
+#AT_START_2199
+at_fn_group_banner 2199 'stp.at:597' \
   "STP - check link-state when stp is running" "     " 113
 at_xfail=no
 (
-  $as_echo "2190. $at_setup_line: testing $at_desc ..."
+  $as_echo "2199. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -411568,13 +413449,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2190
-#AT_START_2191
-at_fn_group_banner 2191 'rstp.at:3' \
+#AT_STOP_2199
+#AT_START_2200
+at_fn_group_banner 2200 'rstp.at:3' \
   "RSTP Single bridge" "                             " 114
 at_xfail=no
 (
-  $as_echo "2191. $at_setup_line: testing $at_desc ..."
+  $as_echo "2200. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -411604,13 +413485,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2191
-#AT_START_2192
-at_fn_group_banner 2192 'rstp.at:13' \
+#AT_STOP_2200
+#AT_START_2201
+at_fn_group_banner 2201 'rstp.at:13' \
   "RSTP Link failure" "                              " 114
 at_xfail=no
 (
-  $as_echo "2192. $at_setup_line: testing $at_desc ..."
+  $as_echo "2201. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -411649,13 +413530,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2192
-#AT_START_2193
-at_fn_group_banner 2193 'rstp.at:32' \
+#AT_STOP_2201
+#AT_START_2202
+at_fn_group_banner 2202 'rstp.at:32' \
   "RSTP Double link Failure" "                       " 114
 at_xfail=no
 (
-  $as_echo "2193. $at_setup_line: testing $at_desc ..."
+  $as_echo "2202. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -411717,13 +413598,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2193
-#AT_START_2194
-at_fn_group_banner 2194 'rstp.at:74' \
+#AT_STOP_2202
+#AT_START_2203
+at_fn_group_banner 2203 'rstp.at:74' \
   "RSTP example from IEEE 802.1D-2004 figures 17.4 and 17.5" "" 114
 at_xfail=no
 (
-  $as_echo "2194. $at_setup_line: testing $at_desc ..."
+  $as_echo "2203. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -411780,13 +413661,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2194
-#AT_START_2195
-at_fn_group_banner 2195 'rstp.at:111' \
+#AT_STOP_2203
+#AT_START_2204
+at_fn_group_banner 2204 'rstp.at:111' \
   "RSTP example from IEEE 802.1D-2004 figure 17.6" " " 114
 at_xfail=no
 (
-  $as_echo "2195. $at_setup_line: testing $at_desc ..."
+  $as_echo "2204. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -411826,13 +413707,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2195
-#AT_START_2196
-at_fn_group_banner 2196 'rstp.at:131' \
+#AT_STOP_2204
+#AT_START_2205
+at_fn_group_banner 2205 'rstp.at:131' \
   "RSTP example from IEEE 802.1D-2004 figure 17.7" " " 114
 at_xfail=no
 (
-  $as_echo "2196. $at_setup_line: testing $at_desc ..."
+  $as_echo "2205. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -411872,13 +413753,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2196
-#AT_START_2197
-at_fn_group_banner 2197 'rstp.at:156' \
+#AT_STOP_2205
+#AT_START_2206
+at_fn_group_banner 2206 'rstp.at:156' \
   "RSTP - dummy interface" "                         " 114
 at_xfail=no
 (
-  $as_echo "2197. $at_setup_line: testing $at_desc ..."
+  $as_echo "2206. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -412567,13 +414448,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2197
-#AT_START_2198
-at_fn_group_banner 2198 'vlog.at:3' \
+#AT_STOP_2206
+#AT_START_2207
+at_fn_group_banner 2207 'vlog.at:3' \
   "vlog - Python3" "                                 " 115
 at_xfail=no
 (
-  $as_echo "2198. $at_setup_line: testing $at_desc ..."
+  $as_echo "2207. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -412711,13 +414592,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2198
-#AT_START_2199
-at_fn_group_banner 2199 'vlog.at:110' \
+#AT_STOP_2207
+#AT_START_2208
+at_fn_group_banner 2208 'vlog.at:110' \
   "vlog - vlog/reopen - C" "                         " 115
 at_xfail=no
 (
-  $as_echo "2199. $at_setup_line: testing $at_desc ..."
+  $as_echo "2208. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -412885,13 +414766,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2199
-#AT_START_2200
-at_fn_group_banner 2200 'vlog.at:144' \
+#AT_STOP_2208
+#AT_START_2209
+at_fn_group_banner 2209 'vlog.at:144' \
   "vlog - vlog/reopen - Python3" "                   " 115
 at_xfail=no
 (
-  $as_echo "2200. $at_setup_line: testing $at_desc ..."
+  $as_echo "2209. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -413039,13 +414920,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2200
-#AT_START_2201
-at_fn_group_banner 2201 'vlog.at:171' \
+#AT_STOP_2209
+#AT_START_2210
+at_fn_group_banner 2210 'vlog.at:171' \
   "vlog - vlog/reopen without log file - C" "        " 115
 at_xfail=no
 (
-  $as_echo "2201. $at_setup_line: testing $at_desc ..."
+  $as_echo "2210. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -413123,13 +415004,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2201
-#AT_START_2202
-at_fn_group_banner 2202 'vlog.at:183' \
+#AT_STOP_2210
+#AT_START_2211
+at_fn_group_banner 2211 'vlog.at:183' \
   "vlog - vlog/reopen without log file - Python3" "  " 115
 at_xfail=no
 (
-  $as_echo "2202. $at_setup_line: testing $at_desc ..."
+  $as_echo "2211. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -413170,13 +415051,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2202
-#AT_START_2203
-at_fn_group_banner 2203 'vlog.at:195' \
+#AT_STOP_2211
+#AT_START_2212
+at_fn_group_banner 2212 'vlog.at:195' \
   "vlog - vlog/reopen can't reopen log file - C" "   " 115
 at_xfail=no
 (
-  $as_echo "2203. $at_setup_line: testing $at_desc ..."
+  $as_echo "2212. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -413340,13 +415221,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2203
-#AT_START_2204
-at_fn_group_banner 2204 'vlog.at:231' \
+#AT_STOP_2212
+#AT_START_2213
+at_fn_group_banner 2213 'vlog.at:231' \
   "vlog - vlog/reopen can't reopen log file - Python3" "" 115
 at_xfail=no
 (
-  $as_echo "2204. $at_setup_line: testing $at_desc ..."
+  $as_echo "2213. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -413492,13 +415373,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2204
-#AT_START_2205
-at_fn_group_banner 2205 'vlog.at:258' \
+#AT_STOP_2213
+#AT_START_2214
+at_fn_group_banner 2214 'vlog.at:258' \
   "vlog - vlog/close - C" "                          " 115
 at_xfail=no
 (
-  $as_echo "2205. $at_setup_line: testing $at_desc ..."
+  $as_echo "2214. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -413727,13 +415608,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2205
-#AT_START_2206
-at_fn_group_banner 2206 'vlog.at:298' \
+#AT_STOP_2214
+#AT_START_2215
+at_fn_group_banner 2215 'vlog.at:298' \
   "vlog - vlog/close - Python3" "                    " 115
 at_xfail=no
 (
-  $as_echo "2206. $at_setup_line: testing $at_desc ..."
+  $as_echo "2215. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -413942,13 +415823,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2206
-#AT_START_2207
-at_fn_group_banner 2207 'vlog.at:332' \
+#AT_STOP_2215
+#AT_START_2216
+at_fn_group_banner 2216 'vlog.at:332' \
   "vlog - vlog/set and vlog/list - C" "              " 115
 at_xfail=no
 (
-  $as_echo "2207. $at_setup_line: testing $at_desc ..."
+  $as_echo "2216. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -414196,13 +416077,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2207
-#AT_START_2208
-at_fn_group_banner 2208 'vlog.at:378' \
+#AT_STOP_2216
+#AT_START_2217
+at_fn_group_banner 2217 'vlog.at:378' \
   "vlog - vlog/set and vlog/list - Python3" "        " 115
 at_xfail=no
 (
-  $as_echo "2208. $at_setup_line: testing $at_desc ..."
+  $as_echo "2217. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -414402,13 +416283,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2208
-#AT_START_2209
-at_fn_group_banner 2209 'vlog.at:428' \
+#AT_STOP_2217
+#AT_START_2218
+at_fn_group_banner 2218 'vlog.at:428' \
   "vlog - RFC5424 facility" "                        " 115
 at_xfail=no
 (
-  $as_echo "2209. $at_setup_line: testing $at_desc ..."
+  $as_echo "2218. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -414636,13 +416517,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2209
-#AT_START_2210
-at_fn_group_banner 2210 'vlog.at:465' \
+#AT_STOP_2218
+#AT_START_2219
+at_fn_group_banner 2219 'vlog.at:465' \
   "vlog - RFC5424 facility - Python3" "              " 115
 at_xfail=no
 (
-  $as_echo "2210. $at_setup_line: testing $at_desc ..."
+  $as_echo "2219. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -414717,13 +416598,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2210
-#AT_START_2211
-at_fn_group_banner 2211 'vtep-ctl.at:168' \
+#AT_STOP_2219
+#AT_START_2220
+at_fn_group_banner 2220 'vtep-ctl.at:168' \
   "add-ps a" "                                       " 116
 at_xfail=no
 (
-  $as_echo "2211. $at_setup_line: testing $at_desc ..."
+  $as_echo "2220. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -415088,13 +416969,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2211
-#AT_START_2212
-at_fn_group_banner 2212 'vtep-ctl.at:176' \
+#AT_STOP_2220
+#AT_START_2221
+at_fn_group_banner 2221 'vtep-ctl.at:176' \
   "add-ps a, add-ps a" "                             " 116
 at_xfail=no
 (
-  $as_echo "2212. $at_setup_line: testing $at_desc ..."
+  $as_echo "2221. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -415296,13 +417177,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2212
-#AT_START_2213
-at_fn_group_banner 2213 'vtep-ctl.at:186' \
+#AT_STOP_2221
+#AT_START_2222
+at_fn_group_banner 2222 'vtep-ctl.at:186' \
   "add-ps a, add-ps b" "                             " 116
 at_xfail=no
 (
-  $as_echo "2213. $at_setup_line: testing $at_desc ..."
+  $as_echo "2222. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -415722,13 +417603,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2213
-#AT_START_2214
-at_fn_group_banner 2214 'vtep-ctl.at:195' \
+#AT_STOP_2222
+#AT_START_2223
+at_fn_group_banner 2223 'vtep-ctl.at:195' \
   "add-ps a, add-ps b, del-ps a" "                   " 116
 at_xfail=no
 (
-  $as_echo "2214. $at_setup_line: testing $at_desc ..."
+  $as_echo "2223. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -416097,13 +417978,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2214
-#AT_START_2215
-at_fn_group_banner 2215 'vtep-ctl.at:204' \
+#AT_STOP_2223
+#AT_START_2224
+at_fn_group_banner 2224 'vtep-ctl.at:204' \
   "add-ps a, del-ps a, add-ps a" "                   " 116
 at_xfail=no
 (
-  $as_echo "2215. $at_setup_line: testing $at_desc ..."
+  $as_echo "2224. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -416470,13 +418351,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2215
-#AT_START_2216
-at_fn_group_banner 2216 'vtep-ctl.at:218' \
+#AT_STOP_2224
+#AT_START_2225
+at_fn_group_banner 2225 'vtep-ctl.at:218' \
   "add-ps a, add-port a a1, add-port a a2" "         " 116
 at_xfail=no
 (
-  $as_echo "2216. $at_setup_line: testing $at_desc ..."
+  $as_echo "2225. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -416959,13 +418840,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2216
-#AT_START_2217
-at_fn_group_banner 2217 'vtep-ctl.at:231' \
+#AT_STOP_2225
+#AT_START_2226
+at_fn_group_banner 2226 'vtep-ctl.at:231' \
   "add-ps a, add-port a a1, add-port a a1" "         " 116
 at_xfail=no
 (
-  $as_echo "2217. $at_setup_line: testing $at_desc ..."
+  $as_echo "2226. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -417169,13 +419050,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2217
-#AT_START_2218
-at_fn_group_banner 2218 'vtep-ctl.at:243' \
+#AT_STOP_2226
+#AT_START_2227
+at_fn_group_banner 2227 'vtep-ctl.at:243' \
   "add-ps a b, add-port a a1, add-port b b1, del-ps a" "" 116
 at_xfail=no
 (
-  $as_echo "2218. $at_setup_line: testing $at_desc ..."
+  $as_echo "2227. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -417656,13 +419537,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2218
-#AT_START_2219
-at_fn_group_banner 2219 'vtep-ctl.at:264' \
+#AT_STOP_2227
+#AT_START_2228
+at_fn_group_banner 2228 'vtep-ctl.at:264' \
   "add-ps a b, add-port a a1, add-port b b1, del-port a a1" "" 116
 at_xfail=no
 (
-  $as_echo "2219. $at_setup_line: testing $at_desc ..."
+  $as_echo "2228. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -418361,13 +420242,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2219
-#AT_START_2220
-at_fn_group_banner 2220 'vtep-ctl.at:281' \
+#AT_STOP_2228
+#AT_START_2229
+at_fn_group_banner 2229 'vtep-ctl.at:281' \
   "add-ps a b, add-port a p1, add-port b p1, del-port a p1" "" 116
 at_xfail=no
 (
-  $as_echo "2220. $at_setup_line: testing $at_desc ..."
+  $as_echo "2229. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -419557,13 +421438,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2220
-#AT_START_2221
-at_fn_group_banner 2221 'vtep-ctl.at:304' \
+#AT_STOP_2229
+#AT_START_2230
+at_fn_group_banner 2230 'vtep-ctl.at:304' \
   "add-ls a" "                                       " 117
 at_xfail=no
 (
-  $as_echo "2221. $at_setup_line: testing $at_desc ..."
+  $as_echo "2230. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -419928,13 +421809,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2221
-#AT_START_2222
-at_fn_group_banner 2222 'vtep-ctl.at:312' \
+#AT_STOP_2230
+#AT_START_2231
+at_fn_group_banner 2231 'vtep-ctl.at:312' \
   "add-ls a, add-ls a" "                             " 117
 at_xfail=no
 (
-  $as_echo "2222. $at_setup_line: testing $at_desc ..."
+  $as_echo "2231. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -420136,13 +422017,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2222
-#AT_START_2223
-at_fn_group_banner 2223 'vtep-ctl.at:322' \
+#AT_STOP_2231
+#AT_START_2232
+at_fn_group_banner 2232 'vtep-ctl.at:322' \
   "add-ls a, add-ls b" "                             " 117
 at_xfail=no
 (
-  $as_echo "2223. $at_setup_line: testing $at_desc ..."
+  $as_echo "2232. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -420562,13 +422443,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2223
-#AT_START_2224
-at_fn_group_banner 2224 'vtep-ctl.at:331' \
+#AT_STOP_2232
+#AT_START_2233
+at_fn_group_banner 2233 'vtep-ctl.at:331' \
   "add-ls a, add-ls b, del-ls a" "                   " 117
 at_xfail=no
 (
-  $as_echo "2224. $at_setup_line: testing $at_desc ..."
+  $as_echo "2233. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -420937,13 +422818,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2224
-#AT_START_2225
-at_fn_group_banner 2225 'vtep-ctl.at:340' \
+#AT_STOP_2233
+#AT_START_2234
+at_fn_group_banner 2234 'vtep-ctl.at:340' \
   "add-ls a, del-ls a, add-ls a" "                   " 117
 at_xfail=no
 (
-  $as_echo "2225. $at_setup_line: testing $at_desc ..."
+  $as_echo "2234. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -421310,13 +423191,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2225
-#AT_START_2226
-at_fn_group_banner 2226 'vtep-ctl.at:354' \
+#AT_STOP_2234
+#AT_START_2235
+at_fn_group_banner 2235 'vtep-ctl.at:354' \
   "add-ls a, get-replication-mode a" "               " 117
 at_xfail=no
 (
-  $as_echo "2226. $at_setup_line: testing $at_desc ..."
+  $as_echo "2235. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -421467,13 +423348,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2226
-#AT_START_2227
-at_fn_group_banner 2227 'vtep-ctl.at:365' \
+#AT_STOP_2235
+#AT_START_2236
+at_fn_group_banner 2236 'vtep-ctl.at:365' \
   "add-ls a, set-replication-mode a source_node" "   " 117
 at_xfail=no
 (
-  $as_echo "2227. $at_setup_line: testing $at_desc ..."
+  $as_echo "2236. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -421626,13 +423507,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2227
-#AT_START_2228
-at_fn_group_banner 2228 'vtep-ctl.at:376' \
+#AT_STOP_2236
+#AT_START_2237
+at_fn_group_banner 2237 'vtep-ctl.at:376' \
   "add-ls a, set-replication-mode a service_node" "  " 117
 at_xfail=no
 (
-  $as_echo "2228. $at_setup_line: testing $at_desc ..."
+  $as_echo "2237. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -421785,13 +423666,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2228
-#AT_START_2229
-at_fn_group_banner 2229 'vtep-ctl.at:391' \
+#AT_STOP_2237
+#AT_START_2238
+at_fn_group_banner 2238 'vtep-ctl.at:391' \
   "add-lr a" "                                       " 118
 at_xfail=no
 (
-  $as_echo "2229. $at_setup_line: testing $at_desc ..."
+  $as_echo "2238. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -422156,13 +424037,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2229
-#AT_START_2230
-at_fn_group_banner 2230 'vtep-ctl.at:399' \
+#AT_STOP_2238
+#AT_START_2239
+at_fn_group_banner 2239 'vtep-ctl.at:399' \
   "add-lr a, add-lr a" "                             " 118
 at_xfail=no
 (
-  $as_echo "2230. $at_setup_line: testing $at_desc ..."
+  $as_echo "2239. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -422364,13 +424245,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2230
-#AT_START_2231
-at_fn_group_banner 2231 'vtep-ctl.at:409' \
+#AT_STOP_2239
+#AT_START_2240
+at_fn_group_banner 2240 'vtep-ctl.at:409' \
   "add-lr a, add-lr b" "                             " 118
 at_xfail=no
 (
-  $as_echo "2231. $at_setup_line: testing $at_desc ..."
+  $as_echo "2240. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -422790,13 +424671,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2231
-#AT_START_2232
-at_fn_group_banner 2232 'vtep-ctl.at:418' \
+#AT_STOP_2240
+#AT_START_2241
+at_fn_group_banner 2241 'vtep-ctl.at:418' \
   "add-lr a, add-lr b, del-lr a" "                   " 118
 at_xfail=no
 (
-  $as_echo "2232. $at_setup_line: testing $at_desc ..."
+  $as_echo "2241. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -423165,13 +425046,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2232
-#AT_START_2233
-at_fn_group_banner 2233 'vtep-ctl.at:427' \
+#AT_STOP_2241
+#AT_START_2242
+at_fn_group_banner 2242 'vtep-ctl.at:427' \
   "add-lr a, del-lr a, add-lr a" "                   " 118
 at_xfail=no
 (
-  $as_echo "2233. $at_setup_line: testing $at_desc ..."
+  $as_echo "2242. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -423538,13 +425419,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2233
-#AT_START_2234
-at_fn_group_banner 2234 'vtep-ctl.at:444' \
+#AT_STOP_2242
+#AT_START_2243
+at_fn_group_banner 2243 'vtep-ctl.at:444' \
   "bind-ls ps1 pp1 300 ls1" "                        " 119
 at_xfail=no
 (
-  $as_echo "2234. $at_setup_line: testing $at_desc ..."
+  $as_echo "2243. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -424350,13 +426231,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2234
-#AT_START_2235
-at_fn_group_banner 2235 'vtep-ctl.at:462' \
+#AT_STOP_2243
+#AT_START_2244
+at_fn_group_banner 2244 'vtep-ctl.at:462' \
   "bind-ls ps1 pp1 300 ls1, bind-ls ps1 pp1 400 ls2" "" 119
 at_xfail=no
 (
-  $as_echo "2235. $at_setup_line: testing $at_desc ..."
+  $as_echo "2244. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -425271,13 +427152,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2235
-#AT_START_2236
-at_fn_group_banner 2236 'vtep-ctl.at:484' \
+#AT_STOP_2244
+#AT_START_2245
+at_fn_group_banner 2245 'vtep-ctl.at:484' \
   "bind-ls ps1 pp1 300, bind-ls ps2 pp2 300 ls2" "   " 119
 at_xfail=no
 (
-  $as_echo "2236. $at_setup_line: testing $at_desc ..."
+  $as_echo "2245. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -426414,13 +428295,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2236
-#AT_START_2237
-at_fn_group_banner 2237 'vtep-ctl.at:515' \
+#AT_STOP_2245
+#AT_START_2246
+at_fn_group_banner 2246 'vtep-ctl.at:515' \
   "add-ucast-local ls1" "                            " 120
 at_xfail=no
 (
-  $as_echo "2237. $at_setup_line: testing $at_desc ..."
+  $as_echo "2246. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -426960,13 +428841,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2237
-#AT_START_2238
-at_fn_group_banner 2238 'vtep-ctl.at:542' \
+#AT_STOP_2246
+#AT_START_2247
+at_fn_group_banner 2247 'vtep-ctl.at:542' \
   "add-ucast-local ls1, overwrite" "                 " 120
 at_xfail=no
 (
-  $as_echo "2238. $at_setup_line: testing $at_desc ..."
+  $as_echo "2247. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -427447,13 +429328,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2238
-#AT_START_2239
-at_fn_group_banner 2239 'vtep-ctl.at:562' \
+#AT_STOP_2247
+#AT_START_2248
+at_fn_group_banner 2248 'vtep-ctl.at:562' \
   "add-ucast-local ls1, del-ucast-local ls1" "       " 120
 at_xfail=no
 (
-  $as_echo "2239. $at_setup_line: testing $at_desc ..."
+  $as_echo "2248. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -428049,13 +429930,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2239
-#AT_START_2240
-at_fn_group_banner 2240 'vtep-ctl.at:593' \
+#AT_STOP_2248
+#AT_START_2249
+at_fn_group_banner 2249 'vtep-ctl.at:593' \
   "add-ucast-remote ls1" "                           " 120
 at_xfail=no
 (
-  $as_echo "2240. $at_setup_line: testing $at_desc ..."
+  $as_echo "2249. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -428595,13 +430476,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2240
-#AT_START_2241
-at_fn_group_banner 2241 'vtep-ctl.at:620' \
+#AT_STOP_2249
+#AT_START_2250
+at_fn_group_banner 2250 'vtep-ctl.at:620' \
   "add-ucast-remote ls1, overwrite" "                " 120
 at_xfail=no
 (
-  $as_echo "2241. $at_setup_line: testing $at_desc ..."
+  $as_echo "2250. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -429082,13 +430963,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2241
-#AT_START_2242
-at_fn_group_banner 2242 'vtep-ctl.at:640' \
+#AT_STOP_2250
+#AT_START_2251
+at_fn_group_banner 2251 'vtep-ctl.at:640' \
   "add-ucast-remote ls1, del-ucast-remote ls1" "     " 120
 at_xfail=no
 (
-  $as_echo "2242. $at_setup_line: testing $at_desc ..."
+  $as_echo "2251. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -429684,13 +431565,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2242
-#AT_START_2243
-at_fn_group_banner 2243 'vtep-ctl.at:671' \
+#AT_STOP_2251
+#AT_START_2252
+at_fn_group_banner 2252 'vtep-ctl.at:671' \
   "add-ucast-local ls1, add-ucast-remote ls1" "      " 120
 at_xfail=no
 (
-  $as_echo "2243. $at_setup_line: testing $at_desc ..."
+  $as_echo "2252. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -430236,13 +432117,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2243
-#AT_START_2244
-at_fn_group_banner 2244 'vtep-ctl.at:702' \
+#AT_STOP_2252
+#AT_START_2253
+at_fn_group_banner 2253 'vtep-ctl.at:702' \
   "add-mcast-local ls1" "                            " 120
 at_xfail=no
 (
-  $as_echo "2244. $at_setup_line: testing $at_desc ..."
+  $as_echo "2253. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -430785,13 +432666,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2244
-#AT_START_2245
-at_fn_group_banner 2245 'vtep-ctl.at:731' \
+#AT_STOP_2253
+#AT_START_2254
+at_fn_group_banner 2254 'vtep-ctl.at:731' \
   "add-mcast-local ls1, del-mcast-local ls1" "       " 120
 at_xfail=no
 (
-  $as_echo "2245. $at_setup_line: testing $at_desc ..."
+  $as_echo "2254. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -431395,13 +433276,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2245
-#AT_START_2246
-at_fn_group_banner 2246 'vtep-ctl.at:768' \
+#AT_STOP_2254
+#AT_START_2255
+at_fn_group_banner 2255 'vtep-ctl.at:768' \
   "add-mcast-remote ls1" "                           " 120
 at_xfail=no
 (
-  $as_echo "2246. $at_setup_line: testing $at_desc ..."
+  $as_echo "2255. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -431944,13 +433825,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2246
-#AT_START_2247
-at_fn_group_banner 2247 'vtep-ctl.at:797' \
+#AT_STOP_2255
+#AT_START_2256
+at_fn_group_banner 2256 'vtep-ctl.at:797' \
   "add-mcast-remote ls1, del-mcast-remote ls1" "     " 120
 at_xfail=no
 (
-  $as_echo "2247. $at_setup_line: testing $at_desc ..."
+  $as_echo "2256. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -432554,13 +434435,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2247
-#AT_START_2248
-at_fn_group_banner 2248 'vtep-ctl.at:834' \
+#AT_STOP_2256
+#AT_START_2257
+at_fn_group_banner 2257 'vtep-ctl.at:834' \
   "add-mcast-local ls1, add-mcast-remote ls1" "      " 120
 at_xfail=no
 (
-  $as_echo "2248. $at_setup_line: testing $at_desc ..."
+  $as_echo "2257. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -433112,13 +434993,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2248
-#AT_START_2249
-at_fn_group_banner 2249 'vtep-ctl.at:869' \
+#AT_STOP_2257
+#AT_START_2258
+at_fn_group_banner 2258 'vtep-ctl.at:869' \
   "add local and remote macs, clear-local-macs" "    " 120
 at_xfail=no
 (
-  $as_echo "2249. $at_setup_line: testing $at_desc ..."
+  $as_echo "2258. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -433849,13 +435730,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2249
-#AT_START_2250
-at_fn_group_banner 2250 'vtep-ctl.at:926' \
+#AT_STOP_2258
+#AT_START_2259
+at_fn_group_banner 2259 'vtep-ctl.at:926' \
   "add local and remote macs, clear-remote-macs" "   " 120
 at_xfail=no
 (
-  $as_echo "2250. $at_setup_line: testing $at_desc ..."
+  $as_echo "2259. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -434586,13 +436467,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2250
-#AT_START_2251
-at_fn_group_banner 2251 'vtep-ctl.at:986' \
+#AT_STOP_2259
+#AT_START_2260
+at_fn_group_banner 2260 'vtep-ctl.at:986' \
   "managers" "                                       " 121
 at_xfail=no
 (
-  $as_echo "2251. $at_setup_line: testing $at_desc ..."
+  $as_echo "2260. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -434748,13 +436629,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2251
-#AT_START_2252
-at_fn_group_banner 2252 'vtep-ctl.at:1013' \
+#AT_STOP_2260
+#AT_START_2261
+at_fn_group_banner 2261 'vtep-ctl.at:1013' \
   "show command" "                                   " 121
 at_xfail=no
 (
-  $as_echo "2252. $at_setup_line: testing $at_desc ..."
+  $as_echo "2261. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -434972,13 +436853,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2252
-#AT_START_2253
-at_fn_group_banner 2253 'auto-attach.at:3' \
+#AT_STOP_2261
+#AT_START_2262
+at_fn_group_banner 2262 'auto-attach.at:3' \
   "auto-attach - packets" "                          " 122
 at_xfail=no
 (
-  $as_echo "2253. $at_setup_line: testing $at_desc ..."
+  $as_echo "2262. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -435003,13 +436884,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2253
-#AT_START_2254
-at_fn_group_banner 2254 'mcast-snooping.at:3' \
+#AT_STOP_2262
+#AT_START_2263
+at_fn_group_banner 2263 'mcast-snooping.at:3' \
   "mcast - check multicasts to trunk ports are not duplicated" "" 123
 at_xfail=no
 (
-  $as_echo "2254. $at_setup_line: testing $at_desc ..."
+  $as_echo "2263. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -435633,13 +437514,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2254
-#AT_START_2255
-at_fn_group_banner 2255 'mcast-snooping.at:108' \
+#AT_STOP_2263
+#AT_START_2264
+at_fn_group_banner 2264 'mcast-snooping.at:108' \
   "mcast - delete the port mdb when vlan configuration changed" "" 123
 at_xfail=no
 (
-  $as_echo "2255. $at_setup_line: testing $at_desc ..."
+  $as_echo "2264. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -435971,13 +437852,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2255
-#AT_START_2256
-at_fn_group_banner 2256 'mcast-snooping.at:165' \
+#AT_STOP_2264
+#AT_START_2265
+at_fn_group_banner 2265 'mcast-snooping.at:165' \
   "mcast - delete the port mdb when port destroyed" "" 123
 at_xfail=no
 (
-  $as_echo "2256. $at_setup_line: testing $at_desc ..."
+  $as_echo "2265. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -436305,13 +438186,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2256
-#AT_START_2257
-at_fn_group_banner 2257 'packet-type-aware.at:3' \
+#AT_STOP_2265
+#AT_START_2266
+at_fn_group_banner 2266 'packet-type-aware.at:3' \
   "ptap - legal flow entries in ptap bridge" "       " 124
 at_xfail=no
 (
-  $as_echo "2257. $at_setup_line: testing $at_desc ..."
+  $as_echo "2266. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -436614,13 +438495,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2257
-#AT_START_2258
-at_fn_group_banner 2258 'packet-type-aware.at:34' \
+#AT_STOP_2266
+#AT_START_2267
+at_fn_group_banner 2267 'packet-type-aware.at:34' \
   "ptap - triangle bridge setup with L2 and L3 GRE tunnels" "" 124
 at_xfail=no
 (
-  $as_echo "2258. $at_setup_line: testing $at_desc ..."
+  $as_echo "2267. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -437969,13 +439850,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2258
-#AT_START_2259
-at_fn_group_banner 2259 'packet-type-aware.at:515' \
+#AT_STOP_2267
+#AT_START_2268
+at_fn_group_banner 2268 'packet-type-aware.at:515' \
   "ptap - check decap() prerequisits" "              " 124
 at_xfail=no
 (
-  $as_echo "2259. $at_setup_line: testing $at_desc ..."
+  $as_echo "2268. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -438302,13 +440183,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2259
-#AT_START_2260
-at_fn_group_banner 2260 'packet-type-aware.at:544' \
+#AT_STOP_2268
+#AT_START_2269
+at_fn_group_banner 2269 'packet-type-aware.at:544' \
   "ptap - check encap/decap VLAN tagged Ethernet frame" "" 124
 at_xfail=no
 (
-  $as_echo "2260. $at_setup_line: testing $at_desc ..."
+  $as_echo "2269. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -438775,13 +440656,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2260
-#AT_START_2261
-at_fn_group_banner 2261 'packet-type-aware.at:619' \
+#AT_STOP_2269
+#AT_START_2270
+at_fn_group_banner 2270 'packet-type-aware.at:619' \
   "ptap - L3 over patch port" "                      " 124
 at_xfail=no
 (
-  $as_echo "2261. $at_setup_line: testing $at_desc ..."
+  $as_echo "2270. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -439871,13 +441752,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2261
-#AT_START_2262
-at_fn_group_banner 2262 'packet-type-aware.at:920' \
+#AT_STOP_2270
+#AT_START_2271
+at_fn_group_banner 2271 'packet-type-aware.at:920' \
   "ptap - recirculate after packet_type change" "    " 124
 at_xfail=no
 (
-  $as_echo "2262. $at_setup_line: testing $at_desc ..."
+  $as_echo "2271. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -440428,13 +442309,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2262
-#AT_START_2263
-at_fn_group_banner 2263 'nsh.at:7' \
+#AT_STOP_2271
+#AT_START_2272
+at_fn_group_banner 2272 'nsh.at:7' \
   "nsh - matching" "                                 " 125
 at_xfail=no
 (
-  $as_echo "2263. $at_setup_line: testing $at_desc ..."
+  $as_echo "2272. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -440747,13 +442628,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2263
-#AT_START_2264
-at_fn_group_banner 2264 'nsh.at:53' \
+#AT_STOP_2272
+#AT_START_2273
+at_fn_group_banner 2273 'nsh.at:53' \
   "nsh - md1 encap over a veth link" "               " 125
 at_xfail=no
 (
-  $as_echo "2264. $at_setup_line: testing $at_desc ..."
+  $as_echo "2273. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -441275,13 +443156,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2264
-#AT_START_2265
-at_fn_group_banner 2265 'nsh.at:187' \
+#AT_STOP_2273
+#AT_START_2274
+at_fn_group_banner 2274 'nsh.at:187' \
   "nsh - md2 encap over a veth link" "               " 125
 at_xfail=no
 (
-  $as_echo "2265. $at_setup_line: testing $at_desc ..."
+  $as_echo "2274. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -441711,13 +443592,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2265
-#AT_START_2266
-at_fn_group_banner 2266 'nsh.at:282' \
+#AT_STOP_2274
+#AT_START_2275
+at_fn_group_banner 2275 'nsh.at:282' \
   "nsh - double encap over veth link using groups" " " 125
 at_xfail=no
 (
-  $as_echo "2266. $at_setup_line: testing $at_desc ..."
+  $as_echo "2275. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -442216,13 +444097,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2266
-#AT_START_2267
-at_fn_group_banner 2267 'nsh.at:462' \
+#AT_STOP_2275
+#AT_START_2276
+at_fn_group_banner 2276 'nsh.at:462' \
   "nsh - triangle PTAP bridge setup with NSH over vxlan-gpe" "" 125
 at_xfail=no
 (
-  $as_echo "2267. $at_setup_line: testing $at_desc ..."
+  $as_echo "2276. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -443206,13 +445087,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2267
-#AT_START_2268
-at_fn_group_banner 2268 'drop-stats.at:3' \
+#AT_STOP_2276
+#AT_START_2277
+at_fn_group_banner 2277 'drop-stats.at:3' \
   "drop-stats - cli tests" "                         " 126
 at_xfail=no
 (
-  $as_echo "2268. $at_setup_line: testing $at_desc ..."
+  $as_echo "2277. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -443555,13 +445436,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2268
-#AT_START_2269
-at_fn_group_banner 2269 'drop-stats.at:43' \
+#AT_STOP_2277
+#AT_START_2278
+at_fn_group_banner 2278 'drop-stats.at:43' \
   "drop-stats - pipeline and recurssion drops" "     " 126
 at_xfail=no
 (
-  $as_echo "2269. $at_setup_line: testing $at_desc ..."
+  $as_echo "2278. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -443957,13 +445838,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2269
-#AT_START_2270
-at_fn_group_banner 2270 'drop-stats.at:102' \
+#AT_STOP_2278
+#AT_START_2279
+at_fn_group_banner 2279 'drop-stats.at:102' \
   "drop-stats - too many resubmit" "                 " 126
 at_xfail=no
 (
-  $as_echo "2270. $at_setup_line: testing $at_desc ..."
+  $as_echo "2279. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -444256,13 +446137,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2270
-#AT_START_2271
-at_fn_group_banner 2271 'drop-stats.at:129' \
+#AT_STOP_2279
+#AT_START_2280
+at_fn_group_banner 2280 'drop-stats.at:129' \
   "drop-stats - stack too deep" "                    " 126
 at_xfail=no
 (
-  $as_echo "2271. $at_setup_line: testing $at_desc ..."
+  $as_echo "2280. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -444553,13 +446434,13 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2271
-#AT_START_2272
-at_fn_group_banner 2272 'drop-stats.at:155' \
+#AT_STOP_2280
+#AT_START_2281
+at_fn_group_banner 2281 'drop-stats.at:155' \
   "drop-stats - too many mpls labels" "              " 126
 at_xfail=no
 (
-  $as_echo "2272. $at_setup_line: testing $at_desc ..."
+  $as_echo "2281. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 ovs_init
@@ -444883,4 +446764,4 @@
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_2272
+#AT_STOP_2281
diff -Nru openvswitch-2.13.1/tests/tunnel.at openvswitch-2.13.3/tests/tunnel.at
--- openvswitch-2.13.1/tests/tunnel.at	2020-08-04 21:41:31.998524451 +0000
+++ openvswitch-2.13.3/tests/tunnel.at	2021-02-10 20:04:59.573074628 +0000
@@ -110,6 +110,35 @@
 OVS_VSWITCHD_STOP(["/dropping tunnel packet marked ECN CE but is not ECN capable/d"])
 AT_CLEANUP
 
+AT_SETUP([tunnel - too long nested attributes])
+OVS_VSWITCHD_START([add-port br0 p1 \
+    -- set Interface p1 type=gre options:remote_ip=1.1.1.1 ofport_request=1 \
+    -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2])
+
+AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+    br0 65534/100: (dummy-internal)
+    p1 1/1: (gre: remote_ip=1.1.1.1)
+    p2 2/2: (dummy)
+])
+
+dst_single="dst=1.1.1.1"
+dst_rep=${dst_single}
+dnl Size of one OVS_TUNNEL_KEY_ATTR_IPV4_DST is 4 bytes + NLA_HDRLEN (4 bytes).
+dnl One nested message has room for UINT16_MAX - NLA_HDRLEN (4) bytes, i.e.
+dnl (UINT16_MAX - NLA_HDRLEN) / (4 + NLA_HDRLEN) = 8191.375 of dst addresses.
+for i in `seq 1 8192` ; do
+    dst_rep="${dst_rep},${dst_single}"
+done
+
+AT_CHECK([ovs-appctl dpctl/add-flow "tunnel(${dst_rep})" "2" 2>&1 | dnl
+          sed "s/${dst_single},//g"], [], [dnl
+ovs-vswitchd: parsing flow key (syntax error at tunnel(dst=1.1.1.1)) (Argument list too long)
+ovs-appctl: ovs-vswitchd: server returned an error
+])
+
+OVS_VSWITCHD_STOP
+AT_CLEANUP
+
 AT_SETUP([tunnel - output])
 OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=gre \
                     options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \
diff -Nru openvswitch-2.13.1/tests/uuidfilt.py openvswitch-2.13.3/tests/uuidfilt.py
--- openvswitch-2.13.1/tests/uuidfilt.py	2020-08-04 21:41:31.999524451 +0000
+++ openvswitch-2.13.3/tests/uuidfilt.py	2021-02-10 20:04:59.573074628 +0000
@@ -1,4 +1,20 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+# Copyright (c) 2020 VMware, 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.
+# Breaks lines read from stdin into groups using blank lines as
+# group separators, then sorts lines within the groups for
+# reproducibility.
 
 import re
 import sys
diff -Nru openvswitch-2.13.1/.travis/linux-build.sh openvswitch-2.13.3/.travis/linux-build.sh
--- openvswitch-2.13.1/.travis/linux-build.sh	2020-08-04 21:41:31.765524451 +0000
+++ openvswitch-2.13.3/.travis/linux-build.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,227 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -x
-
-CFLAGS_FOR_OVS="-g -O2"
-SPARSE_FLAGS=""
-EXTRA_OPTS="--enable-Werror"
-TARGET="x86_64-native-linuxapp-gcc"
-
-function install_kernel()
-{
-    if [[ "$1" =~ ^5.* ]]; then
-        PREFIX="v5.x"
-    elif [[ "$1" =~ ^4.* ]]; then
-        PREFIX="v4.x"
-    elif [[ "$1" =~ ^3.* ]]; then
-        PREFIX="v3.x"
-    else
-        PREFIX="v2.6/longterm/v2.6.32"
-    fi
-
-    base_url="https://cdn.kernel.org/pub/linux/kernel/${PREFIX}"
-    # Download page with list of all available kernel versions.
-    wget ${base_url}/
-    # Uncompress in case server returned gzipped page.
-    (file index* | grep ASCII) || (mv index* index.new.gz && gunzip index*)
-    # Get version of the latest stable release.
-    hi_ver=$(echo ${1} | sed 's/\./\\\./')
-    lo_ver=$(cat ./index* | grep -P -o "${hi_ver}\.[0-9]+" | \
-             sed 's/.*\..*\.\(.*\)/\1/' | sort -h | tail -1)
-    version="${1}.${lo_ver}"
-
-    rm -rf index* linux-*
-
-    url="${base_url}/linux-${version}.tar.xz"
-    # Download kernel sources. Try direct link on CDN failure.
-    wget ${url} || wget ${url} || wget ${url/cdn/www}
-
-    tar xvf linux-${version}.tar.xz > /dev/null
-    pushd linux-${version}
-    make allmodconfig
-
-    # Cannot use CONFIG_KCOV: -fsanitize-coverage=trace-pc is not supported by compiler
-    sed -i 's/CONFIG_KCOV=y/CONFIG_KCOV=n/' .config
-
-    # stack validation depends on tools/objtool, but objtool does not compile on travis.
-    # It is giving following error.
-    #  >>> GEN      arch/x86/insn/inat-tables.c
-    #  >>> Semantic error at 40: Unknown imm opnd: AL
-    # So for now disable stack-validation for the build.
-
-    sed -i 's/CONFIG_STACK_VALIDATION=y/CONFIG_STACK_VALIDATION=n/' .config
-    make oldconfig
-
-    # Older kernels do not include openvswitch
-    if [ -d "net/openvswitch" ]; then
-        make net/openvswitch/
-    else
-        make net/bridge/
-    fi
-
-    if [ "$AFXDP" ]; then
-        sudo make headers_install INSTALL_HDR_PATH=/usr
-        pushd tools/lib/bpf/
-        # Bulding with gcc because there are some issues in make files
-        # that breaks building libbpf with clang on Travis.
-        CC=gcc sudo make install
-        CC=gcc sudo make install_headers
-        sudo ldconfig
-        popd
-        # The Linux kernel defines __always_inline in stddef.h (283d7573), and
-        # sys/cdefs.h tries to re-define it.  Older libc-dev package in xenial
-        # doesn't have a fix for this issue.  Applying it manually.
-        sudo sed -i '/^# define __always_inline .*/i # undef __always_inline' \
-                    /usr/include/x86_64-linux-gnu/sys/cdefs.h || true
-        EXTRA_OPTS="${EXTRA_OPTS} --enable-afxdp"
-    else
-        EXTRA_OPTS="${EXTRA_OPTS} --with-linux=$(pwd)"
-        echo "Installed kernel source in $(pwd)"
-    fi
-    popd
-}
-
-function install_dpdk()
-{
-    local DPDK_VER=$1
-    local VERSION_FILE="dpdk-dir/travis-dpdk-cache-version"
-
-    if [ "${DPDK_VER##refs/*/}" != "${DPDK_VER}" ]; then
-        # Avoid using cache for git tree build.
-        rm -rf dpdk-dir
-
-        DPDK_GIT=${DPDK_GIT:-https://dpdk.org/git/dpdk}
-        git clone --single-branch $DPDK_GIT dpdk-dir -b "${DPDK_VER##refs/*/}"
-        pushd dpdk-dir
-        git log -1 --oneline
-    else
-        if [ -f "${VERSION_FILE}" ]; then
-            VER=$(cat ${VERSION_FILE})
-            if [ "${VER}" = "${DPDK_VER}" ]; then
-                EXTRA_OPTS="${EXTRA_OPTS} --with-dpdk=$(pwd)/dpdk-dir/build"
-                echo "Found cached DPDK ${VER} build in $(pwd)/dpdk-dir"
-                return
-            fi
-        fi
-        # No cache or version mismatch.
-        rm -rf dpdk-dir
-        wget https://fast.dpdk.org/rel/dpdk-$1.tar.xz
-        tar xvf dpdk-$1.tar.xz > /dev/null
-        DIR_NAME=$(tar -tf dpdk-$1.tar.xz | head -1 | cut -f1 -d"/")
-        mv ${DIR_NAME} dpdk-dir
-        pushd dpdk-dir
-    fi
-
-    make config CC=gcc T=$TARGET
-
-    if [ "$DPDK_SHARED" ]; then
-        sed -i '/CONFIG_RTE_BUILD_SHARED_LIB=n/s/=n/=y/' build/.config
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/$TARGET/lib
-    fi
-
-    # Disable building DPDK kernel modules. Not needed for OVS build or tests.
-    sed -i '/CONFIG_RTE_EAL_IGB_UIO=y/s/=y/=n/' build/.config
-    sed -i '/CONFIG_RTE_KNI_KMOD=y/s/=y/=n/' build/.config
-
-    # Enable pdump support in DPDK.
-    sed -i '/CONFIG_RTE_LIBRTE_PMD_PCAP=n/s/=n/=y/' build/.config
-    sed -i '/CONFIG_RTE_LIBRTE_PDUMP=n/s/=n/=y/' build/.config
-
-    make -j4 CC=gcc EXTRA_CFLAGS='-fPIC'
-    EXTRA_OPTS="$EXTRA_OPTS --with-dpdk=$(pwd)/build"
-    echo "Installed DPDK source in $(pwd)"
-    popd
-    echo "${DPDK_VER}" > ${VERSION_FILE}
-}
-
-function configure_ovs()
-{
-    ./boot.sh
-    ./configure CFLAGS="${CFLAGS_FOR_OVS}" $* || { cat config.log; exit 1; }
-}
-
-function build_ovs()
-{
-    local KERNEL=$1
-
-    configure_ovs $OPTS
-    make selinux-policy
-
-    # Only build datapath if we are testing kernel w/o running testsuite and
-    # AF_XDP support.
-    if [ "${KERNEL}" ] && ! [ "$AFXDP" ]; then
-        pushd datapath
-        make -j4
-        popd
-    else
-        make -j4 || { cat config.log; exit 1; }
-    fi
-}
-
-if [ "$KERNEL" ]; then
-    install_kernel $KERNEL
-fi
-
-if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then
-    if [ -z "$DPDK_VER" ]; then
-        DPDK_VER="19.11.2"
-    fi
-    install_dpdk $DPDK_VER
-    # Enable pdump support in OVS.
-    EXTRA_OPTS="${EXTRA_OPTS} --enable-dpdk-pdump"
-    if [ "$CC" = "clang" ]; then
-        # Disregard cast alignment errors until DPDK is fixed
-        CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-cast-align"
-    fi
-fi
-
-if [ "$CC" = "clang" ]; then
-    CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-error=unused-command-line-argument"
-elif [ "$M32" ]; then
-    # Not using sparse for 32bit builds on 64bit machine.
-    # Adding m32 flag directly to CC to avoid any posiible issues with API/ABI
-    # difference on 'configure' and 'make' stages.
-    export CC="$CC -m32"
-else
-    OPTS="--enable-sparse"
-    if [ "$AFXDP" ]; then
-        # netdev-afxdp uses memset for 64M for umem initialization.
-        SPARSE_FLAGS="${SPARSE_FLAGS} -Wno-memcpy-max-count"
-    fi
-    CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} ${SPARSE_FLAGS}"
-fi
-
-save_OPTS="${OPTS} $*"
-OPTS="${EXTRA_OPTS} ${save_OPTS}"
-
-if [ "$TESTSUITE" ]; then
-    # 'distcheck' will reconfigure with required options.
-    # Now we only need to prepare the Makefile without sparse-wrapped CC.
-    configure_ovs
-
-    export DISTCHECK_CONFIGURE_FLAGS="$OPTS"
-    if ! make distcheck CFLAGS="${CFLAGS_FOR_OVS}" \
-         TESTSUITEFLAGS=-j4 RECHECK=yes; then
-        # testsuite.log is necessary for debugging.
-        cat */_build/sub/tests/testsuite.log
-        exit 1
-    fi
-else
-    if [ -z "${KERNEL_LIST}" ]; then build_ovs ${KERNEL};
-    else
-        save_EXTRA_OPTS="${EXTRA_OPTS}"
-        for KERNEL in ${KERNEL_LIST}; do
-            echo "=============================="
-            echo "Building with kernel ${KERNEL}"
-            echo "=============================="
-            EXTRA_OPTS="${save_EXTRA_OPTS}"
-            install_kernel ${KERNEL}
-            OPTS="${EXTRA_OPTS} ${save_OPTS}"
-            build_ovs ${KERNEL}
-            make distclean
-        done
-    fi
-fi
-
-exit 0
diff -Nru openvswitch-2.13.1/.travis/linux-prepare.sh openvswitch-2.13.3/.travis/linux-prepare.sh
--- openvswitch-2.13.1/.travis/linux-prepare.sh	2020-08-04 21:41:31.765524451 +0000
+++ openvswitch-2.13.3/.travis/linux-prepare.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -ev
-
-# Build and install sparse.
-#
-# Explicitly disable sparse support for llvm because some travis
-# environments claim to have LLVM (llvm-config exists and works) but
-# linking against it fails.
-# Disabling sqlite support because sindex build fails and we don't
-# really need this utility being installed.
-git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git
-cd sparse
-make -j4 HAVE_LLVM= HAVE_SQLITE= install
-cd ..
-
-pip3 install --disable-pip-version-check --user flake8 hacking
-pip3 install --user --upgrade docutils
-
-if [ "$M32" ]; then
-    # Installing 32-bit libraries.
-    # 32-bit and 64-bit libunwind can not be installed at the same time.
-    # This will remove the 64-bit libunwind and install 32-bit version.
-    sudo apt-get install -y \
-        libunwind-dev:i386 libunbound-dev:i386 gcc-multilib
-fi
-
-# IPv6 is supported by kernel but disabled in TravisCI images:
-#   https://github.com/travis-ci/travis-ci/issues/8891
-# Enable it to avoid skipping of IPv6 related tests.
-sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
diff -Nru openvswitch-2.13.1/.travis/osx-build.sh openvswitch-2.13.3/.travis/osx-build.sh
--- openvswitch-2.13.1/.travis/osx-build.sh	2020-08-04 21:41:31.765524451 +0000
+++ openvswitch-2.13.3/.travis/osx-build.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CFLAGS="-Werror $CFLAGS"
-EXTRA_OPTS=""
-
-function configure_ovs()
-{
-    ./boot.sh && ./configure $*
-}
-
-configure_ovs $EXTRA_OPTS $*
-
-if [ "$CC" = "clang" ]; then
-    set make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument"
-else
-    set make CFLAGS="$CFLAGS $BUILD_ENV"
-fi
-if ! "$@"; then
-    cat config.log
-    exit 1
-fi
-if [ "$TESTSUITE" ] && [ "$CC" != "clang" ]; then
-    if ! make distcheck RECHECK=yes; then
-        # testsuite.log is necessary for debugging.
-        cat */_build/sub/tests/testsuite.log
-        exit 1
-    fi
-fi
-
-exit 0
diff -Nru openvswitch-2.13.1/.travis/osx-prepare.sh openvswitch-2.13.3/.travis/osx-prepare.sh
--- openvswitch-2.13.1/.travis/osx-prepare.sh	2020-08-04 21:41:31.765524451 +0000
+++ openvswitch-2.13.3/.travis/osx-prepare.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-set -ev
-pip3 install --user --upgrade docutils
diff -Nru openvswitch-2.13.1/.travis.yml openvswitch-2.13.3/.travis.yml
--- openvswitch-2.13.1/.travis.yml	2020-08-04 21:41:31.765524451 +0000
+++ openvswitch-2.13.3/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-language: c
-compiler:
-  - gcc
-  - clang
-
-os:
-  - linux
-
-cache:
-  directories:
-    - dpdk-dir
-
-addons:
-  apt:
-    packages:
-      - bc
-      - libssl-dev
-      - llvm-dev
-      - libjemalloc1
-      - libjemalloc-dev
-      - libnuma-dev
-      - libpcap-dev
-      - python3-openssl
-      - python3-pip
-      - python3-sphinx
-      - libelf-dev
-      - selinux-policy-dev
-      - libunbound-dev
-      - libunwind-dev
-
-before_install: ./.travis/${TRAVIS_OS_NAME}-prepare.sh
-
-before_script: export PATH=$PATH:$HOME/bin
-
-env:
-  - OPTS="--disable-ssl"
-  - TESTSUITE=1 KERNEL=3.16
-  - TESTSUITE=1 OPTS="--enable-shared"
-  - TESTSUITE=1 DPDK=1
-  - TESTSUITE=1 LIBS=-ljemalloc
-  - KERNEL_LIST="5.0  4.20 4.19 4.18 4.17 4.16"
-  - KERNEL_LIST="4.15 4.14 4.9  4.4  3.19 3.16"
-  - AFXDP=1 KERNEL=5.3
-  - M32=1 OPTS="--disable-ssl"
-  - DPDK=1 OPTS="--enable-shared"
-  - DPDK_SHARED=1
-  - DPDK_SHARED=1 OPTS="--enable-shared"
-
-matrix:
-  include:
-    - os: osx
-      compiler: clang
-      env: OPTS="--disable-ssl"
-
-script: ./.travis/${TRAVIS_OS_NAME}-build.sh $OPTS
-
-notifications:
-  email:
-    recipients:
-      - ovs-build@openvswitch.org
diff -Nru openvswitch-2.13.1/utilities/bugtool/ovs-bugtool.in openvswitch-2.13.3/utilities/bugtool/ovs-bugtool.in
--- openvswitch-2.13.1/utilities/bugtool/ovs-bugtool.in	2020-08-04 21:41:32.000524451 +0000
+++ openvswitch-2.13.3/utilities/bugtool/ovs-bugtool.in	2021-02-10 20:04:59.574074628 +0000
@@ -33,8 +33,7 @@
 # or func_output().
 #
 
-import StringIO
-import commands
+from io import BytesIO
 import fcntl
 import getopt
 import hashlib
@@ -48,7 +47,7 @@
 import zipfile
 from select import select
 from signal import SIGTERM
-from subprocess import PIPE, Popen
+from subprocess import PIPE, Popen, check_output
 
 from xml.dom.minidom import getDOMImplementation, parse
 
@@ -348,7 +347,7 @@
             cap = v['cap']
             if 'cmd_args' in v:
                 if 'output' not in v.keys():
-                    v['output'] = StringIOmtime()
+                    v['output'] = BytesIOmtime()
                 if v['repeat_count'] > 0:
                     if cap not in process_lists:
                         process_lists[cap] = []
@@ -373,20 +372,23 @@
         if 'filename' in v and v['filename'].startswith('/proc/'):
             # proc files must be read into memory
             try:
-                f = open(v['filename'], 'r')
+                f = open(v['filename'], 'rb')
                 s = f.read()
                 f.close()
                 if check_space(cap, v['filename'], len(s)):
-                    v['output'] = StringIOmtime(s)
+                    v['output'] = BytesIOmtime(s)
             except:
                 pass
         elif 'func' in v:
             try:
                 s = v['func'](cap)
             except Exception as e:
-                s = str(e)
+                s = str(e).encode()
             if check_space(cap, k, len(s)):
-                v['output'] = StringIOmtime(s)
+                if isinstance(s, str):
+                    v['output'] = BytesIOmtime(s.encode())
+                else:
+                    v['output'] = BytesIOmtime(s)
 
 
 def main(argv=None):
@@ -682,8 +684,8 @@
         ovs_info_caps = [CAP_NETWORK_STATUS, CAP_SYSTEM_LOGS,
                          CAP_OPENVSWITCH_LOGS, CAP_NETWORK_CONFIG]
         ovs_info_list = ['process-tree']
-        # We cannot use iteritems, since we modify 'data' as we pass through
-        for (k, v) in data.items():
+        # We cannot use items(), since we modify 'data' as we pass through
+        for (k, v) in list(data.items()):
             cap = v['cap']
             if 'filename' in v:
                 info = k[0]
@@ -703,8 +705,8 @@
         pass
 
     # permit the user to filter out data
-    # We cannot use iteritems, since we modify 'data' as we pass through
-    for (k, v) in sorted(data.items()):
+    # We cannot use items(), since we modify 'data' as we pass through
+    for (k, v) in list(data.items()):
         cap = v['cap']
         if 'filename' in v:
             key = k[0]
@@ -721,7 +723,7 @@
 
     # include inventory
     data['inventory.xml'] = {'cap': None,
-                        'output': StringIOmtime(make_inventory(data, subdir))}
+                        'output': BytesIOmtime(make_inventory(data, subdir))}
 
     # create archive
     if output_fd == -1:
@@ -782,7 +784,7 @@
 
 
 def module_info(cap):
-    output = StringIO.StringIO()
+    output = BytesIO()
     modules = open(PROC_MODULES, 'r')
     procs = []
 
@@ -806,7 +808,7 @@
 
 
 def dp_list():
-    output = StringIO.StringIO()
+    output = BytesIO()
     procs = [ProcOutput([OVS_DPCTL, 'dump-dps'],
              caps[CAP_NETWORK_STATUS][MAX_TIME], output)]
 
@@ -828,7 +830,7 @@
             if os.path.isfile(OPENVSWITCH_COMPACT_DB):
                 os.unlink(OPENVSWITCH_COMPACT_DB)
 
-            output = StringIO.StringIO()
+            output = BytesIO()
             max_time = 5
             procs = [ProcOutput(['ovsdb-tool', 'compact',
                                 OPENVSWITCH_CONF_DB, OPENVSWITCH_COMPACT_DB],
@@ -871,7 +873,7 @@
 
 
 def dump_rdac_groups(cap):
-    output = StringIO.StringIO()
+    output = BytesIO()
     procs = [ProcOutput([MPPUTIL, '-a'], caps[cap][MAX_TIME], output)]
 
     run_procs([procs])
@@ -896,7 +898,7 @@
         for node in nodelist:
             if node.nodeType == node.TEXT_NODE:
                 rc += node.data
-        return rc.encode()
+        return rc
 
     def getBoolAttr(el, attr, default=False):
         ret = default
@@ -1037,7 +1039,7 @@
                     s = os.stat(v['filename'])
                     ti.mtime = s.st_mtime
                     ti.size = s.st_size
-                    tf.addfile(ti, open(v['filename']))
+                    tf.addfile(ti, open(v['filename'], 'rb'))
             except:
                 pass
     finally:
@@ -1095,12 +1097,12 @@
     s.setAttribute('date', time.strftime('%c'))
     s.setAttribute('hostname', platform.node())
     s.setAttribute('uname', ' '.join(platform.uname()))
-    s.setAttribute('uptime', commands.getoutput(UPTIME))
+    s.setAttribute('uptime', check_output(UPTIME).decode())
     document.getElementsByTagName(INVENTORY_XML_ROOT)[0].appendChild(s)
 
     map(lambda k_v: inventory_entry(document, subdir, k_v[0], k_v[1]),
         inventory.items())
-    return document.toprettyxml()
+    return document.toprettyxml().encode()
 
 
 def inventory_entry(document, subdir, k, v):
@@ -1301,7 +1303,7 @@
             line = self.proc.stdout.readline()
         else:
             line = self.proc.stdout.read(self.bufsize)
-        if line == '':
+        if line == b'':
             # process exited
             self.proc.stdout.close()
             self.status = self.proc.wait()
@@ -1391,13 +1393,13 @@
     return s.f_frsize * s.f_bfree
 
 
-class StringIOmtime(StringIO.StringIO):
-    def __init__(self, buf=''):
-        StringIO.StringIO.__init__(self, buf)
+class BytesIOmtime(BytesIO):
+    def __init__(self, buf=b''):
+        BytesIO.__init__(self, buf)
         self.mtime = time.time()
 
     def write(self, s):
-        StringIO.StringIO.write(self, s)
+        BytesIO.write(self, s)
         self.mtime = time.time()
 
 
diff -Nru openvswitch-2.13.1/utilities/ovs-ctl.in openvswitch-2.13.3/utilities/ovs-ctl.in
--- openvswitch-2.13.1/utilities/ovs-ctl.in	2020-08-04 21:40:41.481524451 +0000
+++ openvswitch-2.13.3/utilities/ovs-ctl.in	2021-02-10 20:04:59.576074628 +0000
@@ -43,7 +43,8 @@
     else
         hn="$(uname -n)"
     fi
-    ovs_vsctl set Open_vSwitch . external-ids:hostname="$hn"
+    # Set the hostname if it wasn't set before
+    ovs_vsctl add Open_vSwitch . external-ids hostname="$hn"
 }
 
 set_system_ids () {
@@ -230,9 +231,14 @@
 }
 
 start_ovs_ipsec () {
+    if test X$RESTART_IKE_DAEMON = Xno; then
+        no_restart="--no-restart-ike-daemon"
+    fi
+
     ${datadir}/scripts/ovs-monitor-ipsec \
         --pidfile=${rundir}/ovs-monitor-ipsec.pid \
         --ike-daemon=$IKE_DAEMON \
+        $no_restart \
         --log-file --detach --monitor unix:${rundir}/db.sock || return 1
     return 0
 }
@@ -254,8 +260,7 @@
 }
 
 stop_ovs_ipsec () {
-    ${bindir}/ovs-appctl -t ovs-monitor-ipsec exit || return 1
-    return 0
+    stop_daemon ovs-monitor-ipsec
 }
 
 ## --------------- ##
@@ -341,6 +346,7 @@
     SPORT=
 
     IKE_DAEMON=
+    RESTART_IKE_DAEMON=yes
 
     type_file=$etcdir/system-type.conf
     version_file=$etcdir/system-version.conf
@@ -424,6 +430,8 @@
 Option for "start-ovs-ipsec":
   --ike-daemon=IKE_DAEMON
       the IKE daemon for ipsec tunnels (either libreswan or strongswan)
+  --no-restart-ike-daemon
+      do not restart the IKE daemon on startup
 
 Other options:
   -h, --help                  display this help message
diff -Nru openvswitch-2.13.1/utilities/ovs-dev.py openvswitch-2.13.3/utilities/ovs-dev.py
--- openvswitch-2.13.1/utilities/ovs-dev.py	2020-08-04 21:38:24.919524451 +0000
+++ openvswitch-2.13.3/utilities/ovs-dev.py	2021-02-10 20:04:59.576074628 +0000
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright (c) 2013, 2014, 2015, 2016 Nicira, Inc.
+#!/usr/bin/env python3
+# Copyright (c) 2013, 2014, 2015, 2016, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/utilities/ovs-dpctl-top.in openvswitch-2.13.3/utilities/ovs-dpctl-top.in
--- openvswitch-2.13.1/utilities/ovs-dpctl-top.in	2020-08-04 21:41:32.002524451 +0000
+++ openvswitch-2.13.3/utilities/ovs-dpctl-top.in	2021-02-10 20:04:59.577074628 +0000
@@ -480,6 +480,8 @@
     """ Convert line to a hierarchy of dictionaries. """
     result = {}
     for element in elements:
+        if (element == "eth()"):
+            continue
         match = FIELDS_CMPND.search(element)
         if (match):
             key = match.group(1)
diff -Nru openvswitch-2.13.1/utilities/ovs-pipegen.py openvswitch-2.13.3/utilities/ovs-pipegen.py
--- openvswitch-2.13.1/utilities/ovs-pipegen.py	2020-08-04 21:36:07.580524451 +0000
+++ openvswitch-2.13.3/utilities/ovs-pipegen.py	2021-02-10 20:04:59.580074628 +0000
@@ -1,5 +1,5 @@
-#! /usr/bin/env python
-# Copyright (c) 2013, 2014, 2015 Nicira, Inc.
+#! /usr/bin/env python3
+# Copyright (c) 2013, 2014, 2015, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/vswitchd/vswitch.xml openvswitch-2.13.3/vswitchd/vswitch.xml
--- openvswitch-2.13.1/vswitchd/vswitch.xml	2020-08-04 21:41:32.010524451 +0000
+++ openvswitch-2.13.3/vswitchd/vswitch.xml	2021-02-10 20:04:59.585074628 +0000
@@ -2971,8 +2971,8 @@
       <group title="Tunnel Options: IPsec">
         <p>
           Setting any of these options enables IPsec support for a given
-          tunnel.  <code>gre</code>, <code>ip6gre</code>,
-          <code>geneve</code>, <code>vxlan</code> and <code>stt</code>
+          tunnel.  <code>gre</code>, <code>geneve</code>,
+          <code>vxlan</code> and <code>stt</code>
           interfaces support these options.  See the <code>IPsec</code>
           section in the <ref table="Open_vSwitch"/> table for a description
           of each mode.
diff -Nru openvswitch-2.13.1/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update openvswitch-2.13.3/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
--- openvswitch-2.13.1/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update	2020-08-04 19:11:45.744524451 +0000
+++ openvswitch-2.13.3/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update	2021-02-10 20:04:59.586074628 +0000
@@ -1,10 +1,10 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # xapi plugin script to update the cache of configuration items in the
 # ovs-vswitchd configuration that are managed in the xapi database when
 # integrated with Citrix management tools.
 
-# Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff -Nru openvswitch-2.13.1/xenserver/openvswitch-xen.spec openvswitch-2.13.3/xenserver/openvswitch-xen.spec
--- openvswitch-2.13.1/xenserver/openvswitch-xen.spec	2020-08-04 21:42:10.871524451 +0000
+++ openvswitch-2.13.3/xenserver/openvswitch-xen.spec	2021-02-10 20:05:35.566074628 +0000
@@ -32,7 +32,7 @@
 # rpmbuild -bb --without check xenserver/openvswitch-xen.spec
 
 %if %{?openvswitch_version:0}%{!?openvswitch_version:1}
-%define openvswitch_version 2.13.1
+%define openvswitch_version 2.13.3
 %endif
 
 %if %{?kernel_uname:1}%{!?kernel_uname:0}
diff -Nru openvswitch-2.13.1/xenserver/opt_xensource_libexec_interface-reconfigure openvswitch-2.13.3/xenserver/opt_xensource_libexec_interface-reconfigure
--- openvswitch-2.13.1/xenserver/opt_xensource_libexec_interface-reconfigure	2020-08-04 21:31:55.397524451 +0000
+++ openvswitch-2.13.3/xenserver/opt_xensource_libexec_interface-reconfigure	2021-02-10 20:04:59.587074628 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2008,2009 Citrix Systems, Inc.
 #
diff -Nru openvswitch-2.13.1/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync openvswitch-2.13.3/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
--- openvswitch-2.13.1/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync	2020-08-04 21:41:32.012524451 +0000
+++ openvswitch-2.13.3/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync	2021-02-10 20:04:59.587074628 +0000
@@ -1,5 +1,5 @@
-#! /usr/bin/env python
-# Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+#!/usr/bin/env python3
+# Copyright (c) 2009, 2010, 2011, 2012, 2013, 2020 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.