Skip to content

Commit 3fa1a21

Browse files
plotnickplotnick
committed
OpenAPI compatible planning reports
1 parent f0aabe5 commit 3fa1a21

17 files changed

+1133
-186
lines changed

‎dev-tools/omdb/tests/successes.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ parent: <none>
15681568

15691569
PENDING MGS-MANAGED UPDATES: 0
15701570

1571-
Report on planning run for blueprint ......<REDACTED_BLUEPRINT_ID>.......:
1571+
Nothing to report on planning for blueprint ......<REDACTED_BLUEPRINT_ID>........
15721572

15731573

15741574
---------------------------------------------
@@ -1691,7 +1691,7 @@ parent: <none>
16911691

16921692
PENDING MGS-MANAGED UPDATES: 0
16931693

1694-
Report on planning run for blueprint ......<REDACTED_BLUEPRINT_ID>.......:
1694+
Nothing to report on planning for blueprint ......<REDACTED_BLUEPRINT_ID>........
16951695

16961696

16971697
---------------------------------------------

‎dev-tools/reconfigurator-cli/tests/output/cmds-add-sled-no-disks-stdout‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ generated inventory collection eb0796d5-ab8a-4f7b-a884-b4aeacb8ab51 from configu
3939
INFO skipping noop image source check for all sleds, reason: no target release is currently set
4040
WARN cannot issue more SP updates (no current artifacts)
4141
generated blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1 based on parent blueprint dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
42+
Planning report for blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1:
43+
* No zpools in service for NTP zones on sleds: 00320471-945d-413c-85e7-03e091a70b3c
44+
4245

4346
> blueprint-show 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
4447
blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
@@ -270,7 +273,7 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
270273

271274
PENDING MGS-MANAGED UPDATES: 0
272275

273-
Report on planning run for blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1:
276+
Planning report for blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1:
274277
* No zpools in service for NTP zones on sleds: 00320471-945d-413c-85e7-03e091a70b3c
275278

276279

‎dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
392392

393393
PENDING MGS-MANAGED UPDATES: 0
394394

395-
Report on planning run for blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a:
395+
Nothing to report on planning for blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a.
396396

397397

398398

@@ -503,7 +503,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
503503

504504
PENDING MGS-MANAGED UPDATES: 0
505505

506-
Report on planning run for blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a:
506+
Nothing to report on planning for blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a.
507507

508508

509509

@@ -534,6 +534,14 @@ T ENA ID PARENT
534534
INFO skipping noop image source check for all sleds, reason: no target release is currently set
535535
WARN cannot issue more SP updates (no current artifacts)
536536
generated blueprint 86db3308-f817-4626-8838-4085949a6a41 based on parent blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
537+
Planning report for blueprint 86db3308-f817-4626-8838-4085949a6a41:
538+
* Discretionary zone placement waiting for NTP zones on sleds: 89d02b1b-478c-401a-8e28-7a26f74fa41b
539+
* Missing NTP zone on sled 89d02b1b-478c-401a-8e28-7a26f74fa41b
540+
* Only placed 0/1 desired clickhouse zones
541+
* Only placed 0/3 desired crucible_pantry zones
542+
* Only placed 0/3 desired internal_dns zones
543+
* Only placed 0/3 desired nexus zones
544+
537545

538546
> blueprint-list
539547
T ENA ID PARENT TIME_CREATED
@@ -1005,7 +1013,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
10051013

10061014
PENDING MGS-MANAGED UPDATES: 0
10071015

1008-
Report on planning run for blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a:
1016+
Nothing to report on planning for blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a.
10091017

10101018

10111019

@@ -1016,6 +1024,8 @@ Report on planning run for blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a:
10161024
INFO skipping noop image source check for all sleds, reason: no target release is currently set
10171025
WARN cannot issue more SP updates (no current artifacts)
10181026
generated blueprint 86db3308-f817-4626-8838-4085949a6a41 based on parent blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
1027+
Nothing to report on planning for blueprint 86db3308-f817-4626-8838-4085949a6a41.
1028+
10191029

