diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index 26878ab..21643b3 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -24,6 +24,19 @@ index 2a191b57fb..5f8a1db6af 100755
  
  # Install python test dependencies
  pip3 install -r python/test_requirements.txt
+diff --git a/.cirrus.yml b/.cirrus.yml
+index d73154a971..8835501d4d 100644
+--- a/.cirrus.yml
++++ b/.cirrus.yml
+@@ -8,7 +8,7 @@ freebsd_build_task:
+     memory: 4G
+ 
+   env:
+-    DEPENDENCIES: automake libtool gmake gcc wget openssl python3
++    DEPENDENCIES: automake libtool gmake gcc openssl python3
+     PY_DEPS:      sphinx|netaddr|pyparsing
+     matrix:
+       COMPILER: gcc
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
 index 9d3a13ca1c..a234dbdb67 100644
 --- a/.github/workflows/build-and-test.yml
@@ -256,6 +269,20 @@ index 63a978f0e8..ebd29a45a9 100644
         $ cd $DPDK_DIR
  
  #. Configure and install DPDK using Meson
+diff --git a/Documentation/intro/install/general.rst b/Documentation/intro/install/general.rst
+index eb0813b97f..e8471aa466 100644
+--- a/Documentation/intro/install/general.rst
++++ b/Documentation/intro/install/general.rst
+@@ -150,9 +150,6 @@ The datapath tests for userspace and Linux datapaths also rely upon:
+ - pyftpdlib. Version 1.2.0 is known to work. Earlier versions should
+   also work.
+ 
+-- GNU wget. Version 1.16 is known to work. Earlier versions should also
+-  work.
+-
+ - netcat. Several common implementations are known to work.
+ 
+ - curl. Version 7.47.0 is known to work. Earlier versions should also work.
 diff --git a/Documentation/ref/ovs-appctl.8.rst b/Documentation/ref/ovs-appctl.8.rst
 index 7054cf559e..e7c8b96d49 100644
 --- a/Documentation/ref/ovs-appctl.8.rst
@@ -2019,7 +2046,7 @@ index 9070ea051a..74ccaccdd2 100644
  
  OVSDB_CHECK_IDL_PY([partial-set idl],
 diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
-index e9be021f3f..ff86d15cda 100644
+index e9be021f3f..371357f7be 100644
 --- a/tests/system-common-macros.at
 +++ b/tests/system-common-macros.at
 @@ -2,10 +2,7 @@
@@ -2043,6 +2070,40 @@ index e9be021f3f..ff86d15cda 100644
        CONFIGURE_VETH_OFFLOADS([$1])
        AT_CHECK([ip link set $1 netns $2])
        AT_CHECK([ip link set dev ovs-$1 up])
+@@ -269,6 +266,33 @@ m4_define([NETNS_DAEMONIZE],
+    ]
+ )
+ 
++# OVS_GET_HTTP([url], [optional_curl_arguments])
++#
++# Do a HTTP get; we are currently using the curl command.
++#
++m4_define([OVS_GET_HTTP],
++    [curl $1 --retry 3 --max-time 1 --retry-connrefused -v $2]
++)
++
++# OVS_GET_FTP([url], [optional_curl_arguments])
++#
++# Do a passive FTP get; we are currently using the curl command.
++#
++m4_define([OVS_GET_FTP],
++    [curl ftp://$1 --retry 3 --max-time 1 --retry-connrefused --disable-epsv
++         -v $2]
++)
++
++# OVS_GET_FTP_ACTIVE([url], [optional_curl_arguments])
++#
++# Do an active FTP get; we are currently using the curl command.
++#
++m4_define([OVS_GET_FTP_ACTIVE],
++    [curl ftp://$1 --retry 3 --max-time 1 --retry-connrefused -v \
++        --ftp-port - --disable-eprt $2
++    ]
++)
++
+ # OVS_CHECK_FIREWALL()
+ #
+ # Check if firewalld is active, skip the test if it is on.
 diff --git a/tests/system-ipsec.at b/tests/system-ipsec.at
 index 1e155fecea..4ab384d89c 100644
 --- a/tests/system-ipsec.at
@@ -2293,10 +2354,32 @@ index 1e155fecea..4ab384d89c 100644
 +
 +OVS_TRAFFIC_VSWITCHD_STOP()
 +AT_CLEANUP
