[dns-server] convert DNS server API into a trait

Cargo.toml

@@ -9,7 +9,7 @@ members = [
     "clients/dns-service-client",
     "clients/dpd-client",
     "clients/gateway-client",
-    "clients/installinator-artifact-client",
+    "clients/installinator-client",
     "clients/nexus-client",
     "clients/oxide-client",
     "clients/oximeter-client",
@@ -26,12 +26,13 @@ members = [
     "dev-tools/releng",
     "dev-tools/xtask",
     "dns-server",
+    "dns-server-api",
     "end-to-end-tests",
     "gateway-cli",
     "gateway-test-utils",
     "gateway",
     "illumos-utils",
-    "installinator-artifactd",
+    "installinator-api",
     "installinator-common",
     "installinator",
     "internal-dns-cli",
@@ -86,8 +87,9 @@ members = [
     "wicket-dbg",
     "wicket",
     "wicketd",
+    "wicketd-api",
     "workspace-hack",
-    "zone-setup",
+    "zone-setup", "wicketd-api", "dns-server-api",
 ]
 
 default-members = [
@@ -100,7 +102,7 @@ default-members = [
     "clients/dns-service-client",
     "clients/dpd-client",
     "clients/gateway-client",
-    "clients/installinator-artifact-client",
+    "clients/installinator-client",
     "clients/nexus-client",
     "clients/oxide-client",
     "clients/oximeter-client",
@@ -119,13 +121,14 @@ default-members = [
     # hakari to not work as well and build times to be longer.
     # See omicron#4392.
     "dns-server",
+    "dns-server-api",
     # Do not include end-to-end-tests in the list of default members, as its
     # tests only work on a deployed control plane.
     "gateway-cli",
     "gateway-test-utils",
     "gateway",
     "illumos-utils",
-    "installinator-artifactd",
+    "installinator-api",
     "installinator-common",
     "installinator",
     "internal-dns-cli",
@@ -180,6 +183,7 @@ default-members = [
     "wicket-dbg",
     "wicket",
     "wicketd",
+    "wicketd-api",
     "workspace-hack",
     "zone-setup",
 ]
@@ -279,6 +283,7 @@ derive-where = "1.2.7"
 diesel = { version = "2.1.6", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", branch = "main" }
 dns-server = { path = "dns-server" }
+dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
 dpd-client = { path = "clients/dpd-client" }
 dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
@@ -318,8 +323,8 @@ indent_write = "2.2.0"
 indexmap = "2.2.6"
 indicatif = { version = "0.17.8", features = ["rayon"] }
 installinator = { path = "installinator" }
-installinator-artifactd = { path = "installinator-artifactd" }
-installinator-artifact-client = { path = "clients/installinator-artifact-client" }
+installinator-api = { path = "installinator-api" }
+installinator-client = { path = "clients/installinator-client" }
 installinator-common = { path = "installinator-common" }
 internal-dns = { path = "internal-dns" }
 ipcc = { path = "ipcc" }
@@ -530,6 +535,7 @@ walkdir = "2.5"
 whoami = "1.5"
 wicket = { path = "wicket" }
 wicket-common = { path = "wicket-common" }
+wicketd-api = { path = "wicketd-api" }
 wicketd-client = { path = "clients/wicketd-client" }
 zeroize = { version = "1.7.0", features = ["zeroize_derive", "std"] }
 zip = { version = "0.6.6", default-features = false, features = ["deflate","bzip2"] }

clients/installinator-artifact-client/Cargo.toml → clients/installinator-client/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "installinator-artifact-client"
+name = "installinator-client"
 version = "0.1.0"
 edition = "2021"
 license = "MPL-2.0"

clients/installinator-artifact-client/src/lib.rs → clients/installinator-client/src/lib.rs

@@ -2,10 +2,10 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//! Interface for making API requests to installinator-artifactd.
+//! Interface for installinator to make API requests.
 
 progenitor::generate_api!(
-    spec = "../../openapi/installinator-artifactd.json",
+    spec = "../../openapi/installinator.json",
     inner_type = slog::Logger,
     pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {
         slog::debug!(log, "client request";

clients/wicketd-client/src/lib.rs

@@ -27,21 +27,11 @@ progenitor::generate_api!(
         RackNetworkConfigV2 = { derives = [PartialEq, Eq, PartialOrd, Ord] },
         RackOperationStatus = { derives = [PartialEq, Eq, PartialOrd, Ord] },
         RackResetId = { derives = [PartialEq, Eq, PartialOrd, Ord] },
-        RackV1Inventory = { derives = [PartialEq, Eq, PartialOrd, Ord]},
         RotImageDetails = { derives = [PartialEq, Eq, PartialOrd, Ord]},
-        RotInventory = { derives = [PartialEq, Eq, PartialOrd, Ord]},
-        RotSlot = { derives = [PartialEq, Eq, PartialOrd, Ord]},
-        RotState = { derives = [PartialEq, Eq, PartialOrd, Ord]},
-        SpComponentCaboose = { derives = [PartialEq, Eq, PartialOrd, Ord] },
-        SpComponentInfo = { derives = [PartialEq, Eq, PartialOrd, Ord]},
-        SpIgnition = { derives = [PartialEq, Eq, PartialOrd, Ord]},
-        SpIgnitionSystemType= { derives = [PartialEq, Eq, PartialOrd, Ord]},
-        SpInventory = { derives = [PartialEq, Eq, PartialOrd, Ord]},
-        SpState = { derives = [PartialEq, Eq, PartialOrd, Ord] },
-        StartUpdateOptions = { derives = [Default]},
         UplinkConfig = { derives = [PartialEq, Eq, PartialOrd, Ord] },
     },
     replace = {
+        AbortUpdateOptions = wicket_common::rack_update::AbortUpdateOptions,
         AllowedSourceIps = omicron_common::api::internal::shared::AllowedSourceIps,
         Baseboard = sled_hardware_types::Baseboard,
         BgpAuthKey = wicket_common::rack_setup::BgpAuthKey,
@@ -52,9 +42,11 @@ progenitor::generate_api!(
         BgpPeerAuthKind = wicket_common::rack_setup::BgpPeerAuthKind,
         BgpPeerConfig = omicron_common::api::internal::shared::BgpPeerConfig,
         BootstrapSledDescription = wicket_common::rack_setup::BootstrapSledDescription,
+        ClearUpdateStateOptions = wicket_common::rack_update::ClearUpdateStateOptions,
         ClearUpdateStateResponse = wicket_common::rack_update::ClearUpdateStateResponse,
         CurrentRssUserConfigInsensitive = wicket_common::rack_setup::CurrentRssUserConfigInsensitive,
         Duration = std::time::Duration,
+        EventReportForUplinkPreflightCheckSpec = wicket_common::preflight_check::EventReport,
         EventReportForWicketdEngineSpec = wicket_common::update_events::EventReport,
         GetBgpAuthKeyInfoResponse = wicket_common::rack_setup::GetBgpAuthKeyInfoResponse,
         ImportExportPolicy = omicron_common::api::internal::shared::ImportExportPolicy,
@@ -67,15 +59,31 @@ progenitor::generate_api!(
         PortSpeed = omicron_common::api::internal::shared::PortSpeed,
         ProgressEventForGenericSpec = update_engine::events::ProgressEvent<update_engine::NestedSpec>,
         ProgressEventForInstallinatorSpec = installinator_common::ProgressEvent,
+        ProgressEventForUplinkPreflightSpec = wicket_common::preflight_check::ProgressEvent,
         ProgressEventForWicketdEngineSpec = wicket_common::update_events::ProgressEvent,
         PutRssUserConfigInsensitive = wicket_common::rack_setup::PutRssUserConfigInsensitive,
+        RackV1Inventory = wicket_common::inventory::RackV1Inventory,
+        RotInventory = wicket_common::inventory::RotInventory,
+        RotSlot = wicket_common::inventory::RotSlot,
+        RotState = wicket_common::inventory::RotState,
         RouteConfig = omicron_common::api::internal::shared::RouteConfig,
-        SpIdentifier = wicket_common::rack_update::SpIdentifier,
-        SpType = wicket_common::rack_update::SpType,
+        SpComponentCaboose = wicket_common::inventory::SpComponentCaboose,
+        SpComponentInfo = wicket_common::inventory::SpComponentInfo,
+        SpIdentifier = wicket_common::inventory::SpIdentifier,
+        SpIgnition = wicket_common::inventory::SpIgnition,
+        SpIgnitionSystemType = wicket_common::inventory::SpIgnitionSystemType,
+        SpInventory = wicket_common::inventory::SpInventory,
+        SpState = wicket_common::inventory::SpState,
+        SpType = wicket_common::inventory::SpType,
+        StartUpdateOptions = wicket_common::rack_update::StartUpdateOptions,
         StepEventForGenericSpec = update_engine::events::StepEvent<update_engine::NestedSpec>,
+        StepEventForUplinkPreflightSpec = wicket_common::preflight_check::StepEvent,
         StepEventForInstallinatorSpec = installinator_common::StepEvent,
         StepEventForWicketdEngineSpec = wicket_common::update_events::StepEvent,
         SwitchLocation = omicron_common::api::internal::shared::SwitchLocation,
+        UpdateSimulatedResult = wicket_common::rack_update::UpdateSimulatedResult,
+        UpdateTestError = wicket_common::rack_update::UpdateTestError,
+        UplinkPreflightStepId = wicket_common::preflight_check::UplinkPreflightStepId,
         UserSpecifiedBgpPeerConfig = wicket_common::rack_setup::UserSpecifiedBgpPeerConfig,
         UserSpecifiedImportExportPolicy = wicket_common::rack_setup::UserSpecifiedImportExportPolicy,
         UserSpecifiedPortConfig = wicket_common::rack_setup::UserSpecifiedPortConfig,

dev-tools/openapi-manager/Cargo.toml

@@ -12,9 +12,11 @@ anyhow.workspace = true
 atomicwrites.workspace = true
 camino.workspace = true
 clap.workspace = true
+dns-server-api.workspace = true
 dropshot.workspace = true
 fs-err.workspace = true
 indent_write.workspace = true
+installinator-api.workspace = true
 nexus-internal-api.workspace = true
 omicron-workspace-hack.workspace = true
 openapiv3.workspace = true
@@ -23,3 +25,4 @@ owo-colors.workspace = true
 serde_json.workspace = true
 similar.workspace = true
 supports-color.workspace = true
+wicketd-api.workspace = true