..

Author: zeeshanlakhani

dpd/src/mcast/mod.rs

@@ -599,8 +599,8 @@ pub(crate) fn del_group(s: &Switch, group_ip: IpAddr) -> DpdResult<()> {
     delete_multicast_groups(
         s,
         group_ip,
-        group.external_group_id(),
-        group.underlay_group_id(),
+        group.external_group_id.clone(),
+        group.underlay_group_id.clone(),
     )?;
 
     if let Some(internal_ip) = nat_target_to_remove {
@@ -1204,10 +1204,11 @@ fn create_multicast_group_ids(
 fn delete_multicast_groups(
     s: &Switch,
     group_ip: IpAddr,
-    external_group_id: Option<MulticastGroupId>,
-    underlay_group_id: Option<MulticastGroupId>,
+    external_group_id: Option<ScopedGroupId>,
+    underlay_group_id: Option<ScopedGroupId>,
 ) -> DpdResult<()> {
-    if let Some(external_id) = external_group_id {
+    if let Some(external_scoped) = external_group_id.as_ref() {
+        let external_id = external_scoped.id();
         s.asic_hdl.mc_group_destroy(external_id).map_err(|e| {
             DpdError::McastGroupFailure(format!(
                 "failed to delete external multicast group for IP {} with ID {}: {:?}",
@@ -1216,7 +1217,8 @@ fn delete_multicast_groups(
         })?;
     }
 
-    if let Some(underlay_id) = underlay_group_id {
+    if let Some(underlay_scoped) = underlay_group_id.as_ref() {
+        let underlay_id = underlay_scoped.id();
         s.asic_hdl.mc_group_destroy(underlay_id).map_err(|e| {
             DpdError::McastGroupFailure(format!(
                 "failed to delete underlay multicast group for IP {} with ID {}: {:?}",