Bump Omicron version and add IP Pool type field to IP Pool create form (#2951)

* Bump Omicron version and add IP Pool type field to IP Pool create form

* Move description to top of form; make radios vertical

* update e2e test to use multicast pool type

Author: charliepark

OMICRON_VERSION

@@ -1 +1 @@
-b751cada653d817ba8274135d10e481369d6911c
+9617f40aa6f35b58ffd6b4e92c02ba8e7dd95033

app/api/__generated__/Api.ts

@@ -7,11 +7,13 @@
  */
 import { useForm } from 'react-hook-form'
 import { useNavigate } from 'react-router'
+import type { SetRequired } from 'type-fest'
 
 import { useApiMutation, useApiQueryClient, type IpPoolCreate } from '@oxide/api'
 
 import { DescriptionField } from '~/components/form/fields/DescriptionField'
 import { NameField } from '~/components/form/fields/NameField'
+import { RadioField } from '~/components/form/fields/RadioField'
 import { SideModalForm } from '~/components/form/SideModalForm'
 import { HL } from '~/components/HL'
 import { titleCrumb } from '~/hooks/use-crumbs'
@@ -23,10 +25,13 @@ import { pb } from '~/util/path-builder'
 // create a v6 pool, you can't actually add any ranges to it until
 // https://github.com/oxidecomputer/omicron/issues/8966
 
-const defaultValues: IpPoolCreate = {
+type IpPoolCreateForm = SetRequired<IpPoolCreate, 'poolType'>
+
+const defaultValues: IpPoolCreateForm = {
   name: '',
   description: '',
   ipVersion: 'v4',
+  poolType: 'unicast',
 }
 
 export const handle = titleCrumb('New IP pool')
@@ -45,23 +50,33 @@ export default function CreateIpPoolSideModalForm() {
     },
   })
 
-  const form = useForm({ defaultValues })
+  const form = useForm<IpPoolCreateForm>({ defaultValues })
 
   return (
     <SideModalForm
       form={form}
       formType="create"
       resourceName="IP pool"
       onDismiss={onDismiss}
-      onSubmit={({ name, description }) => {
-        createPool.mutate({ body: { name, description } })
+      onSubmit={({ name, description, poolType }) => {
+        createPool.mutate({ body: { name, description, poolType } })
       }}
       loading={createPool.isPending}
       submitError={createPool.error}
     >
+      <IpPoolVisibilityMessage />
       <NameField name="name" control={form.control} />
       <DescriptionField name="description" control={form.control} />
-      <IpPoolVisibilityMessage />
+      <RadioField
+        name="poolType"
+        label="Pool type"
+        column
+        control={form.control}
+        items={[
+          { value: 'unicast', label: 'Unicast' },
+          { value: 'multicast', label: 'Multicast' },
+        ]}
+      />
     </SideModalForm>
   )
 }

app/api/__generated__/OMICRON_VERSION

@@ -72,9 +72,9 @@ export default function EditIpPoolSideModalForm() {
       loading={editPool.isPending}
       submitError={editPool.error}
     >
+      <IpPoolVisibilityMessage />
       <NameField name="name" control={form.control} />
       <DescriptionField name="description" control={form.control} />
-      <IpPoolVisibilityMessage />
     </SideModalForm>
   )
 }

app/api/__generated__/msw-handlers.ts

@@ -19,6 +19,7 @@ import {
   type IpPool,
 } from '@oxide/api'
 import { IpGlobal16Icon, IpGlobal24Icon } from '@oxide/design-system/icons/react'
+import { Badge } from '@oxide/design-system/ui'
 
 import { DocsPopover } from '~/components/DocsPopover'
 import { HL } from '~/components/HL'
@@ -64,6 +65,10 @@ const colHelper = createColumnHelper<IpPool>()
 const staticColumns = [
   colHelper.accessor('name', { cell: makeLinkCell((pool) => pb.ipPool({ pool })) }),
   colHelper.accessor('description', Columns.description),
+  colHelper.accessor('poolType', {
+    header: 'Pool type',
+    cell: (info) => <Badge color="neutral">{info.getValue()}</Badge>,
+  }),
   // TODO: add version column when API supports v6 pools
   colHelper.display({
     header: 'IPs Remaining',

app/api/__generated__/validate.ts

@@ -18,6 +18,7 @@ export const ipPool1: Json<IpPool> = {
   time_created: new Date().toISOString(),
   time_modified: new Date().toISOString(),
   ip_version: 'v4',
+  pool_type: 'unicast',
 }
 
 export const ipPool2: Json<IpPool> = {
@@ -27,6 +28,7 @@ export const ipPool2: Json<IpPool> = {
   time_created: new Date().toISOString(),
   time_modified: new Date().toISOString(),
   ip_version: 'v6',
+  pool_type: 'unicast',
 }
 
 export const ipPool3: Json<IpPool> = {
@@ -36,6 +38,7 @@ export const ipPool3: Json<IpPool> = {
   time_created: new Date().toISOString(),
   time_modified: new Date().toISOString(),
   ip_version: 'v4',
+  pool_type: 'unicast',
 }
 
 export const ipPool4: Json<IpPool> = {
@@ -45,6 +48,7 @@ export const ipPool4: Json<IpPool> = {
   time_created: new Date().toISOString(),
   time_modified: new Date().toISOString(),
   ip_version: 'v6',
+  pool_type: 'unicast',
 }
 
 export const ipPools: Json<IpPool>[] = [ipPool1, ipPool2, ipPool3, ipPool4]

app/forms/ip-pool-create.tsx

@@ -1030,6 +1030,7 @@ export const handlers = makeHandlers({
       // undefined.
       // See https://zod.dev/v4/changelog?id=defaults-applied-within-optional-fields#defaults-applied-within-optional-fields
       ip_version: body.ip_version || 'v4',
+      pool_type: body.pool_type || 'unicast',
       ...getTimestamps(),
     }
     db.ipPools.push(newPool)
@@ -1998,7 +1999,6 @@ export const handlers = makeHandlers({
   systemUpdateTrustRootView: NotImplemented,
   scimTokenList: NotImplemented,
   scimTokenCreate: NotImplemented,
-  scimTokenDeleteAll: NotImplemented,
   scimTokenView: NotImplemented,
   scimTokenDelete: NotImplemented,
   userBuiltinList: NotImplemented,