From db90b4a6528edb84e7d6095170c5a3646956fad6 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Mon, 6 Jan 2025 12:53:58 -0500 Subject: [PATCH 1/7] add external DNS zones to reconfigurator-cli's example system --- dev-tools/reconfigurator-cli/src/main.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-tools/reconfigurator-cli/src/main.rs b/dev-tools/reconfigurator-cli/src/main.rs index 7da8a05043..87f0a9f7e4 100644 --- a/dev-tools/reconfigurator-cli/src/main.rs +++ b/dev-tools/reconfigurator-cli/src/main.rs @@ -1271,6 +1271,8 @@ fn cmd_load_example( .num_nexus() .map_or(NEXUS_REDUNDANCY, |n| n.into()), ) + .external_dns_count(3) + .context("invalid external DNS zone count")? .create_zones(!args.no_zones) .create_disks_in_blueprint(!args.no_disks_in_blueprint) .build(); From 275e24e115059eb5ae9ca5dd5635d133596bf173 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Mon, 6 Jan 2025 12:54:51 -0500 Subject: [PATCH 2/7] expunge-zone: no longer require specifying parent sled ID --- dev-tools/reconfigurator-cli/src/main.rs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dev-tools/reconfigurator-cli/src/main.rs b/dev-tools/reconfigurator-cli/src/main.rs index 87f0a9f7e4..bc37a2e7f3 100644 --- a/dev-tools/reconfigurator-cli/src/main.rs +++ b/dev-tools/reconfigurator-cli/src/main.rs @@ -423,7 +423,7 @@ enum BlueprintEditCommands { /// add a CockroachDB instance to a particular sled AddCockroach { sled_id: SledUuid }, /// expunge a particular zone from a particular sled - ExpungeZone { sled_id: SledUuid, zone_id: OmicronZoneUuid }, + ExpungeZone { zone_id: OmicronZoneUuid }, } #[derive(Debug, Args)] @@ -828,7 +828,20 @@ fn cmd_blueprint_edit( .context("failed to add CockroachDB zone")?; format!("added CockroachDB zone to sled {}", sled_id) } - BlueprintEditCommands::ExpungeZone { sled_id, zone_id } => { + BlueprintEditCommands::ExpungeZone { zone_id } => { + let mut parent_sled_id = None; + for sled_id in builder.sled_ids_with_zones() { + if builder + .current_sled_zones(sled_id, BlueprintZoneFilter::All) + .any(|z| z.id == zone_id) + { + parent_sled_id = Some(sled_id); + break; + } + } + let Some(sled_id) = parent_sled_id else { + bail!("could not find parent sled for zone {zone_id}"); + }; builder .sled_expunge_zone(sled_id, zone_id) .context("failed to expunge zone")?; From a147954743afc15ff0f73c306c0ff2c4c62ad7ae Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Mon, 6 Jan 2025 12:55:16 -0500 Subject: [PATCH 3/7] blueprint-plan: allow omitted collection ID if exactly 1 exists --- Cargo.lock | 1 + dev-tools/reconfigurator-cli/Cargo.toml | 1 + dev-tools/reconfigurator-cli/src/main.rs | 21 +++++++++++++++++++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe8ac9704f..b7556ddb74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9445,6 +9445,7 @@ dependencies = [ "humantime", "indent_write", "internal-dns-types", + "itertools 0.13.0", "nexus-client", "nexus-db-queries", "nexus-inventory", diff --git a/dev-tools/reconfigurator-cli/Cargo.toml b/dev-tools/reconfigurator-cli/Cargo.toml index 0e3bf009a1..1b693de567 100644 --- a/dev-tools/reconfigurator-cli/Cargo.toml +++ b/dev-tools/reconfigurator-cli/Cargo.toml @@ -20,6 +20,7 @@ dropshot.workspace = true humantime.workspace = true indent_write.workspace = true internal-dns-types.workspace = true +itertools.workspace = true nexus-inventory.workspace = true nexus-reconfigurator-planning.workspace = true nexus-reconfigurator-simulation.workspace = true diff --git a/dev-tools/reconfigurator-cli/src/main.rs b/dev-tools/reconfigurator-cli/src/main.rs index bc37a2e7f3..48fffb0f0a 100644 --- a/dev-tools/reconfigurator-cli/src/main.rs +++ b/dev-tools/reconfigurator-cli/src/main.rs @@ -12,6 +12,7 @@ use clap::ValueEnum; use clap::{Args, Parser, Subcommand}; use indent_write::fmt::IndentWriter; use internal_dns_types::diff::DnsDiff; +use itertools::Itertools; use nexus_inventory::CollectionBuilder; use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder; use nexus_reconfigurator_planning::example::ExampleSystemBuilder; @@ -396,7 +397,10 @@ struct BlueprintPlanArgs { /// id of the blueprint on which this one will be based parent_blueprint_id: Uuid, /// id of the inventory collection to use in planning - collection_id: CollectionUuid, + /// + /// Must be provided unless there is only one collection in the loaded + /// state. + collection_id: Option, } #[derive(Debug, Args)] @@ -754,7 +758,20 @@ fn cmd_blueprint_plan( let parent_blueprint_id = args.parent_blueprint_id; let collection_id = args.collection_id; let parent_blueprint = system.get_blueprint(parent_blueprint_id)?; - let collection = system.get_collection(collection_id)?; + let collection = match collection_id { + Some(collection_id) => system.get_collection(collection_id)?, + None => { + let mut all_collections_iter = system.all_collections(); + match all_collections_iter.len() { + 0 => bail!("cannot plan blueprint with no loaded collections"), + 1 => all_collections_iter.next().expect("iter length is 1"), + _ => bail!( + "blueprint-plan: must specify collection ID (one of {:?})", + all_collections_iter.map(|c| c.id).join(", ") + ), + } + } + }; let creator = "reconfigurator-sim"; let planning_input = sim.planning_input(parent_blueprint)?; From 36d82d4b47f3fc92e6db29a1ebc3983501570560 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Mon, 6 Jan 2025 14:04:00 -0500 Subject: [PATCH 4/7] add test and fix for expunge/plan/expunge external-dns --- dev-tools/reconfigurator-cli/src/main.rs | 12 ++-- .../tests/output/cmd-example-stdout | 63 ++++++++++--------- .../reconfigurator-cli/tests/test_basic.rs | 24 +++++++ 3 files changed, 65 insertions(+), 34 deletions(-) diff --git a/dev-tools/reconfigurator-cli/src/main.rs b/dev-tools/reconfigurator-cli/src/main.rs index 48fffb0f0a..0decf064ef 100644 --- a/dev-tools/reconfigurator-cli/src/main.rs +++ b/dev-tools/reconfigurator-cli/src/main.rs @@ -117,8 +117,8 @@ impl ReconfiguratorSim { builder.set_internal_dns_version(parent_blueprint.internal_dns_version); builder.set_external_dns_version(parent_blueprint.external_dns_version); - for (_, zone) in - parent_blueprint.all_omicron_zones(BlueprintZoneFilter::All) + for (_, zone) in parent_blueprint + .all_omicron_zones(BlueprintZoneFilter::ShouldBeRunning) { if let Some((external_ip, nic)) = zone.zone_type.external_networking() @@ -774,7 +774,9 @@ fn cmd_blueprint_plan( }; let creator = "reconfigurator-sim"; - let planning_input = sim.planning_input(parent_blueprint)?; + let planning_input = sim + .planning_input(parent_blueprint) + .context("failed to construct planning input")?; let planner = Planner::new_based_on( sim.log.clone(), parent_blueprint, @@ -808,7 +810,9 @@ fn cmd_blueprint_edit( let blueprint_id = args.blueprint_id; let blueprint = system.get_blueprint(blueprint_id)?; let creator = args.creator.as_deref().unwrap_or("reconfigurator-cli"); - let planning_input = sim.planning_input(blueprint)?; + let planning_input = sim + .planning_input(blueprint) + .context("failed to create planning input")?; // TODO: We may want to do something other than just using the latest // collection -- add a way to specify which collection to use. diff --git a/dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout b/dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout index a51389d7cd..12b43e3d29 100644 --- a/dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout +++ b/dev-tools/reconfigurator-cli/tests/output/cmd-example-stdout @@ -91,6 +91,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9 clickhouse fe79023f-c5d5-4be5-ad2c-da4e9e9237e4 in service fd00:1122:3344:102::23 crucible 054f64a5-182c-4c28-8994-d2e082550201 in service fd00:1122:3344:102::26 crucible 3b5bffea-e5ed-44df-8468-fd4fa69757d8 in service fd00:1122:3344:102::27 + crucible 4f2eb088-7d28-4c4e-a27c-746400ec65ba in service fd00:1122:3344:102::2f crucible 53dd7fa4-899e-49ed-9fc2-48222db3e20d in service fd00:1122:3344:102::2a crucible 7db307d4-a6ed-4c47-bddf-6759161bf64a in service fd00:1122:3344:102::2c crucible 95ad9a1d-4063-4874-974c-2fc92830be27 in service fd00:1122:3344:102::29 @@ -98,8 +99,8 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9 crucible d90401f1-fbc2-42cb-bf17-309ee0f922fe in service fd00:1122:3344:102::2b crucible e8f994c0-0a1b-40e6-8db1-40a8ca89e503 in service fd00:1122:3344:102::2d crucible e9bf481e-323e-466e-842f-8107078c7137 in service fd00:1122:3344:102::2e - crucible f97aa057-6485-45d0-9cb4-4af5b0831d48 in service fd00:1122:3344:102::25 - crucible_pantry eaec16c0-0d44-4847-b2d6-31a5151bae52 in service fd00:1122:3344:102::24 + crucible_pantry f97aa057-6485-45d0-9cb4-4af5b0831d48 in service fd00:1122:3344:102::25 + external_dns eaec16c0-0d44-4847-b2d6-31a5151bae52 in service fd00:1122:3344:102::24 internal_dns 8b8f7c02-7a18-4268-b045-2e286b464c5d in service fd00:1122:3344:1::1 internal_ntp c67dd9a4-0d6c-4e9f-b28d-20003f211f7d in service fd00:1122:3344:102::21 nexus 94b45ce9-d3d8-413a-a76b-865da1f67930 in service fd00:1122:3344:102::22 @@ -128,20 +129,21 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9 --------------------------------------------------------------------------------------------- zone type zone id disposition underlay IP --------------------------------------------------------------------------------------------- - crucible 09937ebb-bb6a-495b-bc97-b58076b70a78 in service fd00:1122:3344:103::2c - crucible a999e5fa-3edc-4dac-919a-d7b554cdae58 in service fd00:1122:3344:103::26 - crucible b416f299-c23c-46c8-9820-be2b66ffea0a in service fd00:1122:3344:103::27 - crucible b5d5491d-b3aa-4727-8b55-f66e0581ea4f in service fd00:1122:3344:103::2b - crucible cc1dc86d-bd6f-4929-aa4a-9619012e9393 in service fd00:1122:3344:103::24 - crucible cd3bb540-e605-465f-8c62-177ac482d850 in service fd00:1122:3344:103::29 - crucible e8971ab3-fb7d-4ad8-aae3-7f2fe87c51f3 in service fd00:1122:3344:103::25 - crucible f3628f0a-2301-4fc8-bcbf-961199771731 in service fd00:1122:3344:103::2d - crucible f52aa245-7e1b-46c0-8a31-e09725f02caf in service fd00:1122:3344:103::2a - crucible fae49024-6cec-444d-a6c4-83658ab015a4 in service fd00:1122:3344:103::28 - crucible_pantry 728db429-8621-4e1e-9915-282aadfa27d1 in service fd00:1122:3344:103::23 - internal_dns e7dd3e98-7fe7-4827-be7f-395ff9a5f542 in service fd00:1122:3344:2::1 - internal_ntp 4f2eb088-7d28-4c4e-a27c-746400ec65ba in service fd00:1122:3344:103::21 - nexus c8aa84a5-a802-46c9-adcd-d61e9c8393c9 in service fd00:1122:3344:103::22 + crucible 09937ebb-bb6a-495b-bc97-b58076b70a78 in service fd00:1122:3344:103::2b + crucible a999e5fa-3edc-4dac-919a-d7b554cdae58 in service fd00:1122:3344:103::25 + crucible b416f299-c23c-46c8-9820-be2b66ffea0a in service fd00:1122:3344:103::26 + crucible b43ce109-90d6-46f9-9df0-8c68bfe6d4a0 in service fd00:1122:3344:103::2e + crucible b5d5491d-b3aa-4727-8b55-f66e0581ea4f in service fd00:1122:3344:103::2a + crucible cbe91cdc-cbb6-4760-aece-6ce08b67e85a in service fd00:1122:3344:103::2d + crucible cd3bb540-e605-465f-8c62-177ac482d850 in service fd00:1122:3344:103::28 + crucible f3628f0a-2301-4fc8-bcbf-961199771731 in service fd00:1122:3344:103::2c + crucible f52aa245-7e1b-46c0-8a31-e09725f02caf in service fd00:1122:3344:103::29 + crucible fae49024-6cec-444d-a6c4-83658ab015a4 in service fd00:1122:3344:103::27 + crucible_pantry e8971ab3-fb7d-4ad8-aae3-7f2fe87c51f3 in service fd00:1122:3344:103::24 + external_dns cc1dc86d-bd6f-4929-aa4a-9619012e9393 in service fd00:1122:3344:103::23 + internal_dns 728db429-8621-4e1e-9915-282aadfa27d1 in service fd00:1122:3344:2::1 + internal_ntp c8aa84a5-a802-46c9-adcd-d61e9c8393c9 in service fd00:1122:3344:103::21 + nexus e7dd3e98-7fe7-4827-be7f-395ff9a5f542 in service fd00:1122:3344:103::22 @@ -167,20 +169,21 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9 --------------------------------------------------------------------------------------------- zone type zone id disposition underlay IP --------------------------------------------------------------------------------------------- - crucible 413d3e02-e19f-400a-9718-a662347538f0 in service fd00:1122:3344:101::24 - crucible 6cb330f9-4609-4d6c-98ad-b5cc34245813 in service fd00:1122:3344:101::29 - crucible 6d725df0-0189-4429-b270-3eeb891d39c8 in service fd00:1122:3344:101::28 - crucible b5443ebd-1f5b-448c-8edc-b4ca25c25db1 in service fd00:1122:3344:101::25 - crucible bb55534c-1042-4af4-ad2f-9590803695ac in service fd00:1122:3344:101::27 - crucible c4296f9f-f902-4fc7-b896-178e56e60732 in service fd00:1122:3344:101::2d - crucible d14c165f-6370-4cce-9dba-3c6deb762cfc in service fd00:1122:3344:101::2c - crucible de65f128-30f7-422b-a234-d1fc8dd6ef78 in service fd00:1122:3344:101::2b - crucible e135441d-637e-4de9-8023-5ea0096347f3 in service fd00:1122:3344:101::26 - crucible fee71ee6-da42-4a7f-a00e-f56b6a3327ce in service fd00:1122:3344:101::2a - crucible_pantry 315a3670-d019-425c-b7a6-c9429428b671 in service fd00:1122:3344:101::23 - internal_dns 8b47e1e8-0396-4e44-a4a5-ea891405c9f2 in service fd00:1122:3344:3::1 - internal_ntp cbe91cdc-cbb6-4760-aece-6ce08b67e85a in service fd00:1122:3344:101::21 - nexus b43ce109-90d6-46f9-9df0-8c68bfe6d4a0 in service fd00:1122:3344:101::22 + crucible 51afbaff-e6d8-4408-afed-a2e2d74724e7 in service fd00:1122:3344:101::2e + crucible 6cb330f9-4609-4d6c-98ad-b5cc34245813 in service fd00:1122:3344:101::27 + crucible 6d725df0-0189-4429-b270-3eeb891d39c8 in service fd00:1122:3344:101::26 + crucible bb55534c-1042-4af4-ad2f-9590803695ac in service fd00:1122:3344:101::25 + crucible c4296f9f-f902-4fc7-b896-178e56e60732 in service fd00:1122:3344:101::2b + crucible c54e90ae-bcdc-42b4-98ed-a6985037aba7 in service fd00:1122:3344:101::2d + crucible d14c165f-6370-4cce-9dba-3c6deb762cfc in service fd00:1122:3344:101::2a + crucible de65f128-30f7-422b-a234-d1fc8dd6ef78 in service fd00:1122:3344:101::29 + crucible faa91ff2-039d-4567-ace9-be27abb34f92 in service fd00:1122:3344:101::2c + crucible fee71ee6-da42-4a7f-a00e-f56b6a3327ce in service fd00:1122:3344:101::28 + crucible_pantry e135441d-637e-4de9-8023-5ea0096347f3 in service fd00:1122:3344:101::24 + external_dns b5443ebd-1f5b-448c-8edc-b4ca25c25db1 in service fd00:1122:3344:101::23 + internal_dns 413d3e02-e19f-400a-9718-a662347538f0 in service fd00:1122:3344:3::1 + internal_ntp 8b47e1e8-0396-4e44-a4a5-ea891405c9f2 in service fd00:1122:3344:101::21 + nexus 315a3670-d019-425c-b7a6-c9429428b671 in service fd00:1122:3344:101::22 COCKROACHDB SETTINGS: diff --git a/dev-tools/reconfigurator-cli/tests/test_basic.rs b/dev-tools/reconfigurator-cli/tests/test_basic.rs index 749f090e06..14573fa461 100644 --- a/dev-tools/reconfigurator-cli/tests/test_basic.rs +++ b/dev-tools/reconfigurator-cli/tests/test_basic.rs @@ -84,6 +84,30 @@ fn test_example() { assert_contents("tests/output/cmd-example-stderr", &stderr_text); } +// Run tests to expunge an external DNS zone, plan (which should add it again), +// then expunge the newly-added zone. +#[test] +fn test_expunge_newly_added_external_dns() { + let (exit_status, stdout_text, stderr_text) = run_cli( + "tests/input/cmds-expunge-newly-added.txt", + &["--seed", "test_expunge_newly_added_external_dns"], + ); + assert_exit_code(exit_status, EXIT_SUCCESS, &stderr_text); + + // The example system uses a fixed seed, which means that UUIDs are + // deterministic. Some of the test commands also use those UUIDs, and it's + // convenient for everyone if they aren't redacted. + let stdout_text = Redactor::default().uuids(false).do_redact(&stdout_text); + assert_contents( + "tests/output/cmd-expunge-newly-added-stdout", + &stdout_text, + ); + assert_contents( + "tests/output/cmd-expunge-newly-added-stderr", + &stderr_text, + ); +} + type ControlPlaneTestContext = nexus_test_utils::ControlPlaneTestContext; From 839899e22c9631e98d28d958768a03b025328a9b Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Mon, 6 Jan 2025 14:11:15 -0500 Subject: [PATCH 5/7] check in new test files --- .../tests/input/cmds-expunge-newly-added.txt | 13 + .../output/cmd-expunge-newly-added-stderr | 26 ++ .../output/cmd-expunge-newly-added-stdout | 439 ++++++++++++++++++ 3 files changed, 478 insertions(+) create mode 100644 dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt create mode 100644 dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stderr create mode 100644 dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout diff --git a/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt b/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt new file mode 100644 index 0000000000..2f768fa4ae --- /dev/null +++ b/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt @@ -0,0 +1,13 @@ +load-example + +# expunge external DNS from initial blueprint +blueprint-show 3f00b694-1b16-4aaa-8f78-e6b3a527b434 +blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 90d08710-3c0b-4fae-b01e-9a826fd3124f + +# run planner, which adds a new external DNS +blueprint-show 366b0b68-d80e-4bc1-abd3-dc69837847e0 +blueprint-plan 366b0b68-d80e-4bc1-abd3-dc69837847e0 + +# expunge newly-added external DNS +blueprint-show 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 +blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone a9bc9526-feb0-4b9f-86e5-f56789a314f6 diff --git a/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stderr b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stderr new file mode 100644 index 0000000000..d82cafa83c --- /dev/null +++ b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stderr @@ -0,0 +1,26 @@ +error: unrecognized subcommand '#' + +Usage: + +For more information, try 'help'. +error: unrecognized subcommand '#' + +Usage: + +For more information, try 'help'. +Jan 06 19:02:24.504 INFO sufficient BoundaryNtp zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 19:02:24.504 INFO sufficient Clickhouse zones exist in plan, current_count: 1, desired_count: 1 +Jan 06 19:02:24.505 INFO sufficient ClickhouseKeeper zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 19:02:24.505 INFO sufficient ClickhouseServer zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 19:02:24.505 INFO sufficient CockroachDb zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 19:02:24.505 INFO sufficient CruciblePantry zones exist in plan, current_count: 3, desired_count: 3 +Jan 06 19:02:24.505 INFO sufficient InternalDns zones exist in plan, current_count: 3, desired_count: 3 +Jan 06 19:02:24.505 INFO added zone to sled, kind: ExternalDns, sled_id: a88790de-5962-4871-8686-61c1fd5b7094 +Jan 06 19:02:24.505 INFO sufficient Nexus zones exist in plan, current_count: 3, desired_count: 3 +Jan 06 19:02:24.505 INFO sufficient Oximeter zones exist in plan, current_count: 0error: unrecognized subcommand '#' + +Usage: + +For more information, try 'help'. +, desired_count: 0 +Jan 06 19:02:24.505 INFO will ensure cockroachdb setting, value: DoNotModify, setting: cluster.preserve_downgrade_option diff --git a/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout new file mode 100644 index 0000000000..54e77928a2 --- /dev/null +++ b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout @@ -0,0 +1,439 @@ +using provided RNG seed: test_expunge_newly_added_external_dns +> load-example +loaded example system with: +- collection: 8bc58dd6-dd6e-44e2-9671-e35a2a941c98 +- blueprint: 3f00b694-1b16-4aaa-8f78-e6b3a527b434 + +> + +> # expunge external DNS from initial blueprint + +> blueprint-show 3f00b694-1b16-4aaa-8f78-e6b3a527b434 +blueprint 3f00b694-1b16-4aaa-8f78-e6b3a527b434 +parent: 06c88262-f435-410e-ba98-101bed41ec27 + + sled: 711ac7f8-d19e-4572-bdb9-e9b50f6e362a (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-3b46c403-ad14-435c-a1a8-e8f940bf814f + fake-vendor fake-model serial-3f8c9484-06e8-4662-9a90-aa7e92c43405 + fake-vendor fake-model serial-4a62a827-4bf3-45d5-a7f5-d080f25c61ef + fake-vendor fake-model serial-5f774f00-52b7-41b5-a57f-6f38037196f5 + fake-vendor fake-model serial-68ae41d4-99ed-4612-99e1-fecf795ca694 + fake-vendor fake-model serial-6a66241b-b595-423d-84ef-a81b5d8430e8 + fake-vendor fake-model serial-7c45c3f6-6369-40d9-a73f-2f7ed0afe96b + fake-vendor fake-model serial-a216d334-4a9a-49dd-8b13-20548839306c + fake-vendor fake-model serial-c9ff8eb0-807c-40ad-a5c4-0d534947c9ad + fake-vendor fake-model serial-fb29d469-7d3f-47b9-944c-ce817fc70370 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + clickhouse da139150-e6c2-4e9e-860e-3ddda2304659 in service fd00:1122:3344:103::23 + crucible 0ec1425f-302f-464c-8062-4b6f378fff9a in service fd00:1122:3344:103::2d + crucible 25fe5970-7f66-4710-991c-2e9cbe9a41f6 in service fd00:1122:3344:103::26 + crucible 441823e4-49aa-4057-b93f-bbb82a08faac in service fd00:1122:3344:103::28 + crucible 504a20c6-b245-4368-8ed2-8bcc4e63a6e5 in service fd00:1122:3344:103::2b + crucible 5cd6a521-4be9-431e-bbf1-46611446f13f in service fd00:1122:3344:103::2e + crucible 92aa30d2-949e-49c2-b390-8d2973755a08 in service fd00:1122:3344:103::2a + crucible 99063858-6a9d-42fd-9d32-2f877227c59f in service fd00:1122:3344:103::2f + crucible 99b3c18f-cb31-4df1-a9f3-244e4c9f8718 in service fd00:1122:3344:103::29 + crucible 9cc92141-152f-4341-8859-0e9a6926a5fd in service fd00:1122:3344:103::27 + crucible d1aed9cc-7edc-4e4b-9b56-137ce9d20196 in service fd00:1122:3344:103::2c + crucible_pantry f685006c-354e-4909-b6b8-b58b8f45abb2 in service fd00:1122:3344:103::25 + external_dns a79cadd5-1bd9-4e3c-add7-b499d6eebe03 in service fd00:1122:3344:103::24 + internal_dns 70f99c28-9a1e-4c0b-a9c4-0fd6d4ac6287 in service fd00:1122:3344:1::1 + internal_ntp cac46937-c0ab-4106-a0fa-e7124ca76003 in service fd00:1122:3344:103::21 + nexus b2a07267-fdeb-47f8-9e66-d959554fdd6e in service fd00:1122:3344:103::22 + + + + sled: 9dc50690-f9bf-4520-bf80-051d0f465c2c (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-1f9589d8-0a68-47e8-b977-d0fb17bd3fdb + fake-vendor fake-model serial-44882b6c-5e19-418b-b6c3-065f2af5a557 + fake-vendor fake-model serial-6de47efc-8a6d-4108-bf82-0146eab3be06 + fake-vendor fake-model serial-80e2c62f-052c-4580-8252-7af238fbbe9c + fake-vendor fake-model serial-81d326ae-5f8a-4ffd-9d5e-a9e8246ac014 + fake-vendor fake-model serial-878af5a0-7810-43e5-bdd5-a3215242459a + fake-vendor fake-model serial-af59fef5-8258-4852-be1d-ce55ae7dc822 + fake-vendor fake-model serial-b16aa11f-6e49-44c1-abcb-2e7584bffa12 + fake-vendor fake-model serial-f173c79b-a3b4-4f4a-a983-bc94b6b1a616 + fake-vendor fake-model serial-f1a041cc-85c7-4d14-8fc0-8d0e417f7e24 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 050a58da-b676-42f4-981e-4576989c6fb9 in service fd00:1122:3344:102::2c + crucible 0699d6b9-1bf8-4fc4-9d12-8c9f6fe258ca in service fd00:1122:3344:102::2a + crucible 0ecb7c9a-11b3-4f77-8834-a28f42dafa8a in service fd00:1122:3344:102::26 + crucible 46cb45be-ee55-4074-a6cb-5d21d722b959 in service fd00:1122:3344:102::2d + crucible 48af0981-f184-45be-a4ae-5423254098a2 in service fd00:1122:3344:102::2b + crucible 728b17f2-2de9-4c1a-96fb-1b557dc91b9f in service fd00:1122:3344:102::2e + crucible a9c41a2d-533d-4438-b2cf-17fd5ad89edb in service fd00:1122:3344:102::25 + crucible b6feb9ca-8e83-430f-a3ed-8674661d6590 in service fd00:1122:3344:102::27 + crucible c6e09093-4ff8-413f-a08f-9f6122855bb0 in service fd00:1122:3344:102::29 + crucible fc99f264-7a6d-4c89-8109-404743a54df3 in service fd00:1122:3344:102::28 + crucible_pantry 1d988cf1-ee5a-42f1-b5be-40d31706bdcf in service fd00:1122:3344:102::24 + external_dns e7c7018d-e38e-4864-bac9-709f6c26e7c2 in service fd00:1122:3344:102::23 + internal_dns f56f5e84-c435-4323-bccf-352e6406b583 in service fd00:1122:3344:2::1 + internal_ntp 6894c508-7a2f-4e07-8869-d7e2ca7dddf5 in service fd00:1122:3344:102::21 + nexus bed8b9a9-27fb-49d5-ab16-13a194cd3aea in service fd00:1122:3344:102::22 + + + + sled: a88790de-5962-4871-8686-61c1fd5b7094 (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-2f26e76b-6c91-4ee9-87b3-f424b942091b + fake-vendor fake-model serial-6f8fa855-4f34-42db-a6e4-9d0090d6c828 + fake-vendor fake-model serial-71450d62-791e-4068-9882-8a206a465fd9 + fake-vendor fake-model serial-7b4ad242-8330-4c08-9588-c66782742678 + fake-vendor fake-model serial-9bf23b52-565e-4439-9728-edb603fa6c4e + fake-vendor fake-model serial-c9476e3d-7745-4fa9-b336-b54ac5b08f56 + fake-vendor fake-model serial-d2cd1e65-b63d-4748-895f-aafecc81e440 + fake-vendor fake-model serial-d4ad3cc1-956a-4444-81a6-da6a025f6df2 + fake-vendor fake-model serial-e1298a43-fa1a-4e6f-bcfa-b26996f69c50 + fake-vendor fake-model serial-fa9ce87c-fa7c-4854-95bd-69b8f01c46f9 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 2941f8f2-6728-4336-a3cd-0e43c3fe9431 in service fd00:1122:3344:101::28 + crucible 61cff688-5fe8-413c-a6d0-3c23b386df62 in service fd00:1122:3344:101::2d + crucible 6c2d2d92-3d87-4482-9d18-c7581f8ba85e in service fd00:1122:3344:101::25 + crucible 70c29074-6dad-423a-8eca-26eadd586ab8 in service fd00:1122:3344:101::2a + crucible 76bc49f7-327e-4eee-a9f3-699e08bf9081 in service fd00:1122:3344:101::2b + crucible 815808c1-5fa1-4279-bddf-7c420e075208 in service fd00:1122:3344:101::29 + crucible 83e00cbb-3f27-4305-ad4d-11c4606cce05 in service fd00:1122:3344:101::2c + crucible bc0ddd2b-a9e6-49cd-a676-aa8ac1a7c280 in service fd00:1122:3344:101::27 + crucible d544957b-d247-42ad-a939-8327a4e36608 in service fd00:1122:3344:101::26 + crucible e49823a0-cb13-4f37-952d-5a9ff62c233b in service fd00:1122:3344:101::2e + crucible_pantry a6daa3a4-99e6-453a-aeb1-2f5019548746 in service fd00:1122:3344:101::24 + external_dns 90d08710-3c0b-4fae-b01e-9a826fd3124f in service fd00:1122:3344:101::23 + internal_dns b66e7569-7058-4392-b758-4e0e097c38eb in service fd00:1122:3344:3::1 + internal_ntp 96b9e852-30ef-4a0d-986e-2c56cb98f6cb in service fd00:1122:3344:101::21 + nexus 451ac383-2341-4ad1-8777-155e50565812 in service fd00:1122:3344:101::22 + + + COCKROACHDB SETTINGS: + state fingerprint::::::::::::::::: (none) + cluster.preserve_downgrade_option: (do not modify) + + METADATA: + created by::::::::::: test suite + created at::::::::::: + comment:::::::::::::: (none) + internal DNS version: 1 + external DNS version: 1 + + + +> blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 90d08710-3c0b-4fae-b01e-9a826fd3124f +blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0 created from blueprint 3f00b694-1b16-4aaa-8f78-e6b3a527b434: expunged zone 90d08710-3c0b-4fae-b01e-9a826fd3124f from sled a88790de-5962-4871-8686-61c1fd5b7094 + +> + +> # run planner, which adds a new external DNS + +> blueprint-show 366b0b68-d80e-4bc1-abd3-dc69837847e0 +blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0 +parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434 + + sled: 711ac7f8-d19e-4572-bdb9-e9b50f6e362a (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-3b46c403-ad14-435c-a1a8-e8f940bf814f + fake-vendor fake-model serial-3f8c9484-06e8-4662-9a90-aa7e92c43405 + fake-vendor fake-model serial-4a62a827-4bf3-45d5-a7f5-d080f25c61ef + fake-vendor fake-model serial-5f774f00-52b7-41b5-a57f-6f38037196f5 + fake-vendor fake-model serial-68ae41d4-99ed-4612-99e1-fecf795ca694 + fake-vendor fake-model serial-6a66241b-b595-423d-84ef-a81b5d8430e8 + fake-vendor fake-model serial-7c45c3f6-6369-40d9-a73f-2f7ed0afe96b + fake-vendor fake-model serial-a216d334-4a9a-49dd-8b13-20548839306c + fake-vendor fake-model serial-c9ff8eb0-807c-40ad-a5c4-0d534947c9ad + fake-vendor fake-model serial-fb29d469-7d3f-47b9-944c-ce817fc70370 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + clickhouse da139150-e6c2-4e9e-860e-3ddda2304659 in service fd00:1122:3344:103::23 + crucible 0ec1425f-302f-464c-8062-4b6f378fff9a in service fd00:1122:3344:103::2d + crucible 25fe5970-7f66-4710-991c-2e9cbe9a41f6 in service fd00:1122:3344:103::26 + crucible 441823e4-49aa-4057-b93f-bbb82a08faac in service fd00:1122:3344:103::28 + crucible 504a20c6-b245-4368-8ed2-8bcc4e63a6e5 in service fd00:1122:3344:103::2b + crucible 5cd6a521-4be9-431e-bbf1-46611446f13f in service fd00:1122:3344:103::2e + crucible 92aa30d2-949e-49c2-b390-8d2973755a08 in service fd00:1122:3344:103::2a + crucible 99063858-6a9d-42fd-9d32-2f877227c59f in service fd00:1122:3344:103::2f + crucible 99b3c18f-cb31-4df1-a9f3-244e4c9f8718 in service fd00:1122:3344:103::29 + crucible 9cc92141-152f-4341-8859-0e9a6926a5fd in service fd00:1122:3344:103::27 + crucible d1aed9cc-7edc-4e4b-9b56-137ce9d20196 in service fd00:1122:3344:103::2c + crucible_pantry f685006c-354e-4909-b6b8-b58b8f45abb2 in service fd00:1122:3344:103::25 + external_dns a79cadd5-1bd9-4e3c-add7-b499d6eebe03 in service fd00:1122:3344:103::24 + internal_dns 70f99c28-9a1e-4c0b-a9c4-0fd6d4ac6287 in service fd00:1122:3344:1::1 + internal_ntp cac46937-c0ab-4106-a0fa-e7124ca76003 in service fd00:1122:3344:103::21 + nexus b2a07267-fdeb-47f8-9e66-d959554fdd6e in service fd00:1122:3344:103::22 + + + + sled: 9dc50690-f9bf-4520-bf80-051d0f465c2c (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-1f9589d8-0a68-47e8-b977-d0fb17bd3fdb + fake-vendor fake-model serial-44882b6c-5e19-418b-b6c3-065f2af5a557 + fake-vendor fake-model serial-6de47efc-8a6d-4108-bf82-0146eab3be06 + fake-vendor fake-model serial-80e2c62f-052c-4580-8252-7af238fbbe9c + fake-vendor fake-model serial-81d326ae-5f8a-4ffd-9d5e-a9e8246ac014 + fake-vendor fake-model serial-878af5a0-7810-43e5-bdd5-a3215242459a + fake-vendor fake-model serial-af59fef5-8258-4852-be1d-ce55ae7dc822 + fake-vendor fake-model serial-b16aa11f-6e49-44c1-abcb-2e7584bffa12 + fake-vendor fake-model serial-f173c79b-a3b4-4f4a-a983-bc94b6b1a616 + fake-vendor fake-model serial-f1a041cc-85c7-4d14-8fc0-8d0e417f7e24 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 050a58da-b676-42f4-981e-4576989c6fb9 in service fd00:1122:3344:102::2c + crucible 0699d6b9-1bf8-4fc4-9d12-8c9f6fe258ca in service fd00:1122:3344:102::2a + crucible 0ecb7c9a-11b3-4f77-8834-a28f42dafa8a in service fd00:1122:3344:102::26 + crucible 46cb45be-ee55-4074-a6cb-5d21d722b959 in service fd00:1122:3344:102::2d + crucible 48af0981-f184-45be-a4ae-5423254098a2 in service fd00:1122:3344:102::2b + crucible 728b17f2-2de9-4c1a-96fb-1b557dc91b9f in service fd00:1122:3344:102::2e + crucible a9c41a2d-533d-4438-b2cf-17fd5ad89edb in service fd00:1122:3344:102::25 + crucible b6feb9ca-8e83-430f-a3ed-8674661d6590 in service fd00:1122:3344:102::27 + crucible c6e09093-4ff8-413f-a08f-9f6122855bb0 in service fd00:1122:3344:102::29 + crucible fc99f264-7a6d-4c89-8109-404743a54df3 in service fd00:1122:3344:102::28 + crucible_pantry 1d988cf1-ee5a-42f1-b5be-40d31706bdcf in service fd00:1122:3344:102::24 + external_dns e7c7018d-e38e-4864-bac9-709f6c26e7c2 in service fd00:1122:3344:102::23 + internal_dns f56f5e84-c435-4323-bccf-352e6406b583 in service fd00:1122:3344:2::1 + internal_ntp 6894c508-7a2f-4e07-8869-d7e2ca7dddf5 in service fd00:1122:3344:102::21 + nexus bed8b9a9-27fb-49d5-ab16-13a194cd3aea in service fd00:1122:3344:102::22 + + + + sled: a88790de-5962-4871-8686-61c1fd5b7094 (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-2f26e76b-6c91-4ee9-87b3-f424b942091b + fake-vendor fake-model serial-6f8fa855-4f34-42db-a6e4-9d0090d6c828 + fake-vendor fake-model serial-71450d62-791e-4068-9882-8a206a465fd9 + fake-vendor fake-model serial-7b4ad242-8330-4c08-9588-c66782742678 + fake-vendor fake-model serial-9bf23b52-565e-4439-9728-edb603fa6c4e + fake-vendor fake-model serial-c9476e3d-7745-4fa9-b336-b54ac5b08f56 + fake-vendor fake-model serial-d2cd1e65-b63d-4748-895f-aafecc81e440 + fake-vendor fake-model serial-d4ad3cc1-956a-4444-81a6-da6a025f6df2 + fake-vendor fake-model serial-e1298a43-fa1a-4e6f-bcfa-b26996f69c50 + fake-vendor fake-model serial-fa9ce87c-fa7c-4854-95bd-69b8f01c46f9 + + + omicron zones at generation 3: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 2941f8f2-6728-4336-a3cd-0e43c3fe9431 in service fd00:1122:3344:101::28 + crucible 61cff688-5fe8-413c-a6d0-3c23b386df62 in service fd00:1122:3344:101::2d + crucible 6c2d2d92-3d87-4482-9d18-c7581f8ba85e in service fd00:1122:3344:101::25 + crucible 70c29074-6dad-423a-8eca-26eadd586ab8 in service fd00:1122:3344:101::2a + crucible 76bc49f7-327e-4eee-a9f3-699e08bf9081 in service fd00:1122:3344:101::2b + crucible 815808c1-5fa1-4279-bddf-7c420e075208 in service fd00:1122:3344:101::29 + crucible 83e00cbb-3f27-4305-ad4d-11c4606cce05 in service fd00:1122:3344:101::2c + crucible bc0ddd2b-a9e6-49cd-a676-aa8ac1a7c280 in service fd00:1122:3344:101::27 + crucible d544957b-d247-42ad-a939-8327a4e36608 in service fd00:1122:3344:101::26 + crucible e49823a0-cb13-4f37-952d-5a9ff62c233b in service fd00:1122:3344:101::2e + crucible_pantry a6daa3a4-99e6-453a-aeb1-2f5019548746 in service fd00:1122:3344:101::24 + external_dns 90d08710-3c0b-4fae-b01e-9a826fd3124f expunged fd00:1122:3344:101::23 + internal_dns b66e7569-7058-4392-b758-4e0e097c38eb in service fd00:1122:3344:3::1 + internal_ntp 96b9e852-30ef-4a0d-986e-2c56cb98f6cb in service fd00:1122:3344:101::21 + nexus 451ac383-2341-4ad1-8777-155e50565812 in service fd00:1122:3344:101::22 + + + COCKROACHDB SETTINGS: + state fingerprint::::::::::::::::: (none) + cluster.preserve_downgrade_option: (do not modify) + + METADATA: + created by::::::::::: reconfigurator-cli + created at::::::::::: + comment:::::::::::::: (none) + internal DNS version: 1 + external DNS version: 1 + + + +> blueprint-plan 366b0b68-d80e-4bc1-abd3-dc69837847e0 +generated blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 based on parent blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0 + +> + +> # expunge newly-added external DNS + +> blueprint-show 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 +blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 +parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0 + + sled: 711ac7f8-d19e-4572-bdb9-e9b50f6e362a (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-3b46c403-ad14-435c-a1a8-e8f940bf814f + fake-vendor fake-model serial-3f8c9484-06e8-4662-9a90-aa7e92c43405 + fake-vendor fake-model serial-4a62a827-4bf3-45d5-a7f5-d080f25c61ef + fake-vendor fake-model serial-5f774f00-52b7-41b5-a57f-6f38037196f5 + fake-vendor fake-model serial-68ae41d4-99ed-4612-99e1-fecf795ca694 + fake-vendor fake-model serial-6a66241b-b595-423d-84ef-a81b5d8430e8 + fake-vendor fake-model serial-7c45c3f6-6369-40d9-a73f-2f7ed0afe96b + fake-vendor fake-model serial-a216d334-4a9a-49dd-8b13-20548839306c + fake-vendor fake-model serial-c9ff8eb0-807c-40ad-a5c4-0d534947c9ad + fake-vendor fake-model serial-fb29d469-7d3f-47b9-944c-ce817fc70370 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + clickhouse da139150-e6c2-4e9e-860e-3ddda2304659 in service fd00:1122:3344:103::23 + crucible 0ec1425f-302f-464c-8062-4b6f378fff9a in service fd00:1122:3344:103::2d + crucible 25fe5970-7f66-4710-991c-2e9cbe9a41f6 in service fd00:1122:3344:103::26 + crucible 441823e4-49aa-4057-b93f-bbb82a08faac in service fd00:1122:3344:103::28 + crucible 504a20c6-b245-4368-8ed2-8bcc4e63a6e5 in service fd00:1122:3344:103::2b + crucible 5cd6a521-4be9-431e-bbf1-46611446f13f in service fd00:1122:3344:103::2e + crucible 92aa30d2-949e-49c2-b390-8d2973755a08 in service fd00:1122:3344:103::2a + crucible 99063858-6a9d-42fd-9d32-2f877227c59f in service fd00:1122:3344:103::2f + crucible 99b3c18f-cb31-4df1-a9f3-244e4c9f8718 in service fd00:1122:3344:103::29 + crucible 9cc92141-152f-4341-8859-0e9a6926a5fd in service fd00:1122:3344:103::27 + crucible d1aed9cc-7edc-4e4b-9b56-137ce9d20196 in service fd00:1122:3344:103::2c + crucible_pantry f685006c-354e-4909-b6b8-b58b8f45abb2 in service fd00:1122:3344:103::25 + external_dns a79cadd5-1bd9-4e3c-add7-b499d6eebe03 in service fd00:1122:3344:103::24 + internal_dns 70f99c28-9a1e-4c0b-a9c4-0fd6d4ac6287 in service fd00:1122:3344:1::1 + internal_ntp cac46937-c0ab-4106-a0fa-e7124ca76003 in service fd00:1122:3344:103::21 + nexus b2a07267-fdeb-47f8-9e66-d959554fdd6e in service fd00:1122:3344:103::22 + + + + sled: 9dc50690-f9bf-4520-bf80-051d0f465c2c (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-1f9589d8-0a68-47e8-b977-d0fb17bd3fdb + fake-vendor fake-model serial-44882b6c-5e19-418b-b6c3-065f2af5a557 + fake-vendor fake-model serial-6de47efc-8a6d-4108-bf82-0146eab3be06 + fake-vendor fake-model serial-80e2c62f-052c-4580-8252-7af238fbbe9c + fake-vendor fake-model serial-81d326ae-5f8a-4ffd-9d5e-a9e8246ac014 + fake-vendor fake-model serial-878af5a0-7810-43e5-bdd5-a3215242459a + fake-vendor fake-model serial-af59fef5-8258-4852-be1d-ce55ae7dc822 + fake-vendor fake-model serial-b16aa11f-6e49-44c1-abcb-2e7584bffa12 + fake-vendor fake-model serial-f173c79b-a3b4-4f4a-a983-bc94b6b1a616 + fake-vendor fake-model serial-f1a041cc-85c7-4d14-8fc0-8d0e417f7e24 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 050a58da-b676-42f4-981e-4576989c6fb9 in service fd00:1122:3344:102::2c + crucible 0699d6b9-1bf8-4fc4-9d12-8c9f6fe258ca in service fd00:1122:3344:102::2a + crucible 0ecb7c9a-11b3-4f77-8834-a28f42dafa8a in service fd00:1122:3344:102::26 + crucible 46cb45be-ee55-4074-a6cb-5d21d722b959 in service fd00:1122:3344:102::2d + crucible 48af0981-f184-45be-a4ae-5423254098a2 in service fd00:1122:3344:102::2b + crucible 728b17f2-2de9-4c1a-96fb-1b557dc91b9f in service fd00:1122:3344:102::2e + crucible a9c41a2d-533d-4438-b2cf-17fd5ad89edb in service fd00:1122:3344:102::25 + crucible b6feb9ca-8e83-430f-a3ed-8674661d6590 in service fd00:1122:3344:102::27 + crucible c6e09093-4ff8-413f-a08f-9f6122855bb0 in service fd00:1122:3344:102::29 + crucible fc99f264-7a6d-4c89-8109-404743a54df3 in service fd00:1122:3344:102::28 + crucible_pantry 1d988cf1-ee5a-42f1-b5be-40d31706bdcf in service fd00:1122:3344:102::24 + external_dns e7c7018d-e38e-4864-bac9-709f6c26e7c2 in service fd00:1122:3344:102::23 + internal_dns f56f5e84-c435-4323-bccf-352e6406b583 in service fd00:1122:3344:2::1 + internal_ntp 6894c508-7a2f-4e07-8869-d7e2ca7dddf5 in service fd00:1122:3344:102::21 + nexus bed8b9a9-27fb-49d5-ab16-13a194cd3aea in service fd00:1122:3344:102::22 + + + + sled: a88790de-5962-4871-8686-61c1fd5b7094 (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-2f26e76b-6c91-4ee9-87b3-f424b942091b + fake-vendor fake-model serial-6f8fa855-4f34-42db-a6e4-9d0090d6c828 + fake-vendor fake-model serial-71450d62-791e-4068-9882-8a206a465fd9 + fake-vendor fake-model serial-7b4ad242-8330-4c08-9588-c66782742678 + fake-vendor fake-model serial-9bf23b52-565e-4439-9728-edb603fa6c4e + fake-vendor fake-model serial-c9476e3d-7745-4fa9-b336-b54ac5b08f56 + fake-vendor fake-model serial-d2cd1e65-b63d-4748-895f-aafecc81e440 + fake-vendor fake-model serial-d4ad3cc1-956a-4444-81a6-da6a025f6df2 + fake-vendor fake-model serial-e1298a43-fa1a-4e6f-bcfa-b26996f69c50 + fake-vendor fake-model serial-fa9ce87c-fa7c-4854-95bd-69b8f01c46f9 + + + omicron zones at generation 4: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 2941f8f2-6728-4336-a3cd-0e43c3fe9431 in service fd00:1122:3344:101::28 + crucible 61cff688-5fe8-413c-a6d0-3c23b386df62 in service fd00:1122:3344:101::2d + crucible 6c2d2d92-3d87-4482-9d18-c7581f8ba85e in service fd00:1122:3344:101::25 + crucible 70c29074-6dad-423a-8eca-26eadd586ab8 in service fd00:1122:3344:101::2a + crucible 76bc49f7-327e-4eee-a9f3-699e08bf9081 in service fd00:1122:3344:101::2b + crucible 815808c1-5fa1-4279-bddf-7c420e075208 in service fd00:1122:3344:101::29 + crucible 83e00cbb-3f27-4305-ad4d-11c4606cce05 in service fd00:1122:3344:101::2c + crucible bc0ddd2b-a9e6-49cd-a676-aa8ac1a7c280 in service fd00:1122:3344:101::27 + crucible d544957b-d247-42ad-a939-8327a4e36608 in service fd00:1122:3344:101::26 + crucible e49823a0-cb13-4f37-952d-5a9ff62c233b in service fd00:1122:3344:101::2e + crucible_pantry a6daa3a4-99e6-453a-aeb1-2f5019548746 in service fd00:1122:3344:101::24 + external_dns 90d08710-3c0b-4fae-b01e-9a826fd3124f expunged fd00:1122:3344:101::23 + external_dns a9bc9526-feb0-4b9f-86e5-f56789a314f6 in service fd00:1122:3344:101::2f + internal_dns b66e7569-7058-4392-b758-4e0e097c38eb in service fd00:1122:3344:3::1 + internal_ntp 96b9e852-30ef-4a0d-986e-2c56cb98f6cb in service fd00:1122:3344:101::21 + nexus 451ac383-2341-4ad1-8777-155e50565812 in service fd00:1122:3344:101::22 + + + COCKROACHDB SETTINGS: + state fingerprint::::::::::::::::: (none) + cluster.preserve_downgrade_option: (do not modify) + + METADATA: + created by::::::::::: reconfigurator-sim + created at::::::::::: + comment:::::::::::::: (none) + internal DNS version: 1 + external DNS version: 1 + + + +> blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone a9bc9526-feb0-4b9f-86e5-f56789a314f6 +blueprint 2ac8c740-444d-42ff-8d66-9812a7e51288 created from blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2: expunged zone a9bc9526-feb0-4b9f-86e5-f56789a314f6 from sled a88790de-5962-4871-8686-61c1fd5b7094 + From c43fbd4b7d83846a2da4389aa48eec80397feaa0 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Mon, 6 Jan 2025 16:09:36 -0500 Subject: [PATCH 6/7] remove fake comments from test input --- .../tests/input/cmds-expunge-newly-added.txt | 3 -- .../output/cmd-expunge-newly-added-stderr | 37 ++++++------------- .../output/cmd-expunge-newly-added-stdout | 6 --- 3 files changed, 11 insertions(+), 35 deletions(-) diff --git a/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt b/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt index 2f768fa4ae..58499d9599 100644 --- a/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt +++ b/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt @@ -1,13 +1,10 @@ load-example -# expunge external DNS from initial blueprint blueprint-show 3f00b694-1b16-4aaa-8f78-e6b3a527b434 blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 90d08710-3c0b-4fae-b01e-9a826fd3124f -# run planner, which adds a new external DNS blueprint-show 366b0b68-d80e-4bc1-abd3-dc69837847e0 blueprint-plan 366b0b68-d80e-4bc1-abd3-dc69837847e0 -# expunge newly-added external DNS blueprint-show 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone a9bc9526-feb0-4b9f-86e5-f56789a314f6 diff --git a/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stderr b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stderr index d82cafa83c..ca90a6bd0c 100644 --- a/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stderr +++ b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stderr @@ -1,26 +1,11 @@ -error: unrecognized subcommand '#' - -Usage: - -For more information, try 'help'. -error: unrecognized subcommand '#' - -Usage: - -For more information, try 'help'. -Jan 06 19:02:24.504 INFO sufficient BoundaryNtp zones exist in plan, current_count: 0, desired_count: 0 -Jan 06 19:02:24.504 INFO sufficient Clickhouse zones exist in plan, current_count: 1, desired_count: 1 -Jan 06 19:02:24.505 INFO sufficient ClickhouseKeeper zones exist in plan, current_count: 0, desired_count: 0 -Jan 06 19:02:24.505 INFO sufficient ClickhouseServer zones exist in plan, current_count: 0, desired_count: 0 -Jan 06 19:02:24.505 INFO sufficient CockroachDb zones exist in plan, current_count: 0, desired_count: 0 -Jan 06 19:02:24.505 INFO sufficient CruciblePantry zones exist in plan, current_count: 3, desired_count: 3 -Jan 06 19:02:24.505 INFO sufficient InternalDns zones exist in plan, current_count: 3, desired_count: 3 -Jan 06 19:02:24.505 INFO added zone to sled, kind: ExternalDns, sled_id: a88790de-5962-4871-8686-61c1fd5b7094 -Jan 06 19:02:24.505 INFO sufficient Nexus zones exist in plan, current_count: 3, desired_count: 3 -Jan 06 19:02:24.505 INFO sufficient Oximeter zones exist in plan, current_count: 0error: unrecognized subcommand '#' - -Usage: - -For more information, try 'help'. -, desired_count: 0 -Jan 06 19:02:24.505 INFO will ensure cockroachdb setting, value: DoNotModify, setting: cluster.preserve_downgrade_option +Jan 06 21:08:52.995 INFO sufficient BoundaryNtp zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 21:08:52.995 INFO sufficient Clickhouse zones exist in plan, current_count: 1, desired_count: 1 +Jan 06 21:08:52.995 INFO sufficient ClickhouseKeeper zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 21:08:52.995 INFO sufficient ClickhouseServer zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 21:08:52.995 INFO sufficient CockroachDb zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 21:08:52.995 INFO sufficient CruciblePantry zones exist in plan, current_count: 3, desired_count: 3 +Jan 06 21:08:52.995 INFO sufficient InternalDns zones exist in plan, current_count: 3, desired_count: 3 +Jan 06 21:08:52.995 INFO added zone to sled, kind: ExternalDns, sled_id: a88790de-5962-4871-8686-61c1fd5b7094 +Jan 06 21:08:52.995 INFO sufficient Nexus zones exist in plan, current_count: 3, desired_count: 3 +Jan 06 21:08:52.995 INFO sufficient Oximeter zones exist in plan, current_count: 0, desired_count: 0 +Jan 06 21:08:52.996 INFO will ensure cockroachdb setting, value: DoNotModify, setting: cluster.preserve_downgrade_option diff --git a/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout index 54e77928a2..a3b1c06835 100644 --- a/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout +++ b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout @@ -6,8 +6,6 @@ loaded example system with: > -> # expunge external DNS from initial blueprint - > blueprint-show 3f00b694-1b16-4aaa-8f78-e6b3a527b434 blueprint 3f00b694-1b16-4aaa-8f78-e6b3a527b434 parent: 06c88262-f435-410e-ba98-101bed41ec27 @@ -150,8 +148,6 @@ blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0 created from blueprint 3f00b694-1 > -> # run planner, which adds a new external DNS - > blueprint-show 366b0b68-d80e-4bc1-abd3-dc69837847e0 blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0 parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434 @@ -294,8 +290,6 @@ generated blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 based on parent bluepri > -> # expunge newly-added external DNS - > blueprint-show 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0 From c52efb64ea57e673c927635d6aa4a1540fc0555c Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Wed, 8 Jan 2025 15:33:00 -0500 Subject: [PATCH 7/7] update test input IDs for new RNGs --- .../tests/input/cmds-expunge-newly-added.txt | 4 +- .../output/cmd-expunge-newly-added-stdout | 294 +++++++++++++++++- 2 files changed, 289 insertions(+), 9 deletions(-) diff --git a/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt b/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt index 58499d9599..3cee31ba7a 100644 --- a/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt +++ b/dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added.txt @@ -1,10 +1,10 @@ load-example blueprint-show 3f00b694-1b16-4aaa-8f78-e6b3a527b434 -blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 90d08710-3c0b-4fae-b01e-9a826fd3124f +blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 9995de32-dd52-4eb1-b0eb-141eb84bc739 blueprint-show 366b0b68-d80e-4bc1-abd3-dc69837847e0 blueprint-plan 366b0b68-d80e-4bc1-abd3-dc69837847e0 blueprint-show 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 -blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone a9bc9526-feb0-4b9f-86e5-f56789a314f6 +blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone d786ef4a-5acb-4f5d-a732-a00addf986b5 diff --git a/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout index e7b06fdca5..3b722317b1 100644 --- a/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout +++ b/dev-tools/reconfigurator-cli/tests/output/cmd-expunge-newly-added-stdout @@ -143,22 +143,302 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27 -> blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 90d08710-3c0b-4fae-b01e-9a826fd3124f -error: could not find parent sled for zone 90d08710-3c0b-4fae-b01e-9a826fd3124f +> blueprint-edit 3f00b694-1b16-4aaa-8f78-e6b3a527b434 expunge-zone 9995de32-dd52-4eb1-b0eb-141eb84bc739 +blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0 created from blueprint 3f00b694-1b16-4aaa-8f78-e6b3a527b434: expunged zone 9995de32-dd52-4eb1-b0eb-141eb84bc739 from sled a88790de-5962-4871-8686-61c1fd5b7094 > > blueprint-show 366b0b68-d80e-4bc1-abd3-dc69837847e0 -error: no such key: blueprint ID 366b0b68-d80e-4bc1-abd3-dc69837847e0 +blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0 +parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434 + + sled: 711ac7f8-d19e-4572-bdb9-e9b50f6e362a (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-3b46c403-ad14-435c-a1a8-e8f940bf814f + fake-vendor fake-model serial-3f8c9484-06e8-4662-9a90-aa7e92c43405 + fake-vendor fake-model serial-4a62a827-4bf3-45d5-a7f5-d080f25c61ef + fake-vendor fake-model serial-5f774f00-52b7-41b5-a57f-6f38037196f5 + fake-vendor fake-model serial-68ae41d4-99ed-4612-99e1-fecf795ca694 + fake-vendor fake-model serial-6a66241b-b595-423d-84ef-a81b5d8430e8 + fake-vendor fake-model serial-7c45c3f6-6369-40d9-a73f-2f7ed0afe96b + fake-vendor fake-model serial-a216d334-4a9a-49dd-8b13-20548839306c + fake-vendor fake-model serial-c9ff8eb0-807c-40ad-a5c4-0d534947c9ad + fake-vendor fake-model serial-fb29d469-7d3f-47b9-944c-ce817fc70370 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + clickhouse e9d3a6d6-6e95-4ec8-a857-a3ab1ce6e62d in service fd00:1122:3344:103::23 + crucible 53491964-307a-45f6-b277-79a5e90f20b7 in service fd00:1122:3344:103::2b + crucible 777087c0-4fb9-43ed-846b-16aa6431a272 in service fd00:1122:3344:103::2f + crucible 78a45052-138b-47ee-877d-e73143467c8a in service fd00:1122:3344:103::2a + crucible 8ec567c1-6776-4573-bfe5-f3041165fdca in service fd00:1122:3344:103::28 + crucible 8ef7ff46-81f7-4f16-aa8f-0c1957589a5f in service fd00:1122:3344:103::2e + crucible af3e8274-151f-4cb1-990c-b0a7680ff210 in service fd00:1122:3344:103::27 + crucible c3114d7e-07cd-4d80-b82b-49ccbe856af2 in service fd00:1122:3344:103::29 + crucible d23b5191-04de-4b48-8599-cf866ffc06e8 in service fd00:1122:3344:103::2d + crucible efdbf061-321c-47d6-bf0f-4530ec4c287e in service fd00:1122:3344:103::26 + crucible f31ab1c5-0f23-44dc-8504-c67c65afc11e in service fd00:1122:3344:103::2c + crucible_pantry 07738018-1b2a-4efc-8c5c-bd6b7a5d7b40 in service fd00:1122:3344:103::25 + external_dns 1b37911d-c427-4bf1-90d3-b2d0c2e98825 in service fd00:1122:3344:103::24 + internal_dns 7a1bd482-74f8-4562-b1db-c8bad16afb44 in service fd00:1122:3344:1::1 + internal_ntp 8c368ed6-6c91-4437-b8ff-0d789193db38 in service fd00:1122:3344:103::21 + nexus ed2d3be3-fcee-4f6b-bb99-a1a9130c4eeb in service fd00:1122:3344:103::22 + + + + sled: 9dc50690-f9bf-4520-bf80-051d0f465c2c (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-1f9589d8-0a68-47e8-b977-d0fb17bd3fdb + fake-vendor fake-model serial-44882b6c-5e19-418b-b6c3-065f2af5a557 + fake-vendor fake-model serial-6de47efc-8a6d-4108-bf82-0146eab3be06 + fake-vendor fake-model serial-80e2c62f-052c-4580-8252-7af238fbbe9c + fake-vendor fake-model serial-81d326ae-5f8a-4ffd-9d5e-a9e8246ac014 + fake-vendor fake-model serial-878af5a0-7810-43e5-bdd5-a3215242459a + fake-vendor fake-model serial-af59fef5-8258-4852-be1d-ce55ae7dc822 + fake-vendor fake-model serial-b16aa11f-6e49-44c1-abcb-2e7584bffa12 + fake-vendor fake-model serial-f173c79b-a3b4-4f4a-a983-bc94b6b1a616 + fake-vendor fake-model serial-f1a041cc-85c7-4d14-8fc0-8d0e417f7e24 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 426cd521-e6ad-4a67-ad8d-a1acef5eab5e in service fd00:1122:3344:102::27 + crucible 4a392139-7423-459b-b1c9-5903421be40c in service fd00:1122:3344:102::2d + crucible 51e403e5-a703-4cfb-b044-c72c52885e82 in service fd00:1122:3344:102::26 + crucible 55a2094a-9590-442f-8203-dffe5a76ae66 in service fd00:1122:3344:102::25 + crucible 758d9a91-7070-43e3-8c60-ea1d0f818a12 in service fd00:1122:3344:102::29 + crucible 8e4d80f8-80ea-48ac-ad47-95501c0c3fbe in service fd00:1122:3344:102::2a + crucible cbf109e0-cdd5-48f9-8998-e9f55c9be980 in service fd00:1122:3344:102::2e + crucible d60cc034-46c4-4233-8066-4008e947d904 in service fd00:1122:3344:102::2c + crucible f24b63e6-2382-4862-90bf-c39e42aad988 in service fd00:1122:3344:102::2b + crucible fddd2bd6-a535-4e2c-9a36-cb90d048c0b7 in service fd00:1122:3344:102::28 + crucible_pantry eb4f0a57-7386-4216-bcb2-874d39aae836 in service fd00:1122:3344:102::24 + external_dns 47387358-e16d-4c34-b8f7-1f3f12c662eb in service fd00:1122:3344:102::23 + internal_dns edb6573c-3621-4d95-ad3b-93a088caeea5 in service fd00:1122:3344:2::1 + internal_ntp 6e1cdf48-6846-4bb3-8a72-8bc1e8d5b21d in service fd00:1122:3344:102::21 + nexus 2cea0275-1fbc-410c-819e-2ec54ffeeffe in service fd00:1122:3344:102::22 + + + + sled: a88790de-5962-4871-8686-61c1fd5b7094 (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-2f26e76b-6c91-4ee9-87b3-f424b942091b + fake-vendor fake-model serial-6f8fa855-4f34-42db-a6e4-9d0090d6c828 + fake-vendor fake-model serial-71450d62-791e-4068-9882-8a206a465fd9 + fake-vendor fake-model serial-7b4ad242-8330-4c08-9588-c66782742678 + fake-vendor fake-model serial-9bf23b52-565e-4439-9728-edb603fa6c4e + fake-vendor fake-model serial-c9476e3d-7745-4fa9-b336-b54ac5b08f56 + fake-vendor fake-model serial-d2cd1e65-b63d-4748-895f-aafecc81e440 + fake-vendor fake-model serial-d4ad3cc1-956a-4444-81a6-da6a025f6df2 + fake-vendor fake-model serial-e1298a43-fa1a-4e6f-bcfa-b26996f69c50 + fake-vendor fake-model serial-fa9ce87c-fa7c-4854-95bd-69b8f01c46f9 + + + omicron zones at generation 3: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 0903299a-6296-44f0-8ab9-7c70b5766a05 in service fd00:1122:3344:101::25 + crucible 2b6b3cfd-4524-465b-ac6e-10be9ab6d4d4 in service fd00:1122:3344:101::27 + crucible 3e0ff677-2ca8-4124-9fef-7c23ac2da6fa in service fd00:1122:3344:101::2d + crucible 512758d0-335f-4c94-9afe-c82f6f127421 in service fd00:1122:3344:101::2a + crucible 8ae67b12-ca74-40d3-a55e-90456cd623ea in service fd00:1122:3344:101::26 + crucible 918c8cbc-1c62-4de5-9cf2-c4153a3d1a7e in service fd00:1122:3344:101::2e + crucible be422e7a-16d0-426e-8567-da0aed7200d4 in service fd00:1122:3344:101::28 + crucible ea50f438-1b5e-4d61-bd65-46d360f590ee in service fd00:1122:3344:101::2b + crucible f055a042-9d1b-4931-8268-d94cac801d7e in service fd00:1122:3344:101::29 + crucible f33e09d1-e3d7-4341-baf2-5f079f3679e5 in service fd00:1122:3344:101::2c + crucible_pantry 100e20aa-1816-4195-8d76-08beace10332 in service fd00:1122:3344:101::24 + external_dns 9995de32-dd52-4eb1-b0eb-141eb84bc739 expunged fd00:1122:3344:101::23 + internal_dns 171cabf0-8635-42e7-8ea1-2a1d2a2daf55 in service fd00:1122:3344:3::1 + internal_ntp 7b4bccad-9869-48da-8320-2dc82752deea in service fd00:1122:3344:101::21 + nexus 5b01b0e0-5cdf-4b34-b0a6-c947cbbdb8be in service fd00:1122:3344:101::22 + + + COCKROACHDB SETTINGS: + state fingerprint::::::::::::::::: (none) + cluster.preserve_downgrade_option: (do not modify) + + METADATA: + created by::::::::::: reconfigurator-cli + created at::::::::::: + comment:::::::::::::: (none) + internal DNS version: 1 + external DNS version: 1 + + > blueprint-plan 366b0b68-d80e-4bc1-abd3-dc69837847e0 -error: no such key: blueprint ID 366b0b68-d80e-4bc1-abd3-dc69837847e0 +INFO sufficient BoundaryNtp zones exist in plan, desired_count: 0, current_count: 0 +INFO sufficient Clickhouse zones exist in plan, desired_count: 1, current_count: 1 +INFO sufficient ClickhouseKeeper zones exist in plan, desired_count: 0, current_count: 0 +INFO sufficient ClickhouseServer zones exist in plan, desired_count: 0, current_count: 0 +INFO sufficient CockroachDb zones exist in plan, desired_count: 0, current_count: 0 +INFO sufficient CruciblePantry zones exist in plan, desired_count: 3, current_count: 3 +INFO sufficient InternalDns zones exist in plan, desired_count: 3, current_count: 3 +INFO added zone to sled, sled_id: a88790de-5962-4871-8686-61c1fd5b7094, kind: ExternalDns +INFO sufficient Nexus zones exist in plan, desired_count: 3, current_count: 3 +INFO sufficient Oximeter zones exist in plan, desired_count: 0, current_count: 0 +INFO will ensure cockroachdb setting, setting: cluster.preserve_downgrade_option, value: DoNotModify +generated blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 based on parent blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0 > > blueprint-show 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 -error: no such key: blueprint ID 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 +blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 +parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0 + + sled: 711ac7f8-d19e-4572-bdb9-e9b50f6e362a (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-3b46c403-ad14-435c-a1a8-e8f940bf814f + fake-vendor fake-model serial-3f8c9484-06e8-4662-9a90-aa7e92c43405 + fake-vendor fake-model serial-4a62a827-4bf3-45d5-a7f5-d080f25c61ef + fake-vendor fake-model serial-5f774f00-52b7-41b5-a57f-6f38037196f5 + fake-vendor fake-model serial-68ae41d4-99ed-4612-99e1-fecf795ca694 + fake-vendor fake-model serial-6a66241b-b595-423d-84ef-a81b5d8430e8 + fake-vendor fake-model serial-7c45c3f6-6369-40d9-a73f-2f7ed0afe96b + fake-vendor fake-model serial-a216d334-4a9a-49dd-8b13-20548839306c + fake-vendor fake-model serial-c9ff8eb0-807c-40ad-a5c4-0d534947c9ad + fake-vendor fake-model serial-fb29d469-7d3f-47b9-944c-ce817fc70370 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + clickhouse e9d3a6d6-6e95-4ec8-a857-a3ab1ce6e62d in service fd00:1122:3344:103::23 + crucible 53491964-307a-45f6-b277-79a5e90f20b7 in service fd00:1122:3344:103::2b + crucible 777087c0-4fb9-43ed-846b-16aa6431a272 in service fd00:1122:3344:103::2f + crucible 78a45052-138b-47ee-877d-e73143467c8a in service fd00:1122:3344:103::2a + crucible 8ec567c1-6776-4573-bfe5-f3041165fdca in service fd00:1122:3344:103::28 + crucible 8ef7ff46-81f7-4f16-aa8f-0c1957589a5f in service fd00:1122:3344:103::2e + crucible af3e8274-151f-4cb1-990c-b0a7680ff210 in service fd00:1122:3344:103::27 + crucible c3114d7e-07cd-4d80-b82b-49ccbe856af2 in service fd00:1122:3344:103::29 + crucible d23b5191-04de-4b48-8599-cf866ffc06e8 in service fd00:1122:3344:103::2d + crucible efdbf061-321c-47d6-bf0f-4530ec4c287e in service fd00:1122:3344:103::26 + crucible f31ab1c5-0f23-44dc-8504-c67c65afc11e in service fd00:1122:3344:103::2c + crucible_pantry 07738018-1b2a-4efc-8c5c-bd6b7a5d7b40 in service fd00:1122:3344:103::25 + external_dns 1b37911d-c427-4bf1-90d3-b2d0c2e98825 in service fd00:1122:3344:103::24 + internal_dns 7a1bd482-74f8-4562-b1db-c8bad16afb44 in service fd00:1122:3344:1::1 + internal_ntp 8c368ed6-6c91-4437-b8ff-0d789193db38 in service fd00:1122:3344:103::21 + nexus ed2d3be3-fcee-4f6b-bb99-a1a9130c4eeb in service fd00:1122:3344:103::22 + + + + sled: 9dc50690-f9bf-4520-bf80-051d0f465c2c (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-1f9589d8-0a68-47e8-b977-d0fb17bd3fdb + fake-vendor fake-model serial-44882b6c-5e19-418b-b6c3-065f2af5a557 + fake-vendor fake-model serial-6de47efc-8a6d-4108-bf82-0146eab3be06 + fake-vendor fake-model serial-80e2c62f-052c-4580-8252-7af238fbbe9c + fake-vendor fake-model serial-81d326ae-5f8a-4ffd-9d5e-a9e8246ac014 + fake-vendor fake-model serial-878af5a0-7810-43e5-bdd5-a3215242459a + fake-vendor fake-model serial-af59fef5-8258-4852-be1d-ce55ae7dc822 + fake-vendor fake-model serial-b16aa11f-6e49-44c1-abcb-2e7584bffa12 + fake-vendor fake-model serial-f173c79b-a3b4-4f4a-a983-bc94b6b1a616 + fake-vendor fake-model serial-f1a041cc-85c7-4d14-8fc0-8d0e417f7e24 + + + omicron zones at generation 2: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 426cd521-e6ad-4a67-ad8d-a1acef5eab5e in service fd00:1122:3344:102::27 + crucible 4a392139-7423-459b-b1c9-5903421be40c in service fd00:1122:3344:102::2d + crucible 51e403e5-a703-4cfb-b044-c72c52885e82 in service fd00:1122:3344:102::26 + crucible 55a2094a-9590-442f-8203-dffe5a76ae66 in service fd00:1122:3344:102::25 + crucible 758d9a91-7070-43e3-8c60-ea1d0f818a12 in service fd00:1122:3344:102::29 + crucible 8e4d80f8-80ea-48ac-ad47-95501c0c3fbe in service fd00:1122:3344:102::2a + crucible cbf109e0-cdd5-48f9-8998-e9f55c9be980 in service fd00:1122:3344:102::2e + crucible d60cc034-46c4-4233-8066-4008e947d904 in service fd00:1122:3344:102::2c + crucible f24b63e6-2382-4862-90bf-c39e42aad988 in service fd00:1122:3344:102::2b + crucible fddd2bd6-a535-4e2c-9a36-cb90d048c0b7 in service fd00:1122:3344:102::28 + crucible_pantry eb4f0a57-7386-4216-bcb2-874d39aae836 in service fd00:1122:3344:102::24 + external_dns 47387358-e16d-4c34-b8f7-1f3f12c662eb in service fd00:1122:3344:102::23 + internal_dns edb6573c-3621-4d95-ad3b-93a088caeea5 in service fd00:1122:3344:2::1 + internal_ntp 6e1cdf48-6846-4bb3-8a72-8bc1e8d5b21d in service fd00:1122:3344:102::21 + nexus 2cea0275-1fbc-410c-819e-2ec54ffeeffe in service fd00:1122:3344:102::22 + + + + sled: a88790de-5962-4871-8686-61c1fd5b7094 (active) + + physical disks at generation 2: + ---------------------------------------------------------------------- + vendor model serial + ---------------------------------------------------------------------- + fake-vendor fake-model serial-2f26e76b-6c91-4ee9-87b3-f424b942091b + fake-vendor fake-model serial-6f8fa855-4f34-42db-a6e4-9d0090d6c828 + fake-vendor fake-model serial-71450d62-791e-4068-9882-8a206a465fd9 + fake-vendor fake-model serial-7b4ad242-8330-4c08-9588-c66782742678 + fake-vendor fake-model serial-9bf23b52-565e-4439-9728-edb603fa6c4e + fake-vendor fake-model serial-c9476e3d-7745-4fa9-b336-b54ac5b08f56 + fake-vendor fake-model serial-d2cd1e65-b63d-4748-895f-aafecc81e440 + fake-vendor fake-model serial-d4ad3cc1-956a-4444-81a6-da6a025f6df2 + fake-vendor fake-model serial-e1298a43-fa1a-4e6f-bcfa-b26996f69c50 + fake-vendor fake-model serial-fa9ce87c-fa7c-4854-95bd-69b8f01c46f9 + + + omicron zones at generation 4: + --------------------------------------------------------------------------------------------- + zone type zone id disposition underlay IP + --------------------------------------------------------------------------------------------- + crucible 0903299a-6296-44f0-8ab9-7c70b5766a05 in service fd00:1122:3344:101::25 + crucible 2b6b3cfd-4524-465b-ac6e-10be9ab6d4d4 in service fd00:1122:3344:101::27 + crucible 3e0ff677-2ca8-4124-9fef-7c23ac2da6fa in service fd00:1122:3344:101::2d + crucible 512758d0-335f-4c94-9afe-c82f6f127421 in service fd00:1122:3344:101::2a + crucible 8ae67b12-ca74-40d3-a55e-90456cd623ea in service fd00:1122:3344:101::26 + crucible 918c8cbc-1c62-4de5-9cf2-c4153a3d1a7e in service fd00:1122:3344:101::2e + crucible be422e7a-16d0-426e-8567-da0aed7200d4 in service fd00:1122:3344:101::28 + crucible ea50f438-1b5e-4d61-bd65-46d360f590ee in service fd00:1122:3344:101::2b + crucible f055a042-9d1b-4931-8268-d94cac801d7e in service fd00:1122:3344:101::29 + crucible f33e09d1-e3d7-4341-baf2-5f079f3679e5 in service fd00:1122:3344:101::2c + crucible_pantry 100e20aa-1816-4195-8d76-08beace10332 in service fd00:1122:3344:101::24 + external_dns 9995de32-dd52-4eb1-b0eb-141eb84bc739 expunged fd00:1122:3344:101::23 + external_dns d786ef4a-5acb-4f5d-a732-a00addf986b5 in service fd00:1122:3344:101::2f + internal_dns 171cabf0-8635-42e7-8ea1-2a1d2a2daf55 in service fd00:1122:3344:3::1 + internal_ntp 7b4bccad-9869-48da-8320-2dc82752deea in service fd00:1122:3344:101::21 + nexus 5b01b0e0-5cdf-4b34-b0a6-c947cbbdb8be in service fd00:1122:3344:101::22 + + + COCKROACHDB SETTINGS: + state fingerprint::::::::::::::::: (none) + cluster.preserve_downgrade_option: (do not modify) + + METADATA: + created by::::::::::: reconfigurator-sim + created at::::::::::: + comment:::::::::::::: (none) + internal DNS version: 1 + external DNS version: 1 + + -> blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone a9bc9526-feb0-4b9f-86e5-f56789a314f6 -error: no such key: blueprint ID 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 +> blueprint-edit 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 expunge-zone d786ef4a-5acb-4f5d-a732-a00addf986b5 +blueprint 2ac8c740-444d-42ff-8d66-9812a7e51288 created from blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2: expunged zone d786ef4a-5acb-4f5d-a732-a00addf986b5 from sled a88790de-5962-4871-8686-61c1fd5b7094