Commit 384a7c6237da ("northd: Refactor Logical Flows for routers with
DNAT/Load Balancers") changed the pipeline a bit, and started using
ct_dnat instead of ct_next.  Originally, the "conntrack nat implies
conntrack" test was written on top of the afore mentioned change.

On branch-21.06 however, we still have ct_next in the pipeline instead
of ct_dnat.  Adapt the test accordingly.

Reported-at: 
https://mail.openvswitch.org/pipermail/ovs-dev/2023-January/400996.html
Reported-by: Vladislav Odintsov <[email protected]>
Signed-off-by: Dumitru Ceara <[email protected]>
---
Note: This patch is only applicable to branch-21.06
---
 tests/ovn-northd.at | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index df95417fd6..b521b2dbda 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -3748,7 +3748,7 @@ flow="eth.dst == 00:00:00:00:01:00 && inport == 
\"rtr-ls\" && ip4.src == 42.42.4
 
 AT_CHECK_UNQUOTED([ovn-trace --ct new --minimal "${flow}" --lb-dst 
42.42.42.42:4242], [0], [dnl
 # 
tcp,reg14=0x1,vlan_tci=0x0000,dl_src=00:00:00:00:00:00,dl_dst=00:00:00:00:01:00,nw_src=42.42.42.42,nw_dst=43.43.43.43,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=0,tp_dst=4343,tcp_flags=0
-ct_dnat /* assuming no un-dnat entry, so no change */ {
+ct_next(ct_state=new|trk) {
     ct_lb {
         ip.ttl--;
         eth.src = 00:00:00:00:01:00;
@@ -3766,7 +3766,9 @@ ct_dnat /* assuming no un-dnat entry, so no change */ {
 
 AT_CHECK_UNQUOTED([ovn-trace --minimal "${flow}" --lb-dst 42.42.42.42:4242], 
[0], [dnl
 # 
tcp,reg14=0x1,vlan_tci=0x0000,dl_src=00:00:00:00:00:00,dl_dst=00:00:00:00:01:00,nw_src=42.42.42.42,nw_dst=43.43.43.43,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=0,tp_dst=4343,tcp_flags=0
-ct_dnat /* assuming no un-dnat entry, so no change */ /* default (use --ct to 
customize) */;
+ct_next(ct_state=est|trk /* default (use --ct to customize) */) {
+    ct_dnat /* assuming no un-dnat entry, so no change */;
+};
 ])
 
 AT_CLEANUP
-- 
2.31.1

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to