Bump API version for jumbo frames and block size type (#3241)

david-crespo · web-flow · commit 4b8e60acb9bf · 2026-06-05T19:33:59.000Z
No UI work, just supporting the API changes and plumbing the jumbo frames enable flag through updates. Will need to update this to a main commit once oxidecomputer/omicron#10472 goes in.
diff --git a/OMICRON_VERSION b/OMICRON_VERSION
@@ -1 +1 @@
-985304a607b16191bdc35e0ea87fa522d925b514
+c007af2f407ddbee44a9c37a690e3208a0f848cc
diff --git a/app/api/__generated__/Api.ts b/app/api/__generated__/Api.ts
diff --git a/app/api/__generated__/OMICRON_VERSION b/app/api/__generated__/OMICRON_VERSION
diff --git a/app/api/__generated__/msw-handlers.ts b/app/api/__generated__/msw-handlers.ts
diff --git a/app/api/__generated__/validate.ts b/app/api/__generated__/validate.ts
diff --git a/app/pages/project/instances/AutoRestartCard.tsx b/app/pages/project/instances/AutoRestartCard.tsx
@@ -89,6 +89,7 @@ export function AutoRestartCard() {
         memory: instance.memory,
         cpuPlatform: instance.cpuPlatform || null,
         bootDisk: instance.bootDiskId || null,
+        enableJumboFrames: instance.enableJumboFrames,
       },
     })
   })
diff --git a/app/pages/project/instances/InstancePage.tsx b/app/pages/project/instances/InstancePage.tsx
@@ -325,6 +325,7 @@ export function ResizeInstanceModal({
         bootDisk: instance.bootDiskId || null,
         cpuPlatform: instance.cpuPlatform || null,
         autoRestartPolicy: instance.autoRestartPolicy || null,
+        enableJumboFrames: instance.enableJumboFrames,
       },
     })
   })
diff --git a/app/pages/project/instances/StorageTab.tsx b/app/pages/project/instances/StorageTab.tsx
@@ -187,6 +187,7 @@ export default function StorageTab() {
                   memory: instance.memory,
                   autoRestartPolicy: instance.autoRestartPolicy || null,
                   cpuPlatform: instance.cpuPlatform || null,
+                  enableJumboFrames: instance.enableJumboFrames,
                 },
               }),
             errorTitle: 'Could not unset boot disk',
@@ -224,6 +225,7 @@ export default function StorageTab() {
       instance.ncpus,
       instance.memory,
       instance.cpuPlatform,
+      instance.enableJumboFrames,
       getSnapshotAction,
     ]
   )
@@ -252,6 +254,7 @@ export default function StorageTab() {
                   memory: instance.memory,
                   autoRestartPolicy: instance.autoRestartPolicy || null,
                   cpuPlatform: instance.cpuPlatform || null,
+                  enableJumboFrames: instance.enableJumboFrames,
                 },
               }),
             errorTitle: `Could not ${verb} boot disk`,
@@ -304,6 +307,7 @@ export default function StorageTab() {
       instance.ncpus,
       instance.memory,
       instance.cpuPlatform,
+      instance.enableJumboFrames,
       getSnapshotAction,
       bootDisks,
     ]
diff --git a/mock-api/disk.ts b/mock-api/disk.ts
@@ -288,8 +288,8 @@ export const disks: Json<Disk>[] = [
       device_path: '/jkl',
       size: 12 * GiB,
       block_size: 2048,
-      disk_type: 'distributed' as const,
+      disk_type: 'distributed',
       read_only: false,
-    }
+    } satisfies Json<Disk>
   }),
 ]
diff --git a/mock-api/image.ts b/mock-api/image.ts
@@ -15,7 +15,7 @@ import { project } from './project'
 const base = {
   time_created: new Date().toISOString(),
   time_modified: new Date().toISOString(),
-  block_size: 512,
+  block_size: 512 as const,
 }
 
 export const images: Json<Image>[] = [
diff --git a/mock-api/instance.ts b/mock-api/instance.ts
@@ -21,6 +21,7 @@ const base = {
   auto_restart_enabled: true,
   ncpus: 2,
   memory: 4 * GiB,
+  enable_jumbo_frames: false,
 }
 
 export const instance: Json<Instance> = {
diff --git a/mock-api/msw/handlers.ts b/mock-api/msw/handlers.ts
@@ -813,6 +813,7 @@ export const handlers = makeHandlers({
       time_run_state_updated: new Date().toISOString(),
       boot_disk_id: bootDiskId,
       auto_restart_enabled: true,
+      enable_jumbo_frames: body.enable_jumbo_frames ?? false,
     }
 
     if (body.start) {
@@ -892,6 +893,9 @@ export const handlers = makeHandlers({
     instance.auto_restart_policy = body.auto_restart_policy
     instance.cpu_platform = body.cpu_platform
 
+    // required on the body, so always set it (effective on next restart in nexus)
+    instance.enable_jumbo_frames = body.enable_jumbo_frames
+
     // We depart here from nexus in that nexus does both of the following
     // calculations at view time (when converting model to view). We can't
     // do that/don't need because our mock DB stores and returns the view
@@ -2681,6 +2685,8 @@ export const handlers = makeHandlers({
   supportBundleUpdate: NotImplemented,
   supportBundleView: NotImplemented,
   switchView: NotImplemented,
+  systemNetworkingSettingsUpdate: NotImplemented,
+  systemNetworkingSettingsView: NotImplemented,
   systemQuotasList: NotImplemented,
   systemTimeseriesSchemaList: NotImplemented,
   systemUpdateRecoveryFinish: NotImplemented,
diff --git a/mock-api/msw/util.ts b/mock-api/msw/util.ts
@@ -17,6 +17,7 @@ import {
   MAX_DISK_SIZE_GiB,
   MIN_DISK_SIZE_GiB,
   totalCapacity,
+  type BlockSize,
   type DiskBackend,
   type DiskCreate,
   type IpRange,
@@ -156,9 +157,9 @@ export const errIfExists = <T extends Record<string, unknown>>(
  * https://github.com/oxidecomputer/omicron/blob/dd74446/nexus/src/app/sagas/disk_create.rs#L292-L304
  * https://github.com/oxidecomputer/omicron/blob/dd74446/nexus/src/app/disk.rs#L159-L174
  */
-export function getBlockSize(backend: Json<DiskBackend>): number {
+export function getBlockSize(backend: Json<DiskBackend>): BlockSize {
   return match(backend)
-    .with({ type: 'local' }, () => 4096) // All local disks use 4k block size (AdvancedFormat)
+    .with({ type: 'local' }, () => 4096 as const) // All local disks use 4k block size (AdvancedFormat)
     .with({ type: 'distributed' }, ({ disk_source: source }) =>
       match(source)
         .with({ type: 'blank' }, (s) => s.block_size)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-985304a607b16191bdc35e0ea87fa522d925b514`
	`1`	`+c007af2f407ddbee44a9c37a690e3208a0f848cc`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import { project } from './project'`
`15`	`15`	`const base = {`
`16`	`16`	`time_created: new Date().toISOString(),`
`17`	`17`	`time_modified: new Date().toISOString(),`
`18`		`- block_size: 512,`
	`18`	`+ block_size: 512 as const,`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`export const images: Json<Image>[] = [`