Skip to content

Commit

Permalink
sort zones
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewjstone
andrewjstone committed May 16, 2024
1 parent b27d34c commit 2752f68
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 37 deletions.
10 changes: 5 additions & 5 deletions nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
crucible 7004cab9-dfc0-43ba-92d3-58d4ced66025 in service fd00:1122:3344:103::24
crucible 79552859-fbd3-43bb-a9d3-6baba25558f8 in service fd00:1122:3344:103::26
crucible 90696819-9b53-485a-9c65-ca63602e843e in service fd00:1122:3344:103::27
nexus b2573120-9c91-4ed7-8b4f-a7bfe8dbc807 in service fd00:1122:3344:103::22
internal_ntp c81c9d4a-36d7-4796-9151-f564d3735152 in service fd00:1122:3344:103::21
crucible c99525b3-3680-4df6-9214-2ee3e1020e8b in service fd00:1122:3344:103::2a
crucible f42959d3-9eef-4e3b-b404-6177ce3ec7a1 in service fd00:1122:3344:103::2b
internal_ntp c81c9d4a-36d7-4796-9151-f564d3735152 in service fd00:1122:3344:103::21
nexus b2573120-9c91-4ed7-8b4f-a7bfe8dbc807 in service fd00:1122:3344:103::22


sled 84ac367e-9b03-4e9d-a846-df1a08deee6c:
Expand All @@ -61,7 +61,6 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
zone type zone id disposition underlay IP
------------------------------------------------------------------------------------------
crucible 0faa9350-2c02-47c7-a0a6-9f4afd69152c in service fd00:1122:3344:101::2c
internal_ntp 38b047ea-e3de-4859-b8e0-70cac5871446 in service fd00:1122:3344:101::21
crucible 5b44003e-1a3d-4152-b606-872c72efce0e in service fd00:1122:3344:101::25
crucible 943fea7a-9458-4935-9dc7-01ee5cfe5a02 in service fd00:1122:3344:101::29
crucible 95c3b6d1-2592-4252-b5c1-5d0faf3ce9c9 in service fd00:1122:3344:101::24
Expand All @@ -71,6 +70,7 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
crucible b6f2dd1e-7f98-4a68-9df2-b33c69d1f7ea in service fd00:1122:3344:101::27
crucible dc22d470-dc46-436b-9750-25c8d7d369e2 in service fd00:1122:3344:101::26
crucible f7e434f9-6d4a-476b-a9e2-48d6ee28a08e in service fd00:1122:3344:101::28
internal_ntp 38b047ea-e3de-4859-b8e0-70cac5871446 in service fd00:1122:3344:101::21
nexus fb36b9dc-273a-4bc3-aaa9-19ee4d0ef552 in service fd00:1122:3344:101::22


Expand All @@ -97,17 +97,17 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
zone type zone id disposition underlay IP
------------------------------------------------------------------------------------------
crucible 248db330-56e6-4c7e-b5ff-9cd6cbcb210a in service fd00:1122:3344:102::2c
nexus 29278a22-1ba1-4117-bfdb-39fcb9ae7fd1 in service fd00:1122:3344:102::22
crucible 353b0aff-4c71-4fae-a6bd-adcb1d2a1a1d in service fd00:1122:3344:102::29
crucible 4330134c-41b9-4097-aa0b-3eaefa06d473 in service fd00:1122:3344:102::24
crucible 65d03287-e43f-45f4-902e-0a5e4638f31a in service fd00:1122:3344:102::25
crucible 6a5901b1-f9d7-425c-8ecb-a786c900f217 in service fd00:1122:3344:102::27
crucible 9b722fea-a186-4bc3-bc37-ce7f6de6a796 in service fd00:1122:3344:102::23
internal_ntp aac3ab51-9e2b-4605-9bf6-e3eb3681c2b5 in service fd00:1122:3344:102::21
crucible b3583b5f-4a62-4471-9be7-41e61578de4c in service fd00:1122:3344:102::2a
crucible bac92034-b9e6-4e8b-9ffb-dbba9caec88d in service fd00:1122:3344:102::28
crucible d9653001-f671-4905-a410-6a7abc358318 in service fd00:1122:3344:102::2b
crucible edaca77e-5806-446a-b00c-125962cd551d in service fd00:1122:3344:102::26
internal_ntp aac3ab51-9e2b-4605-9bf6-e3eb3681c2b5 in service fd00:1122:3344:102::21
nexus 29278a22-1ba1-4117-bfdb-39fcb9ae7fd1 in service fd00:1122:3344:102::22


