Skip to content

Commit 544f608

Browse files
authored
PlanningReport: Remove blueprint_id (#9052)
Planning reports are contained in `Blueprint`s, which have an ID. Prior to this PR we duplicated the containing blueprint's ID. This bit @davepacheco and me in a couple different (admittedly unusual) testing contexts where we were duplicating blueprints and making changes, not realizing we produced a new blueprint with a different ID but carrying a report that still pointed to the original blueprint's ID. The only thing we lose here is that the display output of the planning report can no longer say what blueprint it's for, but I think that's fine - all the places where we want to display a report, we already know the blueprint ID.
1 parent 8571be3 commit 544f608

File tree

15 files changed

+104
-123
lines changed

15 files changed

+104
-123
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ planner config updated:
4747
INFO skipping noop image source check for all sleds, reason: no target release is currently set
4848
generated blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1 based on parent blueprint dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
4949
blueprint source: planner with report:
50-
planning report for blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1:
50+
planning report:
5151
planner config:
5252
add zones with mupdate override: true
5353

@@ -296,7 +296,7 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
296296
PENDING MGS-MANAGED UPDATES: 0
297297

298298
blueprint source: planner with report:
299-
planning report for blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1:
299+
planning report:
300300
planner config:
301301
add zones with mupdate override: true
302302

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ T ENA ID PARENT
601601
INFO skipping noop image source check for all sleds, reason: no target release is currently set
602602
generated blueprint 86db3308-f817-4626-8838-4085949a6a41 based on parent blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
603603
blueprint source: planner with report:
604-
planning report for blueprint 86db3308-f817-4626-8838-4085949a6a41:
604+
planning report:
605605
* zone adds waiting on blockers
606606
* zone adds and updates are blocked:
607607
- sleds have deployment units with image sources not set to Artifact:
@@ -1846,7 +1846,7 @@ INTERNAL DNS STATUS
18461846
INFO skipping noop image source check for all sleds, reason: no target release is currently set
18471847
generated blueprint 86db3308-f817-4626-8838-4085949a6a41 based on parent blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
18481848
blueprint source: planner with report:
1849-
planning report for blueprint 86db3308-f817-4626-8838-4085949a6a41:
1849+
planning report:
18501850
* zone adds waiting on blockers
18511851
* zone adds and updates are blocked:
18521852
- sleds have deployment units with image sources not set to Artifact:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ planner config updated:
851851
INFO skipping noop image source check for all sleds, reason: no target release is currently set
852852
generated blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 based on parent blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0
853853
blueprint source: planner with report:
854-
planning report for blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2:
854+
planning report:
855855
planner config:
856856
add zones with mupdate override: true
857857

@@ -1360,7 +1360,7 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
13601360
PENDING MGS-MANAGED UPDATES: 0
13611361

13621362
blueprint source: planner with report:
1363-
planning report for blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2:
1363+
planning report:
13641364
planner config:
13651365
add zones with mupdate override: true
13661366

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ planner config updated:
658658
INFO skipping noop image source check for all sleds, reason: no target release is currently set
659659
generated blueprint af934083-59b5-4bf6-8966-6fb5292c29e1 based on parent blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
660660
blueprint source: planner with report:
661-
planning report for blueprint af934083-59b5-4bf6-8966-6fb5292c29e1:
661+
planning report:
662662
planner config:
663663
add zones with mupdate override: true
664664

dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout

Lines changed: 13 additions & 13 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ INFO skipped noop image source check on sled, sled_id: d81c6a84-79b8-4958-ae41-e
182182
INFO skipped noop image source check on sled, sled_id: e96e226f-4ed9-4c01-91b9-69a9cd076c9e, reason: sled not found in inventory
183183
generated blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4 based on parent blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
184184
blueprint source: planner with report:
185-
planning report for blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4:
185+
planning report:
186186
* noop converting 6/6 install-dataset zones to artifact store on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6
187187
* noop converting 5/6 install-dataset zones to artifact store on sled aff6c093-197d-42c5-ad80-9f10ba051a34
188188
* zone adds waiting on blockers
@@ -430,7 +430,7 @@ INFO BootPartitionDetails inventory hash not found in TUF repo, ignoring for noo
430430
INFO BootPartitionDetails inventory hash not found in TUF repo, ignoring for noop checks, sled_id: e96e226f-4ed9-4c01-91b9-69a9cd076c9e, slot: b, expected_hash: 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
431431
generated blueprint af934083-59b5-4bf6-8966-6fb5292c29e1 based on parent blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
432432
blueprint source: planner with report:
433-
planning report for blueprint af934083-59b5-4bf6-8966-6fb5292c29e1:
433+
planning report:
434434
* skipping noop zone image source check on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6: all 6 zones are already from artifacts
435435
* noop converting 2/2 install-dataset zones to artifact store on sled e96e226f-4ed9-4c01-91b9-69a9cd076c9e
436436
* zone adds waiting on blockers

0 commit comments

Comments
 (0)