+diff --git a/tests/system-tap.at b/tests/system-tap.at
+index 3d84a53182..03ec01270f 100644
+--- a/tests/system-tap.at
++++ b/tests/system-tap.at
+@@ -27,7 +27,7 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -W 2 10.1.1.2 | FORMAT_PING], [0],
+ ])
+ 
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP(["/.*ethtool command ETHTOOL_G.*/d"])
+ 
 diff --git a/tests/system-traffic.at b/tests/system-traffic.at
-index 202ff04922..d936afb726 100644
+index 202ff04922..063280bfb0 100644
 --- a/tests/system-traffic.at
 +++ b/tests/system-traffic.at
+@@ -38,7 +38,7 @@ NS_CHECK_EXEC([at_ns0], [ping -q -c 3 -i 0.3 -W 2 10.1.1.2 | FORMAT_PING], [0],
+ ])
+ 
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
 @@ -253,6 +253,10 @@ priority=0,actions=NORMAL
  AT_CHECK([ovs-ofctl del-flows br0])
  AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
@@ -2308,6 +2391,638 @@ index 202ff04922..d936afb726 100644
  NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -W 2 fc00::3 | FORMAT_PING], [0], [dnl
  3 packets transmitted, 3 received, 0% packet loss, time 0ms
  ])
