diff mbox series

[ovs-dev] ovn.at: Fix IPv6 periodic RA test on Windows

Message ID 20180114170516.19632-1-aserdean@ovn.org
State Accepted
Headers show
Series [ovs-dev] ovn.at: Fix IPv6 periodic RA test on Windows | expand

Commit Message

Alin-Gabriel Serdean Jan. 14, 2018, 5:05 p.m. UTC 
One issue with this test is that MSYS mangles the shorter form of the IPv6 address.
To solve this, we switch to the longer notation of it.

Another issue is that `printf` command does not add the leading `0` to the packet.
We switch to a more platform independent `awk` substitution.

Co-authored-by: Mark Michelson <mmichels@redhat.com>
Signed-off-by: Mark Michelson <mmichels@redhat.com>
Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
---
 tests/ovn.at | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Ben Pfaff Jan. 23, 2018, 12:20 a.m. UTC | #1 
On Sun, Jan 14, 2018 at 07:05:16PM +0200, Alin Gabriel Serdean wrote:
> One issue with this test is that MSYS mangles the shorter form of the IPv6 address.
> To solve this, we switch to the longer notation of it.
> 
> Another issue is that `printf` command does not add the leading `0` to the packet.
> We switch to a more platform independent `awk` substitution.
> 
> Co-authored-by: Mark Michelson <mmichels@redhat.com>
> Signed-off-by: Mark Michelson <mmichels@redhat.com>
> Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>

Acked-by: Ben Pfaff <blp@ovn.org>
Alin-Gabriel Serdean Jan. 23, 2018, 9:02 p.m. UTC | #2 
Thanks for the review!

I have a "\n" which isn't OK. Also, even with that changed I get the
following:
+++ /c/_2018/january/23/ovs/tests/testsuite.dir/at-groups/2378/stdout
2018-01-23 22:58:49 +0200
@@ -1 +1 @@
-ff4000000000000000000000010100000000000105010000000005dc03044080fffffffffff
fffff00000000aef0000000000000000000000000000003043080ffffffffffffffff0000000
0fd0f0000000000000000000000000000
+ff8000000000000000000000010100000000000105010000000005dc03044080fffffffffff
fffff00000000aef0000000000000000000000000000003043080ffffffffffffffff0000000
0fd0f0000000000000000000000000000
I will look into it and send another revision!

Thanks,
Alin.

> -----Original Message-----
> From: Ben Pfaff [mailto:blp@ovn.org]
> Sent: Tuesday, January 23, 2018 2:20 AM
> To: Alin Gabriel Serdean <aserdean@ovn.org>
> Cc: dev@openvswitch.org
> Subject: Re: [ovs-dev] [PATCH] ovn.at: Fix IPv6 periodic RA test on
Windows
> 
> On Sun, Jan 14, 2018 at 07:05:16PM +0200, Alin Gabriel Serdean wrote:
> > One issue with this test is that MSYS mangles the shorter form of the
IPv6
> address.
> > To solve this, we switch to the longer notation of it.
> >
> > Another issue is that `printf` command does not add the leading `0` to
the
> packet.
> > We switch to a more platform independent `awk` substitution.
> >
> > Co-authored-by: Mark Michelson <mmichels@redhat.com>
> > Signed-off-by: Mark Michelson <mmichels@redhat.com>
> > Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
> 
> Acked-by: Ben Pfaff <blp@ovn.org>
Alin-Gabriel Serdean April 16, 2018, 3 p.m. UTC | #3 
Apparently I needed the '\n'. I retested with tip of master on Ubuntu and
Windows and it was fine.

I applied it on master.

Alin.

> -----Mesaj original-----
> De la: ovs-dev-bounces@openvswitch.org <ovs-dev-
> bounces@openvswitch.org> În numele aserdean@ovn.org
> Trimis: Tuesday, January 23, 2018 11:02 PM
> Către: 'Ben Pfaff' <blp@ovn.org>; 'Alin Gabriel Serdean'
<aserdean@ovn.org>
> Cc: dev@openvswitch.org
> Subiect: Re: [ovs-dev] [PATCH] ovn.at: Fix IPv6 periodic RA test on
Windows
> 
> Thanks for the review!
>
diff mbox series

Patch

diff --git a/tests/ovn.at b/tests/ovn.at
index 98dcf68..b5540b3 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -9090,7 +9090,7 @@  ovs-vsctl add-br br-phys
 ovn_attach n1 br-phys 192.168.0.3
 
 ovn-nbctl lr-add ro
-ovn-nbctl lrp-add ro ro-sw 00:00:00:00:00:01 aef0::1/64
+ovn-nbctl lrp-add ro ro-sw 00:00:00:00:00:01 aef0:0:0:0:0:0:0:1/64
 
 ovn-nbctl ls-add sw
 ovn-nbctl lsp-add sw sw-ro
@@ -9159,7 +9159,7 @@  construct_expected_ra() {
     local icmp=8600XXXX${ra}
 
     local ip_len=$(expr ${#icmp} / 2)
-    ip_len=$(printf "%0.4x" ${ip_len})
+    ip_len=$(echo "$ip_len" | awk '{printf "%0.4x\n", $0}')
 
     local ip=60000000${ip_len}3aff${src_addr}${dst_addr}${icmp}
     local eth=${dst_mac}${src_mac}86dd${ip}