Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewjstone
andrewjstone committed May 11, 2024
1 parent d87241f commit 53f3f25
Show file tree
Hide file tree
Showing 7 changed files with 224 additions and 227 deletions.
9 changes: 3 additions & 6 deletions nexus/reconfigurator/planning/src/planner.rs
View file
Expand Up @@ -637,6 +637,7 @@ mod test {
assert_eq!(collection.sled_agents.len(), 1);
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);

(keep_sled_id, blueprint, collection, builder.build())
};
Expand Down Expand Up @@ -750,12 +751,8 @@ mod test {
// sleds (two should get 4 and one should get 3).
let mut total_new_nexus_zones = 0;
for sled_id in diff.sleds_modified {
let zones_removed =
&diff.zones.removed.get(&sled_id).unwrap().zones;
let zones_modified =
&diff.zones.modified.get(&sled_id).unwrap().zones;
assert_eq!(zones_removed.len(), 0);
assert_eq!(zones_modified.len(), 0);
assert!(!diff.zones.removed.contains_key(&sled_id));
assert!(!diff.zones.modified.contains_key(&sled_id));
let zones_added = &diff.zones.added.get(&sled_id).unwrap().zones;
match zones_added.len() {
n @ (3 | 4) => {
Expand Down
60 changes: 30 additions & 30 deletions nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt
View file
Expand Up @@ -8,16 +8,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-0b19a0b4-6e13-46ed-b0fe-cbaaf6f24467
fake-vendor fake-model serial-2ce497db-01e2-4369-8251-d1aaf3322937
fake-vendor fake-model serial-3798df3f-4e74-4989-88c1-aca21d667b7a
fake-vendor fake-model serial-58b901c9-7c45-4982-9907-bc0d9d70887f
fake-vendor fake-model serial-7c241129-c03f-4c57-b77d-d6ae05c4383c
fake-vendor fake-model serial-8c39bd6e-bb07-4e51-8a59-a6279e7e5688
fake-vendor fake-model serial-c09355cd-9f18-42a0-a25e-8cb2c312775b
fake-vendor fake-model serial-c760cf13-62b2-4c7e-8bd9-e77209e34983
fake-vendor fake-model serial-e218ded9-e192-4a57-877d-a0f1ea53049a
fake-vendor fake-model serial-f6ed6b86-eacb-4b4d-bd00-0b9771e7a084
fake-vendor fake-model serial-168a7bf9-d38d-4373-a425-462c3b1125df
fake-vendor fake-model serial-2ff53468-5481-4899-85be-5a951b2b9bf4
fake-vendor fake-model serial-3530fab0-87da-4965-971c-9e3d318039d1
fake-vendor fake-model serial-53cbe754-94cb-470c-b1a0-54aff4d351ee
fake-vendor fake-model serial-941ddb83-033e-4fde-875b-f23642273982
fake-vendor fake-model serial-b8d6ddf9-6450-4c15-b288-149ff9970190
fake-vendor fake-model serial-c9ab5986-7763-4a3e-8e80-e76816eb253d
fake-vendor fake-model serial-dade42b0-be3f-4e34-afb0-dd1c792030d8
fake-vendor fake-model serial-dbd371a9-11bf-4530-8ee6-7f9c2ca9f421
fake-vendor fake-model serial-f829e6fa-4dd4-4d3d-bf21-01d6da3a2c00


omicron zones at generation 2:
Expand All @@ -44,16 +44,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-55f9127b-c379-4eb2-864e-0b9fa20d0702
fake-vendor fake-model serial-789c4735-2516-4fe0-a494-e6786be5d2e2
fake-vendor fake-model serial-7eedd006-0bf9-42dc-ac57-2a84cf86f66a
fake-vendor fake-model serial-83362035-dd9f-4005-900c-b483bd2540a3
fake-vendor fake-model serial-a131787c-6e79-4b9e-acd1-3ae1ba24ed2f
fake-vendor fake-model serial-bdbfa3a6-c431-495f-bd9a-47ba317a9055
fake-vendor fake-model serial-c87c1414-31b3-48b9-9a22-c398cbf4a372
fake-vendor fake-model serial-d30a9413-5b9f-46bf-81f2-4afd4d7c0d13
fake-vendor fake-model serial-d7a99b54-2d04-4c5c-9664-034181c6693c
fake-vendor fake-model serial-ddd5075e-fe95-4c04-814b-6adcb8067e00
fake-vendor fake-model serial-049bfe76-ef0b-4efb-8d06-1ee867a86a6f
fake-vendor fake-model serial-05b37e69-16ca-4f42-a07c-4af715c17301
fake-vendor fake-model serial-12d37fc1-c950-43e7-96a2-0980fe736468
fake-vendor fake-model serial-62b79334-6006-47f1-99d2-bff891b14db1
fake-vendor fake-model serial-7b6a7a9b-d683-4669-9bd0-ce5ae14e2993
fake-vendor fake-model serial-bf6682e9-1612-48a3-affa-e719559cbc82
fake-vendor fake-model serial-cd2f59cb-5ae8-4a8d-9708-6991cd4b1642
fake-vendor fake-model serial-def73b94-7448-4f19-90db-12153ceae067
fake-vendor fake-model serial-e6d27128-74c4-4607-b5ad-ad803db1d418
fake-vendor fake-model serial-ff6ce539-b83f-44ca-b717-8a58a4099c04


omicron zones at generation 2:
Expand All @@ -80,16 +80,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-08ba4bc0-8610-4bf4-91d0-42892d4738f0
fake-vendor fake-model serial-10dff473-4b8f-44ac-8a2d-df80ed7c0818
fake-vendor fake-model serial-2ec368f8-e660-4c4a-9bff-8fcb0b743c44
fake-vendor fake-model serial-3db2f22b-6cad-4ad0-bf9b-40ba5fc03c46
fake-vendor fake-model serial-5001a298-045b-49e4-9f40-241aad61df2e
fake-vendor fake-model serial-57b7ea13-772b-4149-aa24-1958fdf1c271
fake-vendor fake-model serial-a0b316b4-7028-4dbb-94c5-f5e7386c6e86
fake-vendor fake-model serial-a587dec9-8b73-4422-8784-8c5e8512d6d1
fake-vendor fake-model serial-dd1cc8df-39f5-4909-b6a0-946aa2a55084
fake-vendor fake-model serial-ecf443e9-7d15-419a-9912-afef1a0bc571
fake-vendor fake-model serial-0adc64f9-187a-4404-954a-16d754c9175e
fake-vendor fake-model serial-22c93b73-d848-4976-a312-3f6ac4b221db
fake-vendor fake-model serial-3ab3ffeb-3dd9-4ada-8c2a-0ee13216dd36
fake-vendor fake-model serial-48c12c9c-ff78-418e-b7d9-feb36e59c299
fake-vendor fake-model serial-64774322-555d-40b6-8bce-e18c97210298
fake-vendor fake-model serial-66aa33fa-783e-4cd7-8601-1ec23db2c496
fake-vendor fake-model serial-b2bb4101-d148-4029-be16-a476ee19230d
fake-vendor fake-model serial-b8d3bb85-396e-489a-9f32-ee23c83bff01
fake-vendor fake-model serial-b97dc860-765e-4047-985c-bd731dcc9962
fake-vendor fake-model serial-fa6ffa96-1a47-4a7e-ba7c-34d7df251dd8


omicron zones at generation 2:
Expand Down
80 changes: 40 additions & 40 deletions nexus/reconfigurator/planning/tests/output/planner_basic_add_sled_2_3.txt
View file
Expand Up @@ -9,16 +9,16 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-2545a568-f3ef-4dd3-bdc8-06bf58e2676c
fake-vendor fake-model serial-5c2add0c-9073-454b-b4b9-54fd1f26af31
fake-vendor fake-model serial-75eeca22-cf64-468c-a91d-a17fa11f9462
fake-vendor fake-model serial-94a76566-2a45-4273-a072-b17213077889
fake-vendor fake-model serial-c25370d7-0e72-4b29-b67e-2dec4b3c2570
fake-vendor fake-model serial-d53a8c63-3214-4e5c-804f-d9f5affb65d9
fake-vendor fake-model serial-f56bd906-5ffd-4f7d-a0f2-8799d9428e22
fake-vendor fake-model serial-f60e73ab-80e5-4df0-9eaa-63752a0644b9
fake-vendor fake-model serial-f6d13fe9-3b55-434a-8116-d59993c18f4f
fake-vendor fake-model serial-fc051928-a8c9-4033-8854-9b1a8c74c5f6
fake-vendor fake-model serial-3425398b-dec6-42ae-870d-5c03f22a785a
fake-vendor fake-model serial-4043fd0b-2261-41a9-95e3-28cefa2f6de5
fake-vendor fake-model serial-57ef109d-ba86-40cf-8826-e5611b9fc04e
fake-vendor fake-model serial-5df44fdb-f01c-45df-9cd7-30b776d4c56b
fake-vendor fake-model serial-61a5be80-75f0-4151-93ee-268ee0ede810
fake-vendor fake-model serial-6433a8be-6e5c-4155-852b-c5b9976a00d8
fake-vendor fake-model serial-666a6abb-91e0-4611-8f40-0bbafd953972
fake-vendor fake-model serial-6ea81c58-2f09-4fbf-9f7c-c4c093ffee43
fake-vendor fake-model serial-778f6d97-098e-47ae-8311-b2411a15b13f
fake-vendor fake-model serial-d97ede86-4bba-4d86-9712-59d1bdc3ced1


omicron zones at generation 2:
Expand All @@ -45,16 +45,16 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-088d1b5a-97d5-4d00-bb56-9f38b102e4b7
fake-vendor fake-model serial-2b820c60-5b30-4cc6-8367-7f371ba0ef9b
fake-vendor fake-model serial-49fb9c36-5381-404a-b88b-25ebc031c231
fake-vendor fake-model serial-4b483b03-56e5-476f-bc0a-74f30376044a
fake-vendor fake-model serial-4cca69f8-c541-4809-a45e-2018bb07a893
fake-vendor fake-model serial-85315251-8136-4885-8117-f4f342ec6cb3
fake-vendor fake-model serial-9af1c9d0-e0d3-47de-98db-755db5d9926d
fake-vendor fake-model serial-ecf120d4-f814-4038-91b4-28b8bb6a40de
fake-vendor fake-model serial-f159b85c-883b-435a-b402-ff2eea808ec4
fake-vendor fake-model serial-fb5a0a91-f13a-4508-98f6-c458adae8b1f
fake-vendor fake-model serial-0ea4d99c-2198-4f29-8374-5880491359c8
fake-vendor fake-model serial-78449cb6-771e-4c32-a761-bba36cbb3efb
fake-vendor fake-model serial-a48518ba-9003-4c1d-a435-c0420ce4118b
fake-vendor fake-model serial-ada2e1f3-ea00-4194-91ec-f3f22e90478b
fake-vendor fake-model serial-c2e00520-473a-4d13-86d6-7bbc960fc981
fake-vendor fake-model serial-ce3ec03d-e1c1-4a40-abc5-180519d38c79
fake-vendor fake-model serial-f0e57d9e-f1ac-4262-89d2-c5e318d76804
fake-vendor fake-model serial-f3d2906e-0693-4e7d-8525-ee7bb9e9269b
fake-vendor fake-model serial-f562d75e-407a-495d-992c-4ab5e70b1393
fake-vendor fake-model serial-f85e1f58-7857-4c75-a2c2-827d058a3cbf


omicron zones at generation 2:
Expand All @@ -81,16 +81,16 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-21c66c15-5829-4f88-94ab-48f96a501d55
fake-vendor fake-model serial-33c68629-bec0-478b-819e-78d0001bb335
fake-vendor fake-model serial-4984aec1-738b-494b-bef0-d345cb99f77e
fake-vendor fake-model serial-6711a0bd-ca05-42be-b1fe-a0751d2205b5
fake-vendor fake-model serial-740d6c69-d1f3-4a22-85bd-35694f9a214a
fake-vendor fake-model serial-76091646-42bc-4d14-8b58-472d02d6b247
fake-vendor fake-model serial-77dacc58-af7f-4c42-967b-9cea4869e902
fake-vendor fake-model serial-8e724a5e-7f89-462d-a610-81cb9cf5a9e0
fake-vendor fake-model serial-c654de0d-ba2c-4ecf-bf13-848daf96e467
fake-vendor fake-model serial-e58fb254-a9b2-4e62-9219-8def9528739d
fake-vendor fake-model serial-12c6af66-c1b8-4398-aef7-32849bfdb80a
fake-vendor fake-model serial-623522c4-657d-4579-b7bf-2fd3fc2bae32
fake-vendor fake-model serial-639e0383-bdc1-4cbf-a68d-ff3f674e2ef4
fake-vendor fake-model serial-6e7acc5a-e5ce-425b-9eea-652815f747a9
fake-vendor fake-model serial-73873381-ee09-455d-b774-331afd4430fb
fake-vendor fake-model serial-8cad0b00-2f2e-42ca-b0aa-4452e74b66f4
fake-vendor fake-model serial-9f896137-9023-467c-b077-f8948b698045
fake-vendor fake-model serial-b941cb75-7fbe-4082-b786-fd328d7a7d48
fake-vendor fake-model serial-c5303656-bdb7-4ca3-8573-6e3c9f3a3770
fake-vendor fake-model serial-db848ca1-9d83-46bc-87cc-ac1d244f4035


omicron zones at generation 2:
Expand Down Expand Up @@ -119,16 +119,16 @@ to: blueprint 4171ad05-89dd-474b-846b-b007e4346366
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
+ fake-vendor fake-model serial-04ec6729-b89c-4495-83b3-051d527e8b1b
+ fake-vendor fake-model serial-136023c9-b818-4552-8c6c-1a5b211757fc
+ fake-vendor fake-model serial-188bb5c0-15b6-4772-bcbb-91bdf49f3658
+ fake-vendor fake-model serial-1926ce8d-c6ef-4245-9bf1-30f8023edd7b
+ fake-vendor fake-model serial-63cbba21-c4ac-45e4-bd62-ef90edc9fb38
+ fake-vendor fake-model serial-8bcd5051-1840-486c-923d-47f1702b59cd
+ fake-vendor fake-model serial-bbdec560-50dd-4376-91cb-e07f50f29032
+ fake-vendor fake-model serial-f3900116-79a0-46a7-88e6-f33dc58100e5
+ fake-vendor fake-model serial-f5a191ac-f9c9-49d2-aa53-ae900f3c0ea4
+ fake-vendor fake-model serial-f8b5ead6-c1b3-4480-99ab-95bc4c2c446e
+ fake-vendor fake-model serial-01580394-06ea-488c-8ff0-256fa42b3b7f
+ fake-vendor fake-model serial-4dd509c3-989a-4801-a6db-df8ad5340262
+ fake-vendor fake-model serial-54614aa0-3584-4285-a94b-57f8e7a75a62
+ fake-vendor fake-model serial-5a381140-df6c-461a-abaf-ec3d988dbf48
+ fake-vendor fake-model serial-79078e22-6c4a-4f08-a945-1bb1bd772374
+ fake-vendor fake-model serial-9ae99cc5-efa4-43be-9759-623857fb9894
+ fake-vendor fake-model serial-a464cded-4782-42a2-96a8-e59b9fc47b70
+ fake-vendor fake-model serial-c789b6ba-1937-4a9b-903b-8e16b4907c9c
+ fake-vendor fake-model serial-e7c917c2-9422-4d80-8738-3d1c78580dd9
+ fake-vendor fake-model serial-f2903c15-9c92-4040-ab4f-0366f19ee911


omicron zones at generation 2:
Expand Down

0 comments on commit 53f3f25

Please sign in to comment.