From 8cbc5ce26e8a199c5b183be424d82e047a0efc9f Mon Sep 17 00:00:00 2001 From: "Andrew J. Stone" Date: Wed, 15 May 2024 23:22:22 +0000 Subject: [PATCH] review fixes --- .../planning/src/blueprint_builder/zones.rs | 15 --- .../output/blueprint_builder_initial_diff.txt | 60 +++++------ .../output/planner_basic_add_sled_2_3.txt | 80 +++++++------- .../output/planner_basic_add_sled_3_5.txt | 80 +++++++------- .../planner_decommissions_sleds_1_2.txt | 60 +++++------ .../planner_decommissions_sleds_bp2.txt | 40 +++---- .../output/planner_nonprovisionable_1_2.txt | 100 +++++++++--------- .../output/planner_nonprovisionable_2_2a.txt | 62 +++++------ .../output/planner_nonprovisionable_bp2.txt | 60 +++++------ 9 files changed, 271 insertions(+), 286 deletions(-) diff --git a/nexus/reconfigurator/planning/src/blueprint_builder/zones.rs b/nexus/reconfigurator/planning/src/blueprint_builder/zones.rs index 5b23a2b84d..68e2b9c2a2 100644 --- a/nexus/reconfigurator/planning/src/blueprint_builder/zones.rs +++ b/nexus/reconfigurator/planning/src/blueprint_builder/zones.rs @@ -346,21 +346,6 @@ mod tests { .expect("new zone ID should be present"); } - // TODO: FIXME: AJS - Delete use of the control sled? - We don't - // actually compute changes based on generation number anymore. Zones or - // physical disks must change for a sled to be modified. It's not clear - // to me that the way we use this in this test is actually useful. - // - // Also call change_sled_zones without making any changes. This - // currently bumps the generation number, but in the future might - // become smarter and not do so (in which case this test will break). - let control_sled_id = example - .input - .all_sled_ids(SledFilter::Commissioned) - .nth(2) - .expect("at least 2 sleds present"); - _ = builder.zones.change_sled_zones(control_sled_id); - // Attempt to expunge the newly added Oximeter zone. This should fail // because we only support expunging zones that are unchanged from the // parent blueprint. 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 f98a744deb..e28601ff16 100644 --- a/nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt +++ b/nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt @@ -8,16 +8,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-054abfca-23dc-4ea1-803d-df633b496fc5 - fake-vendor fake-model serial-0969ac30-6716-472f-bd0f-1ab6cdd8562c - fake-vendor fake-model serial-1a87543f-82d2-462b-91fc-d813d0345909 - fake-vendor fake-model serial-1bf4011c-bbf1-4773-900e-036a04d9f0e7 - fake-vendor fake-model serial-1d88e366-7379-493d-9045-30be1d6ae9e4 - fake-vendor fake-model serial-2ebb4f34-ce97-4212-8378-7ac837362f30 - fake-vendor fake-model serial-304f33b4-027e-4211-975e-22259819f984 - fake-vendor fake-model serial-61601f7a-2b80-46f8-a166-80563f12f4a2 - fake-vendor fake-model serial-9154e095-3bd6-42be-8dcb-c5268eea73b9 - fake-vendor fake-model serial-c139e5c3-1ebd-471f-a26b-ad830abf5ed9 + fake-vendor fake-model serial-4806733a-5a8e-4ed0-b515-1a89c1594db9 + fake-vendor fake-model serial-83393898-c198-47ad-b58a-6cb1d6d5def8 + fake-vendor fake-model serial-85ab2359-19a1-4d06-8adc-9d14ea139d42 + fake-vendor fake-model serial-980f7dbf-c4a9-45f9-9603-248e5e332355 + fake-vendor fake-model serial-b4414bab-493d-4dd0-b1fb-59028c5519bc + fake-vendor fake-model serial-b47c627e-898b-48eb-a75c-fb5954dd54e0 + fake-vendor fake-model serial-dc17c456-699a-4a71-bfd4-c850249d4bae + fake-vendor fake-model serial-f01c5b3e-6c67-46b1-acaf-e2418e35ff1d + fake-vendor fake-model serial-f88ed5e2-2cc8-4f87-9a51-d977b37e01e0 + fake-vendor fake-model serial-fafd3dd6-bd86-4841-b848-9dbd17a88c30 omicron zones at generation 2: @@ -44,16 +44,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-3c6e2118-6257-494b-85cf-fefb0ee3d4f2 - fake-vendor fake-model serial-45b24162-44e3-4cb1-9be6-8ce542540309 - fake-vendor fake-model serial-8bc6e3ed-8262-4d47-ba09-74a4ff3271dd - fake-vendor fake-model serial-b12936d1-7099-47b5-83a6-bc8fa287c709 - fake-vendor fake-model serial-d6a1f70d-2ffd-46a7-a398-c4119dc4a324 - fake-vendor fake-model serial-da5c8ade-5cad-4830-8f28-5c7ffa08bcaa - fake-vendor fake-model serial-e1101db8-e77b-4d71-a28b-96b687f695f7 - fake-vendor fake-model serial-f5b0d755-4530-404d-a680-12dffa51a252 - fake-vendor fake-model serial-f71b861c-4221-4874-ba7a-5e1b9c85ff14 - fake-vendor fake-model serial-ff74ddbf-6452-4aa3-b870-e5dd8d1fc78f + fake-vendor fake-model serial-12246045-67d5-4913-a634-caedf92489d8 + fake-vendor fake-model serial-146a7975-493c-4d7f-893f-18e9d796f153 + fake-vendor fake-model serial-3ab61b02-ed53-4f8c-8906-b8714f49efc6 + fake-vendor fake-model serial-65153a32-ee4b-4f8a-96af-2179681fd600 + fake-vendor fake-model serial-6e66588a-81bc-4220-afa5-f57e6360eadf + fake-vendor fake-model serial-b678e80e-d715-4727-a3d5-799787396f56 + fake-vendor fake-model serial-c838b209-6b80-48fa-9d65-87e4ef2724e3 + fake-vendor fake-model serial-e9a40967-500c-42b0-8ce9-825761ef2599 + fake-vendor fake-model serial-f830fcc8-bf88-4ec4-b2e4-afa7bc0ded17 + fake-vendor fake-model serial-fcfa0cc0-3c79-403e-8d93-ab4909e4aaa8 omicron zones at generation 2: @@ -80,16 +80,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-02063dc1-62a9-4559-bcfe-6eda82331aa4 - fake-vendor fake-model serial-042250ff-90a5-46be-a143-ab5052521782 - fake-vendor fake-model serial-0a462e64-76fc-4fc2-8f85-459349ff2bb2 - fake-vendor fake-model serial-18cc0eb9-9ae9-406e-bbbe-b346e203c975 - fake-vendor fake-model serial-6e478703-47e8-4b9d-b7c0-7279b2caabf6 - fake-vendor fake-model serial-6f360728-3632-4f9e-a7b4-8e64e137ea48 - fake-vendor fake-model serial-80daa136-388b-459e-a7d5-9ab3edb4c6aa - fake-vendor fake-model serial-b6462894-8235-40ab-8526-c5cc80b9a5c0 - fake-vendor fake-model serial-c03df46f-a1ba-45c0-9ccc-45d057f16fcc - fake-vendor fake-model serial-f36e6462-8125-48e5-8277-16bba0c5e12f + fake-vendor fake-model serial-09724143-f71c-46a4-af87-b5b6d60c0ab1 + fake-vendor fake-model serial-1c42cc4d-ffbb-49fb-a451-a66485192fd2 + fake-vendor fake-model serial-32226dd6-f151-4bc9-a467-60a80206b591 + fake-vendor fake-model serial-3b052b60-765b-4a6e-88e5-d0f1969ccf3f + fake-vendor fake-model serial-3bfb6063-5f2d-4162-b3c9-7b48b7247b35 + fake-vendor fake-model serial-46c5dc64-d8dc-476c-9778-abd81def2927 + fake-vendor fake-model serial-4afabcd7-4626-475c-8a86-2c11984fb639 + fake-vendor fake-model serial-54f1c37a-59eb-4296-9035-2e6ead3fb940 + fake-vendor fake-model serial-6cadcb12-1e3a-46a9-8b7b-8d014def5633 + fake-vendor fake-model serial-b36c492a-a405-40ab-a48a-56bd81c901eb omicron zones at generation 2: 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 74233658f9..3aa10ffb8f 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 @@ -9,16 +9,16 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-182681c1-8cc2-4de0-9888-85457300eba9 - fake-vendor fake-model serial-333ef994-8e0a-46eb-80d8-3a11d117d0b9 - fake-vendor fake-model serial-357be03c-4399-403f-96ad-68df49de6230 - fake-vendor fake-model serial-3df9056f-f801-46a8-b18e-b25dd539b778 - fake-vendor fake-model serial-558d4af0-0ac6-4fa2-ab62-2c9aa28ea54c - fake-vendor fake-model serial-78b40981-33b8-418c-8456-6fb2ced53146 - fake-vendor fake-model serial-a32e393d-321d-437d-b0ea-c7672d285f61 - fake-vendor fake-model serial-c41bfe47-537f-44ad-b4b4-fdf0da7dd5f4 - fake-vendor fake-model serial-d6d0973b-5402-4998-895f-75514c40b14a - fake-vendor fake-model serial-e443c3c4-a474-4510-b809-b3565ca85822 + fake-vendor fake-model serial-162ac3db-ff89-4a71-bc24-59874dfd0b65 + fake-vendor fake-model serial-1d9f40fb-d72a-43eb-93c4-66220efb44d8 + fake-vendor fake-model serial-1dc69f5d-5476-44e7-b8ef-09a3eb5497ce + fake-vendor fake-model serial-2b2ce59c-14bb-4425-bda3-56f8c3077ba5 + fake-vendor fake-model serial-80cc4e9d-cf06-4e41-94e9-5005ad82aeb6 + fake-vendor fake-model serial-b0ebb01e-f0ca-4ab5-b735-29acd51a546b + fake-vendor fake-model serial-c7bb5b29-fcc9-441f-bf06-e9d077a29023 + fake-vendor fake-model serial-d76c417a-f612-4b9c-821c-478b59cd196c + fake-vendor fake-model serial-e023dde2-179a-4ea6-b6cb-4e367f81c2f4 + fake-vendor fake-model serial-f40bbe9f-2e89-4bd1-a295-22fee2d86c2c omicron zones at generation 2: @@ -45,16 +45,16 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-2f34f26c-547f-4fb5-a242-6cc1b856d4d1 - fake-vendor fake-model serial-53d510a2-5ac4-432a-8898-7f75e4e76b22 - fake-vendor fake-model serial-69bf4ca3-11fb-451e-a3b8-f7197eb0191a - fake-vendor fake-model serial-85a7476b-69ef-4ffb-b2c2-a480ddc776d3 - fake-vendor fake-model serial-96d653b2-19a7-4097-a97f-015a51ae7388 - fake-vendor fake-model serial-a9b2a2de-9737-4e2d-bb84-00550714a201 - fake-vendor fake-model serial-b5defc73-ad92-4dfa-bd9e-8bf0c8816dc5 - fake-vendor fake-model serial-c1398692-d317-4768-92e1-aef0b79f6675 - fake-vendor fake-model serial-c53f52e7-d7a4-4379-9142-c067be2d4dd0 - fake-vendor fake-model serial-ede987cf-962c-4e43-b26f-477d94ec8fcb + fake-vendor fake-model serial-090cadb0-8dba-4b85-9e67-3d6ffe4dcd51 + fake-vendor fake-model serial-0f6cefea-d494-464f-a046-b4c0a01cdb56 + fake-vendor fake-model serial-1b7df87f-dbd6-4fb3-a360-d3e06a7be2a5 + fake-vendor fake-model serial-36302ea9-5442-4823-9eea-165b9a35330a + fake-vendor fake-model serial-3c2a66d9-bea1-4488-a825-8e06a7902dfc + fake-vendor fake-model serial-49fde484-b427-4e3a-908f-db73689ce094 + fake-vendor fake-model serial-5c4c284f-a272-492d-a845-1311b69dd7d0 + fake-vendor fake-model serial-6e887dcb-e7af-4abc-99d0-242d86537e01 + fake-vendor fake-model serial-ab0be98b-1bb1-476d-817f-fcf88d4ca5ff + fake-vendor fake-model serial-cdbdf2a7-91bb-4e42-93bd-deb23a8e2310 omicron zones at generation 2: @@ -81,16 +81,16 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-05d0b9af-6e7d-4999-b4d4-6bd037a36001 - fake-vendor fake-model serial-17b2f996-ded9-4998-8a8e-d88554658249 - fake-vendor fake-model serial-28a5376e-19c5-4c07-89f9-5386642668a0 - fake-vendor fake-model serial-3f3179dc-5955-4178-8504-1b15ff94eca4 - fake-vendor fake-model serial-5d996530-1dca-475e-843c-7bb061c604c8 - fake-vendor fake-model serial-5dd9b748-c658-40e9-b00d-b34f1f75526d - fake-vendor fake-model serial-809fa4bd-4fdc-4d68-b003-413e10f0e18b - fake-vendor fake-model serial-c55e8c23-f01f-4861-bbd1-f9ddcb0783a2 - fake-vendor fake-model serial-da4b22d3-47db-4765-8906-50a5eba4a3f8 - fake-vendor fake-model serial-e163fb0f-e68c-42a1-a977-f53d16afe47d + fake-vendor fake-model serial-2ad1a91e-4bf5-4eaa-b2b3-d995660575fb + fake-vendor fake-model serial-4c4b603e-b2d7-42ff-bc42-958607d21627 + fake-vendor fake-model serial-5984c027-208b-460b-9f3a-75d92b3590a9 + fake-vendor fake-model serial-61f62265-b2b6-440a-bdd5-4021679f199f + fake-vendor fake-model serial-626dc1bb-5bd3-4228-b400-ec49f2f37ee0 + fake-vendor fake-model serial-79e49a5c-a3c7-4ca9-a7f7-d8d18f61cd7e + fake-vendor fake-model serial-90727ed6-b36a-49da-b6e9-059859a0f008 + fake-vendor fake-model serial-b1b169cb-b9d0-41ce-b184-04192a02ebbe + fake-vendor fake-model serial-e65d0085-50ed-49b0-b79f-d47b9febb223 + fake-vendor fake-model serial-fb5893d8-8d45-4d8a-940f-ab49b9472b43 omicron zones at generation 2: @@ -119,16 +119,16 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- -+ fake-vendor fake-model serial-42a4fca0-052b-4a60-9340-124bfb5b19ef -+ fake-vendor fake-model serial-8c2010c7-213a-4358-9fd6-261ca40d3667 -+ fake-vendor fake-model serial-a2dbfd3b-047c-42a5-9305-71b8a8b45423 -+ fake-vendor fake-model serial-aa68fda8-73ef-4b83-ab01-e4c8cfbeb5db -+ fake-vendor fake-model serial-bd11dbba-2f62-42b1-ac30-8458bb9a9f3e -+ fake-vendor fake-model serial-d0ecb952-a6d0-4001-b22d-568f473d5076 -+ fake-vendor fake-model serial-d50d897a-d70d-4f25-adac-3d2d4a344418 -+ fake-vendor fake-model serial-e5fc5d2b-be26-4734-8297-3f8024b85fda -+ fake-vendor fake-model serial-e9562cc6-a07e-4929-a1ed-c6bb377dc301 -+ fake-vendor fake-model serial-fdae7c62-0eec-44a6-a7e8-296382df11de ++ fake-vendor fake-model serial-09aee89a-5844-48b8-ba6a-717b71445bfa ++ fake-vendor fake-model serial-3000a555-6045-4f6e-b17c-87a64afc5431 ++ fake-vendor fake-model serial-4630b6d3-3189-4f10-9a6e-a849b4faacfb ++ fake-vendor fake-model serial-4c0bd29a-dfa3-4e23-9426-6e3426267351 ++ fake-vendor fake-model serial-73bc4d08-0998-4e72-abb6-d3dfd9151d0e ++ fake-vendor fake-model serial-7816df32-5eb7-42f9-b453-6f4af314b80b ++ fake-vendor fake-model serial-84d31b23-b47c-4a3d-8bf5-af589c179ac4 ++ fake-vendor fake-model serial-97605efe-c8f7-4c70-801b-688d64b62862 ++ fake-vendor fake-model serial-9b3f1964-71b7-4224-a845-cba8a37dcb97 ++ fake-vendor fake-model serial-e77a02ec-1217-438a-9cfb-0c2ff15bcdf1 omicron zones at generation 2: 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 6fc626548d..a190cc6724 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 @@ -9,16 +9,16 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-182681c1-8cc2-4de0-9888-85457300eba9 - fake-vendor fake-model serial-333ef994-8e0a-46eb-80d8-3a11d117d0b9 - fake-vendor fake-model serial-357be03c-4399-403f-96ad-68df49de6230 - fake-vendor fake-model serial-3df9056f-f801-46a8-b18e-b25dd539b778 - fake-vendor fake-model serial-558d4af0-0ac6-4fa2-ab62-2c9aa28ea54c - fake-vendor fake-model serial-78b40981-33b8-418c-8456-6fb2ced53146 - fake-vendor fake-model serial-a32e393d-321d-437d-b0ea-c7672d285f61 - fake-vendor fake-model serial-c41bfe47-537f-44ad-b4b4-fdf0da7dd5f4 - fake-vendor fake-model serial-d6d0973b-5402-4998-895f-75514c40b14a - fake-vendor fake-model serial-e443c3c4-a474-4510-b809-b3565ca85822 + fake-vendor fake-model serial-162ac3db-ff89-4a71-bc24-59874dfd0b65 + fake-vendor fake-model serial-1d9f40fb-d72a-43eb-93c4-66220efb44d8 + fake-vendor fake-model serial-1dc69f5d-5476-44e7-b8ef-09a3eb5497ce + fake-vendor fake-model serial-2b2ce59c-14bb-4425-bda3-56f8c3077ba5 + fake-vendor fake-model serial-80cc4e9d-cf06-4e41-94e9-5005ad82aeb6 + fake-vendor fake-model serial-b0ebb01e-f0ca-4ab5-b735-29acd51a546b + fake-vendor fake-model serial-c7bb5b29-fcc9-441f-bf06-e9d077a29023 + fake-vendor fake-model serial-d76c417a-f612-4b9c-821c-478b59cd196c + fake-vendor fake-model serial-e023dde2-179a-4ea6-b6cb-4e367f81c2f4 + fake-vendor fake-model serial-f40bbe9f-2e89-4bd1-a295-22fee2d86c2c omicron zones at generation 2: @@ -45,16 +45,16 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-2f34f26c-547f-4fb5-a242-6cc1b856d4d1 - fake-vendor fake-model serial-53d510a2-5ac4-432a-8898-7f75e4e76b22 - fake-vendor fake-model serial-69bf4ca3-11fb-451e-a3b8-f7197eb0191a - fake-vendor fake-model serial-85a7476b-69ef-4ffb-b2c2-a480ddc776d3 - fake-vendor fake-model serial-96d653b2-19a7-4097-a97f-015a51ae7388 - fake-vendor fake-model serial-a9b2a2de-9737-4e2d-bb84-00550714a201 - fake-vendor fake-model serial-b5defc73-ad92-4dfa-bd9e-8bf0c8816dc5 - fake-vendor fake-model serial-c1398692-d317-4768-92e1-aef0b79f6675 - fake-vendor fake-model serial-c53f52e7-d7a4-4379-9142-c067be2d4dd0 - fake-vendor fake-model serial-ede987cf-962c-4e43-b26f-477d94ec8fcb + fake-vendor fake-model serial-090cadb0-8dba-4b85-9e67-3d6ffe4dcd51 + fake-vendor fake-model serial-0f6cefea-d494-464f-a046-b4c0a01cdb56 + fake-vendor fake-model serial-1b7df87f-dbd6-4fb3-a360-d3e06a7be2a5 + fake-vendor fake-model serial-36302ea9-5442-4823-9eea-165b9a35330a + fake-vendor fake-model serial-3c2a66d9-bea1-4488-a825-8e06a7902dfc + fake-vendor fake-model serial-49fde484-b427-4e3a-908f-db73689ce094 + fake-vendor fake-model serial-5c4c284f-a272-492d-a845-1311b69dd7d0 + fake-vendor fake-model serial-6e887dcb-e7af-4abc-99d0-242d86537e01 + fake-vendor fake-model serial-ab0be98b-1bb1-476d-817f-fcf88d4ca5ff + fake-vendor fake-model serial-cdbdf2a7-91bb-4e42-93bd-deb23a8e2310 omicron zones at generation 2: @@ -81,16 +81,16 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-05d0b9af-6e7d-4999-b4d4-6bd037a36001 - fake-vendor fake-model serial-17b2f996-ded9-4998-8a8e-d88554658249 - fake-vendor fake-model serial-28a5376e-19c5-4c07-89f9-5386642668a0 - fake-vendor fake-model serial-3f3179dc-5955-4178-8504-1b15ff94eca4 - fake-vendor fake-model serial-5d996530-1dca-475e-843c-7bb061c604c8 - fake-vendor fake-model serial-5dd9b748-c658-40e9-b00d-b34f1f75526d - fake-vendor fake-model serial-809fa4bd-4fdc-4d68-b003-413e10f0e18b - fake-vendor fake-model serial-c55e8c23-f01f-4861-bbd1-f9ddcb0783a2 - fake-vendor fake-model serial-da4b22d3-47db-4765-8906-50a5eba4a3f8 - fake-vendor fake-model serial-e163fb0f-e68c-42a1-a977-f53d16afe47d + fake-vendor fake-model serial-2ad1a91e-4bf5-4eaa-b2b3-d995660575fb + fake-vendor fake-model serial-4c4b603e-b2d7-42ff-bc42-958607d21627 + fake-vendor fake-model serial-5984c027-208b-460b-9f3a-75d92b3590a9 + fake-vendor fake-model serial-61f62265-b2b6-440a-bdd5-4021679f199f + fake-vendor fake-model serial-626dc1bb-5bd3-4228-b400-ec49f2f37ee0 + fake-vendor fake-model serial-79e49a5c-a3c7-4ca9-a7f7-d8d18f61cd7e + fake-vendor fake-model serial-90727ed6-b36a-49da-b6e9-059859a0f008 + fake-vendor fake-model serial-b1b169cb-b9d0-41ce-b184-04192a02ebbe + fake-vendor fake-model serial-e65d0085-50ed-49b0-b79f-d47b9febb223 + fake-vendor fake-model serial-fb5893d8-8d45-4d8a-940f-ab49b9472b43 omicron zones at generation 2: @@ -119,16 +119,16 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-42a4fca0-052b-4a60-9340-124bfb5b19ef - fake-vendor fake-model serial-8c2010c7-213a-4358-9fd6-261ca40d3667 - fake-vendor fake-model serial-a2dbfd3b-047c-42a5-9305-71b8a8b45423 - fake-vendor fake-model serial-aa68fda8-73ef-4b83-ab01-e4c8cfbeb5db - fake-vendor fake-model serial-bd11dbba-2f62-42b1-ac30-8458bb9a9f3e - fake-vendor fake-model serial-d0ecb952-a6d0-4001-b22d-568f473d5076 - fake-vendor fake-model serial-d50d897a-d70d-4f25-adac-3d2d4a344418 - fake-vendor fake-model serial-e5fc5d2b-be26-4734-8297-3f8024b85fda - fake-vendor fake-model serial-e9562cc6-a07e-4929-a1ed-c6bb377dc301 - fake-vendor fake-model serial-fdae7c62-0eec-44a6-a7e8-296382df11de + fake-vendor fake-model serial-09aee89a-5844-48b8-ba6a-717b71445bfa + fake-vendor fake-model serial-3000a555-6045-4f6e-b17c-87a64afc5431 + fake-vendor fake-model serial-4630b6d3-3189-4f10-9a6e-a849b4faacfb + fake-vendor fake-model serial-4c0bd29a-dfa3-4e23-9426-6e3426267351 + fake-vendor fake-model serial-73bc4d08-0998-4e72-abb6-d3dfd9151d0e + fake-vendor fake-model serial-7816df32-5eb7-42f9-b453-6f4af314b80b + fake-vendor fake-model serial-84d31b23-b47c-4a3d-8bf5-af589c179ac4 + fake-vendor fake-model serial-97605efe-c8f7-4c70-801b-688d64b62862 + fake-vendor fake-model serial-9b3f1964-71b7-4224-a845-cba8a37dcb97 + fake-vendor fake-model serial-e77a02ec-1217-438a-9cfb-0c2ff15bcdf1 omicron zones generation 2 -> 3: 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 60d3211082..eb33181eb2 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 @@ -9,16 +9,16 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-01c0e336-7c2c-4f29-ac56-42a0cf0e8e0b - fake-vendor fake-model serial-5bc12d61-6cc1-40a5-bde0-2b2b24caf554 - fake-vendor fake-model serial-6b306a27-06a7-4c5f-832c-b0374c9b58e4 - fake-vendor fake-model serial-79493a9d-8a2c-451f-a708-a9a41bb9765f - fake-vendor fake-model serial-9835bcc4-189c-4e8a-9732-8106c1feb5dd - fake-vendor fake-model serial-a8e94ce6-b2d7-42fe-bac7-208fcb465acb - fake-vendor fake-model serial-b006a807-3372-4cf6-8550-7b1326025209 - fake-vendor fake-model serial-b14ef338-9808-476f-b474-aa709c3c9550 - fake-vendor fake-model serial-f5dc842d-a6e5-4b31-9e04-6ab10e881241 - fake-vendor fake-model serial-f7465551-ec6a-43b2-b7b0-1adbb43208e2 + fake-vendor fake-model serial-0c611374-48b5-43be-b57a-a250c3e46906 + fake-vendor fake-model serial-14f84323-2785-4076-babe-2bbcd7a58de6 + fake-vendor fake-model serial-34aec426-4d9e-4aa7-95cf-21cbc44ff24c + fake-vendor fake-model serial-55d1e072-9459-47c7-b9e8-167261c8255e + fake-vendor fake-model serial-68aada78-01d2-40c2-b274-39c4a86cd3fb + fake-vendor fake-model serial-82cd8dbc-e212-4c92-a110-f49676c5d47d + fake-vendor fake-model serial-87a79396-4f96-405b-be6e-97585648147b + fake-vendor fake-model serial-948b3ca0-d7bc-4a8b-aa4b-a465d40ef2da + fake-vendor fake-model serial-b68abfbb-1af6-48d2-a28d-316571a1f814 + fake-vendor fake-model serial-bf76d8ff-a87e-43f1-a440-68a761075bf7 omicron zones at generation 2: @@ -47,16 +47,16 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- -- fake-vendor fake-model serial-0c0aa636-b8a7-4777-ae4f-dab544767ca9 -- fake-vendor fake-model serial-0e840514-4941-4fc8-93ed-68ccb62aed00 -- fake-vendor fake-model serial-950ae7a3-dc22-4b1d-81ce-eaf80b2f7be2 -- fake-vendor fake-model serial-975cf95c-7f34-47c0-a535-cd5491719428 -- fake-vendor fake-model serial-97cce250-f1b9-450e-ba02-b9e3bfa49ce2 -- fake-vendor fake-model serial-988e9963-c335-4104-b86a-3cb4509c9d64 -- fake-vendor fake-model serial-bf85d201-5b55-4cc5-837f-300a207605dd -- fake-vendor fake-model serial-c4938705-5821-4e20-b5e8-ac40a18b4c0c -- fake-vendor fake-model serial-f9017a6c-304a-4db8-aaa6-6447216eac55 -- fake-vendor fake-model serial-fad821f1-2817-414d-b210-1ef8aea4f786 +- fake-vendor fake-model serial-1783061d-69d4-4010-b08c-e42d4f5a14dd +- fake-vendor fake-model serial-3206a882-1e4f-4746-bed8-d3b6de07fc1c +- fake-vendor fake-model serial-396589b6-4431-441d-a08d-727afa91f402 +- fake-vendor fake-model serial-3e144591-f21e-497f-95ea-a0aac12a82c4 +- fake-vendor fake-model serial-5c4f456f-c309-47f3-8d53-3cc9e3c89293 +- fake-vendor fake-model serial-88c334a5-9967-47da-a610-6d44c3a5f890 +- fake-vendor fake-model serial-a0b679b2-dd2b-4369-bf0b-d93420100517 +- fake-vendor fake-model serial-ad102ede-7463-4c6f-8518-e158a0f7e743 +- fake-vendor fake-model serial-d79a4a8d-dcfb-4709-a829-f7b3d5e62aa0 +- fake-vendor fake-model serial-dd1aeed4-836f-4a99-b14b-db5acd6821fb omicron zones generation 2 -> 3: @@ -83,16 +83,16 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-00f0d59c-eea9-4225-a5e8-be9f09b7aafe - fake-vendor fake-model serial-1a13430c-7c57-492d-af8c-3cba27de8738 - fake-vendor fake-model serial-26f3f412-6ac5-46da-b70a-ee38167b380d - fake-vendor fake-model serial-286600b8-c2fd-4966-bc40-754ce7ff946e - fake-vendor fake-model serial-487b04c8-5677-4844-a800-afa3f5bf7fca - fake-vendor fake-model serial-755b4c8e-d985-4796-8e98-941fdb741a51 - fake-vendor fake-model serial-98365fa0-9c75-458b-943f-3ada660bd618 - fake-vendor fake-model serial-b8825aeb-14e2-4c2a-9c82-9f0d0d581bbf - fake-vendor fake-model serial-c57351f5-6ee8-47dc-b0f8-3c188bdf0aa3 - fake-vendor fake-model serial-f3e9cca0-7a22-41e0-a4fd-fc3bfe4adcee + fake-vendor fake-model serial-4036be4f-b1d6-45d9-9cd6-22c3a3ef3064 + fake-vendor fake-model serial-4efcf01e-a48f-4f73-a5a8-4b04f7dbaccb + fake-vendor fake-model serial-59cb2398-8870-43a4-983f-c4fc2bc30aa0 + fake-vendor fake-model serial-8cd548e4-4084-4d4d-b662-89d3c7f78a73 + fake-vendor fake-model serial-91eb726a-a0c7-47b9-8216-26ea2b0337d8 + fake-vendor fake-model serial-b66b4852-9ce8-42a5-a3ac-7ff3764c4ead + fake-vendor fake-model serial-c725682d-eb97-4012-bdba-91e600f9283b + fake-vendor fake-model serial-e404b831-d4e8-4b73-9411-5e2355df8ca1 + fake-vendor fake-model serial-f0020dd7-165b-4c60-92b3-af9025d767e0 + fake-vendor fake-model serial-fc7cf6df-9fa0-4a13-b31c-15376c3be6e6 omicron zones generation 2 -> 3: diff --git a/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_bp2.txt b/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_bp2.txt index 66e8c05fa0..393a288372 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_bp2.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_bp2.txt @@ -7,16 +7,16 @@ parent: 516e80a3-b362-4fac-bd3c-4559717120dd ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-a8e94ce6-b2d7-42fe-bac7-208fcb465acb - fake-vendor fake-model serial-01c0e336-7c2c-4f29-ac56-42a0cf0e8e0b - fake-vendor fake-model serial-b006a807-3372-4cf6-8550-7b1326025209 - fake-vendor fake-model serial-9835bcc4-189c-4e8a-9732-8106c1feb5dd - fake-vendor fake-model serial-f7465551-ec6a-43b2-b7b0-1adbb43208e2 - fake-vendor fake-model serial-5bc12d61-6cc1-40a5-bde0-2b2b24caf554 - fake-vendor fake-model serial-79493a9d-8a2c-451f-a708-a9a41bb9765f - fake-vendor fake-model serial-b14ef338-9808-476f-b474-aa709c3c9550 - fake-vendor fake-model serial-f5dc842d-a6e5-4b31-9e04-6ab10e881241 - fake-vendor fake-model serial-6b306a27-06a7-4c5f-832c-b0374c9b58e4 + fake-vendor fake-model serial-14f84323-2785-4076-babe-2bbcd7a58de6 + fake-vendor fake-model serial-0c611374-48b5-43be-b57a-a250c3e46906 + fake-vendor fake-model serial-b68abfbb-1af6-48d2-a28d-316571a1f814 + fake-vendor fake-model serial-82cd8dbc-e212-4c92-a110-f49676c5d47d + fake-vendor fake-model serial-87a79396-4f96-405b-be6e-97585648147b + fake-vendor fake-model serial-bf76d8ff-a87e-43f1-a440-68a761075bf7 + fake-vendor fake-model serial-55d1e072-9459-47c7-b9e8-167261c8255e + fake-vendor fake-model serial-68aada78-01d2-40c2-b274-39c4a86cd3fb + fake-vendor fake-model serial-34aec426-4d9e-4aa7-95cf-21cbc44ff24c + fake-vendor fake-model serial-948b3ca0-d7bc-4a8b-aa4b-a465d40ef2da omicron zones at generation 2: @@ -44,16 +44,16 @@ parent: 516e80a3-b362-4fac-bd3c-4559717120dd ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-c57351f5-6ee8-47dc-b0f8-3c188bdf0aa3 - fake-vendor fake-model serial-286600b8-c2fd-4966-bc40-754ce7ff946e - fake-vendor fake-model serial-1a13430c-7c57-492d-af8c-3cba27de8738 - fake-vendor fake-model serial-b8825aeb-14e2-4c2a-9c82-9f0d0d581bbf - fake-vendor fake-model serial-f3e9cca0-7a22-41e0-a4fd-fc3bfe4adcee - fake-vendor fake-model serial-26f3f412-6ac5-46da-b70a-ee38167b380d - fake-vendor fake-model serial-487b04c8-5677-4844-a800-afa3f5bf7fca - fake-vendor fake-model serial-00f0d59c-eea9-4225-a5e8-be9f09b7aafe - fake-vendor fake-model serial-98365fa0-9c75-458b-943f-3ada660bd618 - fake-vendor fake-model serial-755b4c8e-d985-4796-8e98-941fdb741a51 + fake-vendor fake-model serial-4036be4f-b1d6-45d9-9cd6-22c3a3ef3064 + fake-vendor fake-model serial-f0020dd7-165b-4c60-92b3-af9025d767e0 + fake-vendor fake-model serial-fc7cf6df-9fa0-4a13-b31c-15376c3be6e6 + fake-vendor fake-model serial-59cb2398-8870-43a4-983f-c4fc2bc30aa0 + fake-vendor fake-model serial-91eb726a-a0c7-47b9-8216-26ea2b0337d8 + fake-vendor fake-model serial-b66b4852-9ce8-42a5-a3ac-7ff3764c4ead + fake-vendor fake-model serial-c725682d-eb97-4012-bdba-91e600f9283b + fake-vendor fake-model serial-e404b831-d4e8-4b73-9411-5e2355df8ca1 + fake-vendor fake-model serial-8cd548e4-4084-4d4d-b662-89d3c7f78a73 + fake-vendor fake-model serial-4efcf01e-a48f-4f73-a5a8-4b04f7dbaccb omicron zones at generation 3: 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 03e4e65116..55fd03c5ac 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_1_2.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_1_2.txt @@ -9,16 +9,16 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-1000adf1-31d2-4ac5-93cb-9557073f3fce - fake-vendor fake-model serial-102d1821-cfee-41fe-994a-b9081e97c1b6 - fake-vendor fake-model serial-336a8a90-c61e-47b8-bec3-7d63bdb64a05 - fake-vendor fake-model serial-68e8aceb-8d9c-4a50-8fdc-27e3aba477e7 - fake-vendor fake-model serial-8a74733f-de68-431d-9d07-b90a13e0a953 - fake-vendor fake-model serial-9091f1de-433e-4094-a9aa-749c8a1eac3a - fake-vendor fake-model serial-a95db55e-5ce2-4bba-85fd-b1f9a8de9dfa - fake-vendor fake-model serial-b46670e0-2f4d-4e00-90b3-eec1bad4e617 - fake-vendor fake-model serial-c0d2da25-a6c3-47e5-88c6-52f2a9357c35 - fake-vendor fake-model serial-f72765cd-c872-4ab8-8257-595104fc1faf + fake-vendor fake-model serial-06f2cd23-a7aa-4486-b9fe-86f4bd1d0fca + fake-vendor fake-model serial-09df1e55-99fc-4dcb-9020-17abb1194656 + fake-vendor fake-model serial-13a4c4b2-10e8-4042-bc65-15fe4a4c6681 + fake-vendor fake-model serial-1d1b5bef-c747-4a22-bd8e-4a192ea9210b + fake-vendor fake-model serial-26179387-ef29-49a7-bdf4-d83ec9345c26 + fake-vendor fake-model serial-45478072-b62a-4a9b-b15c-457b43b72506 + fake-vendor fake-model serial-9922b977-ce78-4c61-b96c-26f6d7eec1f2 + fake-vendor fake-model serial-e52b7eac-902c-4036-b10c-a2bfd154f420 + fake-vendor fake-model serial-f047831b-3703-42e6-b824-10768c15201a + fake-vendor fake-model serial-faa3bb7d-c91f-49cc-8bac-f113a1516c2d omicron zones at generation 2: @@ -47,16 +47,16 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- -- fake-vendor fake-model serial-00436e53-1da6-4990-892b-82cfc2cbbd0c -- fake-vendor fake-model serial-0235e33b-8d5c-4ce8-8fe4-a3aeef756cf5 -- fake-vendor fake-model serial-0a34e08d-746d-4399-a005-73bb30d8fc8a -- fake-vendor fake-model serial-12e15877-db98-45de-bb7f-6a6b4932608a -- fake-vendor fake-model serial-6017bf1d-ec24-48c1-92f5-ad4f095155e1 -- fake-vendor fake-model serial-6e218f9c-1d93-439a-9e16-c2e50bad89ac -- fake-vendor fake-model serial-80d8f4a0-ea72-4fc3-bd0c-2316c86a1fc2 -- fake-vendor fake-model serial-c2a64d93-b903-4c14-b70e-c7ca77aea700 -- fake-vendor fake-model serial-dfe21e19-b7f2-41de-9647-90f1861088cb -- fake-vendor fake-model serial-efb11a6a-ba9b-41e4-ba3a-9ddd4bbbea8c +- fake-vendor fake-model serial-0d28c2b2-c9ef-4be9-907a-2c99bac7d88e +- fake-vendor fake-model serial-0e3d1aef-3e8e-4f4c-8a4f-301b648079b6 +- fake-vendor fake-model serial-0fc1d164-a59c-4189-8771-1d0227a70dfa +- fake-vendor fake-model serial-155d77e8-ae51-427f-bd9e-a69ae0e2cc41 +- fake-vendor fake-model serial-4ad787cd-1e62-4cdb-a1f4-b2d40ae028f3 +- fake-vendor fake-model serial-608fbc4e-580a-4c90-b55d-08ecc339d819 +- fake-vendor fake-model serial-6d8f437d-5437-4216-9a7d-8176bf873c0e +- fake-vendor fake-model serial-cae1ccc3-15a2-4a90-8d7f-e59bedf8de6c +- fake-vendor fake-model serial-deddcb23-d5c3-4c95-b3df-67cdd082904a +- fake-vendor fake-model serial-f3c3df2b-b765-472c-b7c7-e07530d94fba omicron zones generation 2 -> 3: @@ -83,16 +83,16 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- -- fake-vendor fake-model serial-12716eb7-e43f-4846-9900-07eaf14f2277 -- fake-vendor fake-model serial-2f86ccc5-5ce3-4476-bece-c409dad8d325 -- fake-vendor fake-model serial-45bab329-7b86-4715-aa8c-9a73a8168752 -- fake-vendor fake-model serial-49dd0466-20d4-4f47-a938-0db3fee2c31f -- fake-vendor fake-model serial-71f16ca6-3668-45e4-a22e-628718e01a69 -- fake-vendor fake-model serial-81861ade-91f9-4f1c-96a6-dcda1b54396a -- fake-vendor fake-model serial-dc6fd41a-8a7c-4eb3-939b-1abab03316b0 -- fake-vendor fake-model serial-de71808e-d932-48a6-aedf-bd0286bcfad7 -- fake-vendor fake-model serial-e0f258ef-c9a9-4f6a-ae37-3aceb8b0b269 -- fake-vendor fake-model serial-f8680f9e-521a-4a23-b247-a8c6488c67eb +- fake-vendor fake-model serial-276cd5b2-68b3-4641-b950-f1c1b2433f63 +- fake-vendor fake-model serial-3d56150d-e19b-4542-ab3d-a0864f6ee9bb +- fake-vendor fake-model serial-6089777e-999a-4a2a-8283-b2d1d6507ea2 +- fake-vendor fake-model serial-634b1f5b-e9f3-43db-9ba4-8842645714ab +- fake-vendor fake-model serial-83674e00-4fa4-4930-af53-d4ec68c2929e +- fake-vendor fake-model serial-84fda049-e10a-451c-996a-1859fdbc915b +- fake-vendor fake-model serial-ca5b22a8-1b21-4f01-ad67-390ec30ae53f +- fake-vendor fake-model serial-cc2956eb-1657-422c-9a05-cc533b76186f +- fake-vendor fake-model serial-d98670b9-8676-4915-8eef-3085b7144d57 +- fake-vendor fake-model serial-f1b31edf-d02a-4bb7-8866-bc85ce632777 omicron zones at generation 2: @@ -119,16 +119,16 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-04a142c5-dddf-49d5-a963-12119c5cfa15 - fake-vendor fake-model serial-10dc60af-59ad-4bc8-a5ab-30e65a4ddbc1 - fake-vendor fake-model serial-173f48ca-c1cc-457d-babc-c3426bf99978 - fake-vendor fake-model serial-2d21613a-c3bd-4692-9ca1-ba31f150dd42 - fake-vendor fake-model serial-5f4ed152-a31f-4477-a222-133b137e7830 - fake-vendor fake-model serial-62ae6033-7c9f-4859-b4ce-e6cdb74c853d - fake-vendor fake-model serial-6682fc71-d870-4ec8-adac-2b25b2b1d0dd - fake-vendor fake-model serial-685242da-eb90-4f12-9a5a-577f9611852d - fake-vendor fake-model serial-e6a96ffc-bc7e-4cb8-b431-fe6782cf28ac - fake-vendor fake-model serial-f023bcf7-fe8a-4a55-b20b-8fae207e3911 + fake-vendor fake-model serial-311f4ecf-f3fb-4860-b21f-1829cc7b84b5 + fake-vendor fake-model serial-327cac75-dd89-4f19-af63-2157c30075a1 + fake-vendor fake-model serial-3c027cb8-750c-467b-902e-4b8527772308 + fake-vendor fake-model serial-3ca8481a-7ee3-4f8f-8b2e-bbb9f45c9005 + fake-vendor fake-model serial-70aa7d95-8f3e-404b-ad51-406f04c529c3 + fake-vendor fake-model serial-84e4e1c3-0ac0-4e79-8c71-8b31534fa886 + fake-vendor fake-model serial-8bd23aee-5f02-4756-84dc-b89d82d61b18 + fake-vendor fake-model serial-b38c346d-ddcb-4d79-9e58-df6260507ec4 + fake-vendor fake-model serial-bf1d3068-fb12-4d06-84f0-84032c7f8b4a + fake-vendor fake-model serial-c272e81c-955f-4e60-9539-e91a723b2934 omicron zones generation 2 -> 3: @@ -158,16 +158,16 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-18a2935a-b88b-42a2-8d24-9b68b77803ef - fake-vendor fake-model serial-1c7dddc3-6d05-44ec-8555-7a477ea2dc92 - fake-vendor fake-model serial-2605e094-8a89-4517-a8ea-6b0d4798ba00 - fake-vendor fake-model serial-77d9f80a-3356-43b5-bb9a-db8cda655898 - fake-vendor fake-model serial-8130e805-ff7d-40b2-9384-b90378ce3899 - fake-vendor fake-model serial-9124bf4d-9ae2-4b0d-b312-d44617eab261 - fake-vendor fake-model serial-95e7941a-e213-4487-95a9-266facaac2da - fake-vendor fake-model serial-a7f05920-ebd6-4f11-b86a-019b39747ea4 - fake-vendor fake-model serial-cb15cd83-169e-480f-9fa5-7dba8bcda624 - fake-vendor fake-model serial-ced76864-5ed9-407f-9787-7b878f5b480e + fake-vendor fake-model serial-4f8140ad-2ff7-4eea-9abd-baf4072a2627 + fake-vendor fake-model serial-75df43e2-bb4c-4df0-b9ac-85e1444d0e66 + fake-vendor fake-model serial-89e92664-3a69-45be-8bd5-36ea098d4691 + fake-vendor fake-model serial-b70422ce-8252-4d53-9b6e-7da01190ca04 + fake-vendor fake-model serial-bb4d76ae-8734-4b9e-b671-2da816bfe4eb + fake-vendor fake-model serial-bce07ec9-8d0e-4d94-b60f-b680c3c37016 + fake-vendor fake-model serial-d02ec3a5-63ec-428c-9069-d69e16e9b4a5 + fake-vendor fake-model serial-de0d386e-adcd-4358-8bc4-a438b8e3366e + fake-vendor fake-model serial-f74abac5-002e-4564-95da-1023b2d1857c + fake-vendor fake-model serial-fc54faf3-de6a-400a-9654-da33054c1439 omicron zones generation 2 -> 3: 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 635cb1f9c5..dac3e35c3a 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_2_2a.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_2_2a.txt @@ -9,16 +9,16 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-04a142c5-dddf-49d5-a963-12119c5cfa15 - fake-vendor fake-model serial-10dc60af-59ad-4bc8-a5ab-30e65a4ddbc1 - fake-vendor fake-model serial-173f48ca-c1cc-457d-babc-c3426bf99978 - fake-vendor fake-model serial-2d21613a-c3bd-4692-9ca1-ba31f150dd42 - fake-vendor fake-model serial-5f4ed152-a31f-4477-a222-133b137e7830 - fake-vendor fake-model serial-62ae6033-7c9f-4859-b4ce-e6cdb74c853d - fake-vendor fake-model serial-6682fc71-d870-4ec8-adac-2b25b2b1d0dd - fake-vendor fake-model serial-685242da-eb90-4f12-9a5a-577f9611852d - fake-vendor fake-model serial-e6a96ffc-bc7e-4cb8-b431-fe6782cf28ac - fake-vendor fake-model serial-f023bcf7-fe8a-4a55-b20b-8fae207e3911 + fake-vendor fake-model serial-311f4ecf-f3fb-4860-b21f-1829cc7b84b5 + fake-vendor fake-model serial-327cac75-dd89-4f19-af63-2157c30075a1 + fake-vendor fake-model serial-3c027cb8-750c-467b-902e-4b8527772308 + fake-vendor fake-model serial-3ca8481a-7ee3-4f8f-8b2e-bbb9f45c9005 + fake-vendor fake-model serial-70aa7d95-8f3e-404b-ad51-406f04c529c3 + fake-vendor fake-model serial-84e4e1c3-0ac0-4e79-8c71-8b31534fa886 + fake-vendor fake-model serial-8bd23aee-5f02-4756-84dc-b89d82d61b18 + fake-vendor fake-model serial-b38c346d-ddcb-4d79-9e58-df6260507ec4 + fake-vendor fake-model serial-bf1d3068-fb12-4d06-84f0-84032c7f8b4a + fake-vendor fake-model serial-c272e81c-955f-4e60-9539-e91a723b2934 omicron zones at generation 3: @@ -48,16 +48,16 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-18a2935a-b88b-42a2-8d24-9b68b77803ef - fake-vendor fake-model serial-1c7dddc3-6d05-44ec-8555-7a477ea2dc92 - fake-vendor fake-model serial-2605e094-8a89-4517-a8ea-6b0d4798ba00 - fake-vendor fake-model serial-77d9f80a-3356-43b5-bb9a-db8cda655898 - fake-vendor fake-model serial-8130e805-ff7d-40b2-9384-b90378ce3899 - fake-vendor fake-model serial-9124bf4d-9ae2-4b0d-b312-d44617eab261 - fake-vendor fake-model serial-95e7941a-e213-4487-95a9-266facaac2da - fake-vendor fake-model serial-a7f05920-ebd6-4f11-b86a-019b39747ea4 - fake-vendor fake-model serial-cb15cd83-169e-480f-9fa5-7dba8bcda624 - fake-vendor fake-model serial-ced76864-5ed9-407f-9787-7b878f5b480e + fake-vendor fake-model serial-4f8140ad-2ff7-4eea-9abd-baf4072a2627 + fake-vendor fake-model serial-75df43e2-bb4c-4df0-b9ac-85e1444d0e66 + fake-vendor fake-model serial-89e92664-3a69-45be-8bd5-36ea098d4691 + fake-vendor fake-model serial-b70422ce-8252-4d53-9b6e-7da01190ca04 + fake-vendor fake-model serial-bb4d76ae-8734-4b9e-b671-2da816bfe4eb + fake-vendor fake-model serial-bce07ec9-8d0e-4d94-b60f-b680c3c37016 + fake-vendor fake-model serial-d02ec3a5-63ec-428c-9069-d69e16e9b4a5 + fake-vendor fake-model serial-de0d386e-adcd-4358-8bc4-a438b8e3366e + fake-vendor fake-model serial-f74abac5-002e-4564-95da-1023b2d1857c + fake-vendor fake-model serial-fc54faf3-de6a-400a-9654-da33054c1439 omicron zones at generation 3: @@ -111,16 +111,16 @@ to: blueprint 9f71f5d3-a272-4382-9154-6ea2e171a6c6 ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-1000adf1-31d2-4ac5-93cb-9557073f3fce - fake-vendor fake-model serial-102d1821-cfee-41fe-994a-b9081e97c1b6 - fake-vendor fake-model serial-336a8a90-c61e-47b8-bec3-7d63bdb64a05 - fake-vendor fake-model serial-68e8aceb-8d9c-4a50-8fdc-27e3aba477e7 - fake-vendor fake-model serial-8a74733f-de68-431d-9d07-b90a13e0a953 - fake-vendor fake-model serial-9091f1de-433e-4094-a9aa-749c8a1eac3a - fake-vendor fake-model serial-a95db55e-5ce2-4bba-85fd-b1f9a8de9dfa - fake-vendor fake-model serial-b46670e0-2f4d-4e00-90b3-eec1bad4e617 - fake-vendor fake-model serial-c0d2da25-a6c3-47e5-88c6-52f2a9357c35 - fake-vendor fake-model serial-f72765cd-c872-4ab8-8257-595104fc1faf + fake-vendor fake-model serial-06f2cd23-a7aa-4486-b9fe-86f4bd1d0fca + fake-vendor fake-model serial-09df1e55-99fc-4dcb-9020-17abb1194656 + fake-vendor fake-model serial-13a4c4b2-10e8-4042-bc65-15fe4a4c6681 + fake-vendor fake-model serial-1d1b5bef-c747-4a22-bd8e-4a192ea9210b + fake-vendor fake-model serial-26179387-ef29-49a7-bdf4-d83ec9345c26 + fake-vendor fake-model serial-45478072-b62a-4a9b-b15c-457b43b72506 + fake-vendor fake-model serial-9922b977-ce78-4c61-b96c-26f6d7eec1f2 + fake-vendor fake-model serial-e52b7eac-902c-4036-b10c-a2bfd154f420 + fake-vendor fake-model serial-f047831b-3703-42e6-b824-10768c15201a + fake-vendor fake-model serial-faa3bb7d-c91f-49cc-8bac-f113a1516c2d omicron zones at generation 2: @@ -167,7 +167,7 @@ ERRORS: zone diff errors: before gen 2, after gen 2 zone id: 6dff7633-66bb-4924-a6ff-2c896e66964b - reason: mismatched zone type: after: Nexus(Nexus { internal_address: [fd01:1122:3344:105::22]:12221, external_ip: OmicronZoneExternalFloatingIp { id: df83f715-8f94-49b5-8575-61299178c497 (external_ip), ip: 192.0.2.2 }, nic: NetworkInterface { id: 99402426-92dd-4975-9347-907e130d6b79, kind: Service { id: 6dff7633-66bb-4924-a6ff-2c896e66964b }, name: Name("nexus-6dff7633-66bb-4924-a6ff-2c896e66964b"), ip: 172.30.2.5, mac: MacAddr(MacAddr6([168, 64, 37, 255, 128, 0])), subnet: V4(Ipv4Net(Ipv4Network { addr: 172.30.2.0, prefix: 24 })), vni: Vni(100), primary: true, slot: 0 }, external_tls: false, external_dns_servers: [] }) + reason: mismatched zone type: after: Nexus(Nexus { internal_address: [fd01:1122:3344:105::22]:12221, external_ip: OmicronZoneExternalFloatingIp { id: 21926a58-4db1-43b8-a864-2f902eb564b9 (external_ip), ip: 192.0.2.2 }, nic: NetworkInterface { id: 99402426-92dd-4975-9347-907e130d6b79, kind: Service { id: 6dff7633-66bb-4924-a6ff-2c896e66964b }, name: Name("nexus-6dff7633-66bb-4924-a6ff-2c896e66964b"), ip: 172.30.2.5, mac: MacAddr(MacAddr6([168, 64, 37, 255, 128, 0])), subnet: V4(Ipv4Net(Ipv4Network { addr: 172.30.2.0, prefix: 24 })), vni: Vni(100), primary: true, slot: 0 }, external_tls: false, external_dns_servers: [] }) zone id: 7f4e9f9f-08f8-4d14-885d-e977c05525ad reason: mismatched underlay address: before: fd00:1122:3344:105::21, after: fd01:1122:3344:105::21 diff --git a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_bp2.txt b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_bp2.txt index 65f2e44944..7f4e5dca35 100644 --- a/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_bp2.txt +++ b/nexus/reconfigurator/planning/tests/output/planner_nonprovisionable_bp2.txt @@ -7,16 +7,16 @@ parent: 4d4e6c38-cd95-4c4e-8f45-6af4d686964b ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-9091f1de-433e-4094-a9aa-749c8a1eac3a - fake-vendor fake-model serial-b46670e0-2f4d-4e00-90b3-eec1bad4e617 - fake-vendor fake-model serial-8a74733f-de68-431d-9d07-b90a13e0a953 - fake-vendor fake-model serial-c0d2da25-a6c3-47e5-88c6-52f2a9357c35 - fake-vendor fake-model serial-a95db55e-5ce2-4bba-85fd-b1f9a8de9dfa - fake-vendor fake-model serial-102d1821-cfee-41fe-994a-b9081e97c1b6 - fake-vendor fake-model serial-1000adf1-31d2-4ac5-93cb-9557073f3fce - fake-vendor fake-model serial-68e8aceb-8d9c-4a50-8fdc-27e3aba477e7 - fake-vendor fake-model serial-336a8a90-c61e-47b8-bec3-7d63bdb64a05 - fake-vendor fake-model serial-f72765cd-c872-4ab8-8257-595104fc1faf + fake-vendor fake-model serial-09df1e55-99fc-4dcb-9020-17abb1194656 + fake-vendor fake-model serial-faa3bb7d-c91f-49cc-8bac-f113a1516c2d + fake-vendor fake-model serial-45478072-b62a-4a9b-b15c-457b43b72506 + fake-vendor fake-model serial-9922b977-ce78-4c61-b96c-26f6d7eec1f2 + fake-vendor fake-model serial-1d1b5bef-c747-4a22-bd8e-4a192ea9210b + fake-vendor fake-model serial-f047831b-3703-42e6-b824-10768c15201a + fake-vendor fake-model serial-13a4c4b2-10e8-4042-bc65-15fe4a4c6681 + fake-vendor fake-model serial-26179387-ef29-49a7-bdf4-d83ec9345c26 + fake-vendor fake-model serial-e52b7eac-902c-4036-b10c-a2bfd154f420 + fake-vendor fake-model serial-06f2cd23-a7aa-4486-b9fe-86f4bd1d0fca omicron zones at generation 2: @@ -44,16 +44,16 @@ parent: 4d4e6c38-cd95-4c4e-8f45-6af4d686964b ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-173f48ca-c1cc-457d-babc-c3426bf99978 - fake-vendor fake-model serial-62ae6033-7c9f-4859-b4ce-e6cdb74c853d - fake-vendor fake-model serial-04a142c5-dddf-49d5-a963-12119c5cfa15 - fake-vendor fake-model serial-5f4ed152-a31f-4477-a222-133b137e7830 - fake-vendor fake-model serial-685242da-eb90-4f12-9a5a-577f9611852d - fake-vendor fake-model serial-2d21613a-c3bd-4692-9ca1-ba31f150dd42 - fake-vendor fake-model serial-e6a96ffc-bc7e-4cb8-b431-fe6782cf28ac - fake-vendor fake-model serial-f023bcf7-fe8a-4a55-b20b-8fae207e3911 - fake-vendor fake-model serial-10dc60af-59ad-4bc8-a5ab-30e65a4ddbc1 - fake-vendor fake-model serial-6682fc71-d870-4ec8-adac-2b25b2b1d0dd + fake-vendor fake-model serial-c272e81c-955f-4e60-9539-e91a723b2934 + fake-vendor fake-model serial-311f4ecf-f3fb-4860-b21f-1829cc7b84b5 + fake-vendor fake-model serial-327cac75-dd89-4f19-af63-2157c30075a1 + fake-vendor fake-model serial-70aa7d95-8f3e-404b-ad51-406f04c529c3 + fake-vendor fake-model serial-bf1d3068-fb12-4d06-84f0-84032c7f8b4a + fake-vendor fake-model serial-84e4e1c3-0ac0-4e79-8c71-8b31534fa886 + fake-vendor fake-model serial-3ca8481a-7ee3-4f8f-8b2e-bbb9f45c9005 + fake-vendor fake-model serial-8bd23aee-5f02-4756-84dc-b89d82d61b18 + fake-vendor fake-model serial-b38c346d-ddcb-4d79-9e58-df6260507ec4 + fake-vendor fake-model serial-3c027cb8-750c-467b-902e-4b8527772308 omicron zones at generation 3: @@ -84,16 +84,16 @@ parent: 4d4e6c38-cd95-4c4e-8f45-6af4d686964b ---------------------------------------------------------------------- vendor model serial ---------------------------------------------------------------------- - fake-vendor fake-model serial-9124bf4d-9ae2-4b0d-b312-d44617eab261 - fake-vendor fake-model serial-77d9f80a-3356-43b5-bb9a-db8cda655898 - fake-vendor fake-model serial-95e7941a-e213-4487-95a9-266facaac2da - fake-vendor fake-model serial-2605e094-8a89-4517-a8ea-6b0d4798ba00 - fake-vendor fake-model serial-1c7dddc3-6d05-44ec-8555-7a477ea2dc92 - fake-vendor fake-model serial-ced76864-5ed9-407f-9787-7b878f5b480e - fake-vendor fake-model serial-8130e805-ff7d-40b2-9384-b90378ce3899 - fake-vendor fake-model serial-a7f05920-ebd6-4f11-b86a-019b39747ea4 - fake-vendor fake-model serial-18a2935a-b88b-42a2-8d24-9b68b77803ef - fake-vendor fake-model serial-cb15cd83-169e-480f-9fa5-7dba8bcda624 + fake-vendor fake-model serial-fc54faf3-de6a-400a-9654-da33054c1439 + fake-vendor fake-model serial-bce07ec9-8d0e-4d94-b60f-b680c3c37016 + fake-vendor fake-model serial-89e92664-3a69-45be-8bd5-36ea098d4691 + fake-vendor fake-model serial-f74abac5-002e-4564-95da-1023b2d1857c + fake-vendor fake-model serial-d02ec3a5-63ec-428c-9069-d69e16e9b4a5 + fake-vendor fake-model serial-4f8140ad-2ff7-4eea-9abd-baf4072a2627 + fake-vendor fake-model serial-75df43e2-bb4c-4df0-b9ac-85e1444d0e66 + fake-vendor fake-model serial-bb4d76ae-8734-4b9e-b671-2da816bfe4eb + fake-vendor fake-model serial-de0d386e-adcd-4358-8bc4-a438b8e3366e + fake-vendor fake-model serial-b70422ce-8252-4d53-9b6e-7da01190ca04 omicron zones at generation 3: