[deps] bump maghemite to aa03ae9, migrate to mg-api-types

Picks up recent oxidecomputer/maghemite#729 (ddmd --api-only flag) and the
preceding main changes that moved canonical types out of the auto-generated
client into the `mg-api-types` crate.

Includes:

- replaces `rdb-types` (removed upstream) with `mg-api-types` as a direct
  workspace dep
- bumps `num_enum` 0.7.5 -> 0.7.6 to satisfy maghemite's workspace pin
- migrates types
- renames `bgp_apply_v2` callers to `bgp_apply`
- `DdmInstance` fixture is renamed from `--no-state-machine` to `--api-only` to
  match the new clap flag.

Author: zeeshanlakhani

Cargo.lock

@@ -604,8 +604,9 @@ ntp-admin-api = { path = "ntp-admin/api" }
 ntp-admin-client = { path = "clients/ntp-admin-client" }
 ntp-admin-types = { path = "ntp-admin/types" }
 ntp-admin-types-versions = { path = "ntp-admin/types/versions" }
-mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "974423895c17cc23711732f518e447b284425ccd" }
-ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "974423895c17cc23711732f518e447b284425ccd" }
+mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "aa03ae96aa97d22a6bdb75831a8a1218c79d3908" }
+mg-api-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "aa03ae96aa97d22a6bdb75831a8a1218c79d3908" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "aa03ae96aa97d22a6bdb75831a8a1218c79d3908" }
 multimap = "0.10.1"
 nexus-auth = { path = "nexus/auth" }
 nexus-background-task-interface = { path = "nexus/background-task-interface" }
@@ -742,7 +743,6 @@ rats-corim = { git = "https://github.com/oxidecomputer/rats-corim.git", rev = "f
 raw-cpuid = { git = "https://github.com/oxidecomputer/rust-cpuid.git", rev = "a4cf01df76f35430ff5d39dc2fe470bcb953503b" }
 rayon = "1.10"
 rcgen = "0.12.1"
-rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "974423895c17cc23711732f518e447b284425ccd" }
 reconfigurator-cli = { path = "dev-tools/reconfigurator-cli" }
 reedline = "0.40.0"
 ref-cast = "1.0"

Cargo.toml

@@ -63,6 +63,7 @@ jiff.workspace = true
 lldpd_client.workspace = true
 macaddr.workspace = true
 maplit.workspace = true
+mg-api-types.workspace = true
 nexus-background-task-interface.workspace = true
 # Not under "dev-dependencies"; these also need to be implemented for
 # integration tests.
@@ -96,7 +97,6 @@ qorb.workspace = true
 rand.workspace = true
 range-requests.workspace = true
 ref-cast.workspace = true
-rdb-types.workspace = true
 regex.workspace = true
 reqwest = { workspace = true, features = ["http2", "json"] }
 reqwest012 = { workspace = true }

nexus/Cargo.toml

