From 7bfc989ba8f370946c0b9989d7cf8a9101247a23 Mon Sep 17 00:00:00 2001 From: Sean Klein Date: Fri, 30 Aug 2024 11:04:26 -0700 Subject: [PATCH] Deterministic UUIDs, populate ExampleSystem datasets, sorting, check BP diff in tests --- Cargo.lock | 1 + .../planning/src/blueprint_builder/builder.rs | 15 +- nexus/reconfigurator/planning/src/example.rs | 15 ++ nexus/reconfigurator/planning/src/planner.rs | 24 +- nexus/reconfigurator/planning/src/system.rs | 45 +++- .../output/blueprint_builder_initial_diff.txt | 144 ++++++++++ .../output/planner_basic_add_sled_2_3.txt | 171 ++++++++++++ .../output/planner_basic_add_sled_3_5.txt | 191 ++++++++++++++ .../planner_decommissions_sleds_1_2.txt | 145 +++++++++++ .../output/planner_nonprovisionable_1_2.txt | 246 ++++++++++++++++++ .../output/planner_nonprovisionable_2_2a.txt | 154 ++++++++++- nexus/types/Cargo.toml | 1 + nexus/types/src/deployment/blueprint_diff.rs | 30 ++- .../types/src/deployment/blueprint_display.rs | 2 +- 14 files changed, 1164 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 13edf0f0eaa..7860e023608 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5566,6 +5566,7 @@ dependencies = [ "http 0.2.12", "humantime", "ipnetwork", + "itertools 0.13.0", "newtype-uuid", "newtype_derive", "nexus-sled-agent-shared", diff --git a/nexus/reconfigurator/planning/src/blueprint_builder/builder.rs b/nexus/reconfigurator/planning/src/blueprint_builder/builder.rs index b8ed931bf4d..f65c515023e 100644 --- a/nexus/reconfigurator/planning/src/blueprint_builder/builder.rs +++ b/nexus/reconfigurator/planning/src/blueprint_builder/builder.rs @@ -711,17 +711,22 @@ impl<'a> BlueprintBuilder<'a> { let (mut additions, mut updates, expunges, removals) = { let mut datasets_builder = BlueprintSledDatasetsBuilder::new( self.log.clone(), + &mut self.rng, sled_id, &self.datasets, resources, ); // Ensure each zpool has a "Debug" and "Zone Root" dataset. - let bp_zpools = self + let mut bp_zpools = self .disks .current_sled_disks(sled_id) .map(|disk_config| disk_config.pool_id) .collect::>(); + // We iterate over the zpools in a deterministic order to ensure + // that "new Dataset UUIDs" are distributed in a reliable order. + bp_zpools.sort(); + for zpool_id in bp_zpools { let zpool = ZpoolName::new_external(zpool_id); let address = None; @@ -1454,6 +1459,7 @@ struct BlueprintBuilderRng { // associated with a specific `TypedUuidKind`. blueprint_rng: UuidRng, zone_rng: TypedUuidRng, + dataset_rng: TypedUuidRng, network_interface_rng: UuidRng, external_ip_rng: TypedUuidRng, } @@ -1466,6 +1472,7 @@ impl BlueprintBuilderRng { fn new_from_parent(mut parent: StdRng) -> Self { let blueprint_rng = UuidRng::from_parent_rng(&mut parent, "blueprint"); let zone_rng = TypedUuidRng::from_parent_rng(&mut parent, "zone"); + let dataset_rng = TypedUuidRng::from_parent_rng(&mut parent, "dataset"); let network_interface_rng = UuidRng::from_parent_rng(&mut parent, "network_interface"); let external_ip_rng = @@ -1474,6 +1481,7 @@ impl BlueprintBuilderRng { BlueprintBuilderRng { blueprint_rng, zone_rng, + dataset_rng, network_interface_rng, external_ip_rng, } @@ -1773,6 +1781,7 @@ impl<'a> BlueprintDatasetsBuilder<'a> { #[derive(Debug)] struct BlueprintSledDatasetsBuilder<'a> { log: Logger, + rng: &'a mut BlueprintBuilderRng, blueprint_datasets: BTreeMap>, database_datasets: @@ -1793,6 +1802,7 @@ struct BlueprintSledDatasetsBuilder<'a> { impl<'a> BlueprintSledDatasetsBuilder<'a> { pub fn new( log: Logger, + rng: &'a mut BlueprintBuilderRng, sled_id: SledUuid, datasets: &'a BlueprintDatasetsBuilder<'_>, resources: &'a SledResources, @@ -1824,6 +1834,7 @@ impl<'a> BlueprintSledDatasetsBuilder<'a> { Self { log, + rng, blueprint_datasets, database_datasets, unchanged_datasets: BTreeMap::new(), @@ -1887,7 +1898,7 @@ impl<'a> BlueprintSledDatasetsBuilder<'a> { let id = if let Some(old_config) = self.get_from_db(zpool_id, kind) { old_config.id } else { - DatasetUuid::new_v4() + self.rng.dataset_rng.next() }; let new_config = make_config(id); diff --git a/nexus/reconfigurator/planning/src/example.rs b/nexus/reconfigurator/planning/src/example.rs index 8ead3a314a8..066ad17b4a9 100644 --- a/nexus/reconfigurator/planning/src/example.rs +++ b/nexus/reconfigurator/planning/src/example.rs @@ -89,6 +89,21 @@ impl ExampleSystem { } let blueprint = builder.build(); + + // We just ensured that a handful of datasets should exist in + // the blueprint, but they don't yet exist in the SystemDescription. + // + // Go back and add them so that the blueprint is consistent with + // inventory. + for (sled_id, datasets) in &blueprint.blueprint_datasets { + let sled = system.get_sled_mut(*sled_id).unwrap(); + + for dataset_config in datasets.datasets.values() { + let config = dataset_config.clone().try_into().unwrap(); + sled.add_synthetic_dataset(config); + } + } + let mut builder = system.to_collection_builder().expect("failed to build collection"); builder.set_rng_seed((test_name, "ExampleSystem collection")); diff --git a/nexus/reconfigurator/planning/src/planner.rs b/nexus/reconfigurator/planning/src/planner.rs index b345e1c761d..491007923a5 100644 --- a/nexus/reconfigurator/planning/src/planner.rs +++ b/nexus/reconfigurator/planning/src/planner.rs @@ -845,6 +845,9 @@ mod test { assert_eq!(diff.zones.errors.len(), 0); assert_eq!(diff.physical_disks.added.len(), 0); assert_eq!(diff.physical_disks.removed.len(), 0); + assert_eq!(diff.datasets.added.len(), 0); + assert_eq!(diff.datasets.removed.len(), 0); + assert_eq!(diff.datasets.unchanged.len(), 3); verify_blueprint(&blueprint2); // Now add a new sled. @@ -876,6 +879,8 @@ mod test { &diff.display().to_string(), ); assert_eq!(diff.sleds_added.len(), 1); + assert_eq!(diff.physical_disks.added.len(), 1); + assert_eq!(diff.datasets.added.len(), 1); let sled_id = *diff.sleds_added.first().unwrap(); let sled_zones = diff.zones.added.get(&sled_id).unwrap(); // We have defined elsewhere that the first generation contains no @@ -1021,6 +1026,7 @@ mod test { assert_eq!(collection.omicron_zones.len(), 1); blueprint.blueprint_zones.retain(|k, _v| keep_sled_id == *k); blueprint.blueprint_disks.retain(|k, _v| keep_sled_id == *k); + blueprint.blueprint_datasets.retain(|k, _v| keep_sled_id == *k); // Also remove all the networking resources for the zones we just // stripped out; i.e., only keep those for `keep_sled_id`. @@ -1099,7 +1105,6 @@ mod test { assert_eq!(diff.sleds_removed.len(), 0); assert_eq!(diff.sleds_modified.len(), 1); let changed_sled_id = diff.sleds_modified.first().unwrap(); - // TODO-cleanup use `TypedUuid` everywhere assert_eq!(*changed_sled_id, sled_id); assert_eq!(diff.zones.removed.len(), 0); @@ -1115,6 +1120,11 @@ mod test { } } + assert_eq!(diff.physical_disks.added.len(), 0); + assert_eq!(diff.physical_disks.removed.len(), 0); + assert_eq!(diff.datasets.added.len(), 1); + assert_eq!(diff.datasets.removed.len(), 0); + logctx.cleanup_successful(); } @@ -1272,6 +1282,11 @@ mod test { ); assert!(!diff.zones.removed.contains_key(sled_id)); + assert_eq!(diff.physical_disks.added.len(), 1); + assert_eq!(diff.physical_disks.removed.len(), 0); + assert_eq!(diff.datasets.added.len(), 1); + assert_eq!(diff.datasets.removed.len(), 0); + logctx.cleanup_successful(); } @@ -1361,6 +1376,13 @@ mod test { "Should have expunged this zone" ); + assert_eq!(diff.physical_disks.added.len(), 0); + assert_eq!(diff.physical_disks.removed.len(), 1); + assert_eq!(diff.datasets.added.len(), 0); + // NOTE: Expunging a disk doesn't immediately delete datasets; see the + // "decommissioned_disk_cleaner" background task for more context. + assert_eq!(diff.datasets.removed.len(), 0); + logctx.cleanup_successful(); } diff --git a/nexus/reconfigurator/planning/src/system.rs b/nexus/reconfigurator/planning/src/system.rs index aaeaf606fbf..b4edd2567b7 100644 --- a/nexus/reconfigurator/planning/src/system.rs +++ b/nexus/reconfigurator/planning/src/system.rs @@ -12,7 +12,9 @@ use indexmap::IndexMap; use nexus_inventory::CollectionBuilder; use nexus_sled_agent_shared::inventory::Baseboard; use nexus_sled_agent_shared::inventory::Inventory; +use nexus_sled_agent_shared::inventory::InventoryDataset; use nexus_sled_agent_shared::inventory::InventoryDisk; +use nexus_sled_agent_shared::inventory::InventoryZpool; use nexus_sled_agent_shared::inventory::SledRole; use nexus_types::deployment::CockroachDbClusterVersion; use nexus_types::deployment::CockroachDbSettings; @@ -207,6 +209,16 @@ impl SystemDescription { self } + pub fn get_sled_mut( + &mut self, + sled_id: SledUuid, + ) -> anyhow::Result<&mut Sled> { + let Some(sled) = self.sleds.get_mut(&sled_id) else { + bail!("Sled not found with id {sled_id}"); + }; + Ok(sled) + } + /// Add a sled to the system, as described by a SledBuilder pub fn sled(&mut self, sled: SledBuilder) -> anyhow::Result<&mut Self> { let sled_id = sled.id.unwrap_or_else(SledUuid::new_v4); @@ -450,11 +462,13 @@ pub struct SledHwInventory<'a> { /// This needs to be rich enough to generate a PlanningInput and inventory /// Collection. #[derive(Clone, Debug)] -struct Sled { +pub struct Sled { sled_id: SledUuid, sled_subnet: Ipv6Subnet, inventory_sp: Option<(u16, SpState)>, inventory_sled_agent: Inventory, + // This represents "intended configuration of pools and datasets", rather + // than "observed status of pools and datasets". zpools: BTreeMap)>, policy: SledPolicy, } @@ -561,9 +575,13 @@ impl Sled { slot: i64::try_from(i).unwrap(), }) .collect(), - // Zpools & Datasets won't necessarily show up until our first - // request to provision storage, so we omit them. - zpools: vec![], + zpools: zpools + .keys() + .map(|id| InventoryZpool { + id: *id, + total_size: ByteCount::from_gibibytes_u32(100), + }) + .collect(), datasets: vec![], } }; @@ -713,6 +731,25 @@ impl Sled { } } + /// Adds a dataset to the system description. + /// + /// The inventory values for "available space" and "used space" are + /// made up, since this is a synthetic dataset. + pub fn add_synthetic_dataset( + &mut self, + config: omicron_common::disk::DatasetConfig, + ) { + self.inventory_sled_agent.datasets.push(InventoryDataset { + id: Some(config.id), + name: config.name.full_name(), + available: ByteCount::from_gibibytes_u32(1), + used: ByteCount::from_gibibytes_u32(0), + quota: config.quota, + reservation: config.reservation, + compression: config.compression.to_string(), + }); + } + fn sp_state(&self) -> Option<&(u16, SpState)> { self.inventory_sp.as_ref() } diff --git a/nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt b/nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt index 01b7ceb46b7..72763c8ec19 100644 --- a/nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt +++ b/nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt @@ -20,6 +20,54 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1 fake-vendor fake-model serial-f9bcdb70-6846-4330-9d37-bfdd5583aea6 + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_3fb05590-2632-413e-989f-aaaabaf01fab/crucible 1123460d-14bc-4651-8e92-b71a4cb1320a + oxp_3fb05590-2632-413e-989f-aaaabaf01fab/crypt/debug 613c5d20-d3c3-4d43-ae5a-dda783ae87ba + oxp_3fb05590-2632-413e-989f-aaaabaf01fab/crypt/zone 70b3a51d-a3bf-4019-ad3d-04c5ce992ffe + oxp_3fb05590-2632-413e-989f-aaaabaf01fab/crypt/zone/oxz_crucible_44afce85-3377-4b20-a398-517c1579df4d 7ef76726-083e-4f84-a818-8394b820f862 + oxp_3fb05590-2632-413e-989f-aaaabaf01fab/crypt/zone/oxz_nexus_b2573120-9c91-4ed7-8b4f-a7bfe8dbc807 170a525e-dda8-4ce6-9cf1-fbe1b8e8b69d + oxp_3fb05590-2632-413e-989f-aaaabaf01fab/crypt/zone/oxz_ntp_c81c9d4a-36d7-4796-9151-f564d3735152 a605a65f-1430-4e04-8d39-74f3f9ecd99c + oxp_4711ce46-43f6-4732-9769-a69ea519b62d/crucible 1b14ab69-234b-456e-a253-5309c45d0cdd + oxp_4711ce46-43f6-4732-9769-a69ea519b62d/crypt/debug 5f11f7e2-c868-4494-bb58-9f5d1691624e + oxp_4711ce46-43f6-4732-9769-a69ea519b62d/crypt/zone da15dac3-157f-428c-b114-0f151ab8e3d5 + oxp_4711ce46-43f6-4732-9769-a69ea519b62d/crypt/zone/oxz_crucible_7004cab9-dfc0-43ba-92d3-58d4ced66025 6b2e018c-8f22-40fa-8a30-7533ccf35a54 + oxp_4a2cc08d-8e18-4f0e-8fc6-443cb2016858/crucible 43b758fe-e7e6-4bed-bcb6-64789c180fe1 + oxp_4a2cc08d-8e18-4f0e-8fc6-443cb2016858/crypt/debug d52b83be-2c94-495c-baae-f9a051db37d2 + oxp_4a2cc08d-8e18-4f0e-8fc6-443cb2016858/crypt/zone 03ad2792-8fac-4c2a-8e81-0d5de681a4ba + oxp_4a2cc08d-8e18-4f0e-8fc6-443cb2016858/crypt/zone/oxz_crucible_55f4d117-0b9d-4256-a2c0-f46d3ed5fff9 f22149ee-144a-4c39-89bb-c6cea2a5173e + oxp_7032a67e-2ff6-45cc-af34-8b3502965cc9/crucible 8539d147-7b9f-4746-a00f-b61bafa3a46e + oxp_7032a67e-2ff6-45cc-af34-8b3502965cc9/crypt/debug 04440028-c8bf-484f-929e-c2811db1d6c4 + oxp_7032a67e-2ff6-45cc-af34-8b3502965cc9/crypt/zone 5c40200b-a261-40fc-8e82-1741ffa4d7c5 + oxp_7032a67e-2ff6-45cc-af34-8b3502965cc9/crypt/zone/oxz_crucible_79552859-fbd3-43bb-a9d3-6baba25558f8 750b5b15-b541-4506-9244-b93b277a9646 + oxp_908218e9-26ea-4d75-86f9-4b99ff72dcb5/crucible c479e900-76d3-460f-82f1-eb6467becd91 + oxp_908218e9-26ea-4d75-86f9-4b99ff72dcb5/crypt/debug c57d915c-9e21-4177-ba19-f58846ac3946 + oxp_908218e9-26ea-4d75-86f9-4b99ff72dcb5/crypt/zone 2b7326fa-d02e-4c08-baa8-5eaf2d20b33b + oxp_908218e9-26ea-4d75-86f9-4b99ff72dcb5/crypt/zone/oxz_crucible_90696819-9b53-485a-9c65-ca63602e843e 73deef16-ed89-4217-b4ee-245208ccddbc + oxp_9bc4e63d-b8fe-4ac6-ac3a-cf097d06cc6d/crucible 6b879024-3f61-4272-a022-05fb63bd75aa + oxp_9bc4e63d-b8fe-4ac6-ac3a-cf097d06cc6d/crypt/debug 218ba88a-838f-4397-9dfb-49f67099d48b + oxp_9bc4e63d-b8fe-4ac6-ac3a-cf097d06cc6d/crypt/zone 32c80edc-5ccd-4f02-98bb-8e891b09e683 + oxp_9bc4e63d-b8fe-4ac6-ac3a-cf097d06cc6d/crypt/zone/oxz_crucible_5c6a4628-8831-483b-995f-79b9126c4d04 6afc575c-d188-45ee-9f8e-4b67f4328fdc + oxp_9f343299-ef7a-46aa-9904-061be15abfeb/crucible 14da6b65-4e17-4974-9e05-345bd8e48dfb + oxp_9f343299-ef7a-46aa-9904-061be15abfeb/crypt/debug d048b1c6-4730-4005-a964-fce3d86e76ad + oxp_9f343299-ef7a-46aa-9904-061be15abfeb/crypt/zone 7857daa4-ef48-4e7d-9961-d0d34a344746 + oxp_9f343299-ef7a-46aa-9904-061be15abfeb/crypt/zone/oxz_crucible_6a01210c-45ed-41a5-9230-8e05ecf5dd8f fd3fee94-220f-46e1-b60c-2db3c484dd89 + oxp_c8523dd7-4e87-4e4b-8e46-04b806f0763c/crucible 4d7a3506-392e-429a-9295-10d14e7c3ae7 + oxp_c8523dd7-4e87-4e4b-8e46-04b806f0763c/crypt/debug b4e82f4d-bc70-49f0-b0aa-194aa2dc6b23 + oxp_c8523dd7-4e87-4e4b-8e46-04b806f0763c/crypt/zone 22d59c0d-1687-432c-a847-5ef3c4ea1707 + oxp_c8523dd7-4e87-4e4b-8e46-04b806f0763c/crypt/zone/oxz_crucible_c99525b3-3680-4df6-9214-2ee3e1020e8b d5b0ab35-b0c0-4a4b-929d-f907ac927638 + oxp_e02245bc-ca0d-4f08-ac1e-870c4fa2a17c/crucible c1e703f4-5547-4cac-bd3b-938364961df7 + oxp_e02245bc-ca0d-4f08-ac1e-870c4fa2a17c/crypt/debug a51f6079-d3e1-4c1e-b93f-b5d406ea37d6 + oxp_e02245bc-ca0d-4f08-ac1e-870c4fa2a17c/crypt/zone c28e6261-80ed-4553-828a-f6031a2fa866 + oxp_e02245bc-ca0d-4f08-ac1e-870c4fa2a17c/crypt/zone/oxz_crucible_f42959d3-9eef-4e3b-b404-6177ce3ec7a1 3d181bb0-dfb8-460c-9fdd-81d45451f751 + oxp_f9bcdb70-6846-4330-9d37-bfdd5583aea6/crucible 8c98392d-df57-4c21-a0d3-85bd81438049 + oxp_f9bcdb70-6846-4330-9d37-bfdd5583aea6/crypt/debug f26fd0f8-03ce-459b-8309-785e8c306d83 + oxp_f9bcdb70-6846-4330-9d37-bfdd5583aea6/crypt/zone 43fbca70-69af-4c55-af3f-7ff3326a99d2 + oxp_f9bcdb70-6846-4330-9d37-bfdd5583aea6/crypt/zone/oxz_crucible_4644ea0c-0ec3-41be-a356-660308e1c3fc 10e97a60-9424-4332-9f36-1f7d7adfcc16 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -56,6 +104,54 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1 fake-vendor fake-model serial-ff66a45c-38a8-4b62-825e-e7c9470bc8bc + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_092eaf94-328b-45b6-99da-c850a06e8592/crucible a86deb8c-63b7-4b0f-9684-b7bec755ee93 + oxp_092eaf94-328b-45b6-99da-c850a06e8592/crypt/debug cbe0b7c1-326d-4c7e-a871-eb8b08653fc9 + oxp_092eaf94-328b-45b6-99da-c850a06e8592/crypt/zone 26378c99-c953-45ba-a045-37d4f8b91173 + oxp_092eaf94-328b-45b6-99da-c850a06e8592/crypt/zone/oxz_crucible_a9a6a974-8953-4783-b815-da46884f2c02 301df8ce-ca9a-40d8-bf0c-a894f05a07c6 + oxp_092eaf94-328b-45b6-99da-c850a06e8592/crypt/zone/oxz_nexus_fb36b9dc-273a-4bc3-aaa9-19ee4d0ef552 76fb829c-faf6-482a-8cee-ad65fbf90061 + oxp_092eaf94-328b-45b6-99da-c850a06e8592/crypt/zone/oxz_ntp_38b047ea-e3de-4859-b8e0-70cac5871446 953584c2-3e10-49f2-b3e0-731334ace4ba + oxp_3195b46a-d32d-458e-ad7f-b0b2f91af483/crucible 1ced3421-0de2-4d49-b295-ebbf2d231ab7 + oxp_3195b46a-d32d-458e-ad7f-b0b2f91af483/crypt/debug 49c827a1-3125-451d-9213-3276118a5a44 + oxp_3195b46a-d32d-458e-ad7f-b0b2f91af483/crypt/zone ff93df28-7830-43f8-b4bc-0bd328679411 + oxp_3195b46a-d32d-458e-ad7f-b0b2f91af483/crypt/zone/oxz_crucible_95c3b6d1-2592-4252-b5c1-5d0faf3ce9c9 ac5d249f-271c-434b-b979-0f6f2a1482fb + oxp_327bdbbb-c40e-4784-888e-18492a753708/crucible 83c2dc46-edc2-4c3f-81b0-cef8ec80614f + oxp_327bdbbb-c40e-4784-888e-18492a753708/crypt/debug 48885295-bb47-4090-983a-1c444e5399d1 + oxp_327bdbbb-c40e-4784-888e-18492a753708/crypt/zone 8742a54b-0996-46ca-a20d-db07b83487a8 + oxp_327bdbbb-c40e-4784-888e-18492a753708/crypt/zone/oxz_crucible_5b44003e-1a3d-4152-b606-872c72efce0e 207e9adb-290e-4d13-9b7a-beea1fdc66eb + oxp_4f067c20-2860-49b1-8a03-6715a3c12c0e/crucible e30bb8e5-290f-425c-b7f1-3592f190db92 + oxp_4f067c20-2860-49b1-8a03-6715a3c12c0e/crypt/debug 2837517b-9d80-4757-bb71-48c2da364297 + oxp_4f067c20-2860-49b1-8a03-6715a3c12c0e/crypt/zone ded2e1eb-91ce-467d-86ef-150d27273986 + oxp_4f067c20-2860-49b1-8a03-6715a3c12c0e/crypt/zone/oxz_crucible_dc22d470-dc46-436b-9750-25c8d7d369e2 1e5e8f8d-bf9f-47a6-a820-33d23e8d6b13 + oxp_564460fe-7357-4883-a3af-1c931f473e83/crucible d848e35e-5967-419d-abc7-9fa1384349f2 + oxp_564460fe-7357-4883-a3af-1c931f473e83/crypt/debug 7905fda4-3c4f-4621-94a0-8c5be4f779e4 + oxp_564460fe-7357-4883-a3af-1c931f473e83/crypt/zone fa0a338a-13fb-4e2d-b42d-657751c90fa4 + oxp_564460fe-7357-4883-a3af-1c931f473e83/crypt/zone/oxz_crucible_b6f2dd1e-7f98-4a68-9df2-b33c69d1f7ea bd687fb0-87bb-49ea-9155-d24060de6c19 + oxp_66f85be6-1143-48a1-a898-504c6b540035/crucible a2ca9da2-c139-4458-a84a-51fb94310a90 + oxp_66f85be6-1143-48a1-a898-504c6b540035/crypt/debug 7ddb052f-24d9-4616-93fd-9fee744ac811 + oxp_66f85be6-1143-48a1-a898-504c6b540035/crypt/zone 9862e4af-f588-4957-b3a6-2d8ea7e55b87 + oxp_66f85be6-1143-48a1-a898-504c6b540035/crypt/zone/oxz_crucible_f7e434f9-6d4a-476b-a9e2-48d6ee28a08e f72eb456-23b9-4414-adc5-c4bd3f983022 + oxp_97b3f199-b488-4ce0-bd34-484d4d3bd194/crucible 0974afa0-87d2-4f03-b623-50cc687603e3 + oxp_97b3f199-b488-4ce0-bd34-484d4d3bd194/crypt/debug ff8b51f9-b765-447e-ac95-e8c822183598 + oxp_97b3f199-b488-4ce0-bd34-484d4d3bd194/crypt/zone 3c0027e3-68b5-4c7e-a508-50ffc47371cd + oxp_97b3f199-b488-4ce0-bd34-484d4d3bd194/crypt/zone/oxz_crucible_943fea7a-9458-4935-9dc7-01ee5cfe5a02 267cfac7-9559-41ea-9f0c-f72b46b6cc50 + oxp_a38f8150-2efd-4b55-9ffb-3c98e2939e13/crucible 9b7cdf59-fa1e-4815-9108-3c2e00757e93 + oxp_a38f8150-2efd-4b55-9ffb-3c98e2939e13/crypt/debug 9ad3f33b-7789-4e9d-95c5-cc3b33868722 + oxp_a38f8150-2efd-4b55-9ffb-3c98e2939e13/crypt/zone 5827cf48-90f2-456a-a5f1-e03aef056b1d + oxp_a38f8150-2efd-4b55-9ffb-3c98e2939e13/crypt/zone/oxz_crucible_aa25add8-60b0-4ace-ac60-15adcdd32d50 47c4203e-6fb4-4e6b-9514-4bdfa2b134bb + oxp_d788bf53-35dd-4fa7-a820-c1233e859d03/crucible 6c89c1a5-1716-4758-b63d-09e8672ca3cb + oxp_d788bf53-35dd-4fa7-a820-c1233e859d03/crypt/debug cff02d61-c543-49f1-9109-e81c68cefd83 + oxp_d788bf53-35dd-4fa7-a820-c1233e859d03/crypt/zone d08c6f7e-553f-4024-8958-41cdfb2f3e04 + oxp_d788bf53-35dd-4fa7-a820-c1233e859d03/crypt/zone/oxz_crucible_a5a0b7a9-37c9-4dbd-8393-ec7748ada3b0 be03d0f5-4769-423f-b06e-5f5f9aad6cd3 + oxp_ff66a45c-38a8-4b62-825e-e7c9470bc8bc/crucible 92a5bf2e-c559-4ae4-8aca-eff0069ff95d + oxp_ff66a45c-38a8-4b62-825e-e7c9470bc8bc/crypt/debug 8cf86314-701b-4ba6-8f03-ed1bf6a353af + oxp_ff66a45c-38a8-4b62-825e-e7c9470bc8bc/crypt/zone 3354cd57-f010-468c-bf03-8fee73f9cbd4 + oxp_ff66a45c-38a8-4b62-825e-e7c9470bc8bc/crypt/zone/oxz_crucible_0faa9350-2c02-47c7-a0a6-9f4afd69152c f179fdef-52ce-4cff-8a97-89148f43b6b8 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -92,6 +188,54 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1 fake-vendor fake-model serial-e90056a4-dd19-4ebb-b484-c677aea31d80 + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_29867b4d-f12b-40ea-b59e-5169d0b2a831/crucible 22055c6e-87c5-4843-a270-b839de792db2 + oxp_29867b4d-f12b-40ea-b59e-5169d0b2a831/crypt/debug ccb37b34-455c-4131-b2d5-2afa86844af7 + oxp_29867b4d-f12b-40ea-b59e-5169d0b2a831/crypt/zone 08ebb666-a034-4645-be11-975e628dc24b + oxp_29867b4d-f12b-40ea-b59e-5169d0b2a831/crypt/zone/oxz_crucible_9b722fea-a186-4bc3-bc37-ce7f6de6a796 60758be8-1109-4a6c-86e4-4f94570f9b75 + oxp_29867b4d-f12b-40ea-b59e-5169d0b2a831/crypt/zone/oxz_nexus_29278a22-1ba1-4117-bfdb-39fcb9ae7fd1 f25c3f52-5701-477d-86da-2c223b58d6c9 + oxp_29867b4d-f12b-40ea-b59e-5169d0b2a831/crypt/zone/oxz_ntp_aac3ab51-9e2b-4605-9bf6-e3eb3681c2b5 ddc5e970-52e6-4318-b8ff-4dcce27f019f + oxp_54b3613b-a80e-4eda-aa1c-0d92050de367/crucible 91b21b39-f0f0-4844-ae69-ffb20c8fef3c + oxp_54b3613b-a80e-4eda-aa1c-0d92050de367/crypt/debug b8b9edf8-61ad-4be9-9158-d19dc0d55c8e + oxp_54b3613b-a80e-4eda-aa1c-0d92050de367/crypt/zone f6286214-eee2-4d21-9beb-d56d6a9ff647 + oxp_54b3613b-a80e-4eda-aa1c-0d92050de367/crypt/zone/oxz_crucible_4330134c-41b9-4097-aa0b-3eaefa06d473 1952c1a0-a291-4c9c-b671-5b9bc26cebdd + oxp_75939bd0-28f6-428b-8ce2-e55241d201ce/crucible 4cd0d29c-fc49-4264-958b-63d0d58b1bfc + oxp_75939bd0-28f6-428b-8ce2-e55241d201ce/crypt/debug b62ae708-bda3-4e55-aeec-4f6ebde36147 + oxp_75939bd0-28f6-428b-8ce2-e55241d201ce/crypt/zone 69afa9b4-0b5b-44b7-959b-2e0c919a902c + oxp_75939bd0-28f6-428b-8ce2-e55241d201ce/crypt/zone/oxz_crucible_65d03287-e43f-45f4-902e-0a5e4638f31a 6af89615-bdf5-4f35-9b17-c121184d055c + oxp_7bcb41c3-6fc7-4cab-ac5f-b2e09f62567d/crucible de3fa3f8-d348-4520-9025-d8e21ae467d4 + oxp_7bcb41c3-6fc7-4cab-ac5f-b2e09f62567d/crypt/debug 59a882c6-2590-4e1b-8bac-6c80bde22cd0 + oxp_7bcb41c3-6fc7-4cab-ac5f-b2e09f62567d/crypt/zone f48b7d15-5deb-43c4-a60e-3e0fbcf97181 + oxp_7bcb41c3-6fc7-4cab-ac5f-b2e09f62567d/crypt/zone/oxz_crucible_edaca77e-5806-446a-b00c-125962cd551d 0153190b-60fb-438c-9635-2d979c7ebe62 + oxp_92aeebc3-4154-4147-b721-0ccf5e337d8d/crucible 9e1fe3b4-5a48-45ba-b940-8d57446ea9b1 + oxp_92aeebc3-4154-4147-b721-0ccf5e337d8d/crypt/debug 4cda93d9-ceb2-4dab-8ded-146338f74201 + oxp_92aeebc3-4154-4147-b721-0ccf5e337d8d/crypt/zone 9824b691-56a2-4969-b2bb-86434fcffb63 + oxp_92aeebc3-4154-4147-b721-0ccf5e337d8d/crypt/zone/oxz_crucible_6a5901b1-f9d7-425c-8ecb-a786c900f217 cee2172a-5d28-43e1-abcd-a8e615a6ee6b + oxp_960229b6-dbb2-4df0-ad93-83ddb28484bc/crucible 9739aee2-e6e2-49de-8d28-04c225c73620 + oxp_960229b6-dbb2-4df0-ad93-83ddb28484bc/crypt/debug b71328f5-ec79-4655-a46d-ca65b97737eb + oxp_960229b6-dbb2-4df0-ad93-83ddb28484bc/crypt/zone ccba4005-6b82-4ad7-896c-486f921f11c7 + oxp_960229b6-dbb2-4df0-ad93-83ddb28484bc/crypt/zone/oxz_crucible_bac92034-b9e6-4e8b-9ffb-dbba9caec88d 2a240d7d-a428-4ff5-8ded-3206ef2cec95 + oxp_9e1428de-ad48-4655-8ccc-bbf4cb1badda/crucible 0a6e84ba-dbda-46c6-b464-c503c446908c + oxp_9e1428de-ad48-4655-8ccc-bbf4cb1badda/crypt/debug 74883587-3810-4b3a-8b96-b75c0d175790 + oxp_9e1428de-ad48-4655-8ccc-bbf4cb1badda/crypt/zone eeacb046-ceb7-46be-a500-d0895285c8e8 + oxp_9e1428de-ad48-4655-8ccc-bbf4cb1badda/crypt/zone/oxz_crucible_353b0aff-4c71-4fae-a6bd-adcb1d2a1a1d d662f33a-ad6e-464a-8bab-789e94cf52c6 + oxp_e03fee18-20c9-4c61-8927-bf80525f9b78/crucible 12ea5763-4588-44d7-9729-9d68717a737e + oxp_e03fee18-20c9-4c61-8927-bf80525f9b78/crypt/debug a90f2686-9ab9-475b-b266-3068ce3daf2e + oxp_e03fee18-20c9-4c61-8927-bf80525f9b78/crypt/zone 97e91593-1d0a-44b4-a858-217bf649101d + oxp_e03fee18-20c9-4c61-8927-bf80525f9b78/crypt/zone/oxz_crucible_b3583b5f-4a62-4471-9be7-41e61578de4c c6b9b0cf-3f83-4893-acfe-302e20e1cced + oxp_e25482d4-7111-4acf-b621-4aab851ffda5/crucible 8eaf41af-a705-4205-a700-47df8245a9fb + oxp_e25482d4-7111-4acf-b621-4aab851ffda5/crypt/debug 1565d6ec-e8e8-48fa-a278-466eba9242fd + oxp_e25482d4-7111-4acf-b621-4aab851ffda5/crypt/zone 56c84928-1960-4e9d-b3f1-be1e471eee29 + oxp_e25482d4-7111-4acf-b621-4aab851ffda5/crypt/zone/oxz_crucible_d9653001-f671-4905-a410-6a7abc358318 2f200dce-e6f6-414c-a974-c4d57b911e65 + oxp_e90056a4-dd19-4ebb-b484-c677aea31d80/crucible dd816da2-4f69-4f5f-a68e-25707508b7e8 + oxp_e90056a4-dd19-4ebb-b484-c677aea31d80/crypt/debug 2551466c-2832-43cf-819f-c4a5d38f8649 + oxp_e90056a4-dd19-4ebb-b484-c677aea31d80/crypt/zone 3731ccdd-e64a-40ff-aa8a-d80e2a99cc18 + oxp_e90056a4-dd19-4ebb-b484-c677aea31d80/crypt/zone/oxz_crucible_248db330-56e6-4c7e-b5ff-9cd6cbcb210a 0682d710-685d-4ad6-a450-ac664f3b04e7 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP diff --git a/nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_2_3.txt b/nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_2_3.txt index 3b14db49c70..3cc9546cd8c 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_2_3.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_2_3.txt @@ -21,6 +21,54 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366 fake-vendor fake-model serial-f4a96860-bdeb-4435-bdf5-2a10beb3d44a + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crucible 7c20d4b3-b783-4ba7-94a9-a8b789b04674 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/debug 0a6be80b-87c5-41fd-bd3c-36275b4ec494 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/zone 1e7c17fa-63d5-4a62-8037-663745516d18 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/zone/oxz_crucible_b40f7c7b-526c-46c8-ae33-67280c280eb7 38af39e8-406d-4ffe-8afb-f15d80fbea27 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/zone/oxz_nexus_cc816cfe-3869-4dde-b596-397d41198628 5f84acc5-e9f0-4f12-93e9-d2a271cb8ea0 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/zone/oxz_ntp_267ed614-92af-4b9d-bdba-c2881c2e43a2 bf1b301a-436c-4cdc-b3cd-de08dfcadc86 + oxp_31a3bc64-7a3b-496d-b644-785dc44b6e37/crucible e2a6246d-00f0-4526-a2ab-99b2db7e1d51 + oxp_31a3bc64-7a3b-496d-b644-785dc44b6e37/crypt/debug bbc7b434-12d0-441f-86c1-73d8355db38b + oxp_31a3bc64-7a3b-496d-b644-785dc44b6e37/crypt/zone 5e5c6b62-7785-4180-b901-6f33d676d657 + oxp_31a3bc64-7a3b-496d-b644-785dc44b6e37/crypt/zone/oxz_crucible_322ee9f1-8903-4542-a0a8-a54cefabdeca d907b775-c3e6-4b0f-90e7-a2923c5790bf + oxp_7bb40bd6-9c43-4b63-8337-18313c72aea2/crucible 574ac2b5-0233-488c-afd1-7ef4adc00b61 + oxp_7bb40bd6-9c43-4b63-8337-18313c72aea2/crypt/debug 43858cf5-148f-48d8-9e52-b878d2efb6a5 + oxp_7bb40bd6-9c43-4b63-8337-18313c72aea2/crypt/zone 536e5566-25b0-4df3-946e-3c59ca7d7921 + oxp_7bb40bd6-9c43-4b63-8337-18313c72aea2/crypt/zone/oxz_crucible_747d2426-68bf-4c22-8806-41d290b5d5f5 a820d4d1-87d3-419d-8ed3-0dda65f8e808 + oxp_988aa8c2-cb5e-406b-9289-425dc2e5bc3a/crucible 70a5b1f3-dbd7-4cc0-8a30-9a8c5ff33402 + oxp_988aa8c2-cb5e-406b-9289-425dc2e5bc3a/crypt/debug bb0c5843-4fd2-4c5a-a7a1-2bc1e9180caf + oxp_988aa8c2-cb5e-406b-9289-425dc2e5bc3a/crypt/zone 14d03496-7ebd-4272-a58b-4c193ba0da82 + oxp_988aa8c2-cb5e-406b-9289-425dc2e5bc3a/crypt/zone/oxz_crucible_be97b92b-38d6-422a-8c76-d37060f75bd2 a9c330b0-1f48-4bd7-b82f-c3419131b69b + oxp_ad574c09-2ae0-4534-a2a4-f923ce20ae87/crucible 32f26a28-c25b-4706-9fc0-712ea55b8d88 + oxp_ad574c09-2ae0-4534-a2a4-f923ce20ae87/crypt/debug cb06ffe2-7f4d-4936-8310-ebf5e032a32c + oxp_ad574c09-2ae0-4534-a2a4-f923ce20ae87/crypt/zone 3fa2a825-bfec-42ca-801b-fc901f7a7729 + oxp_ad574c09-2ae0-4534-a2a4-f923ce20ae87/crypt/zone/oxz_crucible_64aa65f8-1ccb-4cd6-9953-027aebdac8ff 2cd64120-ea51-450a-bac8-d419f9ff7570 + oxp_ad91e238-4901-4ff4-a91b-75233c936426/crucible 724bd053-39f3-4c24-8109-a4d8b4c27787 + oxp_ad91e238-4901-4ff4-a91b-75233c936426/crypt/debug 0a585f79-acdb-4de1-9e32-e54906b1cfb8 + oxp_ad91e238-4901-4ff4-a91b-75233c936426/crypt/zone 63720ef8-1aad-4f61-a20b-078a1eb4d436 + oxp_ad91e238-4901-4ff4-a91b-75233c936426/crypt/zone/oxz_crucible_b14d5478-1a0e-4b90-b526-36b06339dfc4 cd1cc777-1813-427a-bf3b-8b4cb372608c + oxp_ce58d463-d442-4c97-a6b4-f7d98c3fd902/crucible e008db37-e6ad-433a-8aa1-ab06f8bad5b4 + oxp_ce58d463-d442-4c97-a6b4-f7d98c3fd902/crypt/debug e86ad99b-5040-4863-86db-0375ed3004f4 + oxp_ce58d463-d442-4c97-a6b4-f7d98c3fd902/crypt/zone b58e8fae-21e3-4131-a37a-7c8bfaa242f5 + oxp_ce58d463-d442-4c97-a6b4-f7d98c3fd902/crypt/zone/oxz_crucible_8e9e923e-62b1-4cbc-9f59-d6397e338b6b 3aa68ad8-0539-4d41-a709-50fa4a0f97e5 + oxp_f18f7689-0059-4b79-880e-34faf7a0fe0e/crucible b833252f-8df1-4188-9282-0b4e90caec37 + oxp_f18f7689-0059-4b79-880e-34faf7a0fe0e/crypt/debug f0945e1c-9c5e-463c-bee9-bee695299a0b + oxp_f18f7689-0059-4b79-880e-34faf7a0fe0e/crypt/zone e7e785bc-f3db-44ab-a4a2-71cca70507e4 + oxp_f18f7689-0059-4b79-880e-34faf7a0fe0e/crypt/zone/oxz_crucible_4ab1650f-32c5-447f-939d-64b8103a7645 eb598474-ce25-4878-87b9-3c26318fb192 + oxp_f1d6cea4-640f-415e-89fe-2b1784ce3db8/crucible 8a3cdc7a-802b-4b83-84bd-14f62c43ee7e + oxp_f1d6cea4-640f-415e-89fe-2b1784ce3db8/crypt/debug dd7111a0-555c-4b82-82b3-2cc93a2b1771 + oxp_f1d6cea4-640f-415e-89fe-2b1784ce3db8/crypt/zone 1e998426-2b49-4abc-877d-e7b972e5aadb + oxp_f1d6cea4-640f-415e-89fe-2b1784ce3db8/crypt/zone/oxz_crucible_6e811d86-8aa7-4660-935b-84b4b7721b10 7600ccdd-7b1a-46b6-85c2-800b2d4cf4d8 + oxp_f4a96860-bdeb-4435-bdf5-2a10beb3d44a/crucible e78dca52-4122-428a-b8c5-911fcce624de + oxp_f4a96860-bdeb-4435-bdf5-2a10beb3d44a/crypt/debug b8abfcc9-d636-4cee-b0a1-dd4b62ceade5 + oxp_f4a96860-bdeb-4435-bdf5-2a10beb3d44a/crypt/zone c02e8b44-3f25-4529-9d97-9a908e52af1d + oxp_f4a96860-bdeb-4435-bdf5-2a10beb3d44a/crypt/zone/oxz_crucible_7fbd2c38-5dc3-48c4-b061-558a2041d70f 3243c276-0a62-4c1f-9976-c353618b2585 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -57,6 +105,54 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366 fake-vendor fake-model serial-db6686c8-2dd9-4032-8444-2a06b43baa68 + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crucible f5e9ef79-2d90-4839-aeac-a1048516011e + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/debug f68ba9d0-a5cf-4148-a754-010656ae5f7b + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/zone cc0d38c6-17f2-4861-889f-82398f0eade2 + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/zone/oxz_crucible_3eda924f-22a9-4f3e-9a1b-91d1c47601ab b7b7c0d6-b2dd-41eb-b5fe-3e131356552f + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/zone/oxz_nexus_c66ab6d5-ff7a-46d1-9fd0-70cefa352d25 05b52b8d-dd52-4a9e-b647-445959885d68 + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/zone/oxz_ntp_08c7f8aa-1ea9-469b-8cac-2fdbfc11ebcb 15bb82a6-77c3-4c3c-ac8b-95c524526704 + oxp_29758363-6c77-40c3-8740-9c0c64f6e14a/crucible c5dc843c-fa8c-46a8-9998-aa0b0397cb0c + oxp_29758363-6c77-40c3-8740-9c0c64f6e14a/crypt/debug cea3cbac-de83-4a0c-a003-e42086fd418c + oxp_29758363-6c77-40c3-8740-9c0c64f6e14a/crypt/zone 53c8cf89-1838-4638-8a27-683d134cbd9c + oxp_29758363-6c77-40c3-8740-9c0c64f6e14a/crypt/zone/oxz_crucible_10d98a73-ec88-4aff-a7e8-7db6a87880e6 51701069-af21-4697-8655-d2a8e455dceb + oxp_3f331c10-7882-48ab-85d9-05108490b55b/crucible 54774860-da9a-4ff5-8d63-242b353c3115 + oxp_3f331c10-7882-48ab-85d9-05108490b55b/crypt/debug 88143ddc-773c-43e6-9859-5033535b566c + oxp_3f331c10-7882-48ab-85d9-05108490b55b/crypt/zone 438902f5-ff09-48f2-8cd1-56dc910d86e1 + oxp_3f331c10-7882-48ab-85d9-05108490b55b/crypt/zone/oxz_crucible_a1696cd4-588c-484a-b95b-66e824c0ce05 5dae2769-982f-485d-9776-57c2ae0a83b9 + oxp_5152d1aa-9045-4e06-9ef6-6eadac3696e4/crucible f7256e30-6e62-4d4b-ab06-8e9b3c9472a3 + oxp_5152d1aa-9045-4e06-9ef6-6eadac3696e4/crypt/debug 5a5afb9f-850c-4501-959a-8ff760eca117 + oxp_5152d1aa-9045-4e06-9ef6-6eadac3696e4/crypt/zone bc7e5ae9-81f0-437b-9655-d11259f5037b + oxp_5152d1aa-9045-4e06-9ef6-6eadac3696e4/crypt/zone/oxz_crucible_07c3c805-8888-4fe5-9543-3d2479dbe6f3 52de1771-5f5b-422d-89e9-96a708c66d47 + oxp_5c0dd424-d905-4fc5-a73c-36254fdd470c/crucible c333b519-9dde-4ada-b507-2bb0b6903d17 + oxp_5c0dd424-d905-4fc5-a73c-36254fdd470c/crypt/debug fe22839c-29a4-4711-8290-44dc001b9a4f + oxp_5c0dd424-d905-4fc5-a73c-36254fdd470c/crypt/zone 70aadfba-de91-4157-ab8c-98609d278d08 + oxp_5c0dd424-d905-4fc5-a73c-36254fdd470c/crypt/zone/oxz_crucible_02acbe6a-1c88-47e3-94c3-94084cbde098 42a06863-188a-4755-99f7-659df14958f7 + oxp_794df76f-bca0-4635-9eb6-773ad0108f7e/crucible 2e09fba5-0c1d-41db-a310-bef9290c6332 + oxp_794df76f-bca0-4635-9eb6-773ad0108f7e/crypt/debug 3b733c7c-d0b0-427b-952a-200518837f87 + oxp_794df76f-bca0-4635-9eb6-773ad0108f7e/crypt/zone d6835e81-73e5-46cc-a188-93050a2e4d40 + oxp_794df76f-bca0-4635-9eb6-773ad0108f7e/crypt/zone/oxz_crucible_8f3a1cc5-9195-4a30-ad02-b804278fe639 a3e5c0e0-3a73-4f7a-abd4-63f3434767aa + oxp_9024d350-38a7-459b-8550-3b2c4a88b5c1/crucible 76ab0eb2-4356-4a8a-b555-a83930ef3dce + oxp_9024d350-38a7-459b-8550-3b2c4a88b5c1/crypt/debug 7aabaeaa-fd10-4686-bd7e-65a961ea3f87 + oxp_9024d350-38a7-459b-8550-3b2c4a88b5c1/crypt/zone 4939df35-a183-4c85-9872-5ced516bd154 + oxp_9024d350-38a7-459b-8550-3b2c4a88b5c1/crypt/zone/oxz_crucible_2a455c35-eb3c-4c73-ab6c-d0a706e25316 94407842-70fd-48cd-933f-b0d7768fa45b + oxp_95e86080-e162-4980-a589-db6bb1a95ca7/crucible 52255a04-77be-486f-a59f-f17de4916cc2 + oxp_95e86080-e162-4980-a589-db6bb1a95ca7/crypt/debug e991d7ef-7ca9-444e-ad9d-6f9d165a3b80 + oxp_95e86080-e162-4980-a589-db6bb1a95ca7/crypt/zone 35f7f5fc-0d30-442d-b74a-7ef63b13bb6d + oxp_95e86080-e162-4980-a589-db6bb1a95ca7/crypt/zone/oxz_crucible_a2079cbc-a69e-41a1-b1e0-fbcb972d03f6 40cae2bc-0505-4d53-9d94-b199aaf5600a + oxp_d55d36d7-df92-4615-944d-440a1f8b5001/crucible ab598283-0338-4124-af32-71aaf478908d + oxp_d55d36d7-df92-4615-944d-440a1f8b5001/crypt/debug f06995fc-99ad-4184-80b4-3d0a42ac858f + oxp_d55d36d7-df92-4615-944d-440a1f8b5001/crypt/zone d6fee205-15ef-41f9-8719-bc0be41ca283 + oxp_d55d36d7-df92-4615-944d-440a1f8b5001/crypt/zone/oxz_crucible_587be699-a320-4c79-b320-128d9ecddc0b 8879f080-4bd0-4073-ab2f-08e6f289bb4f + oxp_db6686c8-2dd9-4032-8444-2a06b43baa68/crucible e54385d1-cead-4fb6-a28e-c13db4e9561f + oxp_db6686c8-2dd9-4032-8444-2a06b43baa68/crypt/debug 61be50c0-fa4b-405a-86aa-51da8c92580a + oxp_db6686c8-2dd9-4032-8444-2a06b43baa68/crypt/zone c2e8fc9e-40d5-4ba5-b9e6-bd4ac88b0e7b + oxp_db6686c8-2dd9-4032-8444-2a06b43baa68/crypt/zone/oxz_crucible_6fa06115-4959-4913-8e7b-dd70d7651f07 3e03f4d9-b2e7-4176-91e4-dc5771ccc769 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -93,6 +189,54 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366 fake-vendor fake-model serial-f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crucible a79b0ad5-06b8-466c-928c-39e311ace5ff + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/debug c1fc8d09-f44c-4a2e-b989-066f2787d4c1 + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/zone 8aa9c334-3980-4875-b858-b1739848474d + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/zone/oxz_crucible_af322036-371f-437c-8c08-7f40f3f1403b 411e3457-3113-40d2-8a7d-747b108e0de7 + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/zone/oxz_nexus_704e1fed-f8d6-4cfa-a470-bad27fdc06d1 aa37e2bb-8d16-4dc2-a549-5f265fdad77c + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/zone/oxz_ntp_47199d48-534c-4267-a654-d2d90e64b498 19bdebd5-9757-409f-ac06-2b309379975e + oxp_32456d15-f5b6-4efc-90c8-dbba979b69cb/crucible 1635dad8-971f-4409-aca3-6204eafec699 + oxp_32456d15-f5b6-4efc-90c8-dbba979b69cb/crypt/debug a9f4142b-b18d-4f1a-8274-6fbf12a10efd + oxp_32456d15-f5b6-4efc-90c8-dbba979b69cb/crypt/zone de88d3ee-683a-4550-99de-aca94b4a276a + oxp_32456d15-f5b6-4efc-90c8-dbba979b69cb/crypt/zone/oxz_crucible_edabedf3-839c-488d-ad6f-508ffa864674 79ce0088-d8a8-46ff-ac72-958b8db65e67 + oxp_416fe9f9-5161-4b0f-9e11-c9d81563ded5/crucible 1b5a2379-ec60-47f0-8def-fa3ab5c2487c + oxp_416fe9f9-5161-4b0f-9e11-c9d81563ded5/crypt/debug 3b94580a-8ff4-4302-8d49-30ff90ef7edc + oxp_416fe9f9-5161-4b0f-9e11-c9d81563ded5/crypt/zone f6df8087-1122-4715-851a-127309740840 + oxp_416fe9f9-5161-4b0f-9e11-c9d81563ded5/crypt/zone/oxz_crucible_d637264f-6f40-44c2-8b7e-a179430210d2 2059b139-6510-4447-aa56-cf995ef469a2 + oxp_4c68800e-23f8-485b-b251-628fd151e445/crucible 4abeefa4-e5ad-46e9-b056-79f5950a5639 + oxp_4c68800e-23f8-485b-b251-628fd151e445/crypt/debug bde5f2d8-ac7d-40e8-b4b7-2cdf1cff6e57 + oxp_4c68800e-23f8-485b-b251-628fd151e445/crypt/zone 882faa8a-7df8-4f67-abba-3d97a2615932 + oxp_4c68800e-23f8-485b-b251-628fd151e445/crypt/zone/oxz_crucible_7a9f60d3-2b66-4547-9b63-7d4f7a8b6382 63337e4d-61a8-4dc7-a322-1442bc19b347 + oxp_9dd87c4d-5fb4-475a-86fa-c0da81a3e00a/crucible b0fcbafd-55cc-49f1-9e02-20503673b34f + oxp_9dd87c4d-5fb4-475a-86fa-c0da81a3e00a/crypt/debug bdf9f107-3a76-4d6a-bea0-5cfb4d3cd6a6 + oxp_9dd87c4d-5fb4-475a-86fa-c0da81a3e00a/crypt/zone 0b216cae-701c-4341-a48a-690543b8e1e9 + oxp_9dd87c4d-5fb4-475a-86fa-c0da81a3e00a/crypt/zone/oxz_crucible_dce226c9-7373-4bfa-8a94-79dc472857a6 2fe942e9-085c-4155-a415-c2dcc19dbd91 + oxp_be93a517-445e-46c2-aa21-3dc526d4a413/crucible eec6f425-d377-42b2-890f-c8c3efe173d1 + oxp_be93a517-445e-46c2-aa21-3dc526d4a413/crypt/debug cc56ea63-0ae3-48ce-8faf-1bd7d83eb148 + oxp_be93a517-445e-46c2-aa21-3dc526d4a413/crypt/zone dce1da41-4cf0-4f70-a9e5-f4b7fad54228 + oxp_be93a517-445e-46c2-aa21-3dc526d4a413/crypt/zone/oxz_crucible_ab7ba6df-d401-40bd-940e-faf57c57aa2a ada776f0-dbb1-4430-a60a-f7462570a19c + oxp_d9344e2b-84d2-4392-84ab-41b86ed02237/crucible a33e3d63-6413-42b2-8cf0-02c774666916 + oxp_d9344e2b-84d2-4392-84ab-41b86ed02237/crypt/debug abe29a15-fef4-47ef-8f08-71645f396213 + oxp_d9344e2b-84d2-4392-84ab-41b86ed02237/crypt/zone 5dd03902-3f33-4f7e-896a-c08d7c6e37f1 + oxp_d9344e2b-84d2-4392-84ab-41b86ed02237/crypt/zone/oxz_crucible_56d5d7cf-db2c-40a3-a775-003241ad4820 35656b97-3eef-46f2-aab0-4d33a3548e62 + oxp_eab188d0-b34a-4673-b254-12e705597654/crucible 4c0303d2-205d-4644-b55a-5c74bbce54c3 + oxp_eab188d0-b34a-4673-b254-12e705597654/crypt/debug 32535344-4e21-4fb3-9c43-f305ac367efb + oxp_eab188d0-b34a-4673-b254-12e705597654/crypt/zone 447cc163-589e-479c-a73d-0071e5dc59bf + oxp_eab188d0-b34a-4673-b254-12e705597654/crypt/zone/oxz_crucible_18f8fe40-646e-4962-b17a-20e201f3a6e5 3b4f5bbb-cc50-49ae-a208-ca88dff1f361 + oxp_f1e0386f-11b6-4cdf-8250-826d256db6b5/crucible 5a210076-5d38-42f0-915c-c09f67ff38af + oxp_f1e0386f-11b6-4cdf-8250-826d256db6b5/crypt/debug 7d983611-ab39-4083-93d0-f57f3ada9a0f + oxp_f1e0386f-11b6-4cdf-8250-826d256db6b5/crypt/zone 0568d976-0079-4d6e-9d1f-a8cfc4b044df + oxp_f1e0386f-11b6-4cdf-8250-826d256db6b5/crypt/zone/oxz_crucible_6af7f4d6-33b6-4eb3-a146-d8e9e4ae9d66 8b82f804-50d1-4e6f-8899-181433d82299 + oxp_f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b/crucible e2de5537-a289-49ac-8a61-65805a35755e + oxp_f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b/crypt/debug 731caeb5-c24f-45b7-aafa-4e747302eaa4 + oxp_f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b/crypt/zone f75ef0e7-663d-4418-99b6-71e2a77a27e3 + oxp_f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b/crypt/zone/oxz_crucible_93f2f40c-5616-4d8d-8519-ec6debdcede0 226cea90-799d-4f6c-90c6-459d2d7674c1 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -131,6 +275,33 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366 + fake-vendor fake-model serial-e6f289fe-142e-4778-8629-dc87adb53f06 + datasets at generation 1: + --------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + --------------------------------------------------------------------------------------------------------------------------------------- ++ oxp_1bb5ee5d-c2c6-4eaa-86c4-817d89cf10cf/crypt/debug bbab775c-07b1-48b1-96a3-9aa155396112 ++ oxp_1bb5ee5d-c2c6-4eaa-86c4-817d89cf10cf/crypt/zone 07381a6a-e397-4ff9-a2a6-8f1e46c47eb3 ++ oxp_1bb5ee5d-c2c6-4eaa-86c4-817d89cf10cf/crypt/zone/oxz_ntp_2d73d30e-ca47-46a8-9c12-917d4ab824b6 15e9b1ea-8947-48a2-8d78-54665e4d2f03 ++ oxp_298d1eec-0313-4a42-8af9-0e51299a14ef/crypt/debug 75c1432c-19e1-4c06-8393-9907a09efcbe ++ oxp_298d1eec-0313-4a42-8af9-0e51299a14ef/crypt/zone b4c23ac2-86af-4b47-9d8d-35eff7997788 ++ oxp_2eed666f-a10b-42d0-b626-68335d3270b8/crypt/debug 5501c13c-0500-41a6-9c48-85924383fdcc ++ oxp_2eed666f-a10b-42d0-b626-68335d3270b8/crypt/zone 32143abb-e501-450b-9398-7d4dbebdf4a1 ++ oxp_6cc4d7a7-2a89-4f2f-aa55-5e7a10d0fc08/crypt/debug bcdd7a5a-59da-4a47-8a1c-79281428d71b ++ oxp_6cc4d7a7-2a89-4f2f-aa55-5e7a10d0fc08/crypt/zone 6ec35c5c-9d6c-4d72-8bec-af91069ef7a9 ++ oxp_7aad6fd9-b698-4c77-af6b-947be10ba953/crypt/debug 8ed9d1a2-3c60-4f38-9e80-5c56d80e67c9 ++ oxp_7aad6fd9-b698-4c77-af6b-947be10ba953/crypt/zone 8529e7f8-8c11-4869-b330-83ddc45ed17a ++ oxp_a5a15e51-c48a-40e4-a2d8-1c7198c1d46b/crypt/debug 4aef9a3a-0829-4ada-a0e9-a45c91e74249 ++ oxp_a5a15e51-c48a-40e4-a2d8-1c7198c1d46b/crypt/zone 940f06cb-822f-4034-8d34-e14bcc6ea998 ++ oxp_b81d4993-ea5b-4720-b8c8-2360c1121d6e/crypt/debug 2b23d885-836a-4270-886d-08640aae90aa ++ oxp_b81d4993-ea5b-4720-b8c8-2360c1121d6e/crypt/zone 0507b005-e018-4b69-9d84-50faf61e792f ++ oxp_d0064c4d-f5f7-4c89-9f37-0ca475048e79/crypt/debug feac64a1-ade2-4f88-8c17-64d2863e2be6 ++ oxp_d0064c4d-f5f7-4c89-9f37-0ca475048e79/crypt/zone 1acaf776-970a-49cf-9f1c-7d8e3146ef11 ++ oxp_dba739c1-76e4-4b6a-a173-89c938fa13ef/crypt/debug 91edd9a1-178d-4aa5-83a7-b2f4ef1fc44a ++ oxp_dba739c1-76e4-4b6a-a173-89c938fa13ef/crypt/zone 1bd5ab24-2a54-438f-bae0-af1b06a3cc41 ++ oxp_e6f289fe-142e-4778-8629-dc87adb53f06/crypt/debug 8840ccd9-e8c9-48d9-affb-8587e468b204 ++ oxp_e6f289fe-142e-4778-8629-dc87adb53f06/crypt/zone b501adbf-be36-4724-9409-329f690fb09d + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP diff --git a/nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_3_5.txt b/nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_3_5.txt index b252a21d7d1..05e78700342 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_3_5.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_3_5.txt @@ -21,6 +21,54 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163 fake-vendor fake-model serial-f4a96860-bdeb-4435-bdf5-2a10beb3d44a + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crucible 7c20d4b3-b783-4ba7-94a9-a8b789b04674 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/debug 0a6be80b-87c5-41fd-bd3c-36275b4ec494 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/zone 1e7c17fa-63d5-4a62-8037-663745516d18 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/zone/oxz_crucible_b40f7c7b-526c-46c8-ae33-67280c280eb7 38af39e8-406d-4ffe-8afb-f15d80fbea27 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/zone/oxz_nexus_cc816cfe-3869-4dde-b596-397d41198628 5f84acc5-e9f0-4f12-93e9-d2a271cb8ea0 + oxp_014eb1e9-04fe-4f36-8339-0a090b053ada/crypt/zone/oxz_ntp_267ed614-92af-4b9d-bdba-c2881c2e43a2 bf1b301a-436c-4cdc-b3cd-de08dfcadc86 + oxp_31a3bc64-7a3b-496d-b644-785dc44b6e37/crucible e2a6246d-00f0-4526-a2ab-99b2db7e1d51 + oxp_31a3bc64-7a3b-496d-b644-785dc44b6e37/crypt/debug bbc7b434-12d0-441f-86c1-73d8355db38b + oxp_31a3bc64-7a3b-496d-b644-785dc44b6e37/crypt/zone 5e5c6b62-7785-4180-b901-6f33d676d657 + oxp_31a3bc64-7a3b-496d-b644-785dc44b6e37/crypt/zone/oxz_crucible_322ee9f1-8903-4542-a0a8-a54cefabdeca d907b775-c3e6-4b0f-90e7-a2923c5790bf + oxp_7bb40bd6-9c43-4b63-8337-18313c72aea2/crucible 574ac2b5-0233-488c-afd1-7ef4adc00b61 + oxp_7bb40bd6-9c43-4b63-8337-18313c72aea2/crypt/debug 43858cf5-148f-48d8-9e52-b878d2efb6a5 + oxp_7bb40bd6-9c43-4b63-8337-18313c72aea2/crypt/zone 536e5566-25b0-4df3-946e-3c59ca7d7921 + oxp_7bb40bd6-9c43-4b63-8337-18313c72aea2/crypt/zone/oxz_crucible_747d2426-68bf-4c22-8806-41d290b5d5f5 a820d4d1-87d3-419d-8ed3-0dda65f8e808 + oxp_988aa8c2-cb5e-406b-9289-425dc2e5bc3a/crucible 70a5b1f3-dbd7-4cc0-8a30-9a8c5ff33402 + oxp_988aa8c2-cb5e-406b-9289-425dc2e5bc3a/crypt/debug bb0c5843-4fd2-4c5a-a7a1-2bc1e9180caf + oxp_988aa8c2-cb5e-406b-9289-425dc2e5bc3a/crypt/zone 14d03496-7ebd-4272-a58b-4c193ba0da82 + oxp_988aa8c2-cb5e-406b-9289-425dc2e5bc3a/crypt/zone/oxz_crucible_be97b92b-38d6-422a-8c76-d37060f75bd2 a9c330b0-1f48-4bd7-b82f-c3419131b69b + oxp_ad574c09-2ae0-4534-a2a4-f923ce20ae87/crucible 32f26a28-c25b-4706-9fc0-712ea55b8d88 + oxp_ad574c09-2ae0-4534-a2a4-f923ce20ae87/crypt/debug cb06ffe2-7f4d-4936-8310-ebf5e032a32c + oxp_ad574c09-2ae0-4534-a2a4-f923ce20ae87/crypt/zone 3fa2a825-bfec-42ca-801b-fc901f7a7729 + oxp_ad574c09-2ae0-4534-a2a4-f923ce20ae87/crypt/zone/oxz_crucible_64aa65f8-1ccb-4cd6-9953-027aebdac8ff 2cd64120-ea51-450a-bac8-d419f9ff7570 + oxp_ad91e238-4901-4ff4-a91b-75233c936426/crucible 724bd053-39f3-4c24-8109-a4d8b4c27787 + oxp_ad91e238-4901-4ff4-a91b-75233c936426/crypt/debug 0a585f79-acdb-4de1-9e32-e54906b1cfb8 + oxp_ad91e238-4901-4ff4-a91b-75233c936426/crypt/zone 63720ef8-1aad-4f61-a20b-078a1eb4d436 + oxp_ad91e238-4901-4ff4-a91b-75233c936426/crypt/zone/oxz_crucible_b14d5478-1a0e-4b90-b526-36b06339dfc4 cd1cc777-1813-427a-bf3b-8b4cb372608c + oxp_ce58d463-d442-4c97-a6b4-f7d98c3fd902/crucible e008db37-e6ad-433a-8aa1-ab06f8bad5b4 + oxp_ce58d463-d442-4c97-a6b4-f7d98c3fd902/crypt/debug e86ad99b-5040-4863-86db-0375ed3004f4 + oxp_ce58d463-d442-4c97-a6b4-f7d98c3fd902/crypt/zone b58e8fae-21e3-4131-a37a-7c8bfaa242f5 + oxp_ce58d463-d442-4c97-a6b4-f7d98c3fd902/crypt/zone/oxz_crucible_8e9e923e-62b1-4cbc-9f59-d6397e338b6b 3aa68ad8-0539-4d41-a709-50fa4a0f97e5 + oxp_f18f7689-0059-4b79-880e-34faf7a0fe0e/crucible b833252f-8df1-4188-9282-0b4e90caec37 + oxp_f18f7689-0059-4b79-880e-34faf7a0fe0e/crypt/debug f0945e1c-9c5e-463c-bee9-bee695299a0b + oxp_f18f7689-0059-4b79-880e-34faf7a0fe0e/crypt/zone e7e785bc-f3db-44ab-a4a2-71cca70507e4 + oxp_f18f7689-0059-4b79-880e-34faf7a0fe0e/crypt/zone/oxz_crucible_4ab1650f-32c5-447f-939d-64b8103a7645 eb598474-ce25-4878-87b9-3c26318fb192 + oxp_f1d6cea4-640f-415e-89fe-2b1784ce3db8/crucible 8a3cdc7a-802b-4b83-84bd-14f62c43ee7e + oxp_f1d6cea4-640f-415e-89fe-2b1784ce3db8/crypt/debug dd7111a0-555c-4b82-82b3-2cc93a2b1771 + oxp_f1d6cea4-640f-415e-89fe-2b1784ce3db8/crypt/zone 1e998426-2b49-4abc-877d-e7b972e5aadb + oxp_f1d6cea4-640f-415e-89fe-2b1784ce3db8/crypt/zone/oxz_crucible_6e811d86-8aa7-4660-935b-84b4b7721b10 7600ccdd-7b1a-46b6-85c2-800b2d4cf4d8 + oxp_f4a96860-bdeb-4435-bdf5-2a10beb3d44a/crucible e78dca52-4122-428a-b8c5-911fcce624de + oxp_f4a96860-bdeb-4435-bdf5-2a10beb3d44a/crypt/debug b8abfcc9-d636-4cee-b0a1-dd4b62ceade5 + oxp_f4a96860-bdeb-4435-bdf5-2a10beb3d44a/crypt/zone c02e8b44-3f25-4529-9d97-9a908e52af1d + oxp_f4a96860-bdeb-4435-bdf5-2a10beb3d44a/crypt/zone/oxz_crucible_7fbd2c38-5dc3-48c4-b061-558a2041d70f 3243c276-0a62-4c1f-9976-c353618b2585 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -57,6 +105,54 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163 fake-vendor fake-model serial-db6686c8-2dd9-4032-8444-2a06b43baa68 + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crucible f5e9ef79-2d90-4839-aeac-a1048516011e + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/debug f68ba9d0-a5cf-4148-a754-010656ae5f7b + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/zone cc0d38c6-17f2-4861-889f-82398f0eade2 + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/zone/oxz_crucible_3eda924f-22a9-4f3e-9a1b-91d1c47601ab b7b7c0d6-b2dd-41eb-b5fe-3e131356552f + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/zone/oxz_nexus_c66ab6d5-ff7a-46d1-9fd0-70cefa352d25 05b52b8d-dd52-4a9e-b647-445959885d68 + oxp_12057b4a-0b06-4f70-ba22-336de2385bfe/crypt/zone/oxz_ntp_08c7f8aa-1ea9-469b-8cac-2fdbfc11ebcb 15bb82a6-77c3-4c3c-ac8b-95c524526704 + oxp_29758363-6c77-40c3-8740-9c0c64f6e14a/crucible c5dc843c-fa8c-46a8-9998-aa0b0397cb0c + oxp_29758363-6c77-40c3-8740-9c0c64f6e14a/crypt/debug cea3cbac-de83-4a0c-a003-e42086fd418c + oxp_29758363-6c77-40c3-8740-9c0c64f6e14a/crypt/zone 53c8cf89-1838-4638-8a27-683d134cbd9c + oxp_29758363-6c77-40c3-8740-9c0c64f6e14a/crypt/zone/oxz_crucible_10d98a73-ec88-4aff-a7e8-7db6a87880e6 51701069-af21-4697-8655-d2a8e455dceb + oxp_3f331c10-7882-48ab-85d9-05108490b55b/crucible 54774860-da9a-4ff5-8d63-242b353c3115 + oxp_3f331c10-7882-48ab-85d9-05108490b55b/crypt/debug 88143ddc-773c-43e6-9859-5033535b566c + oxp_3f331c10-7882-48ab-85d9-05108490b55b/crypt/zone 438902f5-ff09-48f2-8cd1-56dc910d86e1 + oxp_3f331c10-7882-48ab-85d9-05108490b55b/crypt/zone/oxz_crucible_a1696cd4-588c-484a-b95b-66e824c0ce05 5dae2769-982f-485d-9776-57c2ae0a83b9 + oxp_5152d1aa-9045-4e06-9ef6-6eadac3696e4/crucible f7256e30-6e62-4d4b-ab06-8e9b3c9472a3 + oxp_5152d1aa-9045-4e06-9ef6-6eadac3696e4/crypt/debug 5a5afb9f-850c-4501-959a-8ff760eca117 + oxp_5152d1aa-9045-4e06-9ef6-6eadac3696e4/crypt/zone bc7e5ae9-81f0-437b-9655-d11259f5037b + oxp_5152d1aa-9045-4e06-9ef6-6eadac3696e4/crypt/zone/oxz_crucible_07c3c805-8888-4fe5-9543-3d2479dbe6f3 52de1771-5f5b-422d-89e9-96a708c66d47 + oxp_5c0dd424-d905-4fc5-a73c-36254fdd470c/crucible c333b519-9dde-4ada-b507-2bb0b6903d17 + oxp_5c0dd424-d905-4fc5-a73c-36254fdd470c/crypt/debug fe22839c-29a4-4711-8290-44dc001b9a4f + oxp_5c0dd424-d905-4fc5-a73c-36254fdd470c/crypt/zone 70aadfba-de91-4157-ab8c-98609d278d08 + oxp_5c0dd424-d905-4fc5-a73c-36254fdd470c/crypt/zone/oxz_crucible_02acbe6a-1c88-47e3-94c3-94084cbde098 42a06863-188a-4755-99f7-659df14958f7 + oxp_794df76f-bca0-4635-9eb6-773ad0108f7e/crucible 2e09fba5-0c1d-41db-a310-bef9290c6332 + oxp_794df76f-bca0-4635-9eb6-773ad0108f7e/crypt/debug 3b733c7c-d0b0-427b-952a-200518837f87 + oxp_794df76f-bca0-4635-9eb6-773ad0108f7e/crypt/zone d6835e81-73e5-46cc-a188-93050a2e4d40 + oxp_794df76f-bca0-4635-9eb6-773ad0108f7e/crypt/zone/oxz_crucible_8f3a1cc5-9195-4a30-ad02-b804278fe639 a3e5c0e0-3a73-4f7a-abd4-63f3434767aa + oxp_9024d350-38a7-459b-8550-3b2c4a88b5c1/crucible 76ab0eb2-4356-4a8a-b555-a83930ef3dce + oxp_9024d350-38a7-459b-8550-3b2c4a88b5c1/crypt/debug 7aabaeaa-fd10-4686-bd7e-65a961ea3f87 + oxp_9024d350-38a7-459b-8550-3b2c4a88b5c1/crypt/zone 4939df35-a183-4c85-9872-5ced516bd154 + oxp_9024d350-38a7-459b-8550-3b2c4a88b5c1/crypt/zone/oxz_crucible_2a455c35-eb3c-4c73-ab6c-d0a706e25316 94407842-70fd-48cd-933f-b0d7768fa45b + oxp_95e86080-e162-4980-a589-db6bb1a95ca7/crucible 52255a04-77be-486f-a59f-f17de4916cc2 + oxp_95e86080-e162-4980-a589-db6bb1a95ca7/crypt/debug e991d7ef-7ca9-444e-ad9d-6f9d165a3b80 + oxp_95e86080-e162-4980-a589-db6bb1a95ca7/crypt/zone 35f7f5fc-0d30-442d-b74a-7ef63b13bb6d + oxp_95e86080-e162-4980-a589-db6bb1a95ca7/crypt/zone/oxz_crucible_a2079cbc-a69e-41a1-b1e0-fbcb972d03f6 40cae2bc-0505-4d53-9d94-b199aaf5600a + oxp_d55d36d7-df92-4615-944d-440a1f8b5001/crucible ab598283-0338-4124-af32-71aaf478908d + oxp_d55d36d7-df92-4615-944d-440a1f8b5001/crypt/debug f06995fc-99ad-4184-80b4-3d0a42ac858f + oxp_d55d36d7-df92-4615-944d-440a1f8b5001/crypt/zone d6fee205-15ef-41f9-8719-bc0be41ca283 + oxp_d55d36d7-df92-4615-944d-440a1f8b5001/crypt/zone/oxz_crucible_587be699-a320-4c79-b320-128d9ecddc0b 8879f080-4bd0-4073-ab2f-08e6f289bb4f + oxp_db6686c8-2dd9-4032-8444-2a06b43baa68/crucible e54385d1-cead-4fb6-a28e-c13db4e9561f + oxp_db6686c8-2dd9-4032-8444-2a06b43baa68/crypt/debug 61be50c0-fa4b-405a-86aa-51da8c92580a + oxp_db6686c8-2dd9-4032-8444-2a06b43baa68/crypt/zone c2e8fc9e-40d5-4ba5-b9e6-bd4ac88b0e7b + oxp_db6686c8-2dd9-4032-8444-2a06b43baa68/crypt/zone/oxz_crucible_6fa06115-4959-4913-8e7b-dd70d7651f07 3e03f4d9-b2e7-4176-91e4-dc5771ccc769 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -93,6 +189,54 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163 fake-vendor fake-model serial-f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crucible a79b0ad5-06b8-466c-928c-39e311ace5ff + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/debug c1fc8d09-f44c-4a2e-b989-066f2787d4c1 + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/zone 8aa9c334-3980-4875-b858-b1739848474d + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/zone/oxz_crucible_af322036-371f-437c-8c08-7f40f3f1403b 411e3457-3113-40d2-8a7d-747b108e0de7 + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/zone/oxz_nexus_704e1fed-f8d6-4cfa-a470-bad27fdc06d1 aa37e2bb-8d16-4dc2-a549-5f265fdad77c + oxp_2a94863d-16e2-4535-973b-e98dd47fd18d/crypt/zone/oxz_ntp_47199d48-534c-4267-a654-d2d90e64b498 19bdebd5-9757-409f-ac06-2b309379975e + oxp_32456d15-f5b6-4efc-90c8-dbba979b69cb/crucible 1635dad8-971f-4409-aca3-6204eafec699 + oxp_32456d15-f5b6-4efc-90c8-dbba979b69cb/crypt/debug a9f4142b-b18d-4f1a-8274-6fbf12a10efd + oxp_32456d15-f5b6-4efc-90c8-dbba979b69cb/crypt/zone de88d3ee-683a-4550-99de-aca94b4a276a + oxp_32456d15-f5b6-4efc-90c8-dbba979b69cb/crypt/zone/oxz_crucible_edabedf3-839c-488d-ad6f-508ffa864674 79ce0088-d8a8-46ff-ac72-958b8db65e67 + oxp_416fe9f9-5161-4b0f-9e11-c9d81563ded5/crucible 1b5a2379-ec60-47f0-8def-fa3ab5c2487c + oxp_416fe9f9-5161-4b0f-9e11-c9d81563ded5/crypt/debug 3b94580a-8ff4-4302-8d49-30ff90ef7edc + oxp_416fe9f9-5161-4b0f-9e11-c9d81563ded5/crypt/zone f6df8087-1122-4715-851a-127309740840 + oxp_416fe9f9-5161-4b0f-9e11-c9d81563ded5/crypt/zone/oxz_crucible_d637264f-6f40-44c2-8b7e-a179430210d2 2059b139-6510-4447-aa56-cf995ef469a2 + oxp_4c68800e-23f8-485b-b251-628fd151e445/crucible 4abeefa4-e5ad-46e9-b056-79f5950a5639 + oxp_4c68800e-23f8-485b-b251-628fd151e445/crypt/debug bde5f2d8-ac7d-40e8-b4b7-2cdf1cff6e57 + oxp_4c68800e-23f8-485b-b251-628fd151e445/crypt/zone 882faa8a-7df8-4f67-abba-3d97a2615932 + oxp_4c68800e-23f8-485b-b251-628fd151e445/crypt/zone/oxz_crucible_7a9f60d3-2b66-4547-9b63-7d4f7a8b6382 63337e4d-61a8-4dc7-a322-1442bc19b347 + oxp_9dd87c4d-5fb4-475a-86fa-c0da81a3e00a/crucible b0fcbafd-55cc-49f1-9e02-20503673b34f + oxp_9dd87c4d-5fb4-475a-86fa-c0da81a3e00a/crypt/debug bdf9f107-3a76-4d6a-bea0-5cfb4d3cd6a6 + oxp_9dd87c4d-5fb4-475a-86fa-c0da81a3e00a/crypt/zone 0b216cae-701c-4341-a48a-690543b8e1e9 + oxp_9dd87c4d-5fb4-475a-86fa-c0da81a3e00a/crypt/zone/oxz_crucible_dce226c9-7373-4bfa-8a94-79dc472857a6 2fe942e9-085c-4155-a415-c2dcc19dbd91 + oxp_be93a517-445e-46c2-aa21-3dc526d4a413/crucible eec6f425-d377-42b2-890f-c8c3efe173d1 + oxp_be93a517-445e-46c2-aa21-3dc526d4a413/crypt/debug cc56ea63-0ae3-48ce-8faf-1bd7d83eb148 + oxp_be93a517-445e-46c2-aa21-3dc526d4a413/crypt/zone dce1da41-4cf0-4f70-a9e5-f4b7fad54228 + oxp_be93a517-445e-46c2-aa21-3dc526d4a413/crypt/zone/oxz_crucible_ab7ba6df-d401-40bd-940e-faf57c57aa2a ada776f0-dbb1-4430-a60a-f7462570a19c + oxp_d9344e2b-84d2-4392-84ab-41b86ed02237/crucible a33e3d63-6413-42b2-8cf0-02c774666916 + oxp_d9344e2b-84d2-4392-84ab-41b86ed02237/crypt/debug abe29a15-fef4-47ef-8f08-71645f396213 + oxp_d9344e2b-84d2-4392-84ab-41b86ed02237/crypt/zone 5dd03902-3f33-4f7e-896a-c08d7c6e37f1 + oxp_d9344e2b-84d2-4392-84ab-41b86ed02237/crypt/zone/oxz_crucible_56d5d7cf-db2c-40a3-a775-003241ad4820 35656b97-3eef-46f2-aab0-4d33a3548e62 + oxp_eab188d0-b34a-4673-b254-12e705597654/crucible 4c0303d2-205d-4644-b55a-5c74bbce54c3 + oxp_eab188d0-b34a-4673-b254-12e705597654/crypt/debug 32535344-4e21-4fb3-9c43-f305ac367efb + oxp_eab188d0-b34a-4673-b254-12e705597654/crypt/zone 447cc163-589e-479c-a73d-0071e5dc59bf + oxp_eab188d0-b34a-4673-b254-12e705597654/crypt/zone/oxz_crucible_18f8fe40-646e-4962-b17a-20e201f3a6e5 3b4f5bbb-cc50-49ae-a208-ca88dff1f361 + oxp_f1e0386f-11b6-4cdf-8250-826d256db6b5/crucible 5a210076-5d38-42f0-915c-c09f67ff38af + oxp_f1e0386f-11b6-4cdf-8250-826d256db6b5/crypt/debug 7d983611-ab39-4083-93d0-f57f3ada9a0f + oxp_f1e0386f-11b6-4cdf-8250-826d256db6b5/crypt/zone 0568d976-0079-4d6e-9d1f-a8cfc4b044df + oxp_f1e0386f-11b6-4cdf-8250-826d256db6b5/crypt/zone/oxz_crucible_6af7f4d6-33b6-4eb3-a146-d8e9e4ae9d66 8b82f804-50d1-4e6f-8899-181433d82299 + oxp_f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b/crucible e2de5537-a289-49ac-8a61-65805a35755e + oxp_f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b/crypt/debug 731caeb5-c24f-45b7-aafa-4e747302eaa4 + oxp_f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b/crypt/zone f75ef0e7-663d-4418-99b6-71e2a77a27e3 + oxp_f8c9c9a9-d73e-4cdf-a9af-03cfbbbce12b/crypt/zone/oxz_crucible_93f2f40c-5616-4d8d-8519-ec6debdcede0 226cea90-799d-4f6c-90c6-459d2d7674c1 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -131,6 +275,53 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163 fake-vendor fake-model serial-e6f289fe-142e-4778-8629-dc87adb53f06 + datasets generation 1 -> 2: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_1bb5ee5d-c2c6-4eaa-86c4-817d89cf10cf/crypt/debug bbab775c-07b1-48b1-96a3-9aa155396112 + oxp_1bb5ee5d-c2c6-4eaa-86c4-817d89cf10cf/crypt/zone 07381a6a-e397-4ff9-a2a6-8f1e46c47eb3 + oxp_1bb5ee5d-c2c6-4eaa-86c4-817d89cf10cf/crypt/zone/oxz_ntp_2d73d30e-ca47-46a8-9c12-917d4ab824b6 15e9b1ea-8947-48a2-8d78-54665e4d2f03 + oxp_298d1eec-0313-4a42-8af9-0e51299a14ef/crypt/debug 75c1432c-19e1-4c06-8393-9907a09efcbe + oxp_298d1eec-0313-4a42-8af9-0e51299a14ef/crypt/zone b4c23ac2-86af-4b47-9d8d-35eff7997788 + oxp_2eed666f-a10b-42d0-b626-68335d3270b8/crypt/debug 5501c13c-0500-41a6-9c48-85924383fdcc + oxp_2eed666f-a10b-42d0-b626-68335d3270b8/crypt/zone 32143abb-e501-450b-9398-7d4dbebdf4a1 + oxp_6cc4d7a7-2a89-4f2f-aa55-5e7a10d0fc08/crypt/debug bcdd7a5a-59da-4a47-8a1c-79281428d71b + oxp_6cc4d7a7-2a89-4f2f-aa55-5e7a10d0fc08/crypt/zone 6ec35c5c-9d6c-4d72-8bec-af91069ef7a9 + oxp_7aad6fd9-b698-4c77-af6b-947be10ba953/crypt/debug 8ed9d1a2-3c60-4f38-9e80-5c56d80e67c9 + oxp_7aad6fd9-b698-4c77-af6b-947be10ba953/crypt/zone 8529e7f8-8c11-4869-b330-83ddc45ed17a + oxp_a5a15e51-c48a-40e4-a2d8-1c7198c1d46b/crypt/debug 4aef9a3a-0829-4ada-a0e9-a45c91e74249 + oxp_a5a15e51-c48a-40e4-a2d8-1c7198c1d46b/crypt/zone 940f06cb-822f-4034-8d34-e14bcc6ea998 + oxp_b81d4993-ea5b-4720-b8c8-2360c1121d6e/crypt/debug 2b23d885-836a-4270-886d-08640aae90aa + oxp_b81d4993-ea5b-4720-b8c8-2360c1121d6e/crypt/zone 0507b005-e018-4b69-9d84-50faf61e792f + oxp_d0064c4d-f5f7-4c89-9f37-0ca475048e79/crypt/debug feac64a1-ade2-4f88-8c17-64d2863e2be6 + oxp_d0064c4d-f5f7-4c89-9f37-0ca475048e79/crypt/zone 1acaf776-970a-49cf-9f1c-7d8e3146ef11 + oxp_dba739c1-76e4-4b6a-a173-89c938fa13ef/crypt/debug 91edd9a1-178d-4aa5-83a7-b2f4ef1fc44a + oxp_dba739c1-76e4-4b6a-a173-89c938fa13ef/crypt/zone 1bd5ab24-2a54-438f-bae0-af1b06a3cc41 + oxp_e6f289fe-142e-4778-8629-dc87adb53f06/crypt/debug 8840ccd9-e8c9-48d9-affb-8587e468b204 + oxp_e6f289fe-142e-4778-8629-dc87adb53f06/crypt/zone b501adbf-be36-4724-9409-329f690fb09d ++ oxp_1bb5ee5d-c2c6-4eaa-86c4-817d89cf10cf/crucible c842fd37-6d1b-430c-83c5-bb49523434e3 ++ oxp_1bb5ee5d-c2c6-4eaa-86c4-817d89cf10cf/crypt/zone/oxz_crucible_45556184-7092-4a3d-873f-637976bb133b 88f174e0-09e5-4a04-a21f-4885fc7c776b ++ oxp_298d1eec-0313-4a42-8af9-0e51299a14ef/crucible 33b4b373-748a-44ce-bae3-d08a6f760f88 ++ oxp_298d1eec-0313-4a42-8af9-0e51299a14ef/crypt/zone/oxz_crucible_9d75abfe-47ab-434a-93dd-af50dc0dddde be00a599-be07-4eb1-8d83-c53a9cdc66cc ++ oxp_2eed666f-a10b-42d0-b626-68335d3270b8/crucible 6cd2973c-3e14-433f-ba9b-d06dc973814f ++ oxp_2eed666f-a10b-42d0-b626-68335d3270b8/crypt/zone/oxz_crucible_f86e19d2-9145-41cf-be89-6aaa34a73873 889580ca-b8a3-4b65-a162-5f5257f193c8 ++ oxp_6cc4d7a7-2a89-4f2f-aa55-5e7a10d0fc08/crucible 8f5bdd29-1382-42ea-9e3c-b1ac434b8356 ++ oxp_6cc4d7a7-2a89-4f2f-aa55-5e7a10d0fc08/crypt/zone/oxz_crucible_8215bf7a-10d6-4f40-aeb7-27a196307c37 5acdb519-bb18-4e82-ab44-f2dacfc64ce7 ++ oxp_7aad6fd9-b698-4c77-af6b-947be10ba953/crucible 7cab9095-e83c-46d5-8290-db28ed5d6909 ++ oxp_7aad6fd9-b698-4c77-af6b-947be10ba953/crypt/zone/oxz_crucible_f6125d45-b9cc-4721-ba60-ed4dbb177e41 42a16f5e-9510-48ca-82a7-7229c2cda8c2 ++ oxp_a5a15e51-c48a-40e4-a2d8-1c7198c1d46b/crucible 2503ac08-6839-43c5-a2c3-2b08c234ef5f ++ oxp_a5a15e51-c48a-40e4-a2d8-1c7198c1d46b/crypt/zone/oxz_crucible_a36d291c-7f68-462f-830e-bc29e5841ce2 e079d4a4-8b51-4bf2-9f65-f13cb57584ea ++ oxp_b81d4993-ea5b-4720-b8c8-2360c1121d6e/crucible 47880a38-bb35-4619-80fc-2f4578efb231 ++ oxp_b81d4993-ea5b-4720-b8c8-2360c1121d6e/crypt/zone/oxz_crucible_cf5b636b-a505-4db6-bc32-baf9f53f4371 915d03a8-1902-4f81-9d46-0f1987d7a404 ++ oxp_d0064c4d-f5f7-4c89-9f37-0ca475048e79/crucible f99ff9c5-e110-4972-a6d9-627bb6aae3b8 ++ oxp_d0064c4d-f5f7-4c89-9f37-0ca475048e79/crypt/zone/oxz_crucible_28852beb-d0e5-4cba-9adb-e7f0cd4bb864 bfbfbd9d-c656-4f4c-80cd-c91d38d6bdc9 ++ oxp_dba739c1-76e4-4b6a-a173-89c938fa13ef/crucible c6f0a0c8-8410-47ef-adb8-86e9edc688e5 ++ oxp_dba739c1-76e4-4b6a-a173-89c938fa13ef/crypt/zone/oxz_crucible_b3a4d434-aaee-4752-8c99-69d88fbcb8c5 7a364d04-c4a2-4e2c-8081-c24a276621c5 ++ oxp_e6f289fe-142e-4778-8629-dc87adb53f06/crucible 9aab84cf-3764-4611-892b-76e0570a1699 ++ oxp_e6f289fe-142e-4778-8629-dc87adb53f06/crypt/zone/oxz_crucible_1a20ee3c-f66e-4fca-ab85-2a248aa3d79d 9bbbccf0-a3e1-4d6c-becd-c74a91eef9e8 + + omicron zones generation 2 -> 3: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP diff --git a/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_1_2.txt b/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_1_2.txt index 556ca094e18..b285772c55b 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_1_2.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_1_2.txt @@ -21,6 +21,54 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e fake-vendor fake-model serial-ff7e002b-3ad8-4d45-b03a-c46ef0ac8e59 + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_1e2ec79e-9c11-4133-ac77-e0b994a507d5/crucible 9427caff-29ec-4cd1-981b-26d4a7900052 + oxp_1e2ec79e-9c11-4133-ac77-e0b994a507d5/crypt/debug 454c71e8-ba8d-4afd-af1f-0ceb403e6b6b + oxp_1e2ec79e-9c11-4133-ac77-e0b994a507d5/crypt/zone cbece778-757f-435a-86b1-97a6f4ad5a70 + oxp_1e2ec79e-9c11-4133-ac77-e0b994a507d5/crypt/zone/oxz_crucible_2e65b765-5c41-4519-bf4e-e2a68569afc1 813c6cd2-b100-4481-aaf4-c008f2e81d6f + oxp_1e2ec79e-9c11-4133-ac77-e0b994a507d5/crypt/zone/oxz_nexus_e9bf2525-5fa0-4c1b-b52d-481225083845 1b9c97d6-c90d-4109-b99c-9ab799b3c3b9 + oxp_1e2ec79e-9c11-4133-ac77-e0b994a507d5/crypt/zone/oxz_ntp_ad76d200-5675-444b-b19c-684689ff421f 2a72fbf4-ff92-47a2-a4b9-2a702215c946 + oxp_440ae69d-5e2e-4539-91d0-e2930bdd7203/crucible 67169d16-1b64-4236-8cff-6d06a7ab84cd + oxp_440ae69d-5e2e-4539-91d0-e2930bdd7203/crypt/debug e97a59e3-8f57-42f3-95f5-316f966c5efc + oxp_440ae69d-5e2e-4539-91d0-e2930bdd7203/crypt/zone a0459348-1ea1-4a5f-a821-677ed1c46aa6 + oxp_440ae69d-5e2e-4539-91d0-e2930bdd7203/crypt/zone/oxz_crucible_1ec4cc7b-2f00-4d13-8176-3b9815533ae9 4ed5d6be-14cc-4bb5-b0d3-88a48b539751 + oxp_4e91d4a3-bb6c-44bb-bd4e-bf8913c1ba2b/crucible 13ef9dfc-1881-4517-b518-b94d8b8f196e + oxp_4e91d4a3-bb6c-44bb-bd4e-bf8913c1ba2b/crypt/debug 7f4605b3-1caf-4751-9485-2e9554d9b3b5 + oxp_4e91d4a3-bb6c-44bb-bd4e-bf8913c1ba2b/crypt/zone 64793588-5ff8-42d8-af9d-f7b58a2d1431 + oxp_4e91d4a3-bb6c-44bb-bd4e-bf8913c1ba2b/crypt/zone/oxz_crucible_3d4143df-e212-4774-9258-7d9b421fac2e aba6813b-e60b-44cb-b22f-934bd6e28cf9 + oxp_67de3a80-29cb-4066-b743-e285a2ca1f4e/crucible 6d4bc7b7-5f22-44e5-8578-fba855718b56 + oxp_67de3a80-29cb-4066-b743-e285a2ca1f4e/crypt/debug 7627711f-c877-4892-8bb9-2ab494673bab + oxp_67de3a80-29cb-4066-b743-e285a2ca1f4e/crypt/zone 54954ab8-0874-41f7-9382-02aae6831f4c + oxp_67de3a80-29cb-4066-b743-e285a2ca1f4e/crypt/zone/oxz_crucible_eac6c0a0-baa5-4490-9cee-65198b7fbd9c 1114a853-37f6-4933-8ab1-85ad855145ea + oxp_9139b70f-c1d3-475d-8f02-7c9acba52b2b/crucible 3629f248-3fc1-4073-b21b-6a1529fa204e + oxp_9139b70f-c1d3-475d-8f02-7c9acba52b2b/crypt/debug fb4ac064-d11e-4afb-bfc8-b87c58b71977 + oxp_9139b70f-c1d3-475d-8f02-7c9acba52b2b/crypt/zone 112a7b3e-f24f-4a14-94f2-32a1ad8cdbe3 + oxp_9139b70f-c1d3-475d-8f02-7c9acba52b2b/crypt/zone/oxz_crucible_15dbaa30-1539-49d6-970d-ba5962960f33 b860f342-824e-4f30-960d-7e2fe519b72b + oxp_95fbb110-5272-4646-ab50-21b31b7cde23/crucible 0cf030b7-7c47-4304-8247-1a20e6048554 + oxp_95fbb110-5272-4646-ab50-21b31b7cde23/crypt/debug d48badf3-3993-44a5-809c-4eacad8fb929 + oxp_95fbb110-5272-4646-ab50-21b31b7cde23/crypt/zone 73542884-3a70-4acc-a474-b7d361e79909 + oxp_95fbb110-5272-4646-ab50-21b31b7cde23/crypt/zone/oxz_crucible_70232a6d-6c9d-4fa6-a34d-9c73d940db33 0d862983-16aa-4d85-a6f3-78de73b063bb + oxp_9bf35cd7-4938-4c34-8189-288b3195cb64/crucible 8ee49248-8d40-4637-8aad-049c9b312bf2 + oxp_9bf35cd7-4938-4c34-8189-288b3195cb64/crypt/debug 84488b5f-690c-4a21-b14a-9288eaa54488 + oxp_9bf35cd7-4938-4c34-8189-288b3195cb64/crypt/zone d86839e1-e253-4ae2-b1ac-03b7020614cd + oxp_9bf35cd7-4938-4c34-8189-288b3195cb64/crypt/zone/oxz_crucible_8b0b8623-930a-41af-9f9b-ca28b1b11139 07f839aa-beb9-4730-b8eb-7b52a2e40872 + oxp_9d833141-18a1-4f24-8a34-6076c026aa87/crucible fb826e91-9b48-433e-9fc4-dbe56982f94a + oxp_9d833141-18a1-4f24-8a34-6076c026aa87/crypt/debug b1144b57-1e79-41a6-ae1b-9676d777f628 + oxp_9d833141-18a1-4f24-8a34-6076c026aa87/crypt/zone fe27d4c5-cb2b-461c-a03b-3cd163682098 + oxp_9d833141-18a1-4f24-8a34-6076c026aa87/crypt/zone/oxz_crucible_5d9d8fa7-8379-470b-90ba-fe84a3c45512 f39b842a-f73c-4aae-a5ac-fc707fa49dca + oxp_a279461f-a7b9-413f-a79f-cb4dab4c3fce/crucible cbd086a5-8730-49ce-983f-a870416589e5 + oxp_a279461f-a7b9-413f-a79f-cb4dab4c3fce/crypt/debug 141811b6-c055-46b9-9a20-7c6265d507ee + oxp_a279461f-a7b9-413f-a79f-cb4dab4c3fce/crypt/zone 96883b04-1e79-4c38-a0e9-6eaa806df51e + oxp_a279461f-a7b9-413f-a79f-cb4dab4c3fce/crypt/zone/oxz_crucible_cf87d2a3-d323-44a3-a87e-adc4ef6c75f4 67c894bc-e684-42e7-8bc8-1fe86356165e + oxp_ff7e002b-3ad8-4d45-b03a-c46ef0ac8e59/crucible cf4285e6-acd6-4bd6-80a7-4d28c1f1d543 + oxp_ff7e002b-3ad8-4d45-b03a-c46ef0ac8e59/crypt/debug b55242c9-3e0c-4bb9-b702-0d94893388a3 + oxp_ff7e002b-3ad8-4d45-b03a-c46ef0ac8e59/crypt/zone f631d6a1-9db5-4fc7-978b-9ace485dfe16 + oxp_ff7e002b-3ad8-4d45-b03a-c46ef0ac8e59/crypt/zone/oxz_crucible_8567a616-a709-4c8c-a323-4474675dad5c dcc8dea5-c5a2-4559-8629-0015a3b4820e + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -59,6 +107,54 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e - fake-vendor fake-model serial-ffea118f-7715-4e21-8fc5-bb23cd0f59e8 + datasets from generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- +- oxp_069446b4-7881-49dc-838a-63a782d4896d/crucible 3cc40210-6bf9-45fb-ac4b-8cae1c1529af +- oxp_069446b4-7881-49dc-838a-63a782d4896d/crypt/debug d01cbfd4-5f98-4f95-b362-7145429d3228 +- oxp_069446b4-7881-49dc-838a-63a782d4896d/crypt/zone bf59eede-81b0-4acb-b923-33681a92a14f +- oxp_069446b4-7881-49dc-838a-63a782d4896d/crypt/zone/oxz_crucible_4e36b7ef-5684-4304-b7c3-3c31aaf83d4f 418538c2-112c-4bd6-9d02-054b08a79438 +- oxp_069446b4-7881-49dc-838a-63a782d4896d/crypt/zone/oxz_nexus_6a70a233-1900-43c0-9c00-aa9d1f7adfbc 8ac37626-6bbc-4fe7-9c95-8dbbc91c0dbe +- oxp_069446b4-7881-49dc-838a-63a782d4896d/crypt/zone/oxz_ntp_c62b87b6-b98d-4d22-ba4f-cee4499e2ba8 a351cc88-3b88-4408-ba57-098c1b610ffb +- oxp_20eba316-dffe-4516-9703-af561da19b0b/crucible cf3c6633-2c48-4963-a40d-acac89939915 +- oxp_20eba316-dffe-4516-9703-af561da19b0b/crypt/debug 2cd129ba-90d2-4e0a-8de9-8779430bfd52 +- oxp_20eba316-dffe-4516-9703-af561da19b0b/crypt/zone 4e2be862-e2c1-4d37-ac57-34ceea106a0c +- oxp_20eba316-dffe-4516-9703-af561da19b0b/crypt/zone/oxz_crucible_f231e4eb-3fc9-4964-9d71-2c41644852d9 b181a265-ccea-42ca-9259-aa405fb48d6f +- oxp_426f4b6d-4a82-4106-bf4b-64ee86a2a5a4/crucible da2dd11a-9022-4c2b-ad8b-f5650f223449 +- oxp_426f4b6d-4a82-4106-bf4b-64ee86a2a5a4/crypt/debug 15227fcb-319a-491f-bb0c-8d245bec4e58 +- oxp_426f4b6d-4a82-4106-bf4b-64ee86a2a5a4/crypt/zone 07f06a1f-bb55-4e72-a84f-bb1cfd5d18a6 +- oxp_426f4b6d-4a82-4106-bf4b-64ee86a2a5a4/crypt/zone/oxz_crucible_f11f5c60-1ac7-4630-9a3a-a9bc85c75203 2efbbe4f-8548-4890-9f40-1bf099cf795e +- oxp_82daeef2-8641-4bf5-ac66-f7b5f62c48b6/crucible 88c2e536-57af-4402-99dd-cfaca1862b41 +- oxp_82daeef2-8641-4bf5-ac66-f7b5f62c48b6/crypt/debug 9dc58815-aa5b-409a-98e7-7cbf92b17819 +- oxp_82daeef2-8641-4bf5-ac66-f7b5f62c48b6/crypt/zone 3dda6519-98a6-4943-b4e0-daf82b36526a +- oxp_82daeef2-8641-4bf5-ac66-f7b5f62c48b6/crypt/zone/oxz_crucible_e29998e7-9ed2-46b6-bb70-4118159fe07f a9524f87-1bd8-4a3c-b7bd-e3c19a14fb50 +- oxp_8e5feeb2-14f1-440f-a909-3c34aa8e129b/crucible d3e92497-a1c6-4aae-a192-21762cb35207 +- oxp_8e5feeb2-14f1-440f-a909-3c34aa8e129b/crypt/debug 56e40972-948d-4900-9d19-9d62b1983f43 +- oxp_8e5feeb2-14f1-440f-a909-3c34aa8e129b/crypt/zone 064e7ade-7e0a-471c-9743-752a215d7f5c +- oxp_8e5feeb2-14f1-440f-a909-3c34aa8e129b/crypt/zone/oxz_crucible_1e1ed0cc-1adc-410f-943a-d1a3107de619 5743004a-db46-4e84-b826-d860619dc063 +- oxp_942e2123-7c4e-4f6b-9317-1341fe212647/crucible 6f1e99c9-4934-48f5-8b63-e0836d784bdc +- oxp_942e2123-7c4e-4f6b-9317-1341fe212647/crypt/debug 81489861-36ab-4513-a5bb-953d3980974d +- oxp_942e2123-7c4e-4f6b-9317-1341fe212647/crypt/zone 5d9ec6b2-c3ad-4588-a8e3-4ad1c0d83643 +- oxp_942e2123-7c4e-4f6b-9317-1341fe212647/crypt/zone/oxz_crucible_2307bbed-02ba-493b-89e3-46585c74c8fc ed196541-0958-4fc0-8cf8-6da4c522e620 +- oxp_97a5ce17-df5b-47e7-baf8-80ae710ce18e/crucible 5d1bf2c0-daab-4ec6-91c1-cd405da49ab9 +- oxp_97a5ce17-df5b-47e7-baf8-80ae710ce18e/crypt/debug 59d4773a-d49c-4c28-acc6-92d80beb18f6 +- oxp_97a5ce17-df5b-47e7-baf8-80ae710ce18e/crypt/zone 0fe8f233-160a-421b-aba6-1274f95ba79c +- oxp_97a5ce17-df5b-47e7-baf8-80ae710ce18e/crypt/zone/oxz_crucible_c28d7b4b-a259-45ad-945d-f19ca3c6964c ff266774-5999-4631-a516-3f2f9a05f688 +- oxp_debc9fb6-bd58-4e4f-b8b8-6a9a07fcf25d/crucible 1cebd581-aab7-42d5-a8a2-15b3e2f55e23 +- oxp_debc9fb6-bd58-4e4f-b8b8-6a9a07fcf25d/crypt/debug 433a21ac-1830-42ed-991b-18976ebf312f +- oxp_debc9fb6-bd58-4e4f-b8b8-6a9a07fcf25d/crypt/zone d8d25341-34f7-4b98-b6e9-252c06a079fc +- oxp_debc9fb6-bd58-4e4f-b8b8-6a9a07fcf25d/crypt/zone/oxz_crucible_9179d6dc-387d-424e-8d62-ed59b2c728f6 db626d31-b4a3-4b81-970d-cfa469c5d2ff +- oxp_f63a32a9-0659-43cf-8efc-8f34e7af9d45/crucible 5c06fe50-9fe1-44e1-85c2-38ba11e4495b +- oxp_f63a32a9-0659-43cf-8efc-8f34e7af9d45/crypt/debug 3568368a-2a70-4300-b689-3ec8d0bc8f71 +- oxp_f63a32a9-0659-43cf-8efc-8f34e7af9d45/crypt/zone 5073b1d2-6dcb-4a42-afb8-c6dd74f50201 +- oxp_f63a32a9-0659-43cf-8efc-8f34e7af9d45/crypt/zone/oxz_crucible_f06e91a1-0c17-4cca-adbc-1c9b67bdb11d 33c2c71f-d4d7-4357-ba2a-eb9d5d8aa0f5 +- oxp_ffea118f-7715-4e21-8fc5-bb23cd0f59e8/crucible ed7d0891-d558-4c30-8d73-9594ae70b061 +- oxp_ffea118f-7715-4e21-8fc5-bb23cd0f59e8/crypt/debug c84f4ae2-e449-4980-acdd-b3a5ac7e506a +- oxp_ffea118f-7715-4e21-8fc5-bb23cd0f59e8/crypt/zone af81321c-23c6-4491-88a8-8eb5534aa8d8 +- oxp_ffea118f-7715-4e21-8fc5-bb23cd0f59e8/crypt/zone/oxz_crucible_603e629d-2599-400e-b879-4134d4cc426e 040dc13c-0267-430a-b20d-89fd0f000f0b + + omicron zones generation 2 -> 3: ------------------------------------------------------------------------------------------- zone type zone id disposition underlay IP @@ -107,6 +203,55 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e fake-vendor fake-model serial-99e926d6-bd42-4cde-9f63-5ecc7ea14322 + datasets generation 1 -> 2: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_07068f19-1ff2-48da-8e72-874780df2339/crucible 8d86f556-b74e-43f9-87ab-13f0b8d38a66 + oxp_07068f19-1ff2-48da-8e72-874780df2339/crypt/debug 6dfbbad9-2860-4547-8962-35224ff3251a + oxp_07068f19-1ff2-48da-8e72-874780df2339/crypt/zone 5159978d-1d63-4c7a-935f-819c39c4b15b + oxp_07068f19-1ff2-48da-8e72-874780df2339/crypt/zone/oxz_crucible_4f8ce495-21dd-48a1-859c-80d34ce394ed b5203528-903b-4e16-bd00-13147a83a712 + oxp_07068f19-1ff2-48da-8e72-874780df2339/crypt/zone/oxz_nexus_99c6401d-9796-4ae1-bf0c-9a097cf21c33 4dc29bec-f01c-4998-b755-46226bce0aa5 + oxp_07068f19-1ff2-48da-8e72-874780df2339/crypt/zone/oxz_ntp_f68846ad-4619-4747-8293-a2b4aeeafc5b 5a3f0c96-a125-4cc0-9e84-fb5551fe557e + oxp_0f12e6ee-41d2-4eb0-813f-ba5240900ded/crucible bbd3ec95-304c-4e3a-af36-e30990c697a5 + oxp_0f12e6ee-41d2-4eb0-813f-ba5240900ded/crypt/debug eed07a8f-8a64-46fc-9ee8-dff2e610b655 + oxp_0f12e6ee-41d2-4eb0-813f-ba5240900ded/crypt/zone c358c3ef-daa8-4b2d-8c5d-fd760798fcd8 + oxp_0f12e6ee-41d2-4eb0-813f-ba5240900ded/crypt/zone/oxz_crucible_a1ae92ac-e1f1-4654-ab54-5b75ba7c44d6 23c24e8b-87ac-4462-a27d-1bbdb74b7ba3 + oxp_0fdb4a39-3cd5-47a0-9064-e7f3c285af61/crucible 9bdf76dc-8c49-4a8c-85e9-23b70d9d090e + oxp_0fdb4a39-3cd5-47a0-9064-e7f3c285af61/crypt/debug de262cbb-4a71-4f24-a483-1d190bb1fc49 + oxp_0fdb4a39-3cd5-47a0-9064-e7f3c285af61/crypt/zone fbc90cb1-5616-48cc-8b13-89acd5209f4f + oxp_0fdb4a39-3cd5-47a0-9064-e7f3c285af61/crypt/zone/oxz_crucible_a308d3e1-118c-440a-947a-8b6ab7d833ab e9ae4c7d-4721-49de-bf6d-8ecec30c3ebb + oxp_13572832-83ad-40d6-896a-751f7e53f4f6/crucible 5f868bf8-8770-4f07-a620-af7dee8062d6 + oxp_13572832-83ad-40d6-896a-751f7e53f4f6/crypt/debug 1c597048-bc3f-46d5-94cb-3507ada774e3 + oxp_13572832-83ad-40d6-896a-751f7e53f4f6/crypt/zone 0aa0ec68-c208-4d91-beec-cfb7fdc33895 + oxp_13572832-83ad-40d6-896a-751f7e53f4f6/crypt/zone/oxz_crucible_c552280f-ba02-4f8d-9049-bd269e6b7845 a26ebbdb-38b4-4921-9186-3b1e1fb7cbc2 + oxp_3602bdd9-f7bb-4490-87a6-8f061f7712f5/crucible af7470be-9bc4-4d4b-8634-66fb0771fecc + oxp_3602bdd9-f7bb-4490-87a6-8f061f7712f5/crypt/debug 9ed7b9ab-dc13-4179-b867-08d23156253a + oxp_3602bdd9-f7bb-4490-87a6-8f061f7712f5/crypt/zone 0a1e8f41-ffe6-4a4e-98de-a84217fddd4a + oxp_3602bdd9-f7bb-4490-87a6-8f061f7712f5/crypt/zone/oxz_crucible_e6d0df1f-9f98-4c5a-9540-8444d1185c7d 9428edca-e834-4512-b888-e399103343db + oxp_65707837-95a4-45d7-84e6-8b9a4da215f1/crucible 67788d73-161d-4331-b68b-5799dc103acb + oxp_65707837-95a4-45d7-84e6-8b9a4da215f1/crypt/debug 3dad2cc1-25cc-401e-9763-47001a1acc17 + oxp_65707837-95a4-45d7-84e6-8b9a4da215f1/crypt/zone 7a3d49fb-56fd-4e30-b1ca-7c9d6a1fdbfc + oxp_65707837-95a4-45d7-84e6-8b9a4da215f1/crypt/zone/oxz_crucible_5c78756d-6182-4c27-a507-3419e8dbe76b f8eb44eb-00bd-416b-99e9-2539a7469963 + oxp_7a43b2b0-3846-401c-8317-d555715a00f7/crucible 66fd473e-6927-45fa-93e0-6bff82f9c3df + oxp_7a43b2b0-3846-401c-8317-d555715a00f7/crypt/debug 55da940b-ae9a-4c93-87ea-4845c66dbe1c + oxp_7a43b2b0-3846-401c-8317-d555715a00f7/crypt/zone caa4bf8a-ccd5-4ebf-b5c0-8c3664c69738 + oxp_7a43b2b0-3846-401c-8317-d555715a00f7/crypt/zone/oxz_crucible_b7402110-d88f-4ca4-8391-4a2fda6ad271 ea21aba9-6e79-4e20-8e35-92cd9fbba41c + oxp_855e3ef1-6929-4e21-8451-0e62bd93c7c9/crucible e45274bc-8d11-4ffc-89bd-3d17a9bb629e + oxp_855e3ef1-6929-4e21-8451-0e62bd93c7c9/crypt/debug f37b9916-d47a-4fda-9385-2031a73b7a0e + oxp_855e3ef1-6929-4e21-8451-0e62bd93c7c9/crypt/zone 2a95cee2-ff4f-4400-81ac-46df69443c68 + oxp_855e3ef1-6929-4e21-8451-0e62bd93c7c9/crypt/zone/oxz_crucible_0e2b035e-1de1-48af-8ac0-5316418e3de1 b350b7d8-66cc-4d54-b480-1884c791a6d9 + oxp_8adcf329-4cee-4075-b798-28b5add1edf5/crucible b0ff583d-a6fd-4298-8093-ab54f1eaac30 + oxp_8adcf329-4cee-4075-b798-28b5add1edf5/crypt/debug aa333d9a-908b-4e2e-a476-a000e6f2fe25 + oxp_8adcf329-4cee-4075-b798-28b5add1edf5/crypt/zone 6dcb997c-6e19-4c31-9c0e-a5d41f66963f + oxp_8adcf329-4cee-4075-b798-28b5add1edf5/crypt/zone/oxz_crucible_b7ae596e-0c85-40b2-bb47-df9f76db3cca 9020f7d3-2bfc-4af4-a339-c60d233266cd + oxp_99e926d6-bd42-4cde-9f63-5ecc7ea14322/crucible 85bee553-3b86-489f-9b90-d45a26de1a8b + oxp_99e926d6-bd42-4cde-9f63-5ecc7ea14322/crypt/debug eb939b53-6b86-44ae-b3bb-f4fc3111278d + oxp_99e926d6-bd42-4cde-9f63-5ecc7ea14322/crypt/zone f92429b2-b8fe-4a95-9a29-ca8ffe0d51f8 + oxp_99e926d6-bd42-4cde-9f63-5ecc7ea14322/crypt/zone/oxz_crucible_cf13b878-47f1-4ba0-b8c2-9f3e15f2ee87 87d29998-7d01-420b-97c6-f02067fb96ba ++ oxp_07068f19-1ff2-48da-8e72-874780df2339/crypt/zone/oxz_nexus_c8851a11-a4f7-4b21-9281-6182fd15dc8d 60d5c18d-6940-48eb-b36c-7f0b6ef55463 + + omicron zones generation 2 -> 3: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP diff --git a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_1_2.txt b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_1_2.txt index d3f667170ce..9263c0360db 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_1_2.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_1_2.txt @@ -21,6 +21,54 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 fake-vendor fake-model serial-d1ebfd7b-3842-4ad7-be31-2b9c031209a9 + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crucible d577ac11-62ac-4a71-bed7-e7327148bd33 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/debug d6d36f6b-35ff-4766-99de-44abe46932d1 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/zone 18e2a336-9b65-421e-8409-04d9abce8cd6 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/zone/oxz_crucible_93b137a1-a1d6-4b5b-b2cb-21a9f11e2883 d1a755ac-dafc-4087-a0ce-ee8b3f882ac1 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/zone/oxz_nexus_6dff7633-66bb-4924-a6ff-2c896e66964b 9dce1e52-8e3b-4641-9982-69deb049f647 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/zone/oxz_ntp_7f4e9f9f-08f8-4d14-885d-e977c05525ad 7773ffbd-1842-4425-aff5-88f577cd8955 + oxp_44cdb6f2-fa6c-4b69-bab2-3ae4e1ec4b34/crucible b9aa1175-2640-4923-81b3-1e1469b15abf + oxp_44cdb6f2-fa6c-4b69-bab2-3ae4e1ec4b34/crypt/debug 26154290-91f7-4f35-bcd0-ec7a8f398d82 + oxp_44cdb6f2-fa6c-4b69-bab2-3ae4e1ec4b34/crypt/zone c37902cf-d1fe-4370-baef-b7de8731dffe + oxp_44cdb6f2-fa6c-4b69-bab2-3ae4e1ec4b34/crypt/zone/oxz_crucible_c406da50-34b9-4bb4-a460-8f49875d2a6a f47f67f6-e315-4272-b93a-b467cfdfbb7a + oxp_4de5fc8e-0e41-4ab9-ba12-2dc63882c96a/crucible 68724637-d228-4faa-a19f-b5df857ff4ab + oxp_4de5fc8e-0e41-4ab9-ba12-2dc63882c96a/crypt/debug 6dc5df73-7e44-4065-9f14-70a0d965a853 + oxp_4de5fc8e-0e41-4ab9-ba12-2dc63882c96a/crypt/zone 00c2d1d6-94da-4985-a144-2194588afecf + oxp_4de5fc8e-0e41-4ab9-ba12-2dc63882c96a/crypt/zone/oxz_crucible_9f0abbad-dbd3-4d43-9675-78092217ffd9 da62be58-643f-4497-a9d7-e259de6c7a12 + oxp_51564e7a-d69f-4942-bcfe-330224633ca6/crucible 51229ad8-cda3-40c4-b0f3-b1af669abcd4 + oxp_51564e7a-d69f-4942-bcfe-330224633ca6/crypt/debug 3063bdcc-4363-495b-a81f-67c6cc437a75 + oxp_51564e7a-d69f-4942-bcfe-330224633ca6/crypt/zone 3527b52f-f1d4-4e2f-b41e-559f58657839 + oxp_51564e7a-d69f-4942-bcfe-330224633ca6/crypt/zone/oxz_crucible_19fbc4f8-a683-4f22-8f5a-e74782b935be 79a16369-70ab-4f63-af6d-1c7f088eeee3 + oxp_5ca23cb3-cc90-41c5-a474-01898cdd0796/crucible 5d8788c0-13df-4c07-a8b2-b9365fec9796 + oxp_5ca23cb3-cc90-41c5-a474-01898cdd0796/crypt/debug 53deebeb-3952-483a-afd2-2202cee9c33b + oxp_5ca23cb3-cc90-41c5-a474-01898cdd0796/crypt/zone 22581703-157c-474f-bbf3-34f076dd7bca + oxp_5ca23cb3-cc90-41c5-a474-01898cdd0796/crypt/zone/oxz_crucible_6b53ab2e-d98c-485f-87a3-4d5df595390f ac31a04c-1f3a-43f4-b45a-cf4b5176e7f6 + oxp_6a23a532-0712-4a8d-be9b-e8c17e97aa4b/crucible 82fc150e-d6f5-4bb6-8eee-17a0728aadb5 + oxp_6a23a532-0712-4a8d-be9b-e8c17e97aa4b/crypt/debug e315743d-53e3-4505-9364-657c2486a1bb + oxp_6a23a532-0712-4a8d-be9b-e8c17e97aa4b/crypt/zone 4d6e70b1-ff91-4133-b65f-6fcd5bda2568 + oxp_6a23a532-0712-4a8d-be9b-e8c17e97aa4b/crypt/zone/oxz_crucible_b0c63f48-01ea-4aae-bb26-fb0dd59d1662 b92bba84-9437-4f93-8ad0-80bf7ecdae5f + oxp_6f1a330e-e8d4-4c09-97fc-8918b69b2a3c/crucible 68217627-4519-4cfa-85b9-25efb4dad71a + oxp_6f1a330e-e8d4-4c09-97fc-8918b69b2a3c/crypt/debug 2e901ffa-895b-4405-b59a-2bcdfabda681 + oxp_6f1a330e-e8d4-4c09-97fc-8918b69b2a3c/crypt/zone 41e55e8a-ca4b-4c27-8337-57d42cc36fb5 + oxp_6f1a330e-e8d4-4c09-97fc-8918b69b2a3c/crypt/zone/oxz_crucible_f55e6aaf-e8fc-4913-9e3c-8cd1bd4bdad3 dedbf4e7-32fb-406e-a5cc-a2f5281aa6d8 + oxp_7113d104-fb55-4299-bf53-b3c59d258e44/crucible a602c9d4-16a9-4e55-b5de-76fb33cc4ca9 + oxp_7113d104-fb55-4299-bf53-b3c59d258e44/crypt/debug ee20f8cb-7d24-422b-9dff-ca4c9596191f + oxp_7113d104-fb55-4299-bf53-b3c59d258e44/crypt/zone ae6c87ea-dc50-4a15-855a-224300f20c74 + oxp_7113d104-fb55-4299-bf53-b3c59d258e44/crypt/zone/oxz_crucible_d660d7ed-28c0-45ae-9ace-dc3ecf7e8786 b2c9f282-e767-4df1-941e-b7cea21b1a02 + oxp_8c10be49-3a66-40d4-a082-64d09d916f14/crucible ef14767b-6be7-44cb-833d-27d9f523dcdb + oxp_8c10be49-3a66-40d4-a082-64d09d916f14/crypt/debug 84bc6d3f-2d9c-42b3-9982-7394630a0928 + oxp_8c10be49-3a66-40d4-a082-64d09d916f14/crypt/zone 3fc37e5a-3bf3-476f-8a8f-6d32a533cfc0 + oxp_8c10be49-3a66-40d4-a082-64d09d916f14/crypt/zone/oxz_crucible_e98cc0de-abf6-4da4-a20d-d05c7a9bb1d7 47cf951d-ca5c-4ae0-baa3-94472efbcf03 + oxp_d1ebfd7b-3842-4ad7-be31-2b9c031209a9/crucible d63be5b2-5471-4f4d-accc-82e2a0d7276f + oxp_d1ebfd7b-3842-4ad7-be31-2b9c031209a9/crypt/debug 0c11d380-038c-4b68-b9f4-1775f6fec1e8 + oxp_d1ebfd7b-3842-4ad7-be31-2b9c031209a9/crypt/zone 64a64a7b-0d29-4470-bc96-4796ca357507 + oxp_d1ebfd7b-3842-4ad7-be31-2b9c031209a9/crypt/zone/oxz_crucible_4f1ce8a2-d3a5-4a38-be4c-9817de52db37 9390bde4-2073-44b4-a496-5129c7e5ca40 + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -59,6 +107,54 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 - fake-vendor fake-model serial-ef64ff6d-250d-47ac-8686-e696cfb46966 + datasets from generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- +- oxp_22930645-144a-415c-bceb-2dbfafb9c29e/crucible 98a2efcf-db1a-46a1-a4b9-01cf83b48e56 +- oxp_22930645-144a-415c-bceb-2dbfafb9c29e/crypt/debug 5ffb2b84-4a3f-444a-aebf-381f8c58b7ae +- oxp_22930645-144a-415c-bceb-2dbfafb9c29e/crypt/zone 05a77359-0a07-4976-8fbb-5f1eee688e47 +- oxp_22930645-144a-415c-bceb-2dbfafb9c29e/crypt/zone/oxz_crucible_67622d61-2df4-414d-aa0e-d1277265f405 6551d496-8da9-4d11-9be2-7fc3a49f4759 +- oxp_22930645-144a-415c-bceb-2dbfafb9c29e/crypt/zone/oxz_nexus_2aa0ea4f-3561-4989-a98c-9ab7d9a240fb 941ef258-4015-4176-bbc0-5fa323fe2802 +- oxp_22930645-144a-415c-bceb-2dbfafb9c29e/crypt/zone/oxz_ntp_67d913e0-0005-4599-9b28-0abbf6cc2916 b916b8aa-73b5-433d-ab69-fe3166cc6574 +- oxp_24155070-8a43-4244-a3ba-853d8c71972d/crucible 11a058db-758a-4fda-beb8-be18fcf2df25 +- oxp_24155070-8a43-4244-a3ba-853d8c71972d/crypt/debug d72ffc3a-4665-40bc-a099-ebe628622636 +- oxp_24155070-8a43-4244-a3ba-853d8c71972d/crypt/zone 6dbd0e11-89af-4464-bd84-c20cb818a9d5 +- oxp_24155070-8a43-4244-a3ba-853d8c71972d/crypt/zone/oxz_crucible_56ac1706-9e2a-49ba-bd6f-a99c44cb2ccb db457b0d-72f5-47c9-a86c-f9c2c4d3064b +- oxp_494782c7-3821-4f49-918b-ce42cc4d18ad/crucible b79f5a18-1ea5-46cd-b002-3d7f860bd444 +- oxp_494782c7-3821-4f49-918b-ce42cc4d18ad/crypt/debug 39185a78-064c-49d5-b716-93f1a312c0c1 +- oxp_494782c7-3821-4f49-918b-ce42cc4d18ad/crypt/zone 2277b21f-9c43-4537-b63b-82b9c66bc022 +- oxp_494782c7-3821-4f49-918b-ce42cc4d18ad/crypt/zone/oxz_crucible_0dcfdfc5-481e-4153-b97c-11cf02b648ea 23d48cd2-e829-496c-b4df-a05d30d4fcad +- oxp_6ea8a67f-d27d-472b-844c-6c8245b00e2b/crucible 8d1d1315-00a3-4cb0-b3c2-7f3f224d63ba +- oxp_6ea8a67f-d27d-472b-844c-6c8245b00e2b/crypt/debug 5884d02b-a463-45ba-8e99-660ec63d2779 +- oxp_6ea8a67f-d27d-472b-844c-6c8245b00e2b/crypt/zone cadb7c95-f233-4033-b0fe-a7b997245722 +- oxp_6ea8a67f-d27d-472b-844c-6c8245b00e2b/crypt/zone/oxz_crucible_d6ee1338-3127-43ec-9aaa-b973ccf05496 6f1c7df6-6a3b-433e-b376-d1b8b5cf4d5e +- oxp_77565d57-c235-4905-b3c7-32d1c2ca2c44/crucible 8dead13f-23ec-47db-95bf-8ac7c15ec0bf +- oxp_77565d57-c235-4905-b3c7-32d1c2ca2c44/crypt/debug 2b630e70-1cd8-4142-aee9-7067b6fe3ef3 +- oxp_77565d57-c235-4905-b3c7-32d1c2ca2c44/crypt/zone 988e1f23-ecca-487a-aec7-089593a043cc +- oxp_77565d57-c235-4905-b3c7-32d1c2ca2c44/crypt/zone/oxz_crucible_2f5e8010-a94d-43a4-9c5c-3f52832f5f7f c36945af-cdba-45d8-941f-09c5bea2658e +- oxp_8746874c-dc3b-4454-93cd-2a8fc13720fe/crucible 8a70b0f8-2021-46ac-b57e-62ed57442c2e +- oxp_8746874c-dc3b-4454-93cd-2a8fc13720fe/crypt/debug 04c9bd23-0d9f-4a36-a442-42b9e3c54179 +- oxp_8746874c-dc3b-4454-93cd-2a8fc13720fe/crypt/zone b26bab43-3760-4418-a6ab-47e01b267a1d +- oxp_8746874c-dc3b-4454-93cd-2a8fc13720fe/crypt/zone/oxz_crucible_4a9a0a9d-87f0-4f1d-9181-27f6b435e637 f49fa95b-4d2d-4ea3-a9ff-5ed73bf29a7f +- oxp_a42c5a67-6e10-4586-a56e-48bb8260e75f/crucible 0c7a0040-a420-4c46-a43f-cf531b30218b +- oxp_a42c5a67-6e10-4586-a56e-48bb8260e75f/crypt/debug 38e45596-3b96-4ab9-bf80-274dded9157a +- oxp_a42c5a67-6e10-4586-a56e-48bb8260e75f/crypt/zone f1299161-15fd-424f-a739-6263c314ba90 +- oxp_a42c5a67-6e10-4586-a56e-48bb8260e75f/crypt/zone/oxz_crucible_e39d7c9e-182b-48af-af87-58079d723583 73830784-d10d-489b-9e08-41f96e8ae130 +- oxp_ca89b120-7bcd-4eeb-baa7-71031fbd103b/crucible b47d4afb-fa04-4f3a-9816-fa83714b211f +- oxp_ca89b120-7bcd-4eeb-baa7-71031fbd103b/crypt/debug dc86fcab-2838-4b6c-bea3-3cb0fcec846a +- oxp_ca89b120-7bcd-4eeb-baa7-71031fbd103b/crypt/zone 86573b1f-e557-4da1-b7e2-3f3b42dba8de +- oxp_ca89b120-7bcd-4eeb-baa7-71031fbd103b/crypt/zone/oxz_crucible_b91b271d-8d80-4f49-99a0-34006ae86063 4dc23347-b0aa-4705-a309-1baf57f222f2 +- oxp_ef61aa97-c862-428c-82f3-0a69a50d6155/crucible 56f99204-06fc-41fb-8f0c-456c7e97b034 +- oxp_ef61aa97-c862-428c-82f3-0a69a50d6155/crypt/debug 97735f9a-4a36-4f9a-97f5-900204167d44 +- oxp_ef61aa97-c862-428c-82f3-0a69a50d6155/crypt/zone 86a8f677-e4d5-466a-bffb-60d653e91ce5 +- oxp_ef61aa97-c862-428c-82f3-0a69a50d6155/crypt/zone/oxz_crucible_f69f92a1-5007-4bb0-a85b-604dc217154b 035d0068-1470-4491-900a-e8812e10376f +- oxp_ef64ff6d-250d-47ac-8686-e696cfb46966/crucible c310b273-8e72-40e1-8f07-a52d2b7532f3 +- oxp_ef64ff6d-250d-47ac-8686-e696cfb46966/crypt/debug 619c6140-1d63-495b-a5e4-be8f1fefe5ed +- oxp_ef64ff6d-250d-47ac-8686-e696cfb46966/crypt/zone 0043d0b0-c24e-4858-afa3-2e3ae2a99a78 +- oxp_ef64ff6d-250d-47ac-8686-e696cfb46966/crypt/zone/oxz_crucible_094f27af-1acb-4d1e-ba97-1fc1377d4bf2 a916c527-eca0-4df7-b38e-76f4f7915656 + + omicron zones generation 2 -> 3: ------------------------------------------------------------------------------------------- zone type zone id disposition underlay IP @@ -107,6 +203,54 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 - fake-vendor fake-model serial-d56b0c9f-0e57-43d8-a1ac-8b4d2c303c29 + datasets from generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- +- oxp_09a5de95-c15f-486e-b776-fca62bf5e179/crucible b7dab9eb-f509-4e87-976a-aba0d11578a8 +- oxp_09a5de95-c15f-486e-b776-fca62bf5e179/crypt/debug ff5950ed-1acc-477f-a9c1-f660161943f4 +- oxp_09a5de95-c15f-486e-b776-fca62bf5e179/crypt/zone b5844aab-20fe-47c8-8b1d-d2e4b2e75702 +- oxp_09a5de95-c15f-486e-b776-fca62bf5e179/crypt/zone/oxz_crucible_47a87c6e-ef45-4d52-9a3e-69cdd96737cc ac76ddfb-dafd-47fb-87c7-abee8b82f6bd +- oxp_09a5de95-c15f-486e-b776-fca62bf5e179/crypt/zone/oxz_nexus_01d58626-e1b0-480f-96be-ac784863c7dc 1ed89b99-e4e5-4873-8ab3-f68285365c8c +- oxp_09a5de95-c15f-486e-b776-fca62bf5e179/crypt/zone/oxz_ntp_f3f2e4f3-0985-4ef6-8336-ce479382d05d d5497445-1e12-4497-94e5-087fc82cce67 +- oxp_11b8eccf-7c78-4bde-8639-b35a83082a95/crucible bf566572-3446-46c4-ba77-88b57f59dc99 +- oxp_11b8eccf-7c78-4bde-8639-b35a83082a95/crypt/debug 51c0f16b-1ca5-48e6-b2e9-0069cbe9c48b +- oxp_11b8eccf-7c78-4bde-8639-b35a83082a95/crypt/zone f6d614eb-b40d-431b-8a15-f29b7434e702 +- oxp_11b8eccf-7c78-4bde-8639-b35a83082a95/crypt/zone/oxz_crucible_6464d025-4652-4948-919e-740bec5699b1 a3152a55-6fe7-4b34-90ee-e2370860b197 +- oxp_1931c422-4c6a-4597-8ae7-ecb44718462c/crucible 422f8e78-ab9d-4a60-b859-a036db2979a7 +- oxp_1931c422-4c6a-4597-8ae7-ecb44718462c/crypt/debug 9f67b263-7a55-44a2-b0a0-e738b89fb472 +- oxp_1931c422-4c6a-4597-8ae7-ecb44718462c/crypt/zone 4ee918f4-7f38-4759-9cea-00208b404c09 +- oxp_1931c422-4c6a-4597-8ae7-ecb44718462c/crypt/zone/oxz_crucible_878dfddd-3113-4197-a3ea-e0d4dbe9b476 5d5eedcd-8193-40ed-9018-7faab9df80c0 +- oxp_21a8a87e-73a4-42d4-a426-f6eec94004e3/crucible c9208413-484e-47bf-9d54-ec7977cccd81 +- oxp_21a8a87e-73a4-42d4-a426-f6eec94004e3/crypt/debug f95cc7aa-db18-4277-ad08-528c02d267e4 +- oxp_21a8a87e-73a4-42d4-a426-f6eec94004e3/crypt/zone 50faf412-62e6-4cb9-a965-d07b7b035da7 +- oxp_21a8a87e-73a4-42d4-a426-f6eec94004e3/crypt/zone/oxz_crucible_9fd52961-426f-4e62-a644-b70871103fca 2f54bd95-c1d7-4aaa-95e2-7ecacb4be6e3 +- oxp_222c0b55-2966-46b6-816c-9063a7587806/crucible fa80f286-3de6-4042-907a-398973c726ef +- oxp_222c0b55-2966-46b6-816c-9063a7587806/crypt/debug c0485a6d-fe97-47b0-bf93-eb58308fc3c1 +- oxp_222c0b55-2966-46b6-816c-9063a7587806/crypt/zone bec5341c-bcb2-4e7c-92e1-d6c47f435ea2 +- oxp_222c0b55-2966-46b6-816c-9063a7587806/crypt/zone/oxz_crucible_b44cdbc0-0ce0-46eb-8b21-a09e113aa1d0 577d3d90-d609-418b-9278-0cbf605294c6 +- oxp_3676f688-f41c-4f89-936a-6b04c3011b2a/crucible 99ad09ef-da25-4187-b83a-3e95fc8898f7 +- oxp_3676f688-f41c-4f89-936a-6b04c3011b2a/crypt/debug 571edc71-daed-4b47-b4ba-0dc0e29e5e9d +- oxp_3676f688-f41c-4f89-936a-6b04c3011b2a/crypt/zone 34c338eb-b4ea-4c8f-b60e-d3ec612f662c +- oxp_3676f688-f41c-4f89-936a-6b04c3011b2a/crypt/zone/oxz_crucible_b6b759d0-f60d-42b7-bbbc-9d61c9e895a9 35fda90e-04f2-4a3e-89ee-92f9b6047956 +- oxp_5e9e14c4-d60d-4b5c-a11c-bba54eb24c9f/crucible 458ce5af-7d1b-4484-a11d-3c5f8e01bc9a +- oxp_5e9e14c4-d60d-4b5c-a11c-bba54eb24c9f/crypt/debug 5c8d8475-6f8a-4a4a-bc30-d6fdb6d057f2 +- oxp_5e9e14c4-d60d-4b5c-a11c-bba54eb24c9f/crypt/zone c575e10d-30ff-4201-9e3a-892fc8f2fc51 +- oxp_5e9e14c4-d60d-4b5c-a11c-bba54eb24c9f/crypt/zone/oxz_crucible_6939ce48-b17c-4616-b176-8a419a7697be a68daa64-5586-4806-8aaf-3b87601d7439 +- oxp_74f7b89e-88f5-4336-ba8b-22283a6966c5/crucible 93d7d978-cfe4-4637-8809-1b234ca7784d +- oxp_74f7b89e-88f5-4336-ba8b-22283a6966c5/crypt/debug 21e32545-8f60-412f-9f0f-384c00a8c3c7 +- oxp_74f7b89e-88f5-4336-ba8b-22283a6966c5/crypt/zone c32b8e04-6296-49d8-bf08-16a249890867 +- oxp_74f7b89e-88f5-4336-ba8b-22283a6966c5/crypt/zone/oxz_crucible_c407795c-6c8b-428e-8ab8-b962913c447f 703b5340-55ff-4053-af0b-fd5d20f8c47f +- oxp_a787cac8-b5e3-49e3-aaab-20d8eadd8a63/crucible 07a1540e-5775-4768-9938-e8a9031ace4f +- oxp_a787cac8-b5e3-49e3-aaab-20d8eadd8a63/crypt/debug d9c04df5-0f09-4f6f-883b-29137611d89b +- oxp_a787cac8-b5e3-49e3-aaab-20d8eadd8a63/crypt/zone a08d5c26-4524-4b70-888e-a8db7f2883cb +- oxp_a787cac8-b5e3-49e3-aaab-20d8eadd8a63/crypt/zone/oxz_crucible_8d4d2b28-82bb-4e36-80da-1408d8c35d82 c674cb78-2509-4a6a-86a9-57dcd8b59dfb +- oxp_d56b0c9f-0e57-43d8-a1ac-8b4d2c303c29/crucible b4ec6b4d-cac2-44ca-8592-b2951398bd9d +- oxp_d56b0c9f-0e57-43d8-a1ac-8b4d2c303c29/crypt/debug 222b4387-2804-4d53-ba2f-4a32777d0b72 +- oxp_d56b0c9f-0e57-43d8-a1ac-8b4d2c303c29/crypt/zone 5b3537cb-5cd4-48f8-bb9b-222f8287b990 +- oxp_d56b0c9f-0e57-43d8-a1ac-8b4d2c303c29/crypt/zone/oxz_crucible_3b3c14b6-a8e2-4054-a577-8d96cb576230 a0f3bb4d-67e5-4384-9d17-fbe562f8605a + + omicron zones at generation 2: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -143,6 +287,57 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 fake-vendor fake-model serial-f4d7f914-ec73-4b65-8696-5068591d9065 + datasets generation 1 -> 2: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crucible dbc27904-c6dd-4cdc-96c8-32a24bdba0a1 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/debug f4d87d35-e308-41f9-af74-6f7169295160 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone 231ab7ea-48cd-45f4-b359-d9ff54732688 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_crucible_e4b3e159-3dbe-48cb-8497-e3da92a90e5a b27f6972-47f0-43e9-a7cb-3a2fcd93798b + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_nexus_b4947d31-f70e-4ee0-8817-0ca6cea9b16b 5c79ad9d-1aef-407d-804c-ace1d0e069a4 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_ntp_57b96d5c-b71e-43e4-8869-7d514003d00d 4b69a9a9-2994-433c-9733-05de50d9c2a1 + oxp_5248a306-4a03-449e-a8a3-6f86d26da755/crucible 2dfc5c53-6618-4352-b754-86ef6463c20a + oxp_5248a306-4a03-449e-a8a3-6f86d26da755/crypt/debug 6439fca6-e8ae-4eff-b9a5-04dd674b1743 + oxp_5248a306-4a03-449e-a8a3-6f86d26da755/crypt/zone 0bad1d7b-9fa4-4f29-9374-0b2aa2ebcda3 + oxp_5248a306-4a03-449e-a8a3-6f86d26da755/crypt/zone/oxz_crucible_b1783e95-9598-451d-b6ba-c50b52b428c3 4d913be5-fa91-4b22-b714-53babe093654 + oxp_55196665-ed61-4b23-9a74-0711bf2eaf90/crucible 61a653cf-44a6-43c0-90e1-bec539511703 + oxp_55196665-ed61-4b23-9a74-0711bf2eaf90/crypt/debug f89c2279-d18a-4f57-98cc-b48267835008 + oxp_55196665-ed61-4b23-9a74-0711bf2eaf90/crypt/zone d9b8254c-75fa-45b6-8816-e3e6da18f49f + oxp_55196665-ed61-4b23-9a74-0711bf2eaf90/crypt/zone/oxz_crucible_15bb9def-69b8-4d2e-b04f-9fee1143387c e79fbff1-f7fb-4912-9f5c-faca57a6a9c4 + oxp_6b2a719a-35eb-469f-aa54-114a1f21f37d/crucible b803d901-7e43-42fa-8372-43c3c5b3c1a9 + oxp_6b2a719a-35eb-469f-aa54-114a1f21f37d/crypt/debug ff77f150-ae89-4483-872a-d269e06c807c + oxp_6b2a719a-35eb-469f-aa54-114a1f21f37d/crypt/zone c5d41993-88ce-471d-bd89-6ffd35dc8f61 + oxp_6b2a719a-35eb-469f-aa54-114a1f21f37d/crypt/zone/oxz_crucible_996d7570-b0df-46d5-aaa4-0c97697cf484 ffc0cb27-54e5-4d28-8f3d-5f7730fed34a + oxp_7ed4296a-66d1-4fb2-bc56-9b23b8f27d7e/crucible 3b5822d2-9918-4bd6-8b75-2f52bdd73189 + oxp_7ed4296a-66d1-4fb2-bc56-9b23b8f27d7e/crypt/debug 3648ccea-b4ff-4087-9cf4-8291096ef1b3 + oxp_7ed4296a-66d1-4fb2-bc56-9b23b8f27d7e/crypt/zone e2105178-7bec-4e0f-95a9-91f0e698cca5 + oxp_7ed4296a-66d1-4fb2-bc56-9b23b8f27d7e/crypt/zone/oxz_crucible_c6dd531e-2d1d-423b-acc8-358533dab78c ccf69d3f-87be-4f8c-9191-9dde56547b21 + oxp_984e2389-e7fd-4af9-ab02-e3caf77f95b5/crucible 7b00d896-de30-48f8-bcb7-b140ffab2781 + oxp_984e2389-e7fd-4af9-ab02-e3caf77f95b5/crypt/debug a073286c-c538-421f-855b-ba7bca328900 + oxp_984e2389-e7fd-4af9-ab02-e3caf77f95b5/crypt/zone bf9b39db-5a6a-4b45-b2da-c37425271014 + oxp_984e2389-e7fd-4af9-ab02-e3caf77f95b5/crypt/zone/oxz_crucible_621509d6-3772-4009-aca1-35eefd1098fb db6c139b-9028-4d8e-92c7-6cc1e9aa0131 + oxp_a5f75431-3795-426c-8f80-176f658281a5/crucible c596346d-4040-4103-b036-8fafdbaada00 + oxp_a5f75431-3795-426c-8f80-176f658281a5/crypt/debug fc0b9a2c-4002-4fff-92f4-b541b7dd18c4 + oxp_a5f75431-3795-426c-8f80-176f658281a5/crypt/zone 1b4e8d9e-e447-4df1-8e0b-57edc318e8ad + oxp_a5f75431-3795-426c-8f80-176f658281a5/crypt/zone/oxz_crucible_a732c489-d29a-4f75-b900-5966385943af 5c9ef84c-434c-4406-b68a-70e9af65b5a5 + oxp_cf32a1ce-2c9e-49f5-b1cf-4af7f2a28901/crucible 3c7c5190-92dd-4d3b-9222-95d82a530d9e + oxp_cf32a1ce-2c9e-49f5-b1cf-4af7f2a28901/crypt/debug 5f097047-8290-438a-b85a-80bc9450b26c + oxp_cf32a1ce-2c9e-49f5-b1cf-4af7f2a28901/crypt/zone ae4f4e83-0bd1-48dc-bfe3-f1082e8f357a + oxp_cf32a1ce-2c9e-49f5-b1cf-4af7f2a28901/crypt/zone/oxz_crucible_85b8c68a-160d-461d-94dd-1baf175fa75c 182f7cbb-ea53-4057-b85c-667e5d949db5 + oxp_e405da11-cb6b-4ebc-bac1-9bc997352e10/crucible c864de0d-9859-4ad1-a30b-f5ac45ba03ed + oxp_e405da11-cb6b-4ebc-bac1-9bc997352e10/crypt/debug b19e4e13-79e3-481d-ad80-db076a26b7eb + oxp_e405da11-cb6b-4ebc-bac1-9bc997352e10/crypt/zone be833d4e-3439-41ac-b3ad-3e4d14a66360 + oxp_e405da11-cb6b-4ebc-bac1-9bc997352e10/crypt/zone/oxz_crucible_f0ff59e8-4105-4980-a4bb-a1f4c58de1e3 931c4336-5ff9-45ce-b71b-9b6e81e16e53 + oxp_f4d7f914-ec73-4b65-8696-5068591d9065/crucible 02deac75-eb1a-423e-9b64-d20ca921fc25 + oxp_f4d7f914-ec73-4b65-8696-5068591d9065/crypt/debug 7ab2c8a5-3135-4a51-a232-7af8c72b9d3c + oxp_f4d7f914-ec73-4b65-8696-5068591d9065/crypt/zone a02b70bf-b069-4fec-9f53-1976ba462c45 + oxp_f4d7f914-ec73-4b65-8696-5068591d9065/crypt/zone/oxz_crucible_23a8fa2b-ef3e-4017-a43f-f7a83953bd7c 11e2e73b-93a1-47f1-aff3-c4dc7667f4f1 ++ oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_nexus_2ec75441-3d7d-4b4b-9614-af03de5a3666 cd15e9c9-0238-493a-8b32-926d1cd1bce6 ++ oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_nexus_508abd03-cbfe-4654-9a6d-7f15a1ad32e5 b781d032-3149-4c44-a7d3-5f8d80e4a607 ++ oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_nexus_59950bc8-1497-44dd-8cbf-b6502ba921b2 63ec1a21-2c77-41b5-ad3e-e7bf39207107 + + omicron zones generation 2 -> 3: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -182,6 +377,57 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 fake-vendor fake-model serial-fe4fdfba-3b6d-47d3-8612-1fb2390b650a + datasets generation 1 -> 2: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crucible c2eba705-dd3c-49f1-9d7d-abb951cbc722 + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/debug bdc3e42b-b28f-42c9-99fa-3f92e8b30a3c + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone 5c5d822f-d696-4b6a-a075-286c437deba1 + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_crucible_95482c25-1e7f-43e8-adf1-e3548a1b3ae0 d3ae6bfa-bdfd-4a36-9009-4e061be33c0b + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_nexus_15c103f0-ac63-423b-ba5d-1b5fcd563ba3 1f7f6932-ed14-482a-816e-b0f76d96603d + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_ntp_f1a7b9a7-fc6a-4b23-b829-045ff33117ff 1ce1d218-9f8d-4c13-a1bf-e085c569a4b8 + oxp_39ca2e23-4c38-4743-afe0-26b0380b27db/crucible 73674f4b-1d93-404a-bc9c-8395efac97fd + oxp_39ca2e23-4c38-4743-afe0-26b0380b27db/crypt/debug 5c956b09-323e-476c-9a71-352154b1f841 + oxp_39ca2e23-4c38-4743-afe0-26b0380b27db/crypt/zone 23ff87ad-3d52-4c7e-a9a3-be288d08835c + oxp_39ca2e23-4c38-4743-afe0-26b0380b27db/crypt/zone/oxz_crucible_3aa07966-5899-4789-ace5-f8eeb375c6c3 474256d1-bab1-499a-9679-566accf12f3f + oxp_4fbd2fe0-2eac-41b8-8e8d-4fa46c3e8b6c/crucible 938737fb-b72f-4727-8833-9697c518ca37 + oxp_4fbd2fe0-2eac-41b8-8e8d-4fa46c3e8b6c/crypt/debug 7b4f5c33-6a5a-42f9-8199-69f72761b24d + oxp_4fbd2fe0-2eac-41b8-8e8d-4fa46c3e8b6c/crypt/zone a6fcf496-70a1-49bf-a951-62fcec8dd5e2 + oxp_4fbd2fe0-2eac-41b8-8e8d-4fa46c3e8b6c/crypt/zone/oxz_crucible_c60379ba-4e30-4628-a79a-0ae509aef4c5 6e415c23-e85d-4f5b-b993-43a8f1c56763 + oxp_60131a33-1f12-4dbb-9435-bdd368db1f51/crucible 8e58b91f-9ce2-4256-8dec-5f90f31a73fa + oxp_60131a33-1f12-4dbb-9435-bdd368db1f51/crypt/debug 77279948-9fe2-46f2-af39-0d5b692f5984 + oxp_60131a33-1f12-4dbb-9435-bdd368db1f51/crypt/zone 4f3e0a2b-43df-43f1-9244-a67fe65a4856 + oxp_60131a33-1f12-4dbb-9435-bdd368db1f51/crypt/zone/oxz_crucible_72c5a909-077d-4ec1-a9d5-ae64ef9d716e 35a43943-68f5-44f8-83a9-c69423b1ab04 + oxp_77e45b5b-869f-4e78-8ce3-28bbe8cf37e9/crucible a410308c-e2cb-4e4d-9da6-1879336f93f2 + oxp_77e45b5b-869f-4e78-8ce3-28bbe8cf37e9/crypt/debug 0f6d5b5f-674d-465e-9b40-d09c6865416a + oxp_77e45b5b-869f-4e78-8ce3-28bbe8cf37e9/crypt/zone f72e1f0d-0acd-4cde-9acd-f25663592558 + oxp_77e45b5b-869f-4e78-8ce3-28bbe8cf37e9/crypt/zone/oxz_crucible_0dfbf374-9ef9-430f-b06d-f271bf7f84c4 7ec7d64c-c0f8-48fc-905d-fdd9de487672 + oxp_789d607d-d196-428e-a988-f7886a327859/crucible 951bc0b6-8136-4ec3-870b-ffaa4d2ff2f9 + oxp_789d607d-d196-428e-a988-f7886a327859/crypt/debug e7ca75fe-d59c-4324-9053-a6a1566958e2 + oxp_789d607d-d196-428e-a988-f7886a327859/crypt/zone 755e24a8-67cc-44b1-8c25-2dcb3acd988f + oxp_789d607d-d196-428e-a988-f7886a327859/crypt/zone/oxz_crucible_bf79a56a-97af-4cc4-94a5-8b20d64c2cda 45d32c13-cbbb-4382-a0ed-dc6574b827b7 + oxp_b104b94c-2197-4e76-bfbd-6f966bd5af66/crucible c1af262a-2595-4236-98c8-21c5b63c80c3 + oxp_b104b94c-2197-4e76-bfbd-6f966bd5af66/crypt/debug 29246ffd-11d0-4afd-8324-4727380185a3 + oxp_b104b94c-2197-4e76-bfbd-6f966bd5af66/crypt/zone c834f8cd-25ee-4c62-af03-49cef53fc4c1 + oxp_b104b94c-2197-4e76-bfbd-6f966bd5af66/crypt/zone/oxz_crucible_4ad0e9da-08f8-4d40-b4d3-d17e711b5bbf cefe1de4-bebb-4ac1-8871-09585baf593d + oxp_cd62306a-aedf-47e8-93d5-92a358d64c7b/crucible b8868d0c-960d-4ae4-b340-2c5970c8d530 + oxp_cd62306a-aedf-47e8-93d5-92a358d64c7b/crypt/debug 212dad15-885a-45f6-b7ea-5e2ed8d9186f + oxp_cd62306a-aedf-47e8-93d5-92a358d64c7b/crypt/zone 5a288f52-a84e-45a6-873a-3d9c81d67380 + oxp_cd62306a-aedf-47e8-93d5-92a358d64c7b/crypt/zone/oxz_crucible_a1c03689-fc62-4ea5-bb72-4d01f5138614 3bf64d72-e015-4377-b02a-a094f8f96d57 + oxp_f1693454-aac1-4265-b8a0-4e9f3f41c7b3/crucible a7228ebc-840f-4393-94d7-b338dab3d459 + oxp_f1693454-aac1-4265-b8a0-4e9f3f41c7b3/crypt/debug e1e73d4f-0138-42dc-9e10-3432b26098f4 + oxp_f1693454-aac1-4265-b8a0-4e9f3f41c7b3/crypt/zone 078134ea-f776-4283-ae17-116869f304b4 + oxp_f1693454-aac1-4265-b8a0-4e9f3f41c7b3/crypt/zone/oxz_crucible_d47f4996-fac0-4657-bcea-01b1fee6404d c35cac80-eb26-4d90-ac3e-879b9d80c04c + oxp_fe4fdfba-3b6d-47d3-8612-1fb2390b650a/crucible 09d557a8-4a28-4434-bcca-8fa593cc2fec + oxp_fe4fdfba-3b6d-47d3-8612-1fb2390b650a/crypt/debug 48e191ca-1498-4381-b2dd-675b022d9a86 + oxp_fe4fdfba-3b6d-47d3-8612-1fb2390b650a/crypt/zone 60a98875-ee39-49d8-b4b8-1f5d168e39e2 + oxp_fe4fdfba-3b6d-47d3-8612-1fb2390b650a/crypt/zone/oxz_crucible_a568e92e-4fbd-4b69-acd8-f16277073031 30d7609e-1c74-4002-8558-b62246ee9600 ++ oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_nexus_3ca5292f-8a59-4475-bb72-0f43714d0fff 871b35e6-d234-4a96-bab4-d07314bc6ba2 ++ oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_nexus_99f6d544-8599-4e2b-a55a-82d9e0034662 8a39677a-fbcf-4884-b000-63be3247fb63 ++ oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_nexus_c26b3bda-5561-44a1-a69f-22103fe209a1 c9c1a582-1fe0-4001-9301-97230387563a + + omicron zones generation 2 -> 3: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP diff --git a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_2_2a.txt b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_2_2a.txt index 837cc565531..2ba834d0dc2 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_2_2a.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_2_2a.txt @@ -21,6 +21,57 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 fake-vendor fake-model serial-f4d7f914-ec73-4b65-8696-5068591d9065 + datasets at generation 2: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crucible dbc27904-c6dd-4cdc-96c8-32a24bdba0a1 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/debug f4d87d35-e308-41f9-af74-6f7169295160 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone 231ab7ea-48cd-45f4-b359-d9ff54732688 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_crucible_e4b3e159-3dbe-48cb-8497-e3da92a90e5a b27f6972-47f0-43e9-a7cb-3a2fcd93798b + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_nexus_2ec75441-3d7d-4b4b-9614-af03de5a3666 cd15e9c9-0238-493a-8b32-926d1cd1bce6 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_nexus_508abd03-cbfe-4654-9a6d-7f15a1ad32e5 b781d032-3149-4c44-a7d3-5f8d80e4a607 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_nexus_59950bc8-1497-44dd-8cbf-b6502ba921b2 63ec1a21-2c77-41b5-ad3e-e7bf39207107 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_nexus_b4947d31-f70e-4ee0-8817-0ca6cea9b16b 5c79ad9d-1aef-407d-804c-ace1d0e069a4 + oxp_4069c804-c51a-4adc-8822-3cbbab56ed3f/crypt/zone/oxz_ntp_57b96d5c-b71e-43e4-8869-7d514003d00d 4b69a9a9-2994-433c-9733-05de50d9c2a1 + oxp_5248a306-4a03-449e-a8a3-6f86d26da755/crucible 2dfc5c53-6618-4352-b754-86ef6463c20a + oxp_5248a306-4a03-449e-a8a3-6f86d26da755/crypt/debug 6439fca6-e8ae-4eff-b9a5-04dd674b1743 + oxp_5248a306-4a03-449e-a8a3-6f86d26da755/crypt/zone 0bad1d7b-9fa4-4f29-9374-0b2aa2ebcda3 + oxp_5248a306-4a03-449e-a8a3-6f86d26da755/crypt/zone/oxz_crucible_b1783e95-9598-451d-b6ba-c50b52b428c3 4d913be5-fa91-4b22-b714-53babe093654 + oxp_55196665-ed61-4b23-9a74-0711bf2eaf90/crucible 61a653cf-44a6-43c0-90e1-bec539511703 + oxp_55196665-ed61-4b23-9a74-0711bf2eaf90/crypt/debug f89c2279-d18a-4f57-98cc-b48267835008 + oxp_55196665-ed61-4b23-9a74-0711bf2eaf90/crypt/zone d9b8254c-75fa-45b6-8816-e3e6da18f49f + oxp_55196665-ed61-4b23-9a74-0711bf2eaf90/crypt/zone/oxz_crucible_15bb9def-69b8-4d2e-b04f-9fee1143387c e79fbff1-f7fb-4912-9f5c-faca57a6a9c4 + oxp_6b2a719a-35eb-469f-aa54-114a1f21f37d/crucible b803d901-7e43-42fa-8372-43c3c5b3c1a9 + oxp_6b2a719a-35eb-469f-aa54-114a1f21f37d/crypt/debug ff77f150-ae89-4483-872a-d269e06c807c + oxp_6b2a719a-35eb-469f-aa54-114a1f21f37d/crypt/zone c5d41993-88ce-471d-bd89-6ffd35dc8f61 + oxp_6b2a719a-35eb-469f-aa54-114a1f21f37d/crypt/zone/oxz_crucible_996d7570-b0df-46d5-aaa4-0c97697cf484 ffc0cb27-54e5-4d28-8f3d-5f7730fed34a + oxp_7ed4296a-66d1-4fb2-bc56-9b23b8f27d7e/crucible 3b5822d2-9918-4bd6-8b75-2f52bdd73189 + oxp_7ed4296a-66d1-4fb2-bc56-9b23b8f27d7e/crypt/debug 3648ccea-b4ff-4087-9cf4-8291096ef1b3 + oxp_7ed4296a-66d1-4fb2-bc56-9b23b8f27d7e/crypt/zone e2105178-7bec-4e0f-95a9-91f0e698cca5 + oxp_7ed4296a-66d1-4fb2-bc56-9b23b8f27d7e/crypt/zone/oxz_crucible_c6dd531e-2d1d-423b-acc8-358533dab78c ccf69d3f-87be-4f8c-9191-9dde56547b21 + oxp_984e2389-e7fd-4af9-ab02-e3caf77f95b5/crucible 7b00d896-de30-48f8-bcb7-b140ffab2781 + oxp_984e2389-e7fd-4af9-ab02-e3caf77f95b5/crypt/debug a073286c-c538-421f-855b-ba7bca328900 + oxp_984e2389-e7fd-4af9-ab02-e3caf77f95b5/crypt/zone bf9b39db-5a6a-4b45-b2da-c37425271014 + oxp_984e2389-e7fd-4af9-ab02-e3caf77f95b5/crypt/zone/oxz_crucible_621509d6-3772-4009-aca1-35eefd1098fb db6c139b-9028-4d8e-92c7-6cc1e9aa0131 + oxp_a5f75431-3795-426c-8f80-176f658281a5/crucible c596346d-4040-4103-b036-8fafdbaada00 + oxp_a5f75431-3795-426c-8f80-176f658281a5/crypt/debug fc0b9a2c-4002-4fff-92f4-b541b7dd18c4 + oxp_a5f75431-3795-426c-8f80-176f658281a5/crypt/zone 1b4e8d9e-e447-4df1-8e0b-57edc318e8ad + oxp_a5f75431-3795-426c-8f80-176f658281a5/crypt/zone/oxz_crucible_a732c489-d29a-4f75-b900-5966385943af 5c9ef84c-434c-4406-b68a-70e9af65b5a5 + oxp_cf32a1ce-2c9e-49f5-b1cf-4af7f2a28901/crucible 3c7c5190-92dd-4d3b-9222-95d82a530d9e + oxp_cf32a1ce-2c9e-49f5-b1cf-4af7f2a28901/crypt/debug 5f097047-8290-438a-b85a-80bc9450b26c + oxp_cf32a1ce-2c9e-49f5-b1cf-4af7f2a28901/crypt/zone ae4f4e83-0bd1-48dc-bfe3-f1082e8f357a + oxp_cf32a1ce-2c9e-49f5-b1cf-4af7f2a28901/crypt/zone/oxz_crucible_85b8c68a-160d-461d-94dd-1baf175fa75c 182f7cbb-ea53-4057-b85c-667e5d949db5 + oxp_e405da11-cb6b-4ebc-bac1-9bc997352e10/crucible c864de0d-9859-4ad1-a30b-f5ac45ba03ed + oxp_e405da11-cb6b-4ebc-bac1-9bc997352e10/crypt/debug b19e4e13-79e3-481d-ad80-db076a26b7eb + oxp_e405da11-cb6b-4ebc-bac1-9bc997352e10/crypt/zone be833d4e-3439-41ac-b3ad-3e4d14a66360 + oxp_e405da11-cb6b-4ebc-bac1-9bc997352e10/crypt/zone/oxz_crucible_f0ff59e8-4105-4980-a4bb-a1f4c58de1e3 931c4336-5ff9-45ce-b71b-9b6e81e16e53 + oxp_f4d7f914-ec73-4b65-8696-5068591d9065/crucible 02deac75-eb1a-423e-9b64-d20ca921fc25 + oxp_f4d7f914-ec73-4b65-8696-5068591d9065/crypt/debug 7ab2c8a5-3135-4a51-a232-7af8c72b9d3c + oxp_f4d7f914-ec73-4b65-8696-5068591d9065/crypt/zone a02b70bf-b069-4fec-9f53-1976ba462c45 + oxp_f4d7f914-ec73-4b65-8696-5068591d9065/crypt/zone/oxz_crucible_23a8fa2b-ef3e-4017-a43f-f7a83953bd7c 11e2e73b-93a1-47f1-aff3-c4dc7667f4f1 + + omicron zones at generation 3: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -60,6 +111,57 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 fake-vendor fake-model serial-fe4fdfba-3b6d-47d3-8612-1fb2390b650a + datasets at generation 2: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crucible c2eba705-dd3c-49f1-9d7d-abb951cbc722 + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/debug bdc3e42b-b28f-42c9-99fa-3f92e8b30a3c + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone 5c5d822f-d696-4b6a-a075-286c437deba1 + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_crucible_95482c25-1e7f-43e8-adf1-e3548a1b3ae0 d3ae6bfa-bdfd-4a36-9009-4e061be33c0b + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_nexus_15c103f0-ac63-423b-ba5d-1b5fcd563ba3 1f7f6932-ed14-482a-816e-b0f76d96603d + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_nexus_3ca5292f-8a59-4475-bb72-0f43714d0fff 871b35e6-d234-4a96-bab4-d07314bc6ba2 + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_nexus_99f6d544-8599-4e2b-a55a-82d9e0034662 8a39677a-fbcf-4884-b000-63be3247fb63 + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_nexus_c26b3bda-5561-44a1-a69f-22103fe209a1 c9c1a582-1fe0-4001-9301-97230387563a + oxp_33d48d85-751e-4982-b738-eae4d9a05f01/crypt/zone/oxz_ntp_f1a7b9a7-fc6a-4b23-b829-045ff33117ff 1ce1d218-9f8d-4c13-a1bf-e085c569a4b8 + oxp_39ca2e23-4c38-4743-afe0-26b0380b27db/crucible 73674f4b-1d93-404a-bc9c-8395efac97fd + oxp_39ca2e23-4c38-4743-afe0-26b0380b27db/crypt/debug 5c956b09-323e-476c-9a71-352154b1f841 + oxp_39ca2e23-4c38-4743-afe0-26b0380b27db/crypt/zone 23ff87ad-3d52-4c7e-a9a3-be288d08835c + oxp_39ca2e23-4c38-4743-afe0-26b0380b27db/crypt/zone/oxz_crucible_3aa07966-5899-4789-ace5-f8eeb375c6c3 474256d1-bab1-499a-9679-566accf12f3f + oxp_4fbd2fe0-2eac-41b8-8e8d-4fa46c3e8b6c/crucible 938737fb-b72f-4727-8833-9697c518ca37 + oxp_4fbd2fe0-2eac-41b8-8e8d-4fa46c3e8b6c/crypt/debug 7b4f5c33-6a5a-42f9-8199-69f72761b24d + oxp_4fbd2fe0-2eac-41b8-8e8d-4fa46c3e8b6c/crypt/zone a6fcf496-70a1-49bf-a951-62fcec8dd5e2 + oxp_4fbd2fe0-2eac-41b8-8e8d-4fa46c3e8b6c/crypt/zone/oxz_crucible_c60379ba-4e30-4628-a79a-0ae509aef4c5 6e415c23-e85d-4f5b-b993-43a8f1c56763 + oxp_60131a33-1f12-4dbb-9435-bdd368db1f51/crucible 8e58b91f-9ce2-4256-8dec-5f90f31a73fa + oxp_60131a33-1f12-4dbb-9435-bdd368db1f51/crypt/debug 77279948-9fe2-46f2-af39-0d5b692f5984 + oxp_60131a33-1f12-4dbb-9435-bdd368db1f51/crypt/zone 4f3e0a2b-43df-43f1-9244-a67fe65a4856 + oxp_60131a33-1f12-4dbb-9435-bdd368db1f51/crypt/zone/oxz_crucible_72c5a909-077d-4ec1-a9d5-ae64ef9d716e 35a43943-68f5-44f8-83a9-c69423b1ab04 + oxp_77e45b5b-869f-4e78-8ce3-28bbe8cf37e9/crucible a410308c-e2cb-4e4d-9da6-1879336f93f2 + oxp_77e45b5b-869f-4e78-8ce3-28bbe8cf37e9/crypt/debug 0f6d5b5f-674d-465e-9b40-d09c6865416a + oxp_77e45b5b-869f-4e78-8ce3-28bbe8cf37e9/crypt/zone f72e1f0d-0acd-4cde-9acd-f25663592558 + oxp_77e45b5b-869f-4e78-8ce3-28bbe8cf37e9/crypt/zone/oxz_crucible_0dfbf374-9ef9-430f-b06d-f271bf7f84c4 7ec7d64c-c0f8-48fc-905d-fdd9de487672 + oxp_789d607d-d196-428e-a988-f7886a327859/crucible 951bc0b6-8136-4ec3-870b-ffaa4d2ff2f9 + oxp_789d607d-d196-428e-a988-f7886a327859/crypt/debug e7ca75fe-d59c-4324-9053-a6a1566958e2 + oxp_789d607d-d196-428e-a988-f7886a327859/crypt/zone 755e24a8-67cc-44b1-8c25-2dcb3acd988f + oxp_789d607d-d196-428e-a988-f7886a327859/crypt/zone/oxz_crucible_bf79a56a-97af-4cc4-94a5-8b20d64c2cda 45d32c13-cbbb-4382-a0ed-dc6574b827b7 + oxp_b104b94c-2197-4e76-bfbd-6f966bd5af66/crucible c1af262a-2595-4236-98c8-21c5b63c80c3 + oxp_b104b94c-2197-4e76-bfbd-6f966bd5af66/crypt/debug 29246ffd-11d0-4afd-8324-4727380185a3 + oxp_b104b94c-2197-4e76-bfbd-6f966bd5af66/crypt/zone c834f8cd-25ee-4c62-af03-49cef53fc4c1 + oxp_b104b94c-2197-4e76-bfbd-6f966bd5af66/crypt/zone/oxz_crucible_4ad0e9da-08f8-4d40-b4d3-d17e711b5bbf cefe1de4-bebb-4ac1-8871-09585baf593d + oxp_cd62306a-aedf-47e8-93d5-92a358d64c7b/crucible b8868d0c-960d-4ae4-b340-2c5970c8d530 + oxp_cd62306a-aedf-47e8-93d5-92a358d64c7b/crypt/debug 212dad15-885a-45f6-b7ea-5e2ed8d9186f + oxp_cd62306a-aedf-47e8-93d5-92a358d64c7b/crypt/zone 5a288f52-a84e-45a6-873a-3d9c81d67380 + oxp_cd62306a-aedf-47e8-93d5-92a358d64c7b/crypt/zone/oxz_crucible_a1c03689-fc62-4ea5-bb72-4d01f5138614 3bf64d72-e015-4377-b02a-a094f8f96d57 + oxp_f1693454-aac1-4265-b8a0-4e9f3f41c7b3/crucible a7228ebc-840f-4393-94d7-b338dab3d459 + oxp_f1693454-aac1-4265-b8a0-4e9f3f41c7b3/crypt/debug e1e73d4f-0138-42dc-9e10-3432b26098f4 + oxp_f1693454-aac1-4265-b8a0-4e9f3f41c7b3/crypt/zone 078134ea-f776-4283-ae17-116869f304b4 + oxp_f1693454-aac1-4265-b8a0-4e9f3f41c7b3/crypt/zone/oxz_crucible_d47f4996-fac0-4657-bcea-01b1fee6404d c35cac80-eb26-4d90-ac3e-879b9d80c04c + oxp_fe4fdfba-3b6d-47d3-8612-1fb2390b650a/crucible 09d557a8-4a28-4434-bcca-8fa593cc2fec + oxp_fe4fdfba-3b6d-47d3-8612-1fb2390b650a/crypt/debug 48e191ca-1498-4381-b2dd-675b022d9a86 + oxp_fe4fdfba-3b6d-47d3-8612-1fb2390b650a/crypt/zone 60a98875-ee39-49d8-b4b8-1f5d168e39e2 + oxp_fe4fdfba-3b6d-47d3-8612-1fb2390b650a/crypt/zone/oxz_crucible_a568e92e-4fbd-4b69-acd8-f16277073031 30d7609e-1c74-4002-8558-b62246ee9600 + + omicron zones at generation 3: ------------------------------------------------------------------------------------------ zone type zone id disposition underlay IP @@ -123,6 +225,54 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 fake-vendor fake-model serial-d1ebfd7b-3842-4ad7-be31-2b9c031209a9 + datasets at generation 1: + -------------------------------------------------------------------------------------------------------------------------------------------- + dataset name dataset id + -------------------------------------------------------------------------------------------------------------------------------------------- + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crucible d577ac11-62ac-4a71-bed7-e7327148bd33 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/debug d6d36f6b-35ff-4766-99de-44abe46932d1 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/zone 18e2a336-9b65-421e-8409-04d9abce8cd6 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/zone/oxz_crucible_93b137a1-a1d6-4b5b-b2cb-21a9f11e2883 d1a755ac-dafc-4087-a0ce-ee8b3f882ac1 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/zone/oxz_nexus_6dff7633-66bb-4924-a6ff-2c896e66964b 9dce1e52-8e3b-4641-9982-69deb049f647 + oxp_13e6503b-5300-4ccd-abc4-c1512b435929/crypt/zone/oxz_ntp_7f4e9f9f-08f8-4d14-885d-e977c05525ad 7773ffbd-1842-4425-aff5-88f577cd8955 + oxp_44cdb6f2-fa6c-4b69-bab2-3ae4e1ec4b34/crucible b9aa1175-2640-4923-81b3-1e1469b15abf + oxp_44cdb6f2-fa6c-4b69-bab2-3ae4e1ec4b34/crypt/debug 26154290-91f7-4f35-bcd0-ec7a8f398d82 + oxp_44cdb6f2-fa6c-4b69-bab2-3ae4e1ec4b34/crypt/zone c37902cf-d1fe-4370-baef-b7de8731dffe + oxp_44cdb6f2-fa6c-4b69-bab2-3ae4e1ec4b34/crypt/zone/oxz_crucible_c406da50-34b9-4bb4-a460-8f49875d2a6a f47f67f6-e315-4272-b93a-b467cfdfbb7a + oxp_4de5fc8e-0e41-4ab9-ba12-2dc63882c96a/crucible 68724637-d228-4faa-a19f-b5df857ff4ab + oxp_4de5fc8e-0e41-4ab9-ba12-2dc63882c96a/crypt/debug 6dc5df73-7e44-4065-9f14-70a0d965a853 + oxp_4de5fc8e-0e41-4ab9-ba12-2dc63882c96a/crypt/zone 00c2d1d6-94da-4985-a144-2194588afecf + oxp_4de5fc8e-0e41-4ab9-ba12-2dc63882c96a/crypt/zone/oxz_crucible_9f0abbad-dbd3-4d43-9675-78092217ffd9 da62be58-643f-4497-a9d7-e259de6c7a12 + oxp_51564e7a-d69f-4942-bcfe-330224633ca6/crucible 51229ad8-cda3-40c4-b0f3-b1af669abcd4 + oxp_51564e7a-d69f-4942-bcfe-330224633ca6/crypt/debug 3063bdcc-4363-495b-a81f-67c6cc437a75 + oxp_51564e7a-d69f-4942-bcfe-330224633ca6/crypt/zone 3527b52f-f1d4-4e2f-b41e-559f58657839 + oxp_51564e7a-d69f-4942-bcfe-330224633ca6/crypt/zone/oxz_crucible_19fbc4f8-a683-4f22-8f5a-e74782b935be 79a16369-70ab-4f63-af6d-1c7f088eeee3 + oxp_5ca23cb3-cc90-41c5-a474-01898cdd0796/crucible 5d8788c0-13df-4c07-a8b2-b9365fec9796 + oxp_5ca23cb3-cc90-41c5-a474-01898cdd0796/crypt/debug 53deebeb-3952-483a-afd2-2202cee9c33b + oxp_5ca23cb3-cc90-41c5-a474-01898cdd0796/crypt/zone 22581703-157c-474f-bbf3-34f076dd7bca + oxp_5ca23cb3-cc90-41c5-a474-01898cdd0796/crypt/zone/oxz_crucible_6b53ab2e-d98c-485f-87a3-4d5df595390f ac31a04c-1f3a-43f4-b45a-cf4b5176e7f6 + oxp_6a23a532-0712-4a8d-be9b-e8c17e97aa4b/crucible 82fc150e-d6f5-4bb6-8eee-17a0728aadb5 + oxp_6a23a532-0712-4a8d-be9b-e8c17e97aa4b/crypt/debug e315743d-53e3-4505-9364-657c2486a1bb + oxp_6a23a532-0712-4a8d-be9b-e8c17e97aa4b/crypt/zone 4d6e70b1-ff91-4133-b65f-6fcd5bda2568 + oxp_6a23a532-0712-4a8d-be9b-e8c17e97aa4b/crypt/zone/oxz_crucible_b0c63f48-01ea-4aae-bb26-fb0dd59d1662 b92bba84-9437-4f93-8ad0-80bf7ecdae5f + oxp_6f1a330e-e8d4-4c09-97fc-8918b69b2a3c/crucible 68217627-4519-4cfa-85b9-25efb4dad71a + oxp_6f1a330e-e8d4-4c09-97fc-8918b69b2a3c/crypt/debug 2e901ffa-895b-4405-b59a-2bcdfabda681 + oxp_6f1a330e-e8d4-4c09-97fc-8918b69b2a3c/crypt/zone 41e55e8a-ca4b-4c27-8337-57d42cc36fb5 + oxp_6f1a330e-e8d4-4c09-97fc-8918b69b2a3c/crypt/zone/oxz_crucible_f55e6aaf-e8fc-4913-9e3c-8cd1bd4bdad3 dedbf4e7-32fb-406e-a5cc-a2f5281aa6d8 + oxp_7113d104-fb55-4299-bf53-b3c59d258e44/crucible a602c9d4-16a9-4e55-b5de-76fb33cc4ca9 + oxp_7113d104-fb55-4299-bf53-b3c59d258e44/crypt/debug ee20f8cb-7d24-422b-9dff-ca4c9596191f + oxp_7113d104-fb55-4299-bf53-b3c59d258e44/crypt/zone ae6c87ea-dc50-4a15-855a-224300f20c74 + oxp_7113d104-fb55-4299-bf53-b3c59d258e44/crypt/zone/oxz_crucible_d660d7ed-28c0-45ae-9ace-dc3ecf7e8786 b2c9f282-e767-4df1-941e-b7cea21b1a02 + oxp_8c10be49-3a66-40d4-a082-64d09d916f14/crucible ef14767b-6be7-44cb-833d-27d9f523dcdb + oxp_8c10be49-3a66-40d4-a082-64d09d916f14/crypt/debug 84bc6d3f-2d9c-42b3-9982-7394630a0928 + oxp_8c10be49-3a66-40d4-a082-64d09d916f14/crypt/zone 3fc37e5a-3bf3-476f-8a8f-6d32a533cfc0 + oxp_8c10be49-3a66-40d4-a082-64d09d916f14/crypt/zone/oxz_crucible_e98cc0de-abf6-4da4-a20d-d05c7a9bb1d7 47cf951d-ca5c-4ae0-baa3-94472efbcf03 + oxp_d1ebfd7b-3842-4ad7-be31-2b9c031209a9/crucible d63be5b2-5471-4f4d-accc-82e2a0d7276f + oxp_d1ebfd7b-3842-4ad7-be31-2b9c031209a9/crypt/debug 0c11d380-038c-4b68-b9f4-1775f6fec1e8 + oxp_d1ebfd7b-3842-4ad7-be31-2b9c031209a9/crypt/zone 64a64a7b-0d29-4470-bc96-4796ca357507 + oxp_d1ebfd7b-3842-4ad7-be31-2b9c031209a9/crypt/zone/oxz_crucible_4f1ce8a2-d3a5-4a38-be4c-9817de52db37 9390bde4-2073-44b4-a496-5129c7e5ca40 + + omicron zones at generation 2: ---------------------------------------------------------------------------------------- zone type zone id disposition underlay IP @@ -171,11 +321,11 @@ ERRORS: Nexus { internal_address: [fd01:1122:3344:105::22]:12221, external_ip: OmicronZoneExternalFloatingIp { - id: cd63774a-2e2f-49ce-a3df-33e3b5d02650 (external_ip), + id: a6c185b0-b470-4631-b6c8-373349430abb (external_ip), ip: 192.0.2.2, }, nic: NetworkInterface { - id: 99402426-92dd-4975-9347-907e130d6b79, + id: 4e187c77-f123-4738-80d5-410b6a416438, kind: Service { id: 6dff7633-66bb-4924-a6ff-2c896e66964b, }, diff --git a/nexus/types/Cargo.toml b/nexus/types/Cargo.toml index 6b31013d49d..668e5d1e736 100644 --- a/nexus/types/Cargo.toml +++ b/nexus/types/Cargo.toml @@ -21,6 +21,7 @@ futures.workspace = true http.workspace = true humantime.workspace = true ipnetwork.workspace = true +itertools.workspace = true newtype_derive.workspace = true omicron-uuid-kinds.workspace = true openssl.workspace = true diff --git a/nexus/types/src/deployment/blueprint_diff.rs b/nexus/types/src/deployment/blueprint_diff.rs index 89de888df93..c61dc1d2893 100644 --- a/nexus/types/src/deployment/blueprint_diff.rs +++ b/nexus/types/src/deployment/blueprint_diff.rs @@ -12,6 +12,7 @@ use super::blueprint_display::{ BpSledSubtableRow, KvListWithHeading, KvPair, }; use super::{zone_sort_key, CockroachDbPreserveDowngrade}; +use itertools::Itertools; use nexus_sled_agent_shared::inventory::ZoneKind; use omicron_common::api::external::Generation; use omicron_common::disk::DiskIdentity; @@ -578,16 +579,25 @@ impl BpSledSubtableData for DiffDatasetsDetails { &self, state: BpDiffState, ) -> impl Iterator { - self.datasets.iter().map(move |d| { - BpSledSubtableRow::from_strings( - state, - vec![ - d.id.map(|id| id.to_string()) - .unwrap_or_else(|| "none".to_string()), - d.name.clone(), - ], - ) - }) + self.datasets + .iter() + .sorted_by(|a, b| { + // NOTE: We're doing this sorting because it's nice to see all + // datasets that are on the same pool grouped together - but it + // might be nice to auto-sort all columns alphabetically for other + // uses of the blueprint diff too? + Ord::cmp(&a.name, &b.name) + }) + .map(move |d| { + BpSledSubtableRow::from_strings( + state, + vec![ + d.name.clone(), + d.id.map(|id| id.to_string()) + .unwrap_or_else(|| "none".to_string()), + ], + ) + }) } } diff --git a/nexus/types/src/deployment/blueprint_display.rs b/nexus/types/src/deployment/blueprint_display.rs index 25aed7c5562..b8e7b8f4b3c 100644 --- a/nexus/types/src/deployment/blueprint_display.rs +++ b/nexus/types/src/deployment/blueprint_display.rs @@ -331,7 +331,7 @@ impl BpSledSubtableSchema for BpDatasetsSubtableSchema { } fn column_names(&self) -> &'static [&'static str] { - &["dataset id", "dataset name"] + &["dataset name", "dataset id"] } }