consolidate omicron-dev, omdb, and xtask into "dev-tools" directory (#…

…4129)
oxidecomputer · Sep 21, 2023 · 46ffb37 · 46ffb37
1 parent 79fee6a
commit 46ffb37
Show file tree

Hide file tree

Showing 28 changed files with 11 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,9 @@ members = [
     "common",
     "ddm-admin-client",
     "deploy",
-    "dev-tools",
+    "dev-tools/omdb",
+    "dev-tools/omicron-dev",
+    "dev-tools/xtask",
     "dns-server",
     "dns-service-client",
     "dpd-client",
@@ -37,7 +39,6 @@ members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
-    "omdb",
     "oxide-client",
     "oximeter-client",
     "oximeter/collector",
@@ -62,7 +63,6 @@ members = [
     "wicket",
     "wicketd-client",
     "wicketd",
-    "xtask",
 ]
 
 default-members = [
@@ -74,7 +74,9 @@ default-members = [
     "ddm-admin-client",
     "dpd-client",
     "deploy",
-    "dev-tools",
+    "dev-tools/omdb",
+    "dev-tools/omicron-dev",
+    "dev-tools/xtask",
     "dns-server",
     "dns-service-client",
     "gateway",
@@ -98,7 +100,6 @@ default-members = [
     "nexus/db-queries",
     "nexus/defaults",
     "nexus/types",
-    "omdb",
     "oxide-client",
     "oximeter-client",
     "oximeter/collector",
@@ -123,7 +124,6 @@ default-members = [
     "wicket-dbg",
     "wicketd",
     "wicketd-client",
-    "xtask",
 ]
 resolver = "2"
 
@@ -234,7 +234,7 @@ nexus-types = { path = "nexus/types" }
 num-integer = "0.1.45"
 num = { version = "0.4.1", default-features = false, features = [ "libm" ] }
 omicron-common = { path = "common" }
-omicron-dev-tools = { path = "dev-tools" }
+omicron-dev = { path = "dev-tools/omicron-dev" }
 omicron-gateway = { path = "gateway" }
 omicron-nexus = { path = "nexus" }
 omicron-omdb = { path = "omdb" }

diff --git a/omdb/Cargo.toml → dev-tools/omdb/Cargo.toml b/omdb/Cargo.toml → dev-tools/omdb/Cargo.toml
diff --git a/dev-tools/build.rs → dev-tools/omdb/build.rs b/dev-tools/build.rs → dev-tools/omdb/build.rs
diff --git a/omdb/src/bin/omdb/db.rs → dev-tools/omdb/src/bin/omdb/db.rs b/omdb/src/bin/omdb/db.rs → dev-tools/omdb/src/bin/omdb/db.rs
diff --git a/omdb/src/bin/omdb/main.rs → dev-tools/omdb/src/bin/omdb/main.rs b/omdb/src/bin/omdb/main.rs → dev-tools/omdb/src/bin/omdb/main.rs
diff --git a/omdb/src/bin/omdb/nexus.rs → dev-tools/omdb/src/bin/omdb/nexus.rs b/omdb/src/bin/omdb/nexus.rs → dev-tools/omdb/src/bin/omdb/nexus.rs
diff --git a/omdb/src/bin/omdb/sled_agent.rs → dev-tools/omdb/src/bin/omdb/sled_agent.rs b/omdb/src/bin/omdb/sled_agent.rs → dev-tools/omdb/src/bin/omdb/sled_agent.rs
diff --git a/dev-tools/omdb/tests/config.test.toml b/dev-tools/omdb/tests/config.test.toml
@@ -0,0 +1 @@
+../../../nexus/tests/config.test.toml
diff --git a/omdb/tests/env.out → dev-tools/omdb/tests/env.out b/omdb/tests/env.out → dev-tools/omdb/tests/env.out
diff --git a/omdb/tests/successes.out → dev-tools/omdb/tests/successes.out b/omdb/tests/successes.out → dev-tools/omdb/tests/successes.out
diff --git a/omdb/tests/test_all_output.rs → dev-tools/omdb/tests/test_all_output.rs b/omdb/tests/test_all_output.rs → dev-tools/omdb/tests/test_all_output.rs
diff --git a/omdb/tests/usage_errors.out → dev-tools/omdb/tests/usage_errors.out b/omdb/tests/usage_errors.out → dev-tools/omdb/tests/usage_errors.out
diff --git a/dev-tools/Cargo.toml → dev-tools/omicron-dev/Cargo.toml b/dev-tools/Cargo.toml → dev-tools/omicron-dev/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "omicron-dev-tools"
+name = "omicron-dev"
 version = "0.1.0"
 edition = "2021"
 license = "MPL-2.0"

diff --git a/omdb/build.rs → dev-tools/omicron-dev/build.rs b/omdb/build.rs → dev-tools/omicron-dev/build.rs
diff --git a/dev-tools/src/bin/omicron-dev.rs → dev-tools/omicron-dev/src/bin/omicron-dev.rs b/dev-tools/src/bin/omicron-dev.rs → dev-tools/omicron-dev/src/bin/omicron-dev.rs
@@ -327,7 +327,7 @@ async fn cmd_run_all(args: &RunAllArgs) -> Result<(), anyhow::Error> {
     let mut signal_stream = signals.fuse();
 
     // Read configuration.
-    let config_str = include_str!("../../../nexus/examples/config.toml");
+    let config_str = include_str!("../../../../nexus/examples/config.toml");
     let mut config: omicron_common::nexus_config::Config =
         toml::from_str(config_str).context("parsing example config")?;
     config.pkg.log = dropshot::ConfigLogging::File {

diff --git a/...sts/output/cmd-omicron-dev-bad-cmd-stderr → ...sts/output/cmd-omicron-dev-bad-cmd-stderr b/...sts/output/cmd-omicron-dev-bad-cmd-stderr → ...sts/output/cmd-omicron-dev-bad-cmd-stderr
diff --git a/...sts/output/cmd-omicron-dev-bad-cmd-stdout → ...sts/output/cmd-omicron-dev-bad-cmd-stdout b/...sts/output/cmd-omicron-dev-bad-cmd-stdout → ...sts/output/cmd-omicron-dev-bad-cmd-stdout
diff --git a/...cmd-omicron-dev-db-populate-noargs-stderr → ...cmd-omicron-dev-db-populate-noargs-stderr b/...cmd-omicron-dev-db-populate-noargs-stderr → ...cmd-omicron-dev-db-populate-noargs-stderr
diff --git a/...cmd-omicron-dev-db-populate-noargs-stdout → ...cmd-omicron-dev-db-populate-noargs-stdout b/...cmd-omicron-dev-db-populate-noargs-stdout → ...cmd-omicron-dev-db-populate-noargs-stdout
diff --git a/...put/cmd-omicron-dev-db-wipe-noargs-stderr → ...put/cmd-omicron-dev-db-wipe-noargs-stderr b/...put/cmd-omicron-dev-db-wipe-noargs-stderr → ...put/cmd-omicron-dev-db-wipe-noargs-stderr
diff --git a/...put/cmd-omicron-dev-db-wipe-noargs-stdout → ...put/cmd-omicron-dev-db-wipe-noargs-stdout b/...put/cmd-omicron-dev-db-wipe-noargs-stdout → ...put/cmd-omicron-dev-db-wipe-noargs-stdout
diff --git a/...ests/output/cmd-omicron-dev-noargs-stderr → ...ests/output/cmd-omicron-dev-noargs-stderr b/...ests/output/cmd-omicron-dev-noargs-stderr → ...ests/output/cmd-omicron-dev-noargs-stderr
diff --git a/...ests/output/cmd-omicron-dev-noargs-stdout → ...ests/output/cmd-omicron-dev-noargs-stdout b/...ests/output/cmd-omicron-dev-noargs-stdout → ...ests/output/cmd-omicron-dev-noargs-stdout
diff --git a/dev-tools/tests/test_omicron_dev.rs → ...ols/omicron-dev/tests/test_omicron_dev.rs b/dev-tools/tests/test_omicron_dev.rs → ...ols/omicron-dev/tests/test_omicron_dev.rs
diff --git a/xtask/Cargo.toml → dev-tools/xtask/Cargo.toml b/xtask/Cargo.toml → dev-tools/xtask/Cargo.toml
diff --git a/xtask/src/main.rs → dev-tools/xtask/src/main.rs b/xtask/src/main.rs → dev-tools/xtask/src/main.rs
diff --git a/omdb/tests/config.test.toml b/omdb/tests/config.test.toml