diff mbox series

[ovs-dev,v2,2/5] system-ovn.at: Use ADD_BR macro instead of bare ovs-vsctl.

Message ID 20210609121150.11608.45422.stgit@dceara.remote.csb
State Superseded
Headers show
Series Handle DNAT/no-NAT conntrack tuple collisions if possible. | expand

Commit Message

Dumitru Ceara June 9, 2021, 12:11 p.m. UTC
br-int and br-ex are patched together by ovn-controller.  They must have
the same datapath type.  I.e., it won't work if br-int uses the netdev
(userspace) datapath and br-ext uses the system (kernel) datapath;
system is the default.  This ensures the datapath type is properly set
for the br-ext bridge.

a8362ff85dee ("northd: Fix the missing force_snat_for_lb flows when router_ip is configured.")
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
---
 tests/system-ovn.at |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Mark Gray June 10, 2021, 4:28 p.m. UTC | #1
On 09/06/2021 13:11, Dumitru Ceara wrote:
> br-int and br-ex are patched together by ovn-controller.  They must have
> the same datapath type.  I.e., it won't work if br-int uses the netdev
> (userspace) datapath and br-ext uses the system (kernel) datapath;
> system is the default.  This ensures the datapath type is properly set
> for the br-ext bridge.
> 
> a8362ff85dee ("northd: Fix the missing force_snat_for_lb flows when router_ip is configured.")
> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
> ---
>  tests/system-ovn.at |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tests/system-ovn.at b/tests/system-ovn.at
> index 76fc21c87..310bd3d5a 100644
> --- a/tests/system-ovn.at
> +++ b/tests/system-ovn.at
> @@ -2312,8 +2312,7 @@ CHECK_CONNTRACK_NAT()
>  ovn_start
>  OVS_TRAFFIC_VSWITCHD_START()
>  ADD_BR([br-int])
> -check ovs-vsctl add-br br-ext
> -
> +ADD_BR([br-ext], [set Bridge br-ext fail-mode=standalone])
>  
>  # Set external-ids in br-int needed for ovn-controller
>  ovs-vsctl \
> 

Acked-by: Mark D. Gray <mark.d.gray@redhat.com>
diff mbox series

Patch

diff --git a/tests/system-ovn.at b/tests/system-ovn.at
index 76fc21c87..310bd3d5a 100644
--- a/tests/system-ovn.at
+++ b/tests/system-ovn.at
@@ -2312,8 +2312,7 @@  CHECK_CONNTRACK_NAT()
 ovn_start
 OVS_TRAFFIC_VSWITCHD_START()
 ADD_BR([br-int])
-check ovs-vsctl add-br br-ext
-
+ADD_BR([br-ext], [set Bridge br-ext fail-mode=standalone])
 
 # Set external-ids in br-int needed for ovn-controller
 ovs-vsctl \