Skip to content

Commit ecd6a00

Browse files
smkleinsmklein
committed
Add nexus_generation to blueprint
1 parent dab6693 commit ecd6a00

File tree

68 files changed

+2962
-483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2962
-483
lines changed

‎dev-tools/omdb/src/bin/omdb/reconfigurator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ async fn cmd_reconfigurator_export(
148148
// See Nexus::blueprint_planning_context().
149149
eprint!("assembling reconfigurator state ... ");
150150
let state = nexus_reconfigurator_preparation::reconfigurator_state_load(
151-
opctx, datastore,
151+
opctx, datastore, None,
152152
)
153153
.await?;
154154
eprintln!("done");

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,6 +1569,7 @@ parent: <none>
15691569
internal DNS version::: 1
15701570
external DNS version::: 2
15711571
target release min gen: 1
1572+
nexus gen:::::::::::::: 1
15721573

15731574
PENDING MGS-MANAGED UPDATES: 0
15741575

@@ -1692,6 +1693,7 @@ parent: <none>
16921693
internal DNS version::: 1
16931694
external DNS version::: 2
16941695
target release min gen: 1
1696+
nexus gen:::::::::::::: 1
16951697

16961698
PENDING MGS-MANAGED UPDATES: 0
16971699

@@ -1717,6 +1719,7 @@ to: blueprint ......<REDACTED_BLUEPRINT_ID>.......
17171719
internal DNS version::: 1 (unchanged)
17181720
external DNS version::: 2 (unchanged)
17191721
target release min gen: 1 (unchanged)
1722+
nexus gen:::::::::::::: 1 (unchanged)
17201723

17211724
OXIMETER SETTINGS:
17221725
generation: 1 (unchanged)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
274274
internal DNS version::: 1
275275
external DNS version::: 1
276276
target release min gen: 1
277+
nexus gen:::::::::::::: 1
277278

278279
PENDING MGS-MANAGED UPDATES: 0
279280

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
399399
internal DNS version::: 1
400400
external DNS version::: 1
401401
target release min gen: 1
402+
nexus gen:::::::::::::: 1
402403

403404
PENDING MGS-MANAGED UPDATES: 0
404405

@@ -518,6 +519,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
518519
internal DNS version::: 1
519520
external DNS version::: 1
520521
target release min gen: 1
522+
nexus gen:::::::::::::: 1
521523

522524
PENDING MGS-MANAGED UPDATES: 0
523525

@@ -551,7 +553,7 @@ T ENA ID PARENT
551553
> blueprint-plan ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
552554
INFO skipping noop image source check for all sleds, reason: no target release is currently set
553555
WARN cannot issue more MGS-driven updates (no current artifacts)
554-
INFO some zones not yet up-to-date, sled_id: 89d02b1b-478c-401a-8e28-7a26f74fa41b, zones_currently_updating: [ZoneCurrentlyUpdating { zone_id: b3c9c041-d2f0-4767-bdaf-0e52e9d7a013 (service), zone_kind: InternalNtp, reason: MissingInInventory { bp_image_source: InstallDataset } }]
556+
INFO some zones not yet up-to-date, zones_currently_updating: [ZoneCurrentlyUpdating { zone_id: b3c9c041-d2f0-4767-bdaf-0e52e9d7a013 (service), zone_kind: InternalNtp, reason: MissingInInventory { bp_image_source: InstallDataset } }]
555557
generated blueprint 86db3308-f817-4626-8838-4085949a6a41 based on parent blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
556558
planning report for blueprint 86db3308-f817-4626-8838-4085949a6a41:
557559
chicken switches:
@@ -633,6 +635,7 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
633635
internal DNS version::: 1 (unchanged)
634636
external DNS version::: 1 (unchanged)
635637
target release min gen: 1 (unchanged)
638+
nexus gen:::::::::::::: 1 (unchanged)
636639

637640
OXIMETER SETTINGS:
638641
generation: 1 (unchanged)
@@ -713,6 +716,7 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
713716
internal DNS version::: 1 (unchanged)
714717
external DNS version::: 1 (unchanged)
715718
target release min gen: 1 (unchanged)
719+
nexus gen:::::::::::::: 1 (unchanged)
716720

717721
OXIMETER SETTINGS:
718722
generation: 1 (unchanged)
@@ -793,6 +797,7 @@ to: blueprint 02697f74-b14a-4418-90f0-c28b2a3a6aa9
793797
internal DNS version::: 1 (unchanged)
794798
external DNS version::: 1 (unchanged)
795799
target release min gen: 1 (unchanged)
800+
nexus gen:::::::::::::: 1 (unchanged)
796801

797802
OXIMETER SETTINGS:
798803
generation: 1 (unchanged)
@@ -1032,6 +1037,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
10321037
internal DNS version::: 1
10331038
external DNS version::: 1
10341039
target release min gen: 1
1040+
nexus gen:::::::::::::: 1
10351041

10361042
PENDING MGS-MANAGED UPDATES: 0
10371043

@@ -1670,6 +1676,7 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
16701676
internal DNS version::: 1 (unchanged)
16711677
external DNS version::: 1 (unchanged)
16721678
target release min gen: 1 (unchanged)
1679+
nexus gen:::::::::::::: 1 (unchanged)
16731680

16741681
OXIMETER SETTINGS:
16751682
generation: 1 (unchanged)

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27
331331
internal DNS version::: 1
332332
external DNS version::: 1
333333
target release min gen: 1
334+
nexus gen:::::::::::::: 1
334335

335336
PENDING MGS-MANAGED UPDATES: 0
336337

@@ -463,6 +464,7 @@ to: blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0
463464
internal DNS version::: 1 (unchanged)
464465
external DNS version::: 1 (unchanged)
465466
target release min gen: 1 (unchanged)
467+
nexus gen:::::::::::::: 1 (unchanged)
466468

467469
OXIMETER SETTINGS:
468470
generation: 1 (unchanged)
@@ -1022,6 +1024,7 @@ parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434
10221024
internal DNS version::: 1
10231025
external DNS version::: 1
10241026
target release min gen: 1
1027+
nexus gen:::::::::::::: 1
10251028

10261029
PENDING MGS-MANAGED UPDATES: 0
10271030

@@ -1039,7 +1042,7 @@ chicken switches:
10391042
add zones with mupdate override: false
10401043

10411044
* discretionary zones placed:
1042-
* 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
1045+
* external_dns zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a from source install dataset
10431046
* zone updates waiting on discretionary zones
10441047

10451048

@@ -1163,6 +1166,7 @@ to: blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2
11631166
internal DNS version::: 1 (unchanged)
11641167
external DNS version::: 1 (unchanged)
11651168
target release min gen: 1 (unchanged)
1169+
nexus gen:::::::::::::: 1 (unchanged)
11661170

11671171
OXIMETER SETTINGS:
11681172
generation: 1 (unchanged)
@@ -1725,6 +1729,7 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
17251729
internal DNS version::: 1
17261730
external DNS version::: 1
17271731
target release min gen: 1
1732+
nexus gen:::::::::::::: 1
17281733

17291734
PENDING MGS-MANAGED UPDATES: 0
17301735

@@ -1733,7 +1738,7 @@ chicken switches:
17331738
add zones with mupdate override: false
17341739

17351740
* discretionary zones placed:
1736-
* 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
1741+
* external_dns zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a from source install dataset
17371742
* zone updates waiting on discretionary zones
17381743

17391744

@@ -1859,6 +1864,7 @@ to: blueprint 2ac8c740-444d-42ff-8d66-9812a7e51288
18591864
internal DNS version::: 1 (unchanged)
18601865
external DNS version::: 1 (unchanged)
18611866
target release min gen: 1 (unchanged)
1867+
nexus gen:::::::::::::: 1 (unchanged)
18621868

18631869
OXIMETER SETTINGS:
18641870
generation: 1 (unchanged)

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ parent: 184f10b3-61cb-41ef-9b93-3489b2bac559
329329
internal DNS version::: 1
330330
external DNS version::: 1
331331
target release min gen: 1
332+
nexus gen:::::::::::::: 1
332333

333334
PENDING MGS-MANAGED UPDATES: 0
334335

@@ -461,6 +462,7 @@ to: blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
461462
internal DNS version::: 1 (unchanged)
462463
external DNS version::: 1 (unchanged)
463464
target release min gen: 1 (unchanged)
465+
nexus gen:::::::::::::: 1 (unchanged)
464466

465467
OXIMETER SETTINGS:
466468
generation: 1 (unchanged)
@@ -820,6 +822,7 @@ to: blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
820822
internal DNS version::: 1 (unchanged)
821823
external DNS version::: 1 (unchanged)
822824
target release min gen: 1 (unchanged)
825+
nexus gen:::::::::::::: 1 (unchanged)
823826

824827
OXIMETER SETTINGS:
825828
generation: 1 (unchanged)
@@ -1053,7 +1056,7 @@ chicken switches:
10531056
add zones with mupdate override: false
10541057

10551058
* discretionary zones placed:
1056-
* 1 zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c: internal_dns
1059+
* internal_dns zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c from source install dataset
10571060
* zone updates waiting on discretionary zones
10581061

10591062

@@ -1177,6 +1180,7 @@ to: blueprint af934083-59b5-4bf6-8966-6fb5292c29e1
11771180
internal DNS version::: 1 (unchanged)
11781181
external DNS version::: 1 (unchanged)
11791182
target release min gen: 1 (unchanged)
1183+
nexus gen:::::::::::::: 1 (unchanged)
11801184

11811185
OXIMETER SETTINGS:
11821186
generation: 1 (unchanged)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ to: blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
150150
internal DNS version::: 1 (unchanged)
151151
external DNS version::: 1 (unchanged)
152152
target release min gen: 1 (unchanged)
153+
nexus gen:::::::::::::: 1 (unchanged)
153154

154155
OXIMETER SETTINGS:
155156
generation: 1 (unchanged)
@@ -430,6 +431,7 @@ to: blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
430431
internal DNS version::: 1 (unchanged)
431432
external DNS version::: 1 (unchanged)
432433
target release min gen: 1 (unchanged)
434+
nexus gen:::::::::::::: 1 (unchanged)
433435

434436
OXIMETER SETTINGS:
435437
generation: 1 (unchanged)
@@ -709,6 +711,7 @@ parent: 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
709711
internal DNS version::: 1
710712
external DNS version::: 1
711713
target release min gen: 1
714+
nexus gen:::::::::::::: 1
712715

713716
PENDING MGS-MANAGED UPDATES: 0
714717

@@ -860,6 +863,7 @@ to: blueprint af934083-59b5-4bf6-8966-6fb5292c29e1
860863
internal DNS version::: 1 (unchanged)
861864
external DNS version::: 1 (unchanged)
862865
target release min gen: 1 (unchanged)
866+
nexus gen:::::::::::::: 1 (unchanged)
863867

864868
OXIMETER SETTINGS:
865869
generation: 1 (unchanged)
@@ -1140,6 +1144,7 @@ to: blueprint df06bb57-ad42-4431-9206-abff322896c7
11401144
internal DNS version::: 1 (unchanged)
11411145
external DNS version::: 1 (unchanged)
11421146
target release min gen: 1 (unchanged)
1147+
nexus gen:::::::::::::: 1 (unchanged)
11431148

11441149
OXIMETER SETTINGS:
11451150
generation: 1 (unchanged)
@@ -1419,6 +1424,7 @@ parent: af934083-59b5-4bf6-8966-6fb5292c29e1
14191424
internal DNS version::: 1
14201425
external DNS version::: 1
14211426
target release min gen: 1
1427+
nexus gen:::::::::::::: 1
14221428

14231429
PENDING MGS-MANAGED UPDATES: 0
14241430

0 commit comments

Comments
 (0)