Add measurement corpus for installation via wicket (#8852)

Author: labbott

Cargo.lock

@@ -663,6 +663,7 @@ rand_distr = "0.5.1"
 rand_seeder = "0.4.0"
 range-requests = { path = "range-requests" }
 ratatui = "0.29.0"
+rats-corim = { git = "https://github.com/oxidecomputer/rats-corim.git", rev = "f0d5d5168d3d31487a56df32c676b0c6240bcc6b" }
 raw-cpuid = { git = "https://github.com/oxidecomputer/rust-cpuid.git", rev = "a4cf01df76f35430ff5d39dc2fe470bcb953503b" }
 rayon = "1.10"
 rcgen = "0.12.1"

Cargo.toml

@@ -10,27 +10,31 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tufaceous_artifact::ArtifactHash;
 
-/// Describes the set of Omicron zones written out into an install dataset.
+/// Describes a set of files written out into an install dataset.
+/// This is currently used for zones and reference measurements
 #[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize, JsonSchema)]
-pub struct OmicronZoneManifest {
+pub struct OmicronInstallManifest {
     /// The source of the manifest.
-    pub source: OmicronZoneManifestSource,
+    pub source: OmicronInstallManifestSource,
 
-    /// Omicron zone file names and hashes.
-    pub zones: IdOrdMap<OmicronZoneFileMetadata>,
+    /// Omicron install file names and hashes.
+    pub files: IdOrdMap<OmicronInstallMetadata>,
 }
 
-impl OmicronZoneManifest {
-    /// The name of the file.
-    pub const FILE_NAME: &str = "zones.json";
+impl OmicronInstallManifest {
+    /// The name of the zones file.
+    pub const ZONES_FILE_NAME: &str = "zones.json";
+
+    /// The name of the measurment file
+    pub const MEASUREMENT_FILE_NAME: &str = "measurements.json";
 }
 
 /// The source of truth for an Omicron zone manifest.
 #[derive(
     Clone, Copy, Debug, Eq, PartialEq, Deserialize, Serialize, JsonSchema,
 )]
 #[serde(tag = "source", rename_all = "snake_case")]
-pub enum OmicronZoneManifestSource {
+pub enum OmicronInstallManifestSource {
     /// The manifest was written out by installinator and the mupdate process.
     Installinator {
         /// The UUID of the mupdate.
@@ -43,13 +47,13 @@ pub enum OmicronZoneManifestSource {
     SledAgent,
 }
 
-impl fmt::Display for OmicronZoneManifestSource {
+impl fmt::Display for OmicronInstallManifestSource {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            OmicronZoneManifestSource::Installinator { mupdate_id } => {
+            OmicronInstallManifestSource::Installinator { mupdate_id } => {
                 write!(f, "installinator (mupdate ID: {})", mupdate_id)
             }
-            OmicronZoneManifestSource::SledAgent => {
+            OmicronInstallManifestSource::SledAgent => {
                 write!(f, "sled-agent")
             }
         }
@@ -58,7 +62,7 @@ impl fmt::Display for OmicronZoneManifestSource {
 
 /// Information about an Omicron zone file written out to the install dataset.
 ///
-/// Part of [`OmicronZoneManifest`].
+/// Part of [`OmicronInstallManifest`].
 #[derive(
     Clone,
     Debug,
@@ -70,7 +74,7 @@ impl fmt::Display for OmicronZoneManifestSource {
     Serialize,
     JsonSchema,
 )]
-pub struct OmicronZoneFileMetadata {
+pub struct OmicronInstallMetadata {
     /// The file name.
     pub file_name: String,
 
@@ -81,7 +85,7 @@ pub struct OmicronZoneFileMetadata {
     pub hash: ArtifactHash,
 }
 
-impl IdOrdItem for OmicronZoneFileMetadata {
+impl IdOrdItem for OmicronInstallMetadata {
     type Key<'a> = &'a str;
 
     #[inline]

common/src/update/zone_manifest.rs common/src/update/install_manifest.rscommon/src/update/zone_manifest.rs renamed to common/src/update/install_manifest.rs

@@ -3,9 +3,9 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 mod artifact_id;
+mod install_manifest;
 mod mupdate_override;
-mod zone_manifest;
 
 pub use artifact_id::*;
+pub use install_manifest::*;
 pub use mupdate_override::*;
-pub use zone_manifest::*;

common/src/update/mod.rs

@@ -57,7 +57,7 @@ use omicron_common::api::external::Generation;
 use omicron_common::api::external::Name;
 use omicron_common::disk::M2Slot;
 use omicron_common::policy::NEXUS_REDUNDANCY;
-use omicron_common::update::OmicronZoneManifestSource;
+use omicron_common::update::OmicronInstallManifestSource;
 use omicron_repl_utils::run_repl_from_file;
 use omicron_repl_utils::run_repl_on_stdin;
 use omicron_uuid_kinds::GenericUuid;
@@ -3317,9 +3317,9 @@ fn mupdate_source_to_description(
 ) -> anyhow::Result<SimTufRepoDescription> {
     let manifest_source = match source.mupdate_id {
         Some(mupdate_id) => {
-            OmicronZoneManifestSource::Installinator { mupdate_id }
+            OmicronInstallManifestSource::Installinator { mupdate_id }
         }
-        None => OmicronZoneManifestSource::SledAgent,
+        None => OmicronInstallManifestSource::SledAgent,
     };
     if let Some(repo_path) = &source.valid.from_repo {
         let description = extract_tuf_repo_description(&sim.log, repo_path)?;

dev-tools/reconfigurator-cli/src/lib.rs

@@ -40,6 +40,7 @@ INFO added artifact, name: internal-dns, kind: zone, version: 1.0.0, hash: ffbf1
 INFO added artifact, name: ntp, kind: zone, version: 1.0.0, hash: 67593d686ed04a1709f93972b71f4ebc148a9362120f65d239943e814a9a7439, length: 1681
 INFO added artifact, name: nexus, kind: zone, version: 1.0.0, hash: 0e32b4a3e5d3668bb1d6a16fb06b74dc60b973fa479dcee0aae3adbb52bf1388, length: 1682
 INFO added artifact, name: oximeter, kind: zone, version: 1.0.0, hash: 048d8fe8cdef5b175aad714d0f148aa80ce36c9114ac15ce9d02ed3d37877a77, length: 1682
+INFO added artifact, name: fake-corpus, kind: measurement_corpus, version: 1.0.0, hash: 8a0e23157bae655fceec7376926c9758efee6511c7b7ff8355bbb49545a2257f, length: 1048576
 INFO added artifact, name: fake-psc-sp, kind: psc_sp, version: 1.0.0, hash: 89245fe2ac7e6a2ac8dfa4e7d6891a6e6df95e4141395c07c64026778f6d76d7, length: 721
 INFO added artifact, name: fake-psc-rot, kind: psc_rot_image_a, version: 1.0.0, hash: 5d8ea834dd6d42d386f1eb8a2c5f6e99b697c9958bb4ab8edf63e56003e25d8d, length: 775
 INFO added artifact, name: fake-psc-rot, kind: psc_rot_image_b, version: 1.0.0, hash: 5d8ea834dd6d42d386f1eb8a2c5f6e99b697c9958bb4ab8edf63e56003e25d8d, length: 775
@@ -48,7 +49,7 @@ INFO added artifact, name: fake-switch-sp, kind: switch_sp, version: 1.0.0, hash
 INFO added artifact, name: fake-switch-rot, kind: switch_rot_image_a, version: 1.0.0, hash: 32307d6d75c9707e8499ba4a4d379f99c0358237b6e190ff6a8024b470f62342, length: 774
 INFO added artifact, name: fake-switch-rot, kind: switch_rot_image_b, version: 1.0.0, hash: 32307d6d75c9707e8499ba4a4d379f99c0358237b6e190ff6a8024b470f62342, length: 774
 INFO added artifact, name: fake-switch-rot-bootloader, kind: switch_rot_bootloader, version: 1.0.0, hash: 70836d170abd5621f95bb4225987b27b3d3dd6168e73cd60e44309bdfeb94e98, length: 804
-INFO added artifact, name: installinator_document, kind: installinator_document, version: 1.0.0, hash: a6a636b5d57813578766b3f1c2559abf9af5d8c86187538167937c476beeefa3, length: 367
+INFO added artifact, name: installinator_document, kind: installinator_document, version: 1.0.0, hash: 16717c0caa420c7811666e720936c7ca913cd59a4d376331cc79a90544e5e2e8, length: 526
 set target release based on repo-1.0.0.zip
 
 

dev-tools/reconfigurator-cli/tests/output/cmds-add-zones-with-mupdate-override-stdout

@@ -42,6 +42,7 @@ INFO added artifact, name: internal-dns, kind: zone, version: 0.0.1, hash: c29c2
 INFO added artifact, name: ntp, kind: zone, version: 0.0.1, hash: b661b5d1370f5ac593b4c15b5fcd22c904991cf33b6db32f886374bc022a3531, length: 1682
 INFO added artifact, name: nexus, kind: zone, version: 0.0.1, hash: 5f0b97b090966bb754485c3d397d0918d54bf4ffdc6fa691b77f61686f2ac8cc, length: 1683
 INFO added artifact, name: oximeter, kind: zone, version: 0.0.1, hash: 7ea25be50cd4e98e2ba20916cb98fe8ea457372f5973eb6ac691b5bc90dbddc0, length: 1683
+INFO added artifact, name: fake-corpus, kind: measurement_corpus, version: 1.0.0, hash: 8a0e23157bae655fceec7376926c9758efee6511c7b7ff8355bbb49545a2257f, length: 1048576
 INFO added artifact, name: fake-psc-sp, kind: psc_sp, version: 0.0.1, hash: 3a63db2465b433f7b2f2816f833dcce90e0aa7e7472b1735c63faf93a48bb2ab, length: 726
 INFO added artifact, name: fake-psc-rot, kind: psc_rot_image_a, version: 0.0.1, hash: 9bdc198ad072c74cfc1e145355eef307028067776b19f9e2a7830934176fe406, length: 770
 INFO added artifact, name: fake-psc-rot, kind: psc_rot_image_b, version: 0.0.1, hash: 9bdc198ad072c74cfc1e145355eef307028067776b19f9e2a7830934176fe406, length: 770
@@ -50,7 +51,7 @@ INFO added artifact, name: fake-switch-sp, kind: switch_sp, version: 0.0.1, hash
 INFO added artifact, name: fake-switch-rot, kind: switch_rot_image_a, version: 0.0.1, hash: 7776db817d1f1b1a2f578050742e33bd4e805a4c76f36bce84dcb509b900249c, length: 776
 INFO added artifact, name: fake-switch-rot, kind: switch_rot_image_b, version: 0.0.1, hash: 7776db817d1f1b1a2f578050742e33bd4e805a4c76f36bce84dcb509b900249c, length: 776
 INFO added artifact, name: fake-switch-rot-bootloader, kind: switch_rot_bootloader, version: 0.0.1, hash: 0686443d50db2247077dc70b6543cea9a90a9792de00e06c06cff4c91fa5a4a8, length: 792
-INFO added artifact, name: installinator_document, kind: installinator_document, version: 0.0.1, hash: 657aaebc9c2f451446af0411a67a4bd057f39fa1b8a7fdc429ca4a2facd9344c, length: 367
+INFO added artifact, name: installinator_document, kind: installinator_document, version: 0.0.1, hash: 6f0eebe1001e3d00b02b2dcac5b3d883cb88222fde16a028f5431e87a5feee72, length: 526
 set target release based on repo-0.0.1.zip
 
 
@@ -335,6 +336,7 @@ INFO added artifact, name: internal-dns, kind: zone, version: 1.0.0, hash: ffbf1
 INFO added artifact, name: ntp, kind: zone, version: 1.0.0, hash: 67593d686ed04a1709f93972b71f4ebc148a9362120f65d239943e814a9a7439, length: 1681
 INFO added artifact, name: nexus, kind: zone, version: 1.0.0, hash: 0e32b4a3e5d3668bb1d6a16fb06b74dc60b973fa479dcee0aae3adbb52bf1388, length: 1682
 INFO added artifact, name: oximeter, kind: zone, version: 1.0.0, hash: 048d8fe8cdef5b175aad714d0f148aa80ce36c9114ac15ce9d02ed3d37877a77, length: 1682
+INFO added artifact, name: fake-corpus, kind: measurement_corpus, version: 1.0.0, hash: 8a0e23157bae655fceec7376926c9758efee6511c7b7ff8355bbb49545a2257f, length: 1048576
 INFO added artifact, name: fake-psc-sp, kind: psc_sp, version: 1.0.0, hash: 89245fe2ac7e6a2ac8dfa4e7d6891a6e6df95e4141395c07c64026778f6d76d7, length: 721
 INFO added artifact, name: fake-psc-rot, kind: psc_rot_image_a, version: 1.0.0, hash: 5d8ea834dd6d42d386f1eb8a2c5f6e99b697c9958bb4ab8edf63e56003e25d8d, length: 775
 INFO added artifact, name: fake-psc-rot, kind: psc_rot_image_b, version: 1.0.0, hash: 5d8ea834dd6d42d386f1eb8a2c5f6e99b697c9958bb4ab8edf63e56003e25d8d, length: 775
@@ -343,7 +345,7 @@ INFO added artifact, name: fake-switch-sp, kind: switch_sp, version: 1.0.0, hash
 INFO added artifact, name: fake-switch-rot, kind: switch_rot_image_a, version: 1.0.0, hash: 32307d6d75c9707e8499ba4a4d379f99c0358237b6e190ff6a8024b470f62342, length: 774
 INFO added artifact, name: fake-switch-rot, kind: switch_rot_image_b, version: 1.0.0, hash: 32307d6d75c9707e8499ba4a4d379f99c0358237b6e190ff6a8024b470f62342, length: 774
 INFO added artifact, name: fake-switch-rot-bootloader, kind: switch_rot_bootloader, version: 1.0.0, hash: 70836d170abd5621f95bb4225987b27b3d3dd6168e73cd60e44309bdfeb94e98, length: 804
-INFO added artifact, name: installinator_document, kind: installinator_document, version: 1.0.0, hash: a6a636b5d57813578766b3f1c2559abf9af5d8c86187538167937c476beeefa3, length: 367
+INFO added artifact, name: installinator_document, kind: installinator_document, version: 1.0.0, hash: 16717c0caa420c7811666e720936c7ca913cd59a4d376331cc79a90544e5e2e8, length: 526
 set target release based on repo-1.0.0.zip