@@ -30,13 +30,22 @@ use dpd_client::{Client as DpdClient, types as DpdTypes};
 use futures::FutureExt;
 use futures::future::BoxFuture;
 use mg_admin_client::types::{
-    AddStaticRoute4Request, AddStaticRoute6Request, ApplyRequest,
-    BestpathFanoutRequest, BgpPeerConfig, CheckerSource,
-    DeleteStaticRoute4Request, DeleteStaticRoute6Request,
+    ApplyRequest, BgpPeerConfig, UnnumberedBgpPeerConfig,
+};
+use mg_api_types::bgp::config::{
+    CheckerSource, Ipv4UnicastConfig, Ipv6UnicastConfig, JitterRange,
+    ShaperSource,
+};
+use mg_api_types::bgp::policy::{
     ImportExportPolicy4 as MgImportExportPolicy4,
-    ImportExportPolicy6 as MgImportExportPolicy6, Ipv4UnicastConfig,
-    Ipv6UnicastConfig, JitterRange, ShaperSource, StaticRoute4,
-    StaticRoute4List, StaticRoute6, StaticRoute6List, UnnumberedBgpPeerConfig,
+    ImportExportPolicy6 as MgImportExportPolicy6,
+};
+use mg_api_types::rdb::prefix::{Prefix, Prefix4, Prefix6};
+use mg_api_types::rib::BestpathFanoutRequest;
+use mg_api_types::static_routes::{
+    AddStaticRoute4Request, AddStaticRoute6Request, DeleteStaticRoute4Request,
+    DeleteStaticRoute6Request, StaticRoute4, StaticRoute4List, StaticRoute6,
+    StaticRoute6List,
 };
 use nexus_db_queries::{
     context::OpContext,
@@ -49,7 +58,6 @@ use omicron_common::{
     address::{Ipv6Subnet, get_sled_address},
     api::external::{DataPageParams, Name},
 };
-use rdb_types::{Prefix, Prefix4, Prefix6};
 use serde_json::json;
 use sled_agent_client::types::HostPortConfig;
 use sled_agent_types::early_networking::BfdPeerConfig;
@@ -984,7 +992,7 @@ impl BackgroundTask for SwitchPortSettingsManager {
                         "switch_slot" => ?switch_slot,
                         "config" => ?config,
                     );
-                    if let Err(e) = client.bgp_apply_v2(config).await {
+                    if let Err(e) = client.bgp_apply(config).await {
                         error!(log, "error while applying bgp configuration"; "error" => ?e);
                     }
 

nexus/src/app/background/tasks/sync_switch_configuration.rs

@@ -177,7 +177,7 @@ impl super::Nexus {
 
             for r in &router_info {
                 let asn = r.asn;
-                let selector = mg_admin_client::types::ExportedSelector {
+                let selector = mg_api_types::bgp::session::ExportedSelector {
                     afi: None,
                     asn,
                     peer: None,
@@ -199,12 +199,12 @@ impl super::Nexus {
                 for (peer_id, exports) in exported {
                     for ex in exports.iter() {
                         let prefix = match ex {
-                            rdb_types::Prefix::V4(v4) => {
+                            mg_api_types::rdb::prefix::Prefix::V4(v4) => {
                                 oxnet::IpNet::V4(oxnet::Ipv4Net::new_unchecked(
                                     v4.value, v4.length,
                                 ))
                             }
-                            rdb_types::Prefix::V6(v6) => {
+                            mg_api_types::rdb::prefix::Prefix::V6(v6) => {
                                 oxnet::IpNet::V6(oxnet::Ipv6Net::new_unchecked(
                                     v6.value, v6.length,
                                 ))

nexus/src/app/bgp.rs

@@ -16,6 +16,7 @@ daft.workspace = true
 dropshot.workspace = true
 http.workspace = true
 mg-admin-client.workspace = true
+mg-api-types.workspace = true
 omicron-common.workspace = true
 omicron-passwords.workspace = true
 omicron-uuid-kinds.workspace = true

nexus/types/versions/Cargo.toml

@@ -23,11 +23,11 @@ impl From<IpNet> for latest::networking::AddressLotBlockCreate {
     }
 }
 
-impl From<mg_admin_client::types::FsmStateKind>
+impl From<mg_api_types::bgp::session::FsmStateKind>
     for latest::networking::BgpPeerState
 {
-    fn from(s: mg_admin_client::types::FsmStateKind) -> Self {
-        use mg_admin_client::types::FsmStateKind;
+    fn from(s: mg_api_types::bgp::session::FsmStateKind) -> Self {
+        use mg_api_types::bgp::session::FsmStateKind;
         match s {
             FsmStateKind::Idle => Self::Idle,
             FsmStateKind::Connect => Self::Connect,

nexus/types/versions/src/impls/networking.rs

@@ -683,10 +683,10 @@ source.repo = "maghemite"
 # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
 # building `ddm-admin-client` (which will instruct you to update
 # `tools/maghemite_openapi_version`).
-source.commit = "974423895c17cc23711732f518e447b284425ccd"
+source.commit = "aa03ae96aa97d22a6bdb75831a8a1218c79d3908"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm-gz.sha256.txt
-source.sha256 = "eed4c89343c29b42a74b16d74186c4e3c1a78701b0398ec2b81206122e4317d1"
+source.sha256 = "8db83f62eca7271b2f82d3c9d759debb12fae0bcb41ffb81bb03ff5b6486db3c"
 output.type = "tarball"
 
 [package.mg-ddm]
@@ -699,10 +699,10 @@ source.repo = "maghemite"
 # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
 # building `ddm-admin-client` (which will instruct you to update
 # `tools/maghemite_openapi_version`).
-source.commit = "974423895c17cc23711732f518e447b284425ccd"
+source.commit = "aa03ae96aa97d22a6bdb75831a8a1218c79d3908"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
-source.sha256 = "ea97c636761cf7f622ddf0382ab365e68973604809eb6ebc93a0bbb94f758030"
+source.sha256 = "3686f448a825207fd2edfbf09f671785af962e43be946339d3497664041ba82e"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -714,10 +714,10 @@ source.repo = "maghemite"
 # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
 # building `ddm-admin-client` (which will instruct you to update
 # `tools/maghemite_openapi_version`).
-source.commit = "974423895c17cc23711732f518e447b284425ccd"
+source.commit = "aa03ae96aa97d22a6bdb75831a8a1218c79d3908"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mgd.sha256.txt
-source.sha256 = "69f6bc36806b799174897762f0b10885d600a747018d1f9dbf2caeae9c749841"
+source.sha256 = "5ff2470cc845be49ecb106a645f8f1b84e47275048086b4570597dcf6ecdef00"
 output.type = "zone"
 output.intermediate_only = true
 

package-manifest.toml

@@ -29,6 +29,7 @@ internal-dns-resolver.workspace = true
 internal-dns-types.workspace = true
 itertools.workspace = true
 mg-admin-client.workspace = true
+mg-api-types.workspace = true
 nexus-lockstep-client.workspace = true
 nexus-types.workspace = true
 ntp-admin-client.workspace = true
@@ -39,7 +40,6 @@ omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true
 oxnet.workspace = true
 rand = { workspace = true, features = ["os_rng"] }
-rdb-types.workspace = true
 reqwest = { workspace = true, features = ["rustls", "stream"] }
 schemars = { workspace = true, features = ["chrono", "uuid1"] }
 serde.workspace = true