| Message ID | 20220727071208.1096767-1-amusil@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] system-tests: Make netcat calls more robust | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | fail | github build: failed |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
On Wed, Jul 27, 2022 at 3:12 AM Ales Musil <amusil@redhat.com> wrote: > > The netcat compilation options differ between > distributions, make the nc execution more > robust. Now it does not fail on success message > being printed to stderr. > > Signed-off-by: Ales Musil <amusil@redhat.com> Thanks. Applied to the main branch. Numan > --- > tests/system-ovn.at | 34 +++++++++++++++++----------------- > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/tests/system-ovn.at b/tests/system-ovn.at > index 066eab19b..c0621a569 100644 > --- a/tests/system-ovn.at > +++ b/tests/system-ovn.at > @@ -4590,8 +4590,8 @@ ovn-nbctl --wait=hv -t 3 sync > NS_CHECK_EXEC([lsp], [timeout 2s nc -k -l 42.42.42.1 4041 &], [0]) > > # Check that IPv4 TCP hairpin connection succeeds on both VIPs. > -NS_CHECK_EXEC([lsp], [nc 88.88.88.88 8080 -z], [0]) > -NS_CHECK_EXEC([lsp], [nc 88.88.88.89 8080 -z], [0]) > +NS_CHECK_EXEC([lsp], [nc 88.88.88.88 8080 -z], [0], [ignore], [ignore]) > +NS_CHECK_EXEC([lsp], [nc 88.88.88.89 8080 -z], [0], [ignore], [ignore]) > > # Capture IPv4 UDP hairpinned packets. > filter="dst 42.42.42.1 and dst port 2021 and udp" > @@ -4676,8 +4676,8 @@ ovn-nbctl --wait=hv -t 3 sync > NS_CHECK_EXEC([lsp], [timeout 2s nc -k -l 4200::1 4041 &], [0]) > > # Check that IPv6 TCP hairpin connection succeeds on both VIPs. > -NS_CHECK_EXEC([lsp], [nc 8800::0088 8080 -z], [0]) > -NS_CHECK_EXEC([lsp], [nc 8800::0089 8080 -z], [0]) > +NS_CHECK_EXEC([lsp], [nc 8800::0088 8080 -z], [0], [ignore], [ignore]) > +NS_CHECK_EXEC([lsp], [nc 8800::0089 8080 -z], [0], [ignore], [ignore]) > > # Capture IPv6 UDP hairpinned packets. > filter="dst 4200::1 and dst port 2021 and udp" > @@ -5540,18 +5540,18 @@ NS_CHECK_EXEC([sw0-p2-lbc], [ip route add default via 20.0.0.1 dev sw1p2], [0]) > NETNS_DAEMONIZE([sw0-p2-lbc], [nc -l -k 20.0.0.4 80], [nc0.pid]) > > # Send the packet to backend > -NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 20.0.0.4 80], [0]) > +NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 20.0.0.4 80], [0], [ignore], [ignore]) > > # Send the packet to VIP. > -NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 30.0.0.10 80], [0]) > +NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 30.0.0.10 80], [0], [ignore], [ignore]) > > # Now add an ACL in sw1. > ovn-nbctl --wait=hv acl-add sw1 to-lport 2002 "ip" allow-related > # Send the packet to backend > -NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 20.0.0.4 80], [0]) > +NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 20.0.0.4 80], [0], [ignore], [ignore]) > > # Send the packet to VIP. > -NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 30.0.0.10 80], [0]) > +NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 30.0.0.10 80], [0], [ignore], [ignore]) > > OVS_APP_EXIT_AND_WAIT([ovn-controller]) > > @@ -5625,10 +5625,10 @@ check ovn-nbctl --wait=hv sync > NETNS_DAEMONIZE([vm1], [nc -k -l 42.42.42.2 4242], [nc-vm1.pid]) > > # Make sure connecting to the VIP works. > -NS_CHECK_EXEC([vm2], [nc 66.66.66.66 666 -p 2000 -z]) > +NS_CHECK_EXEC([vm2], [nc 66.66.66.66 666 -p 2000 -z], [0], [ignore], [ignore]) > > # Start IPv4 TCP connection to VIP from vm2. > -NS_CHECK_EXEC([vm2], [nc 66.66.66.66 666 -p 2001 -z]) > +NS_CHECK_EXEC([vm2], [nc 66.66.66.66 666 -p 2001 -z], [0], [ignore], [ignore]) > > # Check conntrack. We expect two entries: > # - one in vm1's zone (firewall) > @@ -5645,7 +5645,7 @@ tcp,orig=(src=42.42.42.3,dst=66.66.66.66,sport=<clnt_s_port>,dport=666),reply=(s > > # Start IPv4 TCP connection to backend IP from vm2 which would require > # additional source port translation to avoid a tuple conflict. > -NS_CHECK_EXEC([vm2], [nc 42.42.42.2 4242 -p 2001 -z]) > +NS_CHECK_EXEC([vm2], [nc 42.42.42.2 4242 -p 2001 -z], [0], [ignore], [ignore]) > > # Check conntrack. We expect three entries: > # - one in vm1's zone (firewall) - reused from the previous connection. > @@ -5721,10 +5721,10 @@ check ovn-nbctl --wait=hv sync > NETNS_DAEMONIZE([vm1], [nc -k -l 4242::2 4242], [nc-vm1.pid]) > > # Make sure connecting to the VIP works. > -NS_CHECK_EXEC([vm2], [nc 6666::1 666 -p 2000 -z]) > +NS_CHECK_EXEC([vm2], [nc 6666::1 666 -p 2000 -z], [0], [ignore], [ignore]) > > # Start IPv6 TCP connection to VIP from vm2. > -NS_CHECK_EXEC([vm2], [nc 6666::1 666 -p 2001 -z]) > +NS_CHECK_EXEC([vm2], [nc 6666::1 666 -p 2001 -z], [0], [ignore], [ignore]) > > # Check conntrack. We expect two entries: > # - one in vm1's zone (firewall) > @@ -5741,7 +5741,7 @@ tcp,orig=(src=4242::3,dst=6666::1,sport=<clnt_s_port>,dport=666),reply=(src=4242 > > # Start IPv6 TCP connection to backend IP from vm2 which would require > # additional source port translation to avoid a tuple conflict. > -NS_CHECK_EXEC([vm2], [nc 4242::2 4242 -p 2001 -z]) > +NS_CHECK_EXEC([vm2], [nc 4242::2 4242 -p 2001 -z], [0], [ignore], [ignore]) > > # Check conntrack. We expect three entries: > # - one in vm1's zone (firewall) - reused from the previous connection. > @@ -8095,7 +8095,7 @@ test_ping() { > check ovn-nbctl --wait=hv lr-nat-add R1 snat 172.16.1.21 192.168.2.0/24 > > echo "foo" > foo > -NS_CHECK_EXEC([sw11], [nc 192.168.1.2 8000 < foo]) > +NS_CHECK_EXEC([sw11], [nc 192.168.1.2 8000 -z], [0], [ignore], [ignore]) > test_ping sw11 192.168.1.2 > > # Ensure nat has been hit > @@ -8112,7 +8112,7 @@ AT_CHECK([ovs-appctl dpctl/flush-conntrack]) > > # SNAT and DNAT. using Logical IP > ovn-nbctl --wait=hv lr-nat-add R1 dnat_and_snat 172.16.1.2 192.168.1.2 > -NS_CHECK_EXEC([sw11], [nc 192.168.1.2 8000 < foo ]) > +NS_CHECK_EXEC([sw11], [nc 192.168.1.2 8000 -z], [0], [ignore], [ignore]) > test_ping sw11 192.168.1.2 > > # Ensure conntrack entry is present > @@ -8126,7 +8126,7 @@ tcp,orig=(src=192.168.2.2,dst=192.168.1.2,sport=<cleared>,dport=<cleared>),reply > AT_CHECK([ovs-appctl dpctl/flush-conntrack]) > > # SNAT and DNAT. using floating IP > -NS_CHECK_EXEC([sw11], [nc 172.16.1.2 8000 < foo ]) > +NS_CHECK_EXEC([sw11], [nc 172.16.1.2 8000 -z], [0], [ignore], [ignore]) > test_ping sw11 172.16.1.2 > > # Ensure conntrack entry is present > -- > 2.35.3 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 066eab19b..c0621a569 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -4590,8 +4590,8 @@ ovn-nbctl --wait=hv -t 3 sync NS_CHECK_EXEC([lsp], [timeout 2s nc -k -l 42.42.42.1 4041 &], [0]) # Check that IPv4 TCP hairpin connection succeeds on both VIPs. -NS_CHECK_EXEC([lsp], [nc 88.88.88.88 8080 -z], [0]) -NS_CHECK_EXEC([lsp], [nc 88.88.88.89 8080 -z], [0]) +NS_CHECK_EXEC([lsp], [nc 88.88.88.88 8080 -z], [0], [ignore], [ignore]) +NS_CHECK_EXEC([lsp], [nc 88.88.88.89 8080 -z], [0], [ignore], [ignore]) # Capture IPv4 UDP hairpinned packets. filter="dst 42.42.42.1 and dst port 2021 and udp" @@ -4676,8 +4676,8 @@ ovn-nbctl --wait=hv -t 3 sync NS_CHECK_EXEC([lsp], [timeout 2s nc -k -l 4200::1 4041 &], [0]) # Check that IPv6 TCP hairpin connection succeeds on both VIPs. -NS_CHECK_EXEC([lsp], [nc 8800::0088 8080 -z], [0]) -NS_CHECK_EXEC([lsp], [nc 8800::0089 8080 -z], [0]) +NS_CHECK_EXEC([lsp], [nc 8800::0088 8080 -z], [0], [ignore], [ignore]) +NS_CHECK_EXEC([lsp], [nc 8800::0089 8080 -z], [0], [ignore], [ignore]) # Capture IPv6 UDP hairpinned packets. filter="dst 4200::1 and dst port 2021 and udp" @@ -5540,18 +5540,18 @@ NS_CHECK_EXEC([sw0-p2-lbc], [ip route add default via 20.0.0.1 dev sw1p2], [0]) NETNS_DAEMONIZE([sw0-p2-lbc], [nc -l -k 20.0.0.4 80], [nc0.pid]) # Send the packet to backend -NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 20.0.0.4 80], [0]) +NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 20.0.0.4 80], [0], [ignore], [ignore]) # Send the packet to VIP. -NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 30.0.0.10 80], [0]) +NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 30.0.0.10 80], [0], [ignore], [ignore]) # Now add an ACL in sw1. ovn-nbctl --wait=hv acl-add sw1 to-lport 2002 "ip" allow-related # Send the packet to backend -NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 20.0.0.4 80], [0]) +NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 20.0.0.4 80], [0], [ignore], [ignore]) # Send the packet to VIP. -NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 30.0.0.10 80], [0]) +NS_CHECK_EXEC([sw0-p1-lbc], [nc -z 30.0.0.10 80], [0], [ignore], [ignore]) OVS_APP_EXIT_AND_WAIT([ovn-controller]) @@ -5625,10 +5625,10 @@ check ovn-nbctl --wait=hv sync NETNS_DAEMONIZE([vm1], [nc -k -l 42.42.42.2 4242], [nc-vm1.pid]) # Make sure connecting to the VIP works. -NS_CHECK_EXEC([vm2], [nc 66.66.66.66 666 -p 2000 -z]) +NS_CHECK_EXEC([vm2], [nc 66.66.66.66 666 -p 2000 -z], [0], [ignore], [ignore]) # Start IPv4 TCP connection to VIP from vm2. -NS_CHECK_EXEC([vm2], [nc 66.66.66.66 666 -p 2001 -z]) +NS_CHECK_EXEC([vm2], [nc 66.66.66.66 666 -p 2001 -z], [0], [ignore], [ignore]) # Check conntrack. We expect two entries: # - one in vm1's zone (firewall) @@ -5645,7 +5645,7 @@ tcp,orig=(src=42.42.42.3,dst=66.66.66.66,sport=<clnt_s_port>,dport=666),reply=(s # Start IPv4 TCP connection to backend IP from vm2 which would require # additional source port translation to avoid a tuple conflict. -NS_CHECK_EXEC([vm2], [nc 42.42.42.2 4242 -p 2001 -z]) +NS_CHECK_EXEC([vm2], [nc 42.42.42.2 4242 -p 2001 -z], [0], [ignore], [ignore]) # Check conntrack. We expect three entries: # - one in vm1's zone (firewall) - reused from the previous connection. @@ -5721,10 +5721,10 @@ check ovn-nbctl --wait=hv sync NETNS_DAEMONIZE([vm1], [nc -k -l 4242::2 4242], [nc-vm1.pid]) # Make sure connecting to the VIP works. -NS_CHECK_EXEC([vm2], [nc 6666::1 666 -p 2000 -z]) +NS_CHECK_EXEC([vm2], [nc 6666::1 666 -p 2000 -z], [0], [ignore], [ignore]) # Start IPv6 TCP connection to VIP from vm2. -NS_CHECK_EXEC([vm2], [nc 6666::1 666 -p 2001 -z]) +NS_CHECK_EXEC([vm2], [nc 6666::1 666 -p 2001 -z], [0], [ignore], [ignore]) # Check conntrack. We expect two entries: # - one in vm1's zone (firewall) @@ -5741,7 +5741,7 @@ tcp,orig=(src=4242::3,dst=6666::1,sport=<clnt_s_port>,dport=666),reply=(src=4242 # Start IPv6 TCP connection to backend IP from vm2 which would require # additional source port translation to avoid a tuple conflict. -NS_CHECK_EXEC([vm2], [nc 4242::2 4242 -p 2001 -z]) +NS_CHECK_EXEC([vm2], [nc 4242::2 4242 -p 2001 -z], [0], [ignore], [ignore]) # Check conntrack. We expect three entries: # - one in vm1's zone (firewall) - reused from the previous connection. @@ -8095,7 +8095,7 @@ test_ping() { check ovn-nbctl --wait=hv lr-nat-add R1 snat 172.16.1.21 192.168.2.0/24 echo "foo" > foo -NS_CHECK_EXEC([sw11], [nc 192.168.1.2 8000 < foo]) +NS_CHECK_EXEC([sw11], [nc 192.168.1.2 8000 -z], [0], [ignore], [ignore]) test_ping sw11 192.168.1.2 # Ensure nat has been hit @@ -8112,7 +8112,7 @@ AT_CHECK([ovs-appctl dpctl/flush-conntrack]) # SNAT and DNAT. using Logical IP ovn-nbctl --wait=hv lr-nat-add R1 dnat_and_snat 172.16.1.2 192.168.1.2 -NS_CHECK_EXEC([sw11], [nc 192.168.1.2 8000 < foo ]) +NS_CHECK_EXEC([sw11], [nc 192.168.1.2 8000 -z], [0], [ignore], [ignore]) test_ping sw11 192.168.1.2 # Ensure conntrack entry is present @@ -8126,7 +8126,7 @@ tcp,orig=(src=192.168.2.2,dst=192.168.1.2,sport=<cleared>,dport=<cleared>),reply AT_CHECK([ovs-appctl dpctl/flush-conntrack]) # SNAT and DNAT. using floating IP -NS_CHECK_EXEC([sw11], [nc 172.16.1.2 8000 < foo ]) +NS_CHECK_EXEC([sw11], [nc 172.16.1.2 8000 -z], [0], [ignore], [ignore]) test_ping sw11 172.16.1.2 # Ensure conntrack entry is present
The netcat compilation options differ between distributions, make the nc execution more robust. Now it does not fail on success message being printed to stderr. Signed-off-by: Ales Musil <amusil@redhat.com> --- tests/system-ovn.at | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)