Test fix for missing metrics

Cargo.toml

@@ -698,10 +698,11 @@ progenitor-client010 = { package = "progenitor-client", version = "0.10.0" }
 # NOTE: if you change the pinned revision of the `bhyve_api` and propolis
 # dependencies, you must also update the references in package-manifest.toml to
 # match the new revision.
-bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "36f20be9bb4c3b362029237f5feb6377c982395f" }
-propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "36f20be9bb4c3b362029237f5feb6377c982395f" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "36f20be9bb4c3b362029237f5feb6377c982395f" }
-propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "36f20be9bb4c3b362029237f5feb6377c982395f" }
+bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "8a0026763144cb18f1a23fadecd4527602503df0" }
+propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "8a0026763144cb18f1a23fadecd4527602503df0" }
+propolis-api-types-versions = { git = "https://github.com/oxidecomputer/propolis", rev = "8a0026763144cb18f1a23fadecd4527602503df0" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "8a0026763144cb18f1a23fadecd4527602503df0" }
+propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "8a0026763144cb18f1a23fadecd4527602503df0" }
 # NOTE: see above!
 proptest = "1.7.0"
 qorb = "0.4.1"

nexus/src/app/instance_platform/mod.rs

@@ -85,7 +85,7 @@ use omicron_common::api::internal::shared::NetworkInterface;
 use sled_agent_client::types::{
     BlobStorageBackend, Board, BootOrderEntry, BootSettings, Chipset,
     ComponentV0, Cpuid, CpuidVendor, CrucibleStorageBackend,
-    FileStorageBackend, I440Fx, InstanceSpecV0, NvmeDisk, PciPath, QemuPvpanic,
+    FileStorageBackend, I440Fx, InstanceSpec, NvmeDisk, PciPath, QemuPvpanic,
     SerialPort, SerialPortNumber, SpecKey, VirtioDisk, VirtioNetworkBackend,
     VirtioNic, VmmSpec,
 };