10201030
> blueprint-diff ade5749d-bdf3-4fab-a8ae-00bea01b3a5a latest
10211031
from: blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a

‎dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27
334334

335335
PENDING MGS-MANAGED UPDATES: 0
336336

337-
Report on planning run for blueprint 3f00b694-1b16-4aaa-8f78-e6b3a527b434:
337+
Nothing to report on planning for blueprint 3f00b694-1b16-4aaa-8f78-e6b3a527b434.
338338

339339

340340

@@ -1025,7 +1025,7 @@ parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434
10251025

10261026
PENDING MGS-MANAGED UPDATES: 0
10271027

1028-
Report on planning run for blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0:
1028+
Nothing to report on planning for blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0.
10291029

10301030

10311031

@@ -1034,6 +1034,11 @@ Report on planning run for blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0:
10341034
INFO skipping noop image source check for all sleds, reason: no target release is currently set
10351035
WARN cannot issue more SP updates (no current artifacts)
10361036
generated blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 based on parent blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0
1037+
Planning report for blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2:
1038+
* Discretionary zones placed:
1039+
* 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
1040+
* Zone updates waiting on discretionary zones
1041+
10371042

10381043
> blueprint-diff 366b0b68-d80e-4bc1-abd3-dc69837847e0 9c998c1d-1a7b-440a-ae0c-40f781dea6e2
10391044
from: blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0
@@ -1720,9 +1725,9 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
17201725

17211726
PENDING MGS-MANAGED UPDATES: 0
17221727

1723-
Report on planning run for blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2:
1728+
Planning report for blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2:
17241729
* Discretionary zones placed:
1725-
* on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns zone
1730+
* 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
17261731
* Zone updates waiting on discretionary zones
17271732

17281733

‎dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ parent: 184f10b3-61cb-41ef-9b93-3489b2bac559
332332

333333
PENDING MGS-MANAGED UPDATES: 0
334334

335-
Report on planning run for blueprint dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21:
335+
Nothing to report on planning for blueprint dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21.
336336

337337

338338

@@ -1048,6 +1048,11 @@ external DNS:
10481048
INFO skipping noop image source check for all sleds, reason: no target release is currently set
10491049
WARN cannot issue more SP updates (no current artifacts)
10501050
generated blueprint af934083-59b5-4bf6-8966-6fb5292c29e1 based on parent blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
1051+
Planning report for blueprint af934083-59b5-4bf6-8966-6fb5292c29e1:
1052+
* Discretionary zones placed:
1053+
* 1 zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c: internal_dns
1054+
* Zone updates waiting on discretionary zones
1055+
10511056

10521057
> blueprint-diff 58d5e830-0884-47d8-a7cd-b2b3751adeb4 af934083-59b5-4bf6-8966-6fb5292c29e1
10531058
from: blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4

‎dev-tools/reconfigurator-cli/tests/output/cmds-host-phase-2-source-stdout‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ parent: 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
712712

713713
PENDING MGS-MANAGED UPDATES: 0
714714

715-
Report on planning run for blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4:
715+
Nothing to report on planning for blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4.
716716

717717

718718

@@ -1422,7 +1422,7 @@ parent: af934083-59b5-4bf6-8966-6fb5292c29e1
14221422

14231423
PENDING MGS-MANAGED UPDATES: 0
14241424

1425-
Report on planning run for blueprint df06bb57-ad42-4431-9206-abff322896c7:
1425+
Nothing to report on planning for blueprint df06bb57-ad42-4431-9206-abff322896c7.
14261426

14271427

14281428

‎dev-tools/reconfigurator-cli/tests/output/cmds-noop-image-source-stdout‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,14 @@ INFO skipped noop image source check on sled, sled_id: e96e226f-4ed9-4c01-91b9-6
168168
INFO configuring SP update, artifact_version: 1.0.0, artifact_hash: 7e6667e646ad001b54c8365a3d309c03f89c59102723d38d01697ee8079fe670, expected_inactive_version: NoValidVersion, expected_active_version: 0.0.1, component: sp, sp_slot: 0, sp_type: Sled, serial_number: serial0, part_number: model0
169169
INFO reached maximum number of pending SP updates, max: 1
170170
generated blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4 based on parent blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
171+
Planning report for blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4:
172+
* Noop converting 6/6 install-dataset zones to artifact store on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6
173+
* Noop converting 5/6 install-dataset zones to artifact store on sled aff6c093-197d-42c5-ad80-9f10ba051a34
174+
* 1 pending MGS update:
175+
* model0:serial0: Sp { expected_active_version: ArtifactVersion("0.0.1"), expected_inactive_version: NoValidVersion }
176+
* Discretionary zone placement waiting for NTP zones on sleds: e96e226f-4ed9-4c01-91b9-69a9cd076c9e
177+
* Zone updates waiting on pending MGS updates (RoT / SP / Host OS / etc.)
178+
171179

172180

173181
> # This diff should show expected changes to the blueprint.
@@ -526,6 +534,13 @@ INFO performed noop image source checks on sled, sled_id: e96e226f-4ed9-4c01-91b
526534
INFO SP update not yet completed (will keep it), artifact_version: 1.0.0, artifact_hash: 7e6667e646ad001b54c8365a3d309c03f89c59102723d38d01697ee8079fe670, expected_inactive_version: NoValidVersion, expected_active_version: 0.0.1, component: sp, sp_slot: 0, sp_type: Sled, serial_number: serial0, part_number: model0
527535
INFO reached maximum number of pending SP updates, max: 1
528536
generated blueprint af934083-59b5-4bf6-8966-6fb5292c29e1 based on parent blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
537+
Planning report for blueprint af934083-59b5-4bf6-8966-6fb5292c29e1:
538+
* Skipping noop image source check on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6: all 6 zones are already from artifacts
539+
* Noop converting 2/2 install-dataset zones to artifact store on sled e96e226f-4ed9-4c01-91b9-69a9cd076c9e
540+
* 1 pending MGS update:
541+
* model0:serial0: Sp { expected_active_version: ArtifactVersion("0.0.1"), expected_inactive_version: NoValidVersion }
542+
* Zone updates waiting on pending MGS updates (RoT / SP / Host OS / etc.)
543+
529544

530545

531546
> # This diff should show changes to the sled that's back in inventory.

‎dev-tools/reconfigurator-cli/tests/output/cmds-set-mgs-updates-stdout‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ parent: 6ccc786b-17f1-4562-958f-5a7d9a5a15fd
208208

209209
PENDING MGS-MANAGED UPDATES: 0
210210

211-
Report on planning run for blueprint ad97e762-7bf1-45a6-a98f-60afb7e491c0:
211+
Nothing to report on planning for blueprint ad97e762-7bf1-45a6-a98f-60afb7e491c0.
212212

213213

214214

@@ -425,7 +425,7 @@ parent: ad97e762-7bf1-45a6-a98f-60afb7e491c0
425425
sled 2 model2 serial2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 1.1.0 Sp { expected_active_version: ArtifactVersion("1.0.0"), expected_inactive_version: Version(ArtifactVersion("1.0.1")) }
426426

427427

428-
Report on planning run for blueprint cca24b71-09b5-4042-9185-b33e9f2ebba0:
428+
Nothing to report on planning for blueprint cca24b71-09b5-4042-9185-b33e9f2ebba0.
429429

430430

431431

@@ -972,7 +972,7 @@ parent: cca24b71-09b5-4042-9185-b33e9f2ebba0
972972
sled 2 model2 serial2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 newest Sp { expected_active_version: ArtifactVersion("newer"), expected_inactive_version: Version(ArtifactVersion("older")) }
973973

974974

975-
Report on planning run for blueprint 5bf974f3-81f9-455b-b24e-3099f765664c:
975+
Nothing to report on planning for blueprint 5bf974f3-81f9-455b-b24e-3099f765664c.
976976

977977

978978

@@ -1523,7 +1523,7 @@ parent: 5bf974f3-81f9-455b-b24e-3099f765664c
15231523
sled 2 model2 serial2 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 newest Sp { expected_active_version: ArtifactVersion("newer"), expected_inactive_version: Version(ArtifactVersion("older")) }
15241524

15251525

1526-
Report on planning run for blueprint 1b837a27-3be1-4fcb-8499-a921c839e1d0:
1526+
Nothing to report on planning for blueprint 1b837a27-3be1-4fcb-8499-a921c839e1d0.
15271527

15281528

15291529

@@ -1904,7 +1904,7 @@ parent: 1b837a27-3be1-4fcb-8499-a921c839e1d0
19041904
sled 0 model0 serial0 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 three Sp { expected_active_version: ArtifactVersion("two"), expected_inactive_version: NoValidVersion }
19051905

19061906

1907-
Report on planning run for blueprint 3682a71b-c6ca-4b7e-8f84-16df80c85960:
1907+
Nothing to report on planning for blueprint 3682a71b-c6ca-4b7e-8f84-16df80c85960.
19081908

19091909

19101910

‎dev-tools/reconfigurator-cli/tests/output/cmds-set-remove-mupdate-override-stdout‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ parent: df06bb57-ad42-4431-9206-abff322896c7
277277

278278
PENDING MGS-MANAGED UPDATES: 0
279279

280-
Report on planning run for blueprint 7f976e0d-d2a5-4eeb-9e82-c82bc2824aba:
280+
Nothing to report on planning for blueprint 7f976e0d-d2a5-4eeb-9e82-c82bc2824aba.
281281

282282

283283

@@ -668,7 +668,7 @@ parent: afb09faf-a586-4483-9289-04d4f1d8ba23
668668

669669
PENDING MGS-MANAGED UPDATES: 0
670670

671-
Report on planning run for blueprint ce365dff-2cdb-4f35-a186-b15e20e1e700:
671+
Nothing to report on planning for blueprint ce365dff-2cdb-4f35-a186-b15e20e1e700.
672672

673673

674674

‎dev-tools/reconfigurator-cli/tests/output/cmds-set-zone-images-stdout‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ parent: 1b013011-2062-4b48-b544-a32b23bce83a
110110

111111
PENDING MGS-MANAGED UPDATES: 0
112112

113-
Report on planning run for blueprint 971eeb12-1830-4fa0-a699-98ea0164505c:
113+
Nothing to report on planning for blueprint 971eeb12-1830-4fa0-a699-98ea0164505c.
114114

115115

116116

@@ -228,7 +228,7 @@ parent: 9766ca20-38d4-4380-b005-e7c43c797e7c
228228

229229
PENDING MGS-MANAGED UPDATES: 0
230230

231-
Report on planning run for blueprint f714e6ea-e85a-4d7d-93c2-a018744fe176:
231+
Nothing to report on planning for blueprint f714e6ea-e85a-4d7d-93c2-a018744fe176.
232232

233233

234234

@@ -550,7 +550,7 @@ parent: bb128f06-a2e1-44c1-8874-4f789d0ff896
550550

551551
PENDING MGS-MANAGED UPDATES: 0
552552

553-
Report on planning run for blueprint d9c572a1-a68c-4945-b1ec-5389bd588fe9:
553+
Nothing to report on planning for blueprint d9c572a1-a68c-4945-b1ec-5389bd588fe9.
554554

555555

556556

0 commit comments

Comments
 (0)