+@@ -3410,10 +3414,10 @@ OVS_START_L7([at_ns1], [http])
+ OVS_START_L7([at_ns3], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl HTTP requests from p2->p3 should work fine.
+-NS_CHECK_EXEC([at_ns2], [wget 10.1.1.4 -t 3 -T 1 --retry-connrefused -v -o wget1.log])
++NS_CHECK_EXEC([at_ns2], OVS_GET_HTTP([10.1.1.4]), [0], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
+@@ -3453,10 +3457,10 @@ dnl traffic can't be identified, because the initial request wasn't committed.
+ dnl For the first pair of ports, this means that the connection fails.
+ OVS_START_L7([at_ns1], [http])
+ OVS_START_L7([at_ns3], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log], [4])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [28], [ignore], [ignore])
+ 
+ dnl For the second pair, we allow packets from invalid connections, so it works.
+-NS_CHECK_EXEC([at_ns2], [wget 10.1.1.4 -t 3 -T 1 --retry-connrefused -v -o wget1.log])
++NS_CHECK_EXEC([at_ns2], OVS_GET_HTTP([10.1.1.4]), [0], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
+@@ -3492,7 +3496,7 @@ OVS_START_L7([at_ns1], [http])
+ OVS_START_L7([at_ns3], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -3500,7 +3504,7 @@ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=
+ 
+ dnl HTTP requests from p2->p3 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns2], [wget 10.1.1.4 -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns2], OVS_GET_HTTP([10.1.1.4]), [28], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.4)], [0], [dnl
+ tcp,orig=(src=10.1.1.3,dst=10.1.1.4,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.4,dst=10.1.1.3,sport=<cleared>,dport=<cleared>),zone=2,protoinfo=(state=<cleared>)
+@@ -3539,7 +3543,7 @@ OVS_START_L7([at_ns1], [http])
+ OVS_START_L7([at_ns3], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=4097,protoinfo=(state=<cleared>)
+@@ -3547,7 +3551,7 @@ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=
+ 
+ dnl HTTP requests from p2->p3 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns2], [wget 10.1.1.4 -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns2], OVS_GET_HTTP([10.1.1.4]), [28], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.4)], [0], [dnl
+ tcp,orig=(src=10.1.1.3,dst=10.1.1.4,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.4,dst=10.1.1.3,sport=<cleared>,dport=<cleared>),zone=4098,protoinfo=(state=<cleared>)
+@@ -3581,7 +3585,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ OVS_START_L7([at_ns1], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,dnl
+@@ -3607,7 +3611,7 @@ AT_CHECK([ovs-ofctl mod-flows br0 dnl
+ dnl Wait for a flow flush as some datapaths (read TC) might take time to clear.
+ AT_CHECK([ovs-appctl revalidator/wait], [0])
+ 
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-flows --names filter=in_port=ovs-p0 dnl
+               | grep "+trk" | grep -q "ct_zone(0xf)" ], [0], [])
+@@ -3641,7 +3645,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ OVS_START_L7([at_ns1], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,dnl
+@@ -3659,7 +3663,7 @@ AT_CHECK([ovs-ofctl mod-flows br0 'priority=100,ct_state=-trk,tcp,in_port="ovs-p
+ dnl Wait for a flow flush as some datapaths (read TC) might take time to clear.
+ AT_CHECK([ovs-appctl revalidator/wait], [0])
+ 
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-flows --names filter=in_port=ovs-p0 dnl
+               | grep "+trk" | sed 's/0xffff000f\/0xffff/0xf\/0xffff/' dnl
+@@ -3707,7 +3711,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br1 flows-br1.txt])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
+@@ -3736,10 +3740,10 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ OVS_START_L7([at_ns1], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl (again) HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -3778,10 +3782,10 @@ AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+ OVS_START_L7([at_ns1], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl (again) HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -3823,14 +3827,14 @@ OVS_START_L7([at_ns1], [http])
+ OVS_START_L7([at_ns3], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),mark=1,protoinfo=(state=<cleared>)
+ ])
+ 
+ dnl HTTP requests from p2->p3 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns2], [wget 10.1.1.4 -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns2], OVS_GET_HTTP([10.1.1.4]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.4)], [0], [dnl
+ tcp,orig=(src=10.1.1.3,dst=10.1.1.4,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.4,dst=10.1.1.3,sport=<cleared>,dport=<cleared>),mark=2,protoinfo=(state=<cleared>)
+ ])
+@@ -3865,7 +3869,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ OVS_START_L7([at_ns1], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),mark=3,protoinfo=(state=<cleared>)
+@@ -3904,14 +3908,14 @@ OVS_START_L7([at_ns1], [http])
+ OVS_START_L7([at_ns3], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),mark=1,protoinfo=(state=<cleared>)
+ ])
+ 
+ dnl HTTP requests from p2->p3 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns2], [wget 10.1.1.4 -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns2], OVS_GET_HTTP([10.1.1.4]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.4)], [0], [dnl
+ tcp,orig=(src=10.1.1.3,dst=10.1.1.4,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.4,dst=10.1.1.3,sport=<cleared>,dport=<cleared>),mark=2,protoinfo=(state=<cleared>)
+ ])
+@@ -3950,11 +3954,11 @@ OVS_START_L7([at_ns1], [http])
+ OVS_START_L7([at_ns3], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl HTTP requests from p2->p3 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns2], [wget 10.1.1.4 -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns2], OVS_GET_HTTP([10.1.1.4]), [28], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
+@@ -3986,7 +3990,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ OVS_START_L7([at_ns1], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),labels=0x200000001,protoinfo=(state=<cleared>)
+@@ -4024,7 +4028,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ OVS_START_L7([at_ns1], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,mark=3,labels=0x200000001,protoinfo=(state=<cleared>)
+@@ -4060,7 +4064,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows1.txt])
+ 
+ dnl TCP traffic from ns0 to ns1 should fail.
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log], [4])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [28], [ignore], [ignore])
+ 
+ dnl Send UDP packet on port 1 twice.
+ AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000200080000 actions=resubmit(,0)"])
+@@ -5360,14 +5364,14 @@ OVS_START_L7([at_ns0], [http])
+ OVS_START_L7([at_ns1], [http])
+ 
+ dnl HTTP requests from ns0->ns1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>)
+ ])
+ 
+ dnl HTTP requests from ns1->ns0 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns1], [wget 10.1.1.1 -t 3 -T 1 --retry-connrefused -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns1], OVS_GET_HTTP([10.1.1.1]), [28], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
+@@ -5401,7 +5405,7 @@ OVS_START_L7([at_ns0], [http6])
+ OVS_START_L7([at_ns1], [http6])
+ 
+ dnl HTTP requests from ns0->ns1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget http://[[fc00::2]] -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([http://[[fc00::2]]]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
+ tcp,orig=(src=fc00::1,dst=fc00::2,sport=<cleared>,dport=<cleared>),reply=(src=fc00::2,dst=fc00::1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>)
+@@ -5409,7 +5413,7 @@ tcp,orig=(src=fc00::1,dst=fc00::2,sport=<cleared>,dport=<cleared>),reply=(src=fc
+ 
+ dnl HTTP requests from ns1->ns0 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns1], [wget http://[[fc00::1]] -t 3 -T 1 --retry-connrefused -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns1], OVS_GET_HTTP([http://[[fc00::1]]]), [28], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
+@@ -5447,10 +5451,10 @@ OVS_START_L7([at_ns1], [http])
+ OVS_START_L7([at_ns3], [http])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl HTTP requests from p2->p3 should work fine.
+-NS_CHECK_EXEC([at_ns2], [wget 10.1.1.4 -t 3 -T 1 --retry-connrefused -v -o wget1.log])
++NS_CHECK_EXEC([at_ns2], OVS_GET_HTTP([10.1.1.4]), [0], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
+@@ -5489,10 +5493,10 @@ AT_CHECK([ping -q -c 3 -i 0.3 -W 2 10.1.1.2 | FORMAT_PING], [0], [dnl
+ OVS_START_L7([at_ns0], [http])
+ 
+ dnl HTTP requests from root namespace to p0 should work fine.
+-AT_CHECK([wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++AT_CHECK(OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+-dnl (again) HTTP requests from root namespace to  p0 should work fine.
+-AT_CHECK([wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++dnl (again) HTTP requests from root namespace to p0 should work fine.
++AT_CHECK(OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | grep "zone"], [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),zone=1
+@@ -5560,10 +5564,10 @@ AT_CHECK([ping -q -c 3 -i 0.3 -W 2 10.1.1.2 | FORMAT_PING], [0], [dnl
+ OVS_START_L7([at_ns0], [http])
+ 
+ dnl HTTP requests from root namespace to p0 should work fine.
+-AT_CHECK([wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++AT_CHECK(OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl (again) HTTP requests from root namespace to p0 should work fine.
+-AT_CHECK([wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++AT_CHECK(OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | grep "zone"], [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),zone=1
+@@ -5812,7 +5816,7 @@ NETNS_DAEMONIZE([at_ns1], [[$PYTHON3 $srcdir/test-l7.py ftp]], [ftp0.pid])
+ OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2], [-o index.html]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([find -name index.html], [0], [dnl
+ ./index.html
+@@ -5879,12 +5883,12 @@ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p1->p0 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns1], [wget ftp://10.1.1.1 --no-passive-ftp  -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns1], OVS_GET_FTP_ACTIVE([10.1.1.1]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.1)], [0], [dnl
+ ])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC[at_ns0], (OVS_GET_FTP_ACTIVE([10.1.1.2]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>),helper=ftp
+ ])
+@@ -5895,12 +5899,12 @@ AT_CHECK([ovs-appctl dpctl/flush-conntrack])
+ 
+ dnl FTP requests from p1->p0 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns1], [wget ftp://10.1.1.1 --no-passive-ftp  -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns1], OVS_GET_FTP_ACTIVE([10.1.1.1]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.1)], [0], [dnl
+ ])
+ 
+ dnl Active FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0-1.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>),helper=ftp
+ tcp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>)
+@@ -5909,7 +5913,7 @@ tcp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),reply=(src=
+ AT_CHECK([ovs-appctl dpctl/flush-conntrack])
+ 
+ dnl Passive FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0-2.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP([10.1.1.2]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>),helper=ftp
+ ])
+@@ -5919,7 +5923,7 @@ AT_CHECK([ovs-ofctl --bundle replace-flows br0 flows3.txt])
+ AT_CHECK([ovs-appctl dpctl/flush-conntrack])
+ 
+ dnl FTP control requests from p0->p1 should work fine, but helper will not be assigned.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0-3.log], [4])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>)
+ ])
+@@ -5985,12 +5989,12 @@ OVS_START_L7([at_ns1], [ftp], [11111])
+ 
+ dnl FTP requests from p1->p0 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns1], [wget ftp://10.1.1.1:11111 --no-passive-ftp  -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns1], OVS_GET_FTP_ACTIVE([10.1.1.1:11111]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.1)], [0], [dnl
+ ])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2:11111 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2:11111]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>),helper=ftp
+ ])
+@@ -6001,12 +6005,12 @@ AT_CHECK([ovs-appctl dpctl/flush-conntrack])
+ 
+ dnl FTP requests from p1->p0 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns1], [wget ftp://10.1.1.1:11111 --no-passive-ftp  -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns1], OVS_GET_FTP_ACTIVE([10.1.1.1:11111]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.1)], [0], [dnl
+ ])
+ 
+ dnl Active FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2:11111 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0-1.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2:11111]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>),helper=ftp
+ tcp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>)
+@@ -6015,7 +6019,7 @@ tcp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),reply=(src=
+ AT_CHECK([ovs-appctl dpctl/flush-conntrack])
+ 
+ dnl Passive FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2:11111 -t 3 -T 1 --retry-connrefused -v -o wget0-2.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP([10.1.1.2:11111]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>),helper=ftp
+ ])
+@@ -6025,7 +6029,7 @@ AT_CHECK([ovs-ofctl --bundle replace-flows br0 flows3.txt])
+ AT_CHECK([ovs-appctl dpctl/flush-conntrack])
+ 
+ dnl FTP control requests from p0->p1 should work fine, but helper will not be assigned.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2:11111 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0-3.log], [4])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2:11111]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>)
+ ])
+@@ -6060,7 +6064,7 @@ AT_CHECK([ovs-ofctl --bundle replace-flows br0 flows.txt])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),protoinfo=(state=<cleared>),helper=ftp
+@@ -6121,7 +6125,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-remove-listing -o wget0.log -d])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([[[fc00::2]]], [--ipv6]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
+@@ -6180,7 +6184,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP passive requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 -t 3 -T 1 --retry-connrefused -v --server-response --no-remove-listing -o wget0.log -d])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP([[[fc00::2]]]), [--ipv6]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
+@@ -6230,12 +6234,12 @@ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p1->p0 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+-NS_CHECK_EXEC([at_ns1], [wget ftp://10.1.1.1 --no-passive-ftp  -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns1], OVS_GET_FTP_ACTIVE([10.1.1.1]), [28], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.1)], [0], [dnl
+ ])
+ 
+ dnl Active FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>),helper=ftp
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=2,protoinfo=(state=<cleared>),helper=ftp
+@@ -6246,7 +6250,7 @@ tcp,orig=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),reply=(src=
+ AT_CHECK([ovs-appctl dpctl/flush-conntrack])
+ 
+ dnl Passive FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP([10.1.1.2]), [0], [ignore], [ignore])
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>),helper=ftp
+@@ -6370,7 +6374,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -6460,7 +6464,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -6567,7 +6571,7 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | uniq], [0], [d
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.240,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+ ])
+ 
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 1 -T 1 --retry-connrefused -v -o wget0.log], [4])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [28], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | uniq], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.240,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -6622,7 +6626,7 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ 
+ dnl HTTP requests from p0->p1 should work fine.
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2) | sed -e 's/dst=10.1.1.2[[45]][[0-9]]/dst=10.1.1.2XX/' | uniq], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.2XX,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -6716,14 +6720,14 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ 
+ dnl Should work with the virtual IP address through NAT
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.64 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.64]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.64)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.64,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+ ])
+ 
+ dnl Should work with the assigned IP address as well
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -6754,7 +6758,7 @@ table=2,in_port=1,ip,ct_mark=0xac,ct_label=0xac,actions=2
+ ])
+ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ 
+-NS_CHECK_EXEC([at_ns0], [wget http://172.1.1.2:8080 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([http://172.1.1.2:8080]), [0], [ignore], [ignore])
+ 
+ dnl - make sure only dst nat has been performed
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack |  FORMAT_CT(10.1.1.240)], [0], [dnl
+@@ -6812,14 +6816,14 @@ AT_CHECK([ovs-ofctl --bundle add-flows br0 flows.txt])
+ 
+ dnl Should work with the virtual IP address through NAT
+ OVS_START_L7([at_ns1], [http])
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.64 -t 5 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.64]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.64)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.64,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+ ])
+ 
+ dnl Should work with the assigned IP address as well
+-NS_CHECK_EXEC([at_ns0], [wget 10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+ tcp,orig=(src=10.1.1.1,dst=10.1.1.2,sport=<cleared>,dport=<cleared>),reply=(src=10.1.1.2,dst=10.1.1.1,sport=<cleared>,dport=<cleared>),zone=1,protoinfo=(state=<cleared>)
+@@ -7347,7 +7351,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.1.1.2 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+@@ -7407,7 +7411,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.1.1.240 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+@@ -7467,7 +7471,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.1.100.1 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.200 -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP([10.1.1.200]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.200)], [0], [dnl
+@@ -7527,7 +7531,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.1.1.240 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.1.2 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.1.2]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl
+@@ -7587,7 +7591,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping -c 1 10.1.1.2 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://10.1.120.240 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([10.1.120.240]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.120.240)], [0], [dnl
+@@ -7632,12 +7636,12 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2])
+ dnl HTTP requests from ns0->ns1 should work fine.
+ OVS_START_L7([at_ns1], [http6])
+ 
+-NS_CHECK_EXEC([at_ns0], [wget http://[[fc00::2]] -t 3 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([http://[[fc00::2]]]), [0], [ignore], [ignore])
+ 
+ dnl HTTP requests from ns1->ns0 should fail due to network failure.
+ dnl Try 3 times, in 1 second intervals.
+ OVS_START_L7([at_ns0], [http6])
+-NS_CHECK_EXEC([at_ns1], [wget http://[[fc00::1]] -t 3 -T 1 -v -o wget1.log], [4])
++NS_CHECK_EXEC([at_ns1], OVS_GET_HTTP([http://[[fc00::1]]]), [28], [ignore], [ignore])
+ 
+ OVS_TRAFFIC_VSWITCHD_STOP
+ AT_CLEANUP
+@@ -7676,7 +7680,7 @@ NS_CHECK_EXEC([at_ns0], [ping6 -q -c 3 -i 0.3 -W 2 fc00::240 | FORMAT_PING], [0]
+ 
+ dnl Should work with the virtual IP address through NAT
+ OVS_START_L7([at_ns1], [http6])
+-NS_CHECK_EXEC([at_ns0], [wget http://[[fc00::240]] -t 5 -T 1 --retry-connrefused -v -o wget0.log])
++NS_CHECK_EXEC([at_ns0], OVS_GET_HTTP([http://[[fc00::240]]]), [0], [ignore], [ignore])
+ 
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::1)], [0], [dnl
+ icmpv6,orig=(src=fc00::1,dst=fc00::240,id=<cleared>,type=128,code=0),reply=(src=fc00::2,dst=fc00::1,id=<cleared>,type=129,code=0),zone=1
+@@ -7826,7 +7830,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-remove-listing -o wget0.log -d])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([[[fc00::2]]], [--ipv6]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
+@@ -7887,7 +7891,7 @@ OVS_WAIT_UNTIL([ip netns exec at_ns0 ping6 -c 1 fc00::2 >/dev/null])
+ OVS_START_L7([at_ns1], [ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 -t 3 -T 1 --retry-connrefused -v --server-response --no-remove-listing -o wget0.log -d])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP([[[fc00::2]]], [--ipv6]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
+@@ -7947,7 +7951,7 @@ NETNS_DAEMONIZE([at_ns1], [[$PYTHON3 $srcdir/test-l7.py ftp]], [ftp0.pid])
+ OVS_WAIT_UNTIL([ip netns exec at_ns1 netstat -l | grep ftp])
+ 
+ dnl FTP requests from p0->p1 should work fine.
+-NS_CHECK_EXEC([at_ns0], [wget ftp://[[fc00::2]] -6 --no-passive-ftp -t 3 -T 1 --retry-connrefused -v --server-response --no-remove-listing -o wget0.log -d])
++NS_CHECK_EXEC([at_ns0], OVS_GET_FTP_ACTIVE([[[fc00::2]]], [--ipv6]), [0], [ignore], [ignore])
+ 
+ dnl Discards CLOSE_WAIT and CLOSING
+ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(fc00::2)], [0], [dnl
+@@ -8090,7 +8094,7 @@ on_exit 'ovs-appctl dpif/dump-flows br0'
+ dnl Should work with the virtual IP address through NAT
+ for i in $(seq 1 50); do
+     echo Request $i
+-    NS_CHECK_EXEC([at_ns1], [wget 10.1.1.64 -t 5 -T 1 --retry-connrefused -v -o wget$i.log])
++    NS_CHECK_EXEC([at_ns1], OVS_GET_HTTP([10.1.1.64]), [0], [ignore], [ignore])
+ done
+ 
+ dnl Each server should have at least one connection.
 diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c
 index 41c1525f45..710341b655 100644
 --- a/tests/test-ovsdb.c
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index 694dd6f..a288f17 100644
--- a/SPECS/openvswitch3.4.spec
+++ b/SPECS/openvswitch3.4.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.4.0
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -770,6 +770,13 @@ exit 0
 %endif
 
 %changelog
+* Fri Nov 29 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-20
+- Merging upstream branch-3.4 [RH git: 6ad38fd5b2]
+    Commit list:
+    6d02d8749c system-traffic: Standardize by replacing all wget instances with curl.
+    a946d61f57 system-traffic: Replace wget with curl for negative and ftp tests.
+
+
 * Wed Nov 27 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-19
 - Merging upstream branch-3.4 [RH git: f70b3859b4]
     Commit list: