..

Author: zeeshanlakhani

dpd-client/tests/integration_tests/mcast.rs

@@ -3861,33 +3861,35 @@ async fn test_multicast_group_id_recycling() -> TestResult {
         group_ip: group_ip1,
         tag: Some("recycling_test_1".to_string()),
         nat_target: nat_target.clone(),
-        vlan_id: 10,
+        vlan_id: Some(10),
         sources: None,
-        ports: vec![],
     };
 
     let created_group1 = switch
+        .client
         .multicast_group_create_external(&external_create1)
-        .await?;
+        .await?
+        .into_inner();
 
     let first_external_id = created_group1.external_group_id;
     let first_underlay_id = created_group1.underlay_group_id;
 
-    switch.multicast_group_delete(&group_ip1).await?;
+    switch.client.multicast_group_delete(&group_ip1).await?;
 
     let group_ip2 = IpAddr::V4(Ipv4Addr::new(224, 0, 0, 100));
     let external_create2 = types::MulticastGroupCreateExternalEntry {
         group_ip: group_ip2,
         tag: Some("recycling_test_2".to_string()),
         nat_target: nat_target.clone(),
-        vlan_id: 10,
+        vlan_id: Some(10),
         sources: None,
-        ports: vec![],
     };
 
     let created_group2 = switch
+        .client
         .multicast_group_create_external(&external_create2)
-        .await?;
+        .await?
+        .into_inner();
 
     assert!(
         created_group2.external_group_id.is_some(),
@@ -3903,14 +3905,15 @@ async fn test_multicast_group_id_recycling() -> TestResult {
         group_ip: group_ip3,
         tag: Some("recycling_test_3".to_string()),
         nat_target: nat_target.clone(),
-        vlan_id: 10,
+        vlan_id: Some(10),
         sources: None,
-        ports: vec![],
     };
 
     let created_group3 = switch
+        .client
         .multicast_group_create_external(&external_create3)
-        .await?;
+        .await?
+        .into_inner();
 
     assert!(
         created_group3.external_group_id.is_some(),
@@ -3956,14 +3959,15 @@ async fn test_multicast_group_id_reuse() -> TestResult {
             group_ip,
             tag: Some(format!("id_reuse_test_{}", i)),
             nat_target,
-            vlan_id: 10,
+            vlan_id: Some(10),
             sources: None,
-            ports: vec![],
-        };
+            };
 
         let created_group = switch
+            .client
             .multicast_group_create_external(&external_create)
-            .await?;
+            .await?
+            .into_inner();
 
         if let Some(external_id) = created_group.external_group_id {
             deleted_external_ids.push(external_id);
@@ -3972,7 +3976,7 @@ async fn test_multicast_group_id_reuse() -> TestResult {
             deleted_underlay_ids.push(underlay_id);
         }
 
-        switch.multicast_group_delete(&group_ip).await?;
+        switch.client.multicast_group_delete(&group_ip).await?;
     }
 
     let new_group_ip = IpAddr::V4(Ipv4Addr::new(224, 0, 0, 200));
@@ -3981,14 +3985,15 @@ async fn test_multicast_group_id_reuse() -> TestResult {
         group_ip: new_group_ip,
         tag: Some("id_reuse_verification".to_string()),
         nat_target,
-        vlan_id: 10,
+        vlan_id: Some(10),
         sources: None,
-        ports: vec![],
     };
 
     let new_created_group = switch
+        .client
         .multicast_group_create_external(&new_external_create)
-        .await?;
+        .await?
+        .into_inner();
 
     if let Some(new_external_id) = new_created_group.external_group_id {
         assert!(
@@ -4046,14 +4051,15 @@ async fn test_multicast_group_id_pool_exhaustion_recovery() -> TestResult {
             group_ip,
             tag: Some(format!("pool_test_{}", i)),
             nat_target,
-            vlan_id: 10,
+            vlan_id: Some(10),
             sources: None,
-            ports: vec![],
-        };
+            };
 
         let created_group = switch
+            .client
             .multicast_group_create_external(&external_create)
-            .await?;
+            .await?
+            .into_inner();
 
         created_groups.push((group_ip, created_group));
     }
@@ -4067,7 +4073,7 @@ async fn test_multicast_group_id_pool_exhaustion_recovery() -> TestResult {
 
     let groups_to_delete = &created_groups[0..num_groups / 2];
     for (group_ip, _) in groups_to_delete {
-        switch.multicast_group_delete(group_ip).await?;
+        switch.client.multicast_group_delete(group_ip).await?;
     }
 
     let mut new_groups = Vec::new();
@@ -4078,14 +4084,15 @@ async fn test_multicast_group_id_pool_exhaustion_recovery() -> TestResult {
             group_ip,
             tag: Some(format!("pool_recovery_test_{}", i)),
             nat_target,
-            vlan_id: 10,
+            vlan_id: Some(10),
             sources: None,
-            ports: vec![],
-        };
+            };
 
         let created_group = switch
+            .client
             .multicast_group_create_external(&external_create)
-            .await?;
+            .await?
+            .into_inner();
 
         new_groups.push((group_ip, created_group));
     }

dpd/src/mcast/mod.rs

@@ -1280,7 +1280,6 @@ fn delete_multicast_groups(
         })?;
     }
 
-
     Ok(())
 }