diff mbox series

[ovs-dev,08/11] tests: Remove unused commands from mac-binding test.

Message ID 20250710153345.104954-9-xsimonar@redhat.com
State Superseded
Headers show
Series Multiple unit/system tests fixes. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes success github build: passed

Commit Message

Xavier Simonart July 10, 2025, 3:33 p.m. UTC 
Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
---
 tests/ovn.at | 11 -----------
 1 file changed, 11 deletions(-)

Comments

Mark Michelson July 21, 2025, 8:49 p.m. UTC | #1 
On 7/10/25 11:33 AM, Xavier Simonart via dev wrote:
> Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
> ---
>   tests/ovn.at | 11 -----------
>   1 file changed, 11 deletions(-)
> 
> diff --git a/tests/ovn.at b/tests/ovn.at
> index 274b77d70..e81d4e32a 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -36719,15 +36719,6 @@ send_icmp6_echo_req() {
>       as $hv ovs-appctl netdev-dummy/receive $dev $packet
>   }
>   
> -send_na() {
> -    local hv=$1 dev=$2 hdst=$3 hsrc=$4 idst=$5 isrc=$6
> -    local packet=$(fmt_pkt "Ether(dst='${hdst}', src='${hsrc}')/ \
> -                            IPv6(dst='${idst}', src='${isrc}')/ \
> -                            ICMPv6ND_NA(tgt='${isrc}')/ \
> -                            ICMPv6NDOptDstLLAddr(lladdr='${hsrc}')")
> -    as $hv ovs-appctl netdev-dummy/receive $dev $packet
> -}
> -
>   dump_icmp() {
>       local hdst=$1 hsrc=$2 idst=$3 isrc=$4 ttl=$5 type=$6 chksum=$7
>       local packet=$(fmt_pkt "Ether(dst='${hdst}', src='${hsrc}')/ \
> @@ -36795,7 +36786,6 @@ dump_icmp 00:00:00:00:10:1a 00:00:00:00:10:00 192.168.10.100 192.168.20.2 253 0
>   OVN_CHECK_PACKETS_CONTAIN([hv1/public-tx.pcap], [expected])
>   
>   wait_row_count mac_binding 1 ip="192.168.20.2" logical_port="gw-join"
> -n_arp=$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE |awk '/arp_spa=192.168.20.2/{print substr($4,11,1)}')
>   
>   OVS_WAIT_UNTIL([$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_BINDING | \
>                     sed 's/reg15=0x.,metadata=0x./reg15=<cleared>,metadata=<cleared>/g' | \
> @@ -36824,7 +36814,6 @@ check ovn-nbctl --wait=hv acl-del join
>   wait_row_count mac_binding 0
>   
>   send_icmp6_echo_req hv1 public 00:00:00:00:10:00 00:00:00:00:50:01 fd12::2 fd11::64
> -send_na hv1 vif1 00:00:00:00:10:00 00:00:00:00:50:01 fd11::1 fd11::64

I'm not familiar with this test. Why is it OK to remove this send_na call?

>   check_row_count mac_binding 1 mac=\"00:00:00:00:30:00\" ip=\"fd12::2\"
>   
>   n_ipv6=$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE |awk '/ipv6_src=fd12::2/{print substr($4,11,1)}')
Xavier Simonart July 23, 2025, 7:36 a.m. UTC | #2 
Hi Mark

Thanks for the review and comments.
See discussion below

Thanks
Xavier

On Mon, Jul 21, 2025 at 10:49 PM Mark Michelson <mmichels@redhat.com> wrote:

> On 7/10/25 11:33 AM, Xavier Simonart via dev wrote:
> > Signed-off-by: Xavier Simonart <xsimonar@redhat.com>
> > ---
> >   tests/ovn.at | 11 -----------
> >   1 file changed, 11 deletions(-)
> >
> > diff --git a/tests/ovn.at b/tests/ovn.at
> > index 274b77d70..e81d4e32a 100644
> > --- a/tests/ovn.at
> > +++ b/tests/ovn.at
> > @@ -36719,15 +36719,6 @@ send_icmp6_echo_req() {
> >       as $hv ovs-appctl netdev-dummy/receive $dev $packet
> >   }
> >
> > -send_na() {
> > -    local hv=$1 dev=$2 hdst=$3 hsrc=$4 idst=$5 isrc=$6
> > -    local packet=$(fmt_pkt "Ether(dst='${hdst}', src='${hsrc}')/ \
> > -                            IPv6(dst='${idst}', src='${isrc}')/ \
> > -                            ICMPv6ND_NA(tgt='${isrc}')/ \
> > -                            ICMPv6NDOptDstLLAddr(lladdr='${hsrc}')")
> > -    as $hv ovs-appctl netdev-dummy/receive $dev $packet
> > -}
> > -
> >   dump_icmp() {
> >       local hdst=$1 hsrc=$2 idst=$3 isrc=$4 ttl=$5 type=$6 chksum=$7
> >       local packet=$(fmt_pkt "Ether(dst='${hdst}', src='${hsrc}')/ \
> > @@ -36795,7 +36786,6 @@ dump_icmp 00:00:00:00:10:1a 00:00:00:00:10:00
> 192.168.10.100 192.168.20.2 253 0
> >   OVN_CHECK_PACKETS_CONTAIN([hv1/public-tx.pcap], [expected])
> >
> >   wait_row_count mac_binding 1 ip="192.168.20.2" logical_port="gw-join"
> > -n_arp=$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE |awk
> '/arp_spa=192.168.20.2/{print <http://192.168.20.2/%7Bprint>
> substr($4,11,1)}')
> >
> >   OVS_WAIT_UNTIL([$(ovs-ofctl dump-flows br-int
> table=OFTABLE_MAC_BINDING | \
> >                     sed
> 's/reg15=0x.,metadata=0x./reg15=<cleared>,metadata=<cleared>/g' | \
> > @@ -36824,7 +36814,6 @@ check ovn-nbctl --wait=hv acl-del join
> >   wait_row_count mac_binding 0
> >
> >   send_icmp6_echo_req hv1 public 00:00:00:00:10:00 00:00:00:00:50:01
> fd12::2 fd11::64
> > -send_na hv1 vif1 00:00:00:00:10:00 00:00:00:00:50:01 fd11::1 fd11::64
>
> I'm not familiar with this test. Why is it OK to remove this send_na call?
>
It does not look this na has anything to do with the test: it sends a NA
for mac 00:00:00:00:10:1a, IP6 fd11::64,
but we then check whether IP6 fd12::2 is in mac_binding
table/ MAC_CACHE_USE oftable.
It looks like this is left from the previous test.

>
> >   check_row_count mac_binding 1 mac=\"00:00:00:00:30:00\" ip=\"fd12::2\"
> >
> >   n_ipv6=$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE |awk
> '/ipv6_src=fd12::2/{print substr($4,11,1)}')
>
>
diff mbox series

Patch

diff --git a/tests/ovn.at b/tests/ovn.at
index 274b77d70..e81d4e32a 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -36719,15 +36719,6 @@  send_icmp6_echo_req() {
     as $hv ovs-appctl netdev-dummy/receive $dev $packet
 }
 
-send_na() {
-    local hv=$1 dev=$2 hdst=$3 hsrc=$4 idst=$5 isrc=$6
-    local packet=$(fmt_pkt "Ether(dst='${hdst}', src='${hsrc}')/ \
-                            IPv6(dst='${idst}', src='${isrc}')/ \
-                            ICMPv6ND_NA(tgt='${isrc}')/ \
-                            ICMPv6NDOptDstLLAddr(lladdr='${hsrc}')")
-    as $hv ovs-appctl netdev-dummy/receive $dev $packet
-}
-
 dump_icmp() {
     local hdst=$1 hsrc=$2 idst=$3 isrc=$4 ttl=$5 type=$6 chksum=$7
     local packet=$(fmt_pkt "Ether(dst='${hdst}', src='${hsrc}')/ \
@@ -36795,7 +36786,6 @@  dump_icmp 00:00:00:00:10:1a 00:00:00:00:10:00 192.168.10.100 192.168.20.2 253 0
 OVN_CHECK_PACKETS_CONTAIN([hv1/public-tx.pcap], [expected])
 
 wait_row_count mac_binding 1 ip="192.168.20.2" logical_port="gw-join"
-n_arp=$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE |awk '/arp_spa=192.168.20.2/{print substr($4,11,1)}')
 
 OVS_WAIT_UNTIL([$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_BINDING | \
                   sed 's/reg15=0x.,metadata=0x./reg15=<cleared>,metadata=<cleared>/g' | \
@@ -36824,7 +36814,6 @@  check ovn-nbctl --wait=hv acl-del join
 wait_row_count mac_binding 0
 
 send_icmp6_echo_req hv1 public 00:00:00:00:10:00 00:00:00:00:50:01 fd12::2 fd11::64
-send_na hv1 vif1 00:00:00:00:10:00 00:00:00:00:50:01 fd11::1 fd11::64
 check_row_count mac_binding 1 mac=\"00:00:00:00:30:00\" ip=\"fd12::2\"
 
 n_ipv6=$(ovs-ofctl dump-flows br-int table=OFTABLE_MAC_CACHE_USE |awk '/ipv6_src=fd12::2/{print substr($4,11,1)}')