Boot order

OMICRON_VERSION

@@ -1 +1 @@
-d2e3f344e82fd7a1f45a39a9d1f867f9238d171d
+c50cf019cd9be35f98266a7f4acacab0236b3a3d

app/api/util.ts

@@ -90,22 +90,25 @@ export const genName = (...parts: [string, ...string[]]) => {
 }
 
 const instanceActions: Record<string, InstanceState[]> = {
+  // NoVmm maps to to Stopped:
+  // https://github.com/oxidecomputer/omicron/blob/6dd9802/nexus/db-model/src/instance_state.rs#L55
+
   // https://github.com/oxidecomputer/omicron/blob/0496637/nexus/src/app/instance.rs#L2064
   start: ['stopped', 'failed'],
 
   // https://github.com/oxidecomputer/omicron/blob/6dd9802/nexus/db-queries/src/db/datastore/instance.rs#L865
   delete: ['stopped', 'failed'],
 
+  // https://github.com/oxidecomputer/omicron/blob/3093818/nexus/db-queries/src/db/datastore/instance.rs#L1030-L1043
+  update: ['stopped', 'failed', 'creating'],
+
   // reboot and stop are kind of weird!
   // https://github.com/oxidecomputer/omicron/blob/6dd9802/nexus/src/app/instance.rs#L790-L798
   // https://github.com/oxidecomputer/propolis/blob/b278193/bin/propolis-server/src/lib/vm/request_queue.rs
   // https://github.com/oxidecomputer/console/pull/2387#discussion_r1722368236
   reboot: ['running'], // technically rebooting allowed but too weird to say it
   stop: ['running', 'starting', 'rebooting'],
 
-  // NoVmm maps to to Stopped:
-  // https://github.com/oxidecomputer/omicron/blob/6dd9802/nexus/db-model/src/instance_state.rs#L55
-
   // https://github.com/oxidecomputer/omicron/blob/6dd9802/nexus/db-queries/src/db/datastore/disk.rs#L323-L327
   detachDisk: ['creating', 'stopped', 'failed'],
   // only Creating and NoVmm
@@ -148,6 +151,8 @@ const diskActions: Record<string, DiskState['state'][]> = {
   attach: ['creating', 'detached'],
   // https://github.com/oxidecomputer/omicron/blob/6dd9802/nexus/db-queries/src/db/datastore/disk.rs#L313-L314
   detach: ['attached'],
+  // https://github.com/oxidecomputer/omicron/blob/3093818/nexus/db-queries/src/db/datastore/instance.rs#L1077-L1081
+  setAsBootDisk: ['attached'],
 }
 
 export const diskCan = R.mapValues(diskActions, (states) => {

app/components/form/fields/DisksTableField.tsx

@@ -15,7 +15,6 @@ import { CreateDiskSideModalForm } from '~/forms/disk-create'
 import type { InstanceCreateInput } from '~/forms/instance-create'
 import { Badge } from '~/ui/lib/Badge'
 import { Button } from '~/ui/lib/Button'
-import { FieldLabel } from '~/ui/lib/FieldLabel'
 import * as MiniTable from '~/ui/lib/MiniTable'
 import { bytesToGiB } from '~/util/units'
 
@@ -39,14 +38,13 @@ export function DisksTableField({
 
   const {
     field: { value: items, onChange },
-  } = useController({ control, name: 'disks' })
+  } = useController({ control, name: 'otherDisks' })
 
   return (
     <>
       <div className="max-w-lg">
-        <FieldLabel id="new-disks-label">{/* this was empty */}</FieldLabel>
         {!!items.length && (
-          <MiniTable.Table className="mb-4">
+          <MiniTable.Table className="mb-4" aria-label="Disks">
             <MiniTable.Header>
               <MiniTable.HeadCell>Name</MiniTable.HeadCell>
               <MiniTable.HeadCell>Type</MiniTable.HeadCell>
@@ -68,7 +66,7 @@ export function DisksTableField({
                   </MiniTable.Cell>
                   <MiniTable.Cell>
                     {item.type === 'attach' ? (
-                      '-'
+                      '—'
                     ) : (
                       <>
                         <span>{bytesToGiB(item.size)}</span>

app/forms/instance-create.tsx

@@ -103,7 +103,7 @@ export type InstanceCreateInput = Assign<
   SetRequired<InstanceCreate, 'networkInterfaces'>,
   {
     presetId: (typeof PRESETS)[number]['id']
-    disks: DiskTableItem[]
+    otherDisks: DiskTableItem[]
     bootDiskName: string
     bootDiskSize: number
 
@@ -139,7 +139,7 @@ const baseDefaultValues: InstanceCreateInput = {
   projectImageSource: '',
   diskSource: '',
 
-  disks: [],
+  otherDisks: [],
   networkInterfaces: { type: 'default' },
 
   sshPublicKeys: [],
@@ -317,7 +317,8 @@ export function CreateInstanceForm() {
               description: values.description,
               memory: instance.memory * GiB,
               ncpus: instance.ncpus,
-              disks: [bootDisk, ...values.disks],
+              disks: values.otherDisks,
+              bootDisk,
               externalIps: values.externalIps,
               start: values.start,
               networkInterfaces: values.networkInterfaces,