@@ -548,7 +548,7 @@ impl super::Nexus {
         components.add_nics(nics)?;
         components.add_cloud_init(instance, ssh_keys)?;
 
-        let spec = InstanceSpecV0 {
+        let spec = InstanceSpec {
             board: Board {
                 chipset: Chipset::I440Fx(I440Fx { enable_pcie: false }),
                 cpuid: cpuid_from_vmm_cpu_platform(vmm.cpu_platform),

openapi/sled-agent/sled-agent-26.0.0-294fb6.json.gitstub

@@ -0,0 +1 @@
+78f8995096b912f90220a1e36ba58a9a2abb4f1e:openapi/sled-agent/sled-agent-26.0.0-294fb6.json

openapi/sled-agent/sled-agent-26.0.0-294fb6.json → openapi/sled-agent/sled-agent-27.0.0-242895.json

@@ -7,7 +7,7 @@
       "url": "https://oxide.computer",
       "email": "api@oxide.computer"
     },
-    "version": "26.0.0"
+    "version": "27.0.0"
   },
   "paths": {
     "/artifacts": {
@@ -5939,7 +5939,7 @@
           "nics"
         ]
       },
-      "InstanceSpecV0": {
+      "InstanceSpec": {
         "type": "object",
         "properties": {
           "board": {
@@ -9841,7 +9841,7 @@
         "description": "Specifies the virtual hardware configuration of a new Propolis VMM in the form of a Propolis instance specification.",
         "allOf": [
           {
-            "$ref": "#/components/schemas/InstanceSpecV0"
+            "$ref": "#/components/schemas/InstanceSpec"
           }
         ]
       },

openapi/sled-agent/sled-agent-latest.json

@@ -1 +1 @@
-sled-agent-26.0.0-294fb6.json
+sled-agent-27.0.0-242895.json

package-manifest.toml

@@ -650,10 +650,10 @@ service_name = "propolis-server"
 only_for_targets.image = "standard"
 source.type = "prebuilt"
 source.repo = "propolis"
-source.commit = "36f20be9bb4c3b362029237f5feb6377c982395f"
+source.commit = "8a0026763144cb18f1a23fadecd4527602503df0"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
-source.sha256 = "18f244ef765ae26bc7852e3af9b61016a6ea5a59a8eafbe36780a92e5fc75b46"
+source.sha256 = "88cd4c102ebe1eb6f486708a788aff610886ef4de1a68b0bd27609809409245e"
 output.type = "zone"
 
 [package.mg-ddm-gz]

sled-agent/api/src/lib.rs

@@ -37,6 +37,7 @@ api_versions!([
     // |  example for the next person.
     // v
     // (next_int, IDENT),
+    (27, RENAME_INSTANCE_SPEC),
     (26, RACK_NETWORK_CONFIG_NOT_OPTIONAL),
     (25, BOOTSTORE_VERSIONING),
     (24, ADD_ZPOOL_HEALTH_TO_INVENTORY),

sled-agent/src/instance.rs

@@ -40,7 +40,7 @@ use omicron_uuid_kinds::{
     GenericUuid, InstanceUuid, OmicronZoneUuid, PropolisUuid,
 };
 use oxnet::IpNet;
-use propolis_api_types::ErrorCode as PropolisErrorCode;
+use propolis_api_types::instance::ErrorCode as PropolisErrorCode;
 use propolis_client::Client as PropolisClient;
 use propolis_client::instance_spec::{
     ComponentV0, InstanceSpec, InstanceSpecV0, SpecKey,
@@ -417,7 +417,7 @@ impl InstanceMonitorRunner {
 
             // Update the state generation for the next poll.
             if let InstanceMonitorUpdate::State(ref state) = update {
-                generation = state.r#gen + 1;
+                generation = state.gen_ + 1;
             }
 
             // Now that we have the response from Propolis' HTTP server, we
@@ -444,7 +444,7 @@ impl InstanceMonitorRunner {
             .client
             .instance_state_monitor()
             .body(propolis_client::types::InstanceStateMonitorRequest {
-                r#gen: generation,
+                gen_: generation,
             })
             .send()
             .await;
@@ -2626,9 +2626,7 @@ impl InstanceRunner {
 
         // We use a custom client builder here because the default progenitor
         // one has a timeout of 15s but we want to be able to wait indefinitely.
-        // Use reqwest012 because the rev-pinned propolis-client is still on
-        // reqwest 0.12.
-        let reqwest_client = reqwest012::ClientBuilder::new().build().unwrap();
+        let reqwest_client = reqwest::ClientBuilder::new().build().unwrap();
         let client = Arc::new(PropolisClient::new_with_client(
             &format!("http://{}", &self.propolis_addr),
             reqwest_client,
@@ -2935,6 +2933,7 @@ mod tests {
     use camino_tempfile::Utf8TempDir;
     use dns_server::TransientServer;
     use dropshot::HttpServer;
+    use gateway_client::ClientInfo;
     use internal_dns_resolver::Resolver;
     use omicron_common::FileKv;
     use omicron_common::api::external::{Generation, Hostname};
@@ -3885,7 +3884,7 @@ mod tests {
             .send(InstanceMonitorMessage {
                 update: InstanceMonitorUpdate::State(
                     InstanceStateMonitorResponse {
-                        r#gen: 5,
+                        gen_: 5,
                         migration: InstanceMigrateStatusResponse {
                             migration_in: None,
                             migration_out: None,

sled-agent/src/sim/instance.rs

@@ -457,7 +457,7 @@ impl Simulatable for SimInstance {
                     current.migration_in.map(|m| m.migration_id),
                 ),
                 last_response: InstanceStateMonitorResponse {
-                    r#gen: 1,
+                    gen_: 1,
                     state: PropolisInstanceState::Starting,
                     migration: PropolisMigrateResponse {
                         migration_in: None,

sled-agent/types/versions/Cargo.toml

@@ -24,6 +24,7 @@ omicron-workspace-hack.workspace = true
 oxnet.workspace = true
 slog.workspace = true
 propolis_api_types.workspace = true
+propolis-api-types-versions.workspace = true
 proptest = { workspace = true, optional = true }
 schemars.workspace = true
 serde.workspace = true

sled-agent/types/versions/src/impls/instance.rs

@@ -4,11 +4,10 @@
 
 use crate::latest::instance::{VmmSpec, VmmStateRequested};
 use propolis_api_types::instance_spec::{
-    SpecKey,
+    Component, SpecKey,
     components::backends::{
         CrucibleStorageBackend, FileStorageBackend, VirtioNetworkBackend,
     },
-    v0::ComponentV0,
 };
 
 impl std::fmt::Display for VmmStateRequested {
@@ -34,7 +33,7 @@ impl VmmSpec {
     ) -> impl Iterator<Item = (&SpecKey, &CrucibleStorageBackend)> {
         self.0.components.iter().filter_map(
             |(key, component)| match component {
-                ComponentV0::CrucibleStorageBackend(be) => Some((key, be)),
+                Component::CrucibleStorageBackend(be) => Some((key, be)),
                 _ => None,
             },
         )
@@ -45,7 +44,7 @@ impl VmmSpec {
     ) -> impl Iterator<Item = (&SpecKey, &VirtioNetworkBackend)> {
         self.0.components.iter().filter_map(
             |(key, component)| match component {
-                ComponentV0::VirtioNetworkBackend(be) => Some((key, be)),
+                Component::VirtioNetworkBackend(be) => Some((key, be)),
                 _ => None,
             },
         )
@@ -56,7 +55,7 @@ impl VmmSpec {
     ) -> impl Iterator<Item = (&SpecKey, &FileStorageBackend)> {
         self.0.components.iter().filter_map(
             |(key, component)| match component {
-                ComponentV0::FileStorageBackend(be) => Some((key, be)),
+                Component::FileStorageBackend(be) => Some((key, be)),
                 _ => None,
             },
         )

sled-agent/types/versions/src/initial/instance.rs

@@ -14,7 +14,7 @@ use omicron_common::api::internal::shared::DhcpConfig;
 use omicron_common::api::internal::shared::external_ip::v1::SourceNatConfig;
 use omicron_common::api::internal::shared::network_interface::v1::NetworkInterface;
 use omicron_uuid_kinds::{InstanceUuid, PropolisUuid};
-use propolis_api_types::instance_spec::v0::InstanceSpecV0;
+use propolis_api_types_versions::v1::instance_spec::InstanceSpec as InstanceSpecV0;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;