..

Author: zeeshanlakhani

dpd-client/tests/integration_tests/mcast.rs

@@ -4503,105 +4503,123 @@ async fn test_ipv6_multicast_scope_validation() {
         .ok();
 }
 
-// #[tokio::test]
-// #[ignore]
-// async fn test_multicast_group_id_recycling() {
-//     let switch = &*get_switch().await;
-
-//     // Use admin-scoped IPv6 addresses that get group IDs assigned
-//     let group1_ip = IpAddr::V6(Ipv6Addr::new(0xff05, 0, 0, 0, 0, 0, 0, 10));
-//     let group2_ip = IpAddr::V6(Ipv6Addr::new(0xff05, 0, 0, 0, 0, 0, 0, 11));
-//     let group3_ip = IpAddr::V6(Ipv6Addr::new(0xff05, 0, 0, 0, 0, 0, 0, 12));
-
-//     // Create first group and capture its group IDs
-//     let group1 = create_test_multicast_group(
-//         switch,
-//         group1_ip,
-//         Some("test_recycling_1"),
-//         &[(PhysPort(11), types::Direction::External)],
-//         None,
-//         false,
-//         None,
-//     )
-//     .await;
-
-//     let group1_external_id = group1.external_group_id;
-//     assert!(group1_external_id.is_some());
-
-//     // Create second group and capture its group IDs
-//     let group2 = create_test_multicast_group(
-//         switch,
-//         group2_ip,
-//         Some("test_recycling_2"),
-//         &[(PhysPort(12), types::Direction::External)],
-//         None,
-//         false,
-//         None,
-//     )
-//     .await;
-
-//     let group2_external_id = group2.external_group_id;
-//     assert!(group2_external_id.is_some());
-//     assert_ne!(group1_external_id, group2_external_id);
-
-//     // Delete the first group
-//     switch
-//         .client
-//         .multicast_group_delete(&group1_ip)
-//         .await
-//         .expect("Should be able to delete first group");
-
-//     // Create third group - should reuse the first group's ID
-//     let group3 = create_test_multicast_group(
-//         switch,
-//         group3_ip,
-//         Some("test_recycling_3"),
-//         &[(PhysPort(13), types::Direction::External)],
-//         None,
-//         false,
-//         None,
-//     )
-//     .await;
-
-//     let group3_external_id = group3.external_group_id;
-//     assert!(group3_external_id.is_some());
-
-//     // Verify that ID recycling is working - group3 should get an ID that was previously used
-//     // The exact ID depends on allocation strategy, but it should be different from group2
-//     assert_ne!(
-//         group2_external_id, group3_external_id,
-//         "Third group should get a different ID than the active second group"
-//     );
-
-//     // Create a fourth group after deleting group2, it should reuse group2's ID
-//     switch
-//         .client
-//         .multicast_group_delete(&group2_ip)
-//         .await
-//         .expect("Should be able to delete second group");
-
-//     let group4_ip = IpAddr::V6(Ipv6Addr::new(0xff05, 0, 0, 0, 0, 0, 0, 13));
-//     let group4 = create_test_multicast_group(
-//         switch,
-//         group4_ip,
-//         Some("test_recycling_4"),
-//         &[(PhysPort(14), types::Direction::External)],
-//         None,
-//         false,
-//         None,
-//     )
-//     .await;
-
-//     let group4_external_id = group4.external_group_id;
-//     assert!(group4_external_id.is_some());
-
-//     // Group4 should reuse group2's recently freed ID due to stack-like allocation
-//     assert_eq!(
-//         group2_external_id, group4_external_id,
-//         "Fourth group should reuse second group's recycled ID"
-//     );
-
-//     // Cleanup
-//     cleanup_test_group(switch, group3_ip).await;
-//     cleanup_test_group(switch, group4_ip).await;
-// }
+#[tokio::test]
+#[ignore]
+async fn test_multicast_group_id_recycling() {
+    let switch = &*get_switch().await;
+
+    // Use admin-scoped IPv6 addresses that get group IDs assigned
+    let group1_ip = IpAddr::V6(Ipv6Addr::new(0xff05, 0, 0, 0, 0, 0, 0, 10));
+    let group2_ip = IpAddr::V6(Ipv6Addr::new(0xff05, 0, 0, 0, 0, 0, 0, 11));
+    let group3_ip = IpAddr::V6(Ipv6Addr::new(0xff05, 0, 0, 0, 0, 0, 0, 12));
+
+    // Create first group and capture its group IDs
+    let group1 = create_test_multicast_group(
+        switch,
+        group1_ip,
+        Some("test_recycling_1"),
+        &[(PhysPort(11), types::Direction::External)],
+        None,
+        false,
+        None,
+    )
+    .await;
+
+    let group1_external_id = group1.external_group_id;
+    assert!(group1_external_id.is_some());
+
+    // Create second group and capture its group IDs
+    let group2 = create_test_multicast_group(
+        switch,
+        group2_ip,
+        Some("test_recycling_2"),
+        &[(PhysPort(12), types::Direction::External)],
+        None,
+        false,
+        None,
+    )
+    .await;
+
+    let group2_external_id = group2.external_group_id;
+    assert!(group2_external_id.is_some());
+    assert_ne!(group1_external_id, group2_external_id);
+
+    // Delete the first group
+    switch
+        .client
+        .multicast_group_delete(&group1_ip)
+        .await
+        .expect("Should be able to delete first group");
+
+    // Verify group1 was actually deleted
+    let groups_after_delete1 = switch
+        .client
+        .multicast_groups_list_stream(None)
+        .try_collect::<Vec<_>>()
+        .await
+        .expect("Should be able to list groups");
+    assert!(!groups_after_delete1.iter().any(|g| g.group_ip == group1_ip), "Group1 should be deleted");
+
+    // Create third group - should reuse the first group's ID
+    let group3 = create_test_multicast_group(
+        switch,
+        group3_ip,
+        Some("test_recycling_3"),
+        &[(PhysPort(13), types::Direction::External)],
+        None,
+        false,
+        None,
+    )
+    .await;
+
+    let group3_external_id = group3.external_group_id;
+    assert!(group3_external_id.is_some());
+
+    // Verify that ID recycling is working - group3 should get an ID that was previously used
+    // The exact ID depends on allocation strategy, but it should be different from group2
+    assert_ne!(
+        group2_external_id, group3_external_id,
+        "Third group should get a different ID than the active second group"
+    );
+
+    // The key test: create a fourth group after deleting group2, it should reuse group2's ID
+    switch
+        .client
+        .multicast_group_delete(&group2_ip)
+        .await
+        .expect("Should be able to delete second group");
+
+    // Verify group2 was actually deleted
+    let groups_after_delete2 = switch
+        .client
+        .multicast_groups_list_stream(None)
+        .try_collect::<Vec<_>>()
+        .await
+        .expect("Should be able to list groups");
+    assert!(!groups_after_delete2.iter().any(|g| g.group_ip == group2_ip), "Group2 should be deleted");
+
+    let group4_ip = IpAddr::V6(Ipv6Addr::new(0xff05, 0, 0, 0, 0, 0, 0, 13));
+    let group4 = create_test_multicast_group(
+        switch,
+        group4_ip,
+        Some("test_recycling_4"),
+        &[(PhysPort(14), types::Direction::External)],
+        None,
+        false,
+        None,
+    )
+    .await;
+
+    let group4_external_id = group4.external_group_id;
+    assert!(group4_external_id.is_some());
+
+    // Group4 should reuse group2's recently freed ID due to stack-like allocation
+    assert_eq!(
+        group2_external_id, group4_external_id,
+        "Fourth group should reuse second group's recycled ID"
+    );
+
+    // Cleanup - clean up remaining active groups
+    cleanup_test_group(switch, group3_ip).await;
+    cleanup_test_group(switch, group4_ip).await;
+}