METADATA:
Expand Down
8 changes: 4 additions & 4 deletions nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_2_3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
------------------------------------------------------------------------------------------
zone type zone id disposition underlay IP
------------------------------------------------------------------------------------------
internal_ntp 267ed614-92af-4b9d-bdba-c2881c2e43a2 in service fd00:1122:3344:103::21
crucible 322ee9f1-8903-4542-a0a8-a54cefabdeca in service fd00:1122:3344:103::24
crucible 4ab1650f-32c5-447f-939d-64b8103a7645 in service fd00:1122:3344:103::2a
crucible 64aa65f8-1ccb-4cd6-9953-027aebdac8ff in service fd00:1122:3344:103::27
Expand All @@ -36,6 +35,7 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
crucible b14d5478-1a0e-4b90-b526-36b06339dfc4 in service fd00:1122:3344:103::28
crucible b40f7c7b-526c-46c8-ae33-67280c280eb7 in service fd00:1122:3344:103::23
crucible be97b92b-38d6-422a-8c76-d37060f75bd2 in service fd00:1122:3344:103::26
internal_ntp 267ed614-92af-4b9d-bdba-c2881c2e43a2 in service fd00:1122:3344:103::21
nexus cc816cfe-3869-4dde-b596-397d41198628 in service fd00:1122:3344:103::22


Expand Down Expand Up @@ -63,7 +63,6 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
------------------------------------------------------------------------------------------
crucible 02acbe6a-1c88-47e3-94c3-94084cbde098 in service fd00:1122:3344:101::27
crucible 07c3c805-8888-4fe5-9543-3d2479dbe6f3 in service fd00:1122:3344:101::26
internal_ntp 08c7f8aa-1ea9-469b-8cac-2fdbfc11ebcb in service fd00:1122:3344:101::21
crucible 10d98a73-ec88-4aff-a7e8-7db6a87880e6 in service fd00:1122:3344:101::24
crucible 2a455c35-eb3c-4c73-ab6c-d0a706e25316 in service fd00:1122:3344:101::29
crucible 3eda924f-22a9-4f3e-9a1b-91d1c47601ab in service fd00:1122:3344:101::23
Expand All @@ -72,6 +71,7 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
crucible 8f3a1cc5-9195-4a30-ad02-b804278fe639 in service fd00:1122:3344:101::28
crucible a1696cd4-588c-484a-b95b-66e824c0ce05 in service fd00:1122:3344:101::25
crucible a2079cbc-a69e-41a1-b1e0-fbcb972d03f6 in service fd00:1122:3344:101::2a
internal_ntp 08c7f8aa-1ea9-469b-8cac-2fdbfc11ebcb in service fd00:1122:3344:101::21
nexus c66ab6d5-ff7a-46d1-9fd0-70cefa352d25 in service fd00:1122:3344:101::22


Expand All @@ -98,17 +98,17 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
zone type zone id disposition underlay IP
------------------------------------------------------------------------------------------
crucible 18f8fe40-646e-4962-b17a-20e201f3a6e5 in service fd00:1122:3344:102::2a
internal_ntp 47199d48-534c-4267-a654-d2d90e64b498 in service fd00:1122:3344:102::21
crucible 56d5d7cf-db2c-40a3-a775-003241ad4820 in service fd00:1122:3344:102::29
crucible 6af7f4d6-33b6-4eb3-a146-d8e9e4ae9d66 in service fd00:1122:3344:102::2b
nexus 704e1fed-f8d6-4cfa-a470-bad27fdc06d1 in service fd00:1122:3344:102::22
crucible 7a9f60d3-2b66-4547-9b63-7d4f7a8b6382 in service fd00:1122:3344:102::26
crucible 93f2f40c-5616-4d8d-8519-ec6debdcede0 in service fd00:1122:3344:102::2c
crucible ab7ba6df-d401-40bd-940e-faf57c57aa2a in service fd00:1122:3344:102::28
crucible af322036-371f-437c-8c08-7f40f3f1403b in service fd00:1122:3344:102::23
crucible d637264f-6f40-44c2-8b7e-a179430210d2 in service fd00:1122:3344:102::25
crucible dce226c9-7373-4bfa-8a94-79dc472857a6 in service fd00:1122:3344:102::27
crucible edabedf3-839c-488d-ad6f-508ffa864674 in service fd00:1122:3344:102::24
internal_ntp 47199d48-534c-4267-a654-d2d90e64b498 in service fd00:1122:3344:102::21
nexus 704e1fed-f8d6-4cfa-a470-bad27fdc06d1 in service fd00:1122:3344:102::22


ADDED SLEDS:
Expand Down
8 changes: 4 additions & 4 deletions nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_3_5.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163
------------------------------------------------------------------------------------------
zone type zone id disposition underlay IP
------------------------------------------------------------------------------------------
internal_ntp 267ed614-92af-4b9d-bdba-c2881c2e43a2 in service fd00:1122:3344:103::21
crucible 322ee9f1-8903-4542-a0a8-a54cefabdeca in service fd00:1122:3344:103::24
crucible 4ab1650f-32c5-447f-939d-64b8103a7645 in service fd00:1122:3344:103::2a
crucible 64aa65f8-1ccb-4cd6-9953-027aebdac8ff in service fd00:1122:3344:103::27
Expand All @@ -36,6 +35,7 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163
crucible b14d5478-1a0e-4b90-b526-36b06339dfc4 in service fd00:1122:3344:103::28
crucible b40f7c7b-526c-46c8-ae33-67280c280eb7 in service fd00:1122:3344:103::23
crucible be97b92b-38d6-422a-8c76-d37060f75bd2 in service fd00:1122:3344:103::26
internal_ntp 267ed614-92af-4b9d-bdba-c2881c2e43a2 in service fd00:1122:3344:103::21
nexus cc816cfe-3869-4dde-b596-397d41198628 in service fd00:1122:3344:103::22


Expand Down Expand Up @@ -63,7 +63,6 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163
------------------------------------------------------------------------------------------
crucible 02acbe6a-1c88-47e3-94c3-94084cbde098 in service fd00:1122:3344:101::27
crucible 07c3c805-8888-4fe5-9543-3d2479dbe6f3 in service fd00:1122:3344:101::26
internal_ntp 08c7f8aa-1ea9-469b-8cac-2fdbfc11ebcb in service fd00:1122:3344:101::21
crucible 10d98a73-ec88-4aff-a7e8-7db6a87880e6 in service fd00:1122:3344:101::24
crucible 2a455c35-eb3c-4c73-ab6c-d0a706e25316 in service fd00:1122:3344:101::29
crucible 3eda924f-22a9-4f3e-9a1b-91d1c47601ab in service fd00:1122:3344:101::23
Expand All @@ -72,6 +71,7 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163
crucible 8f3a1cc5-9195-4a30-ad02-b804278fe639 in service fd00:1122:3344:101::28
crucible a1696cd4-588c-484a-b95b-66e824c0ce05 in service fd00:1122:3344:101::25
crucible a2079cbc-a69e-41a1-b1e0-fbcb972d03f6 in service fd00:1122:3344:101::2a
internal_ntp 08c7f8aa-1ea9-469b-8cac-2fdbfc11ebcb in service fd00:1122:3344:101::21
nexus c66ab6d5-ff7a-46d1-9fd0-70cefa352d25 in service fd00:1122:3344:101::22


Expand All @@ -98,17 +98,17 @@ to: blueprint f432fcd5-1284-4058-8b4a-9286a3de6163
zone type zone id disposition underlay IP
------------------------------------------------------------------------------------------
crucible 18f8fe40-646e-4962-b17a-20e201f3a6e5 in service fd00:1122:3344:102::2a
internal_ntp 47199d48-534c-4267-a654-d2d90e64b498 in service fd00:1122:3344:102::21
crucible 56d5d7cf-db2c-40a3-a775-003241ad4820 in service fd00:1122:3344:102::29
crucible 6af7f4d6-33b6-4eb3-a146-d8e9e4ae9d66 in service fd00:1122:3344:102::2b
nexus 704e1fed-f8d6-4cfa-a470-bad27fdc06d1 in service fd00:1122:3344:102::22
crucible 7a9f60d3-2b66-4547-9b63-7d4f7a8b6382 in service fd00:1122:3344:102::26
crucible 93f2f40c-5616-4d8d-8519-ec6debdcede0 in service fd00:1122:3344:102::2c
crucible ab7ba6df-d401-40bd-940e-faf57c57aa2a in service fd00:1122:3344:102::28
crucible af322036-371f-437c-8c08-7f40f3f1403b in service fd00:1122:3344:102::23
crucible d637264f-6f40-44c2-8b7e-a179430210d2 in service fd00:1122:3344:102::25
crucible dce226c9-7373-4bfa-8a94-79dc472857a6 in service fd00:1122:3344:102::27
crucible edabedf3-839c-488d-ad6f-508ffa864674 in service fd00:1122:3344:102::24
internal_ntp 47199d48-534c-4267-a654-d2d90e64b498 in service fd00:1122:3344:102::21
nexus 704e1fed-f8d6-4cfa-a470-bad27fdc06d1 in service fd00:1122:3344:102::22


MODIFIED SLEDS:
Expand Down
10 changes: 5 additions & 5 deletions nexus/reconfigurator/planning/tests/output/planner_decommissions_sleds_1_2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e
crucible 70232a6d-6c9d-4fa6-a34d-9c73d940db33 in service fd00:1122:3344:101::28
crucible 8567a616-a709-4c8c-a323-4474675dad5c in service fd00:1122:3344:101::2c
crucible 8b0b8623-930a-41af-9f9b-ca28b1b11139 in service fd00:1122:3344:101::29
internal_ntp ad76d200-5675-444b-b19c-684689ff421f in service fd00:1122:3344:101::21
crucible cf87d2a3-d323-44a3-a87e-adc4ef6c75f4 in service fd00:1122:3344:101::2b
nexus e9bf2525-5fa0-4c1b-b52d-481225083845 in service fd00:1122:3344:101::22
crucible eac6c0a0-baa5-4490-9cee-65198b7fbd9c in service fd00:1122:3344:101::26
internal_ntp ad76d200-5675-444b-b19c-684689ff421f in service fd00:1122:3344:101::21
nexus e9bf2525-5fa0-4c1b-b52d-481225083845 in service fd00:1122:3344:101::22


MODIFIED SLEDS:
Expand Down Expand Up @@ -67,14 +67,14 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e
* crucible 2307bbed-02ba-493b-89e3-46585c74c8fc in service -> expunged fd00:1122:3344:103::28
* crucible 4e36b7ef-5684-4304-b7c3-3c31aaf83d4f in service -> expunged fd00:1122:3344:103::23
* crucible 603e629d-2599-400e-b879-4134d4cc426e in service -> expunged fd00:1122:3344:103::2c
* nexus 6a70a233-1900-43c0-9c00-aa9d1f7adfbc in service -> expunged fd00:1122:3344:103::22
* crucible 9179d6dc-387d-424e-8d62-ed59b2c728f6 in service -> expunged fd00:1122:3344:103::2a
* crucible c28d7b4b-a259-45ad-945d-f19ca3c6964c in service -> expunged fd00:1122:3344:103::29
* internal_ntp c62b87b6-b98d-4d22-ba4f-cee4499e2ba8 in service -> expunged fd00:1122:3344:103::21
* crucible e29998e7-9ed2-46b6-bb70-4118159fe07f in service -> expunged fd00:1122:3344:103::26
* crucible f06e91a1-0c17-4cca-adbc-1c9b67bdb11d in service -> expunged fd00:1122:3344:103::2b
* crucible f11f5c60-1ac7-4630-9a3a-a9bc85c75203 in service -> expunged fd00:1122:3344:103::25
* crucible f231e4eb-3fc9-4964-9d71-2c41644852d9 in service -> expunged fd00:1122:3344:103::24
* internal_ntp c62b87b6-b98d-4d22-ba4f-cee4499e2ba8 in service -> expunged fd00:1122:3344:103::21
* nexus 6a70a233-1900-43c0-9c00-aa9d1f7adfbc in service -> expunged fd00:1122:3344:103::22


sled fefcf4cf-f7e7-46b3-b629-058526ce440e:
Expand Down Expand Up @@ -102,7 +102,6 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e
crucible 0e2b035e-1de1-48af-8ac0-5316418e3de1 in service fd00:1122:3344:102::2a
crucible 4f8ce495-21dd-48a1-859c-80d34ce394ed in service fd00:1122:3344:102::23
crucible 5c78756d-6182-4c27-a507-3419e8dbe76b in service fd00:1122:3344:102::28
nexus 99c6401d-9796-4ae1-bf0c-9a097cf21c33 in service fd00:1122:3344:102::22
crucible a1ae92ac-e1f1-4654-ab54-5b75ba7c44d6 in service fd00:1122:3344:102::24
crucible a308d3e1-118c-440a-947a-8b6ab7d833ab in service fd00:1122:3344:102::25
crucible b7402110-d88f-4ca4-8391-4a2fda6ad271 in service fd00:1122:3344:102::29
Expand All @@ -111,6 +110,7 @@ to: blueprint 1ac2d88f-27dd-4506-8585-6b2be832528e
crucible cf13b878-47f1-4ba0-b8c2-9f3e15f2ee87 in service fd00:1122:3344:102::2c
crucible e6d0df1f-9f98-4c5a-9540-8444d1185c7d in service fd00:1122:3344:102::27
internal_ntp f68846ad-4619-4747-8293-a2b4aeeafc5b in service fd00:1122:3344:102::21
nexus 99c6401d-9796-4ae1-bf0c-9a097cf21c33 in service fd00:1122:3344:102::22
+ nexus c8851a11-a4f7-4b21-9281-6182fd15dc8d in service fd00:1122:3344:102::2d


Expand Down

0 comments on commit 2752f68

Please sign in to comment.