Skip to content

Commit d6d9570

Browse files
dcearaalmusil
authored andcommitted
ovn-northd.at: Fix 'enable-stateless-acl-with-lb usage' test.
It was missing an '--wait=sb sync' between changing NB and checking SB contents. While at it, also remove some redundant calls to 'ovn-nbctl --wait=sb sync'. Fixes: abbc272 ("northd: Add option to make work lb with stateless ACL.") Signed-off-by: Dumitru Ceara <dceara@redhat.com> Signed-off-by: Ales Musil <amusil@redhat.com>
1 parent e457633 commit d6d9570

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

tests/ovn-northd.at

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17467,20 +17467,20 @@ ovn_start ovn-northd
1746717467

1746817468
AS_BOX([Create logical switches and ports.])
1746917469
check ovn-nbctl ls-add sw0
17470-
check ovn-nbctl --wait=sb lsp-add sw0 sw0-p1 -- lsp-set-addresses sw0-p1 \
17470+
check ovn-nbctl lsp-add sw0 sw0-p1 -- lsp-set-addresses sw0-p1 \
1747117471
"00:00:00:00:00:02 10.0.0.2"
1747217472

17473-
check ovn-nbctl --wait=sb lsp-add sw0 sw0-p2 -- lsp-set-addresses sw0-p2 \
17473+
check ovn-nbctl lsp-add sw0 sw0-p2 -- lsp-set-addresses sw0-p2 \
1747417474
"00:00:00:00:00:03 10.0.0.3"
1747517475

1747617476
AS_BOX([Create stateless ACLs.])
17477-
check ovn-nbctl --wait=sb acl-add sw0 from-lport 1001 "ip" allow-stateless
17478-
check ovn-nbctl --wait=sb acl-add sw0 to-lport 1001 "ip" allow-stateless
17477+
check ovn-nbctl acl-add sw0 from-lport 1001 "ip" allow-stateless
17478+
check ovn-nbctl acl-add sw0 to-lport 1001 "ip" allow-stateless
1747917479

1748017480
AS_BOX([Create stateful ACLs.])
1748117481
# check if allow-stateless acls have higher priority we skip conntrack.
17482-
check ovn-nbctl --wait=sb acl-add sw0 from-lport 1000 "ip" allow-related
17483-
check ovn-nbctl --wait=sb acl-add sw0 to-lport 1000 "ip" allow-related
17482+
check ovn-nbctl acl-add sw0 from-lport 1000 "ip" allow-related
17483+
check ovn-nbctl acl-add sw0 to-lport 1000 "ip" allow-related
1748417484

1748517485
AS_BOX([Create Load Balancer.])
1748617486
check ovn-nbctl lb-add lb1 10.0.0.4:80 10.0.0.2:80,10.0.0.3:80
@@ -17536,7 +17536,7 @@ AT_CHECK([grep -E 'ls_in_pre_stateful' sw0flows | ovn_strip_lflows], [0], [dnl
1753617536
])
1753717537

1753817538
AS_BOX([Create Load Balancer without port.])
17539-
check ovn-nbctl --wait=sb ls-lb-del sw0 lb1
17539+
check ovn-nbctl ls-lb-del sw0 lb1
1754017540
check ovn-nbctl lb-add lb2 10.0.0.5 10.0.0.2,10.0.0.3
1754117541
check ovn-nbctl --wait=sb ls-lb-add sw0 lb2
1754217542

@@ -17570,6 +17570,7 @@ AS_BOX([Create one more logical switch with load balancer.])
1757017570
# where the option is enabled.
1757117571
check ovn-nbctl ls-add sw1
1757217572
check ovn-nbctl ls-lb-add sw1 lb2
17573+
check ovn-nbctl --wait=sb sync
1757317574

1757417575
ovn-sbctl dump-flows sw1 > sw1flows
1757517576
AT_CHECK([grep -E 'ls_in_pre_stateful' sw1flows | ovn_strip_lflows], [0], [dnl

0 commit comments

Comments
 (0)