Wrap up RFD 619 migration

.github/buildomat/jobs/test-bfd.sh

@@ -16,4 +16,4 @@ set -o pipefail
 
 source .github/buildomat/test-common.sh
 banner bfd
-cargo nextest run -p bfd --nocapture
+cargo nextest run -p bfd -p mg-api-types -p mg-api-types-versions --nocapture

.github/buildomat/jobs/test-bgp.sh

@@ -14,11 +14,11 @@ set -e
 
 source .github/buildomat/test-common.sh
 pushd bgp
-pfexec cargo nextest run
+pfexec cargo nextest run -p bgp -p mg-api-types -p mg-api-types-versions
 cp *.log /work/
 popd
 
 pushd mgd
-pfexec cargo nextest run
+pfexec cargo nextest run -p mgd -p mg-api-types -p mg-api-types-versions
 cp *.log /work/
 popd

.github/buildomat/jobs/test-ddm.sh

@@ -16,4 +16,4 @@ set -o pipefail
 
 source .github/buildomat/test-common.sh
 banner ddm
-cargo nextest run -p ddm --nocapture
+cargo nextest run -p ddm -p ddm-api-types -p ddm-api-types-versions --nocapture

.github/buildomat/jobs/test-rdb.sh

@@ -14,6 +14,11 @@ set -x
 set -e
 
 source .github/buildomat/test-common.sh
+
 pushd rdb
-cargo nextest run
+cargo nextest run \
+    -p rdb \
+    -p mg-api-types \
+    -p mg-api-types-versions
 cp *.log /work/
+popd

Cargo.toml

@@ -7,19 +7,18 @@ default-members = [
     "ddmd",
     "ddm-admin-client",
     "ddm-api",
-    "ddm-types",
-    "ddm-types/versions",
+    "ddm-api-types",
+    "ddm-api-types/versions",
     "dropshot-apis",
     "bfd",
     "util",
     "mg-ddm-verify",
     "tests",
     "rdb",
-    "rdb-types",
     "bgp",
     "mg-api",
-    "mg-types",
-    "mg-types/versions",
+    "mg-api-types",
+    "mg-api-types/versions",
     "mg-admin-client",
     "mgadm",
     "mgd",
@@ -37,8 +36,8 @@ members = [
     "ddmd",
     "ddm-admin-client",
     "ddm-api",
-    "ddm-types",
-    "ddm-types/versions",
+    "ddm-api-types",
+    "ddm-api-types/versions",
     "dropshot-apis",
     "bfd",
     "package",
@@ -50,7 +49,6 @@ members = [
     "mg-admin-client",
     "mgadm",
     "rdb",
-    "rdb-types",
     "mgd",
     "mg-lower",
     "mg-common",
@@ -62,19 +60,18 @@ members = [
 [workspace.dependencies]
 # Local
 mg-api = { path = "mg-api" }
-mg-types = { path = "mg-types" }
-mg-types-versions = { path = "mg-types/versions" }
+mg-api-types = { path = "mg-api-types" }
+mg-api-types-versions = { path = "mg-api-types/versions" }
 mg-common = { path = "mg-common" }
-rdb-types = { path = "rdb-types" }
 ndp = { path = "ndp" }
 bgp = { path = "bgp" }
 bfd = { path = "bfd" }
 mg-admin-client = { path = "mg-admin-client" }
 ddm-admin-client = { path = "ddm-admin-client" }
 rdb = { path = "rdb", features = ["clap"] }
 ddm-api = { path = "ddm-api" }
-ddm-types = { path = "ddm-types" }
-ddm-types-versions = { path = "ddm-types/versions" }
+ddm-api-types = { path = "ddm-api-types" }
+ddm-api-types-versions = { path = "ddm-api-types/versions" }
 
 # External
 slog = { version = "2.8.2", features = ["max_level_trace", "release_max_level_debug"] }

bfd/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2024"
 
 [dependencies]
 rdb = { path = "../rdb" }
+mg-api-types.workspace = true
 mg-common.workspace = true
 slog.workspace = true
 slog-bunyan.workspace = true