From bd2f5284af95518f3c6a4e142f5417d27066b6b3 Mon Sep 17 00:00:00 2001
From: Charlie Park <charlie@oxidecomputer.com>
Date: Tue, 8 Apr 2025 16:44:34 -0700
Subject: [PATCH 1/5] Prevent adding instance to A-A group when not stopped

---
 .../project/instances/AntiAffinityCard.tsx    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/pages/project/instances/AntiAffinityCard.tsx b/app/pages/project/instances/AntiAffinityCard.tsx
index b6b8456961..4513b1b32f 100644
--- a/app/pages/project/instances/AntiAffinityCard.tsx
+++ b/app/pages/project/instances/AntiAffinityCard.tsx
@@ -53,6 +53,12 @@ export const allAntiAffinityGroups = ({ project }: PP.Project) =>
     query: { project, limit: ALL_ISH },
   })
 
+const instanceView = ({ project, instance }: PP.Instance) =>
+  apiq('instanceView', {
+    path: { instance },
+    query: { project },
+  })
+
 const colHelper = createColumnHelper<AffinityGroup | AntiAffinityGroup>()
 const staticCols = [
   colHelper.accessor('description', Columns.description),
@@ -70,6 +76,7 @@ export function AntiAffinityCard() {
     instanceAntiAffinityGroups(instanceSelector)
   )
   const { data: allGroups } = usePrefetchedQuery(allAntiAffinityGroups(instanceSelector))
+  const { data: instanceData } = usePrefetchedQuery(instanceView(instanceSelector))
 
   const nonMemberGroups = useMemo(
     () => R.differenceWith(allGroups.items, memberGroups.items, (a, b) => a.id === b.id),
@@ -148,13 +155,15 @@ export function AntiAffinityCard() {
       <CardBlock.Header title="Anti-affinity groups" titleId="anti-affinity-groups-label">
         <Button
           size="sm"
-          disabled={nonMemberGroups.length === 0}
+          disabled={instanceData.runState !== 'stopped' || nonMemberGroups.length === 0}
           disabledReason={
-            allGroups.items.length === 0
-              ? 'No groups found'
-              : nonMemberGroups.length === 0
-                ? 'Instance is already in all groups'
-                : undefined
+            instanceData.runState !== 'stopped'
+              ? 'Only stopped instances can be added to anti-affinity groups'
+              : allGroups.items.length === 0
+                ? 'No groups found'
+                : nonMemberGroups.length === 0
+                  ? 'Instance is already in all groups'
+                  : undefined
           }
           onClick={() => setIsModalOpen(true)}
         >

From 0dd7aa552723b55d78f76e0c83c7ebccac453b03 Mon Sep 17 00:00:00 2001
From: Charlie Park <charlie@oxidecomputer.com>
Date: Tue, 8 Apr 2025 16:49:06 -0700
Subject: [PATCH 2/5] extract disabledReason to its own function

---
 .../project/instances/AntiAffinityCard.tsx    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/pages/project/instances/AntiAffinityCard.tsx b/app/pages/project/instances/AntiAffinityCard.tsx
index 4513b1b32f..973757736e 100644
--- a/app/pages/project/instances/AntiAffinityCard.tsx
+++ b/app/pages/project/instances/AntiAffinityCard.tsx
@@ -150,21 +150,26 @@ export function AntiAffinityCard() {
     getCoreRowModel: getCoreRowModel(),
   })
 
+  const disabledReason = () => {
+    if (instanceData.runState !== 'stopped') {
+      return 'This instance must be stopped to add it to a group'
+    }
+    if (allGroups.items.length === 0) {
+      return 'No groups found'
+    }
+    if (nonMemberGroups.length === 0) {
+      return 'Instance is already in all groups'
+    }
+    return undefined
+  }
+
   return (
     <CardBlock>
       <CardBlock.Header title="Anti-affinity groups" titleId="anti-affinity-groups-label">
         <Button
           size="sm"
-          disabled={instanceData.runState !== 'stopped' || nonMemberGroups.length === 0}
-          disabledReason={
-            instanceData.runState !== 'stopped'
-              ? 'Only stopped instances can be added to anti-affinity groups'
-              : allGroups.items.length === 0
-                ? 'No groups found'
-                : nonMemberGroups.length === 0
-                  ? 'Instance is already in all groups'
-                  : undefined
-          }
+          disabled={!!disabledReason()}
+          disabledReason={disabledReason()}
           onClick={() => setIsModalOpen(true)}
         >
           Add to group

From a65e072c90b5c3c0f801a32bbf2b6a07f9f154e7 Mon Sep 17 00:00:00 2001
From: Charlie Park <charlie@oxidecomputer.com>
Date: Tue, 8 Apr 2025 16:52:02 -0700
Subject: [PATCH 3/5] Only call it once

---
 app/pages/project/instances/AntiAffinityCard.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/pages/project/instances/AntiAffinityCard.tsx b/app/pages/project/instances/AntiAffinityCard.tsx
index 973757736e..bff4e7aa0b 100644
--- a/app/pages/project/instances/AntiAffinityCard.tsx
+++ b/app/pages/project/instances/AntiAffinityCard.tsx
@@ -150,7 +150,7 @@ export function AntiAffinityCard() {
     getCoreRowModel: getCoreRowModel(),
   })
 
-  const disabledReason = () => {
+  const getDisabledReason = () => {
     if (instanceData.runState !== 'stopped') {
       return 'This instance must be stopped to add it to a group'
     }
@@ -162,14 +162,15 @@ export function AntiAffinityCard() {
     }
     return undefined
   }
+  const disabledReason = getDisabledReason()
 
   return (
     <CardBlock>
       <CardBlock.Header title="Anti-affinity groups" titleId="anti-affinity-groups-label">
         <Button
           size="sm"
-          disabled={!!disabledReason()}
-          disabledReason={disabledReason()}
+          disabled={!!disabledReason}
+          disabledReason={disabledReason}
           onClick={() => setIsModalOpen(true)}
         >
           Add to group

From 4475233d25090a4ff2472fbf82e13cb628508625 Mon Sep 17 00:00:00 2001
From: Charlie Park <charlie@oxidecomputer.com>
Date: Tue, 8 Apr 2025 19:57:52 -0700
Subject: [PATCH 4/5] Update test

---
 test/e2e/anti-affinity.e2e.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/e2e/anti-affinity.e2e.ts b/test/e2e/anti-affinity.e2e.ts
index ff496b0fd6..7e2a62388e 100644
--- a/test/e2e/anti-affinity.e2e.ts
+++ b/test/e2e/anti-affinity.e2e.ts
@@ -180,8 +180,19 @@ test('add and remove instance from group on instance settings', async ({ page })
   // Ensure the group is not initially present
   await expect(groupCell).toBeHidden()
 
-  // add instance to group
-  await page.getByRole('button', { name: 'Add to group' }).click()
+  // Make sure Add to group button is disabled
+  const addToGroupButton = page.getByRole('button', { name: 'Add to group' })
+  await expect(addToGroupButton).toBeDisabled()
+
+  // Stop the instance
+  await page.getByRole('button', { name: 'Stop' }).click()
+  const confirmStopModal = page.getByRole('dialog', { name: 'Confirm stop' })
+  await expect(confirmStopModal).toBeVisible()
+  await confirmStopModal.getByRole('button', { name: 'Confirm' }).click()
+  await expect(confirmStopModal).toBeHidden()
+
+  // Add instance to group
+  await addToGroupButton.click()
   const modal = page.getByRole('dialog', { name: 'Add to anti-affinity group' })
   await expect(modal).toBeVisible()
   await modal.getByRole('combobox', { name: 'Anti-affinity group' }).click()

From f6b159c7dcc9c582fe06ed61f7ab1921a4ede538 Mon Sep 17 00:00:00 2001
From: Charlie Park <charlie@oxidecomputer.com>
Date: Tue, 8 Apr 2025 20:10:28 -0700
Subject: [PATCH 5/5] add instanceCan.addToAntiAffinityGroup

---
 app/api/util.ts                                  | 4 ++++
 app/pages/project/instances/AntiAffinityCard.tsx | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/api/util.ts b/app/api/util.ts
index 79a06b87dd..fb763d4945 100644
--- a/app/api/util.ts
+++ b/app/api/util.ts
@@ -131,6 +131,10 @@ const instanceActions = {
   updateNic: ['stopped'],
   // https://github.com/oxidecomputer/omicron/blob/6dd9802/nexus/src/app/instance.rs#L1520-L1522
   serialConsole: ['running', 'rebooting', 'migrating', 'repairing'],
+
+  // https://github.com/oxidecomputer/omicron/blob/5e27bde/nexus/src/app/affinity.rs#L357 checks to see that there's no VMM
+  // TODO: determine whether the intent is only `stopped` or also `failed`
+  addToAntiAffinityGroup: ['stopped'],
 } satisfies Record<string, InstanceState[]>
 
 // setting .states is a cute way to make it ergonomic to call the test function
diff --git a/app/pages/project/instances/AntiAffinityCard.tsx b/app/pages/project/instances/AntiAffinityCard.tsx
index bff4e7aa0b..b113ee9be2 100644
--- a/app/pages/project/instances/AntiAffinityCard.tsx
+++ b/app/pages/project/instances/AntiAffinityCard.tsx
@@ -13,6 +13,7 @@ import * as R from 'remeda'
 
 import {
   apiq,
+  instanceCan,
   queryClient,
   useApiMutation,
   usePrefetchedQuery,
@@ -151,7 +152,7 @@ export function AntiAffinityCard() {
   })
 
   const getDisabledReason = () => {
-    if (instanceData.runState !== 'stopped') {
+    if (!instanceCan.addToAntiAffinityGroup(instanceData)) {
       return 'This instance must be stopped to add it to a group'
     }
     if (allGroups.items.length === 0) {