(9/5) [nexus] Allow anti-affinity members to be affinity groups

common/src/api/external/mod.rs

@@ -22,6 +22,7 @@ use dropshot::HttpError;
 pub use dropshot::PaginationOrder;
 pub use error::*;
 use futures::stream::BoxStream;
+use omicron_uuid_kinds::AffinityGroupUuid;
 use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::InstanceUuid;
 use oxnet::IpNet;
@@ -1336,16 +1337,22 @@ impl SimpleIdentity for AffinityGroupMember {
 ///
 /// Membership in a group is not exclusive - members may belong to multiple
 /// affinity / anti-affinity groups.
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
+#[derive(
+    Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq, Hash, Eq,
+)]
 #[serde(tag = "type", content = "value", rename_all = "snake_case")]
 pub enum AntiAffinityGroupMember {
+    /// An affinity group belonging to this group, identified by UUID.
+    AffinityGroup(AffinityGroupUuid),
+
     /// An instance belonging to this group, identified by UUID.
     Instance(InstanceUuid),
 }
 
 impl SimpleIdentity for AntiAffinityGroupMember {
     fn id(&self) -> Uuid {
         match self {
+            AntiAffinityGroupMember::AffinityGroup(id) => *id.as_untyped_uuid(),
             AntiAffinityGroupMember::Instance(id) => *id.as_untyped_uuid(),
         }
     }

nexus/db-model/src/affinity.rs

@@ -11,6 +11,7 @@ use super::impl_enum_type;
 use crate::schema::affinity_group;
 use crate::schema::affinity_group_instance_membership;
 use crate::schema::anti_affinity_group;
+use crate::schema::anti_affinity_group_affinity_membership;
 use crate::schema::anti_affinity_group_instance_membership;
 use crate::typed_uuid::DbTypedUuid;
 use chrono::{DateTime, Utc};
@@ -257,3 +258,30 @@ impl From<AntiAffinityGroupInstanceMembership>
         Self::Instance(member.instance_id.into())
     }
 }
+
+#[derive(Queryable, Insertable, Clone, Debug, Selectable)]
+#[diesel(table_name = anti_affinity_group_affinity_membership)]
+pub struct AntiAffinityGroupAffinityMembership {
+    pub anti_affinity_group_id: DbTypedUuid<AntiAffinityGroupKind>,
+    pub affinity_group_id: DbTypedUuid<AffinityGroupKind>,
+}
+
+impl AntiAffinityGroupAffinityMembership {
+    pub fn new(
+        anti_affinity_group_id: AntiAffinityGroupUuid,
+        affinity_group_id: AffinityGroupUuid,
+    ) -> Self {
+        Self {
+            anti_affinity_group_id: anti_affinity_group_id.into(),
+            affinity_group_id: affinity_group_id.into(),
+        }
+    }
+}
+
+impl From<AntiAffinityGroupAffinityMembership>
+    for external::AntiAffinityGroupMember
+{
+    fn from(member: AntiAffinityGroupAffinityMembership) -> Self {
+        Self::AffinityGroup(member.affinity_group_id.into())
+    }
+}

nexus/db-model/src/schema.rs

@@ -510,6 +510,13 @@ table! {
     }
 }
 
+table! {
+    anti_affinity_group_affinity_membership (anti_affinity_group_id, affinity_group_id) {
+        anti_affinity_group_id -> Uuid,
+        affinity_group_id -> Uuid,
+    }
+}
+
 table! {
     metric_producer (id) {
         id -> Uuid,
@@ -2083,6 +2090,7 @@ allow_tables_to_appear_in_same_query!(hw_baseboard_id, inv_sled_agent,);
 
 allow_tables_to_appear_in_same_query!(
     anti_affinity_group,
+    anti_affinity_group_affinity_membership,
     anti_affinity_group_instance_membership,
     affinity_group,
     affinity_group_instance_membership,

nexus/db-model/src/schema_versions.rs

@@ -16,7 +16,7 @@ use std::{collections::BTreeMap, sync::LazyLock};
 ///
 /// This must be updated when you change the database schema.  Refer to
 /// schema/crdb/README.adoc in the root of this repository for details.
-pub const SCHEMA_VERSION: Version = Version::new(129, 0, 0);
+pub const SCHEMA_VERSION: Version = Version::new(130, 0, 0);
 
 /// List of all past database schema versions, in *reverse* order
 ///
@@ -28,6 +28,7 @@ static KNOWN_VERSIONS: LazyLock<Vec<KnownVersion>> = LazyLock::new(|| {
         // |  leaving the first copy as an example for the next person.
         // v
         // KnownVersion::new(next_int, "unique-dirname-with-the-sql-files"),
+        KnownVersion::new(130, "anti-affinity-group-affinity-member"),
         KnownVersion::new(129, "create-target-release"),
         KnownVersion::new(128, "sled-resource-for-vmm"),
         KnownVersion::new(127, "bp-disk-disposition-expunged-cleanup"),