There are differences between branches 23.09 and 24.03 (e.g., IC tests
have been consolidated in ovn-ic.at) which made the original backport
non-trivial and some changes were missed.
This commit fixes that.
Fixes: 5f0809be5657 ("Revert "northd: Don't skip transit switch LSP when
creating mcast groups."")
Signed-off-by: Dumitru Ceara <[email protected]>
---
V2:
- fix unit test that was missed while backporting the fix.
---
northd/northd.c | 6 ------
tests/ovn.at | 10 ----------
2 files changed, 16 deletions(-)
diff --git a/northd/northd.c b/northd/northd.c
index 60f692aff3..2873a9bc48 100644
--- a/northd/northd.c
+++ b/northd/northd.c
@@ -806,12 +806,6 @@ ovn_datapath_is_stale(const struct ovn_datapath *od)
return !od->nbr && !od->nbs;
}
-static inline bool
-ovn_datapath_is_transit_switch(const struct ovn_datapath *od)
-{
- return od->tunnel_key >= OVN_MIN_DP_KEY_GLOBAL;
-}
-
static struct ovn_datapath *
ovn_datapath_from_sbrec(const struct hmap *ls_datapaths,
const struct hmap *lr_datapaths,
diff --git a/tests/ovn.at b/tests/ovn.at
index 3004e4d8d4..6d72ef6a13 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -26677,20 +26677,10 @@ wait_row_count IGMP_Group 2 address=239.0.1.68
wait_row_count IGMP_Group 2 address='"ff0a:dead:beef::1"'
check ovn-nbctl --wait=hv sync
-#Validate that Multicast Group contains all registered ports for
-# specific igmp group.
-ts_dp=$(fetch_column datapath_binding _uuid external_ids:name=ts)
-ports=$(fetch_column multicast_group ports name="239.0.1.68" datapath=$ts_dp)
-check test X2 = X$(echo $ports | wc -w)
-
-
ovn_as az2
wait_row_count IGMP_Group 2 address=239.0.1.68
wait_row_count IGMP_Group 2 address='"ff0a:dead:beef::1"'
check ovn-nbctl --wait=hv sync
-ts_dp=$(fetch_column datapath_binding _uuid external_ids:name=ts)
-ports=$(fetch_column multicast_group ports name="239.0.1.68" datapath=$ts_dp)
-check test X2 = X$(echo $ports | wc -w)
# Send an IP multicast packet from LSP2, it should be forwarded
# to lsp1 and lsp3.
--
2.44.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
