[ovs-dev] [PATCH ovn v1 1/2] tests: Updated expected log message

2019-12-07 Thread Russell Bryant
A previous commit added more detail to this log message.  Fix the test
to reflect the new text.

Signed-off-by: Russell Bryant 
---
 tests/ovn.at | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/ovn.at b/tests/ovn.at
index 8f4d9a440..1d5369341 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -13618,22 +13618,22 @@ ovn-nbctl list logical_switch_port
 # Now try to add duplicate addresses on a new port. These should all fail
 ovn-nbctl --wait=sb lsp-add sw1 sw1-p5
 AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 10.0.0.1"], 
[1], [],
-[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 10.0.0.1
+[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '10.0.0.1' found on 
logical switch port 'sw1-p1'
 ])
 AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 10.0.0.2"], 
[1], [],
-[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 10.0.0.2
+[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '10.0.0.2' found on 
logical switch port 'sw1-p1'
 ])
 AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 aef0::1"], 
[1], [],
-[ovn-nbctl: Error on switch sw1: duplicate IPv6 address aef0::1
+[ovn-nbctl: Error on switch sw1: duplicate IPv6 address 'aef0::1' found on 
logical switch port 'sw1-p1'
 ])
 AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 aef0::2"], 
[1], [],
-[ovn-nbctl: Error on switch sw1: duplicate IPv6 address aef0::2
+[ovn-nbctl: Error on switch sw1: duplicate IPv6 address 'aef0::2' found on 
logical switch port 'sw1-p1'
 ])
 AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 192.168.0.2"], 
[1], [],
-[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 192.168.0.2
+[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '192.168.0.2' found on 
logical switch port 'sw1-p2'
 ])
 AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 192.168.0.3"], 
[1], [],
-[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 192.168.0.3
+[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '192.168.0.3' found on 
logical switch port 'sw1-p3'
 ])
 
 # Now try re-setting sw1-p1. This should succeed
-- 
2.23.0

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


Re: [ovs-dev] [PATCH ovn v1 1/2] tests: Updated expected log message

2019-12-08 Thread Dumitru Ceara
On Sun, Dec 8, 2019 at 5:18 AM Russell Bryant  wrote:
>
> A previous commit added more detail to this log message.  Fix the test
> to reflect the new text.
>
> Signed-off-by: Russell Bryant 

Hi Russell,

Thanks for fixing the failing test case.

Acked-by: Dumitru Ceara 

> ---
>  tests/ovn.at | 12 ++--
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tests/ovn.at b/tests/ovn.at
> index 8f4d9a440..1d5369341 100644
> --- a/tests/ovn.at
> +++ b/tests/ovn.at
> @@ -13618,22 +13618,22 @@ ovn-nbctl list logical_switch_port
>  # Now try to add duplicate addresses on a new port. These should all fail
>  ovn-nbctl --wait=sb lsp-add sw1 sw1-p5
>  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 10.0.0.1"], 
> [1], [],
> -[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 10.0.0.1
> +[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '10.0.0.1' found on 
> logical switch port 'sw1-p1'
>  ])
>  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 10.0.0.2"], 
> [1], [],
> -[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 10.0.0.2
> +[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '10.0.0.2' found on 
> logical switch port 'sw1-p1'
>  ])
>  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 aef0::1"], 
> [1], [],
> -[ovn-nbctl: Error on switch sw1: duplicate IPv6 address aef0::1
> +[ovn-nbctl: Error on switch sw1: duplicate IPv6 address 'aef0::1' found on 
> logical switch port 'sw1-p1'
>  ])
>  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 aef0::2"], 
> [1], [],
> -[ovn-nbctl: Error on switch sw1: duplicate IPv6 address aef0::2
> +[ovn-nbctl: Error on switch sw1: duplicate IPv6 address 'aef0::2' found on 
> logical switch port 'sw1-p1'
>  ])
>  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 
> 192.168.0.2"], [1], [],
> -[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 192.168.0.2
> +[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '192.168.0.2' found 
> on logical switch port 'sw1-p2'
>  ])
>  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04 
> 192.168.0.3"], [1], [],
> -[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 192.168.0.3
> +[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '192.168.0.3' found 
> on logical switch port 'sw1-p3'
>  ])
>
>  # Now try re-setting sw1-p1. This should succeed
> --
> 2.23.0
>
> ___
> dev mailing list
> d...@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


Re: [ovs-dev] [PATCH ovn v1 1/2] tests: Updated expected log message

2019-12-09 Thread Russell Bryant
On Mon, Dec 9, 2019 at 2:54 AM Dumitru Ceara  wrote:

> On Sun, Dec 8, 2019 at 5:18 AM Russell Bryant  wrote:
> >
> > A previous commit added more detail to this log message.  Fix the test
> > to reflect the new text.
> >
> > Signed-off-by: Russell Bryant 
>
> Hi Russell,
>
> Thanks for fixing the failing test case.
>
> Acked-by: Dumitru Ceara 
>

Thanks, I pushed this to master.

>
> > ---
> >  tests/ovn.at | 12 ++--
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/tests/ovn.at b/tests/ovn.at
> > index 8f4d9a440..1d5369341 100644
> > --- a/tests/ovn.at
> > +++ b/tests/ovn.at
> > @@ -13618,22 +13618,22 @@ ovn-nbctl list logical_switch_port
> >  # Now try to add duplicate addresses on a new port. These should all
> fail
> >  ovn-nbctl --wait=sb lsp-add sw1 sw1-p5
> >  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04
> 10.0.0.1"], [1], [],
> > -[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 10.0.0.1
> > +[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '10.0.0.1'
> found on logical switch port 'sw1-p1'
> >  ])
> >  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04
> 10.0.0.2"], [1], [],
> > -[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 10.0.0.2
> > +[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '10.0.0.2'
> found on logical switch port 'sw1-p1'
> >  ])
> >  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04
> aef0::1"], [1], [],
> > -[ovn-nbctl: Error on switch sw1: duplicate IPv6 address aef0::1
> > +[ovn-nbctl: Error on switch sw1: duplicate IPv6 address 'aef0::1' found
> on logical switch port 'sw1-p1'
> >  ])
> >  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04
> aef0::2"], [1], [],
> > -[ovn-nbctl: Error on switch sw1: duplicate IPv6 address aef0::2
> > +[ovn-nbctl: Error on switch sw1: duplicate IPv6 address 'aef0::2' found
> on logical switch port 'sw1-p1'
> >  ])
> >  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04
> 192.168.0.2"], [1], [],
> > -[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 192.168.0.2
> > +[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '192.168.0.2'
> found on logical switch port 'sw1-p2'
> >  ])
> >  AT_CHECK([ovn-nbctl lsp-set-addresses sw1-p5 "00:00:00:00:00:04
> 192.168.0.3"], [1], [],
> > -[ovn-nbctl: Error on switch sw1: duplicate IPv4 address 192.168.0.3
> > +[ovn-nbctl: Error on switch sw1: duplicate IPv4 address '192.168.0.3'
> found on logical switch port 'sw1-p3'
> >  ])
> >
> >  # Now try re-setting sw1-p1. This should succeed
> > --
> > 2.23.0
> >
> > ___
> > dev mailing list
> > d...@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
>
>

-- 
Russell Bryant
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev