[post-merge] leftover cleanup during conflicts

Author: zeeshanlakhani

nexus/db-model/src/multicast_group.rs

@@ -92,7 +92,6 @@ use nexus_db_schema::schema::{
     multicast_group, multicast_group_member, underlay_multicast_group,
 };
 use nexus_types::external_api::views;
-use nexus_types::identity::Resource;
 use omicron_common::api::external::{self, IdentityMetadata};
 use omicron_uuid_kinds::SledKind;
 
@@ -179,9 +178,6 @@ pub struct ExternalMulticastGroup {
     pub vni: Vni,
     /// Primary multicast IP address (overlay/external).
     pub multicast_ip: IpNetwork,
-    /// Source IP addresses for Source-Specific Multicast (SSM).
-    /// Empty array means any source is allowed.
-    pub source_ips: Vec<IpNetwork>,
     /// Associated underlay group for NAT.
     /// Initially None in ["Creating"](MulticastGroupState::Creating) state,
     /// populated by reconciler when group becomes ["Active"](MulticastGroupState::Active).
@@ -280,22 +276,6 @@ pub struct MulticastGroupMember {
 
 // Conversions to external API views
 
-impl From<ExternalMulticastGroup> for views::MulticastGroup {
-    fn from(group: ExternalMulticastGroup) -> Self {
-        views::MulticastGroup {
-            identity: group.identity(),
-            multicast_ip: group.multicast_ip.ip(),
-            source_ips: group
-                .source_ips
-                .into_iter()
-                .map(|ip| ip.ip())
-                .collect(),
-            ip_pool_id: group.ip_pool_id,
-            state: group.state.to_string(),
-        }
-    }
-}
-
 impl TryFrom<MulticastGroupMember> for views::MulticastGroupMember {
     type Error = external::Error;
 

nexus/db-queries/src/db/queries/external_multicast_group.rs

@@ -106,11 +106,6 @@ impl NextExternalMulticastGroup {
         // The multicast IP comes from the candidates subquery
         out.push_sql("candidate_ip AS multicast_ip, ");
 
-        // Source IPs are per-member in the implicit lifecycle model.
-        // Groups are created with empty source IPs; the union is computed
-        // from member sources.
-        out.push_sql("ARRAY[]::inet[] AS source_ips, ");
-
         out.push_bind_param::<sql_types::Nullable<sql_types::Uuid>, Option<Uuid>>(&None)?;
         out.push_sql(" AS underlay_group_id, ");
 
@@ -269,10 +264,10 @@ impl QueryFragment<Pg> for NextExternalMulticastGroup {
         out.push_sql("INSERT INTO ");
         schema::multicast_group::table.walk_ast(out.reborrow())?;
         out.push_sql(
-            " (id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, source_ips, underlay_group_id, underlay_salt, tag, state, version_added, version_removed)
-             SELECT id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, source_ips, underlay_group_id, underlay_salt, tag, state, version_added, version_removed FROM next_external_multicast_group
+            " (id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, underlay_group_id, underlay_salt, tag, state, version_added, version_removed)
+             SELECT id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, underlay_group_id, underlay_salt, tag, state, version_added, version_removed FROM next_external_multicast_group
                 WHERE NOT EXISTS (SELECT 1 FROM previously_allocated_group)
-                RETURNING id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, source_ips, underlay_group_id, underlay_salt, tag, state, version_added, version_removed",
+                RETURNING id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, underlay_group_id, underlay_salt, tag, state, version_added, version_removed",
         );
         out.push_sql("), ");
 
@@ -283,9 +278,9 @@ impl QueryFragment<Pg> for NextExternalMulticastGroup {
 
         // Return either the newly inserted or previously allocated group
         out.push_sql(
-            "SELECT id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, source_ips, underlay_group_id, underlay_salt, tag, state, version_added, version_removed FROM previously_allocated_group
+            "SELECT id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, underlay_group_id, underlay_salt, tag, state, version_added, version_removed FROM previously_allocated_group
             UNION ALL
-            SELECT id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, source_ips, underlay_group_id, underlay_salt, tag, state, version_added, version_removed FROM multicast_group",
+            SELECT id, name, description, time_created, time_modified, time_deleted, ip_pool_id, ip_pool_range_id, vni, multicast_ip, underlay_group_id, underlay_salt, tag, state, version_added, version_removed FROM multicast_group",
         );
 
         Ok(())

nexus/db-schema/src/schema.rs

@@ -2777,7 +2777,6 @@ table! {
         ip_pool_range_id -> Uuid,
         vni -> Int4,
         multicast_ip -> Inet,
-        source_ips -> Array<Inet>,
         underlay_group_id -> Nullable<Uuid>,
         underlay_salt -> Nullable<Int2>,
         tag -> Nullable<Text>,

schema/crdb/dbinit.sql

@@ -7118,9 +7118,6 @@ CREATE TABLE IF NOT EXISTS omicron.public.multicast_group (
     ip_pool_range_id UUID NOT NULL,
     multicast_ip INET NOT NULL,
 
-    /* Source-Specific Multicast (SSM) support */
-    source_ips INET[] DEFAULT ARRAY[]::INET[],
-
     /* Associated underlay group for NAT */
     /* We fill this as part of the RPW */
     underlay_group_id UUID,