[reconfigurator-planning] allow adding zones if target release generation is 1 (#9066)

For customers that are going to continue relying on MUPdate, the planner
should act the same way as it did before self-service update existed. We
ascertain this by looking at whether a target release has ever been set.

Most of the tests no longer require the
`add_zones_with_mupdate_override` config, so add a new
reconfigurator-cli script which specifically tests that config.

Author: sunshowers

dev-tools/reconfigurator-cli/tests/input/cmds-add-sled-no-disks.txt

@@ -12,10 +12,6 @@ sled-add --ndisks 0
 # Generate a new inventory collection that includes that sled.
 inventory-generate
 
-# Set the add_zones_with_mupdate_override planner config to ensure that zone
-# adds happen despite zone image sources not being Artifact.
-set planner-config --add-zones-with-mupdate-override true
-
 # Try to plan a new blueprint; this should be okay even though the sled
 # we added has no disks.
 blueprint-plan dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 eb0796d5-ab8a-4f7b-a884-b4aeacb8ab51

dev-tools/reconfigurator-cli/tests/input/cmds-add-zones-with-mupdate-override.txt

@@ -0,0 +1,40 @@
+# This script tests the add-zones-with-mupdate-override
+# planner config.
+
+# Load example system
+load-example --nsleds 3 --ndisks-per-sled 3
+
+# Create a TUF repository from a fake manifest. We're going to use this
+# repository to test out the minimum release generation flow.
+tuf-assemble ../../update-common/manifests/fake.toml
+set target-release repo-1.0.0.zip
+
+# Update the install dataset on this sled to the target release.
+# (This populates the zone manifest, used for no-op conversions from
+# install dataset to artifact down the road.)
+sled-update-install-dataset serial0 --to-target-release
+
+# Simulate a mupdate on sled 0 by setting the mupdate override field to a
+# new UUID (generated using uuidgen).
+sled-set serial0 mupdate-override 2d0f6cbc-addc-47a2-962a-6a01e13376bf
+
+# Generate a new inventory and plan against that.
+inventory-generate
+blueprint-plan latest latest
+
+# Diff the blueprints. This diff should show "will remove mupdate override"
+# and the target release minimum generation being set.
+blueprint-diff latest
+
+# Set Nexus redundancy to 4.
+set num-nexus 4
+
+# Plan with the new Nexus. This will not add any Nexus zones.
+blueprint-plan latest latest
+blueprint-diff latest
+
+# Set the add-zones-with-mupdate-override config, then do a planning run.
+# This *will* add a new Nexus zone.
+set planner-config --add-zones-with-mupdate-override true
+blueprint-plan latest latest
+blueprint-diff latest

dev-tools/reconfigurator-cli/tests/input/cmds-expunge-newly-added-internal-dns.txt

@@ -12,10 +12,6 @@ blueprint-diff dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 8da82a8e-bf97-4fbd-8ddd-9f64
 blueprint-edit 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1 mark-for-cleanup 99e2f30b-3174-40bf-a78a-90da8abba8ca
 blueprint-diff 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1 58d5e830-0884-47d8-a7cd-b2b3751adeb4
 
-# Set the add_zones_with_mupdate_override planner config to ensure that zone
-# adds happen despite zone image sources not being Artifact.
-set planner-config --add-zones-with-mupdate-override true
-
 # Planning a new blueprint will now replace the expunged zone, with new records for its replacement.
 blueprint-plan 58d5e830-0884-47d8-a7cd-b2b3751adeb4
 blueprint-diff 58d5e830-0884-47d8-a7cd-b2b3751adeb4 af934083-59b5-4bf6-8966-6fb5292c29e1

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

@@ -33,31 +33,20 @@ added sled 00320471-945d-413c-85e7-03e091a70b3c (serial: serial3)
 generated inventory collection eb0796d5-ab8a-4f7b-a884-b4aeacb8ab51 from configured sleds
 
 
-> # Set the add_zones_with_mupdate_override planner config to ensure that zone
-> # adds happen despite zone image sources not being Artifact.
-> set planner-config --add-zones-with-mupdate-override true
-planner config updated:
-*   add zones with mupdate override:   false -> true
-
-
-
 > # Try to plan a new blueprint; this should be okay even though the sled
 > # we added has no disks.
 > blueprint-plan dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 eb0796d5-ab8a-4f7b-a884-b4aeacb8ab51
 INFO skipping noop image source check for all sleds, reason: no target release is currently set
 generated blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1 based on parent blueprint dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
 blueprint source: planner with report:
 planning report:
-planner config:
-    add zones with mupdate override:   true
-
 * zone adds and updates are blocked:
   - sleds have deployment units with image sources not set to Artifact:
     - sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c: 9 zones
     - sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6: 8 zones
     - sled d81c6a84-79b8-4958-ae41-ea46c9b19763: 8 zones
 
-* adding zones despite being blocked, as specified by the `add_zones_with_mupdate_override` planner config option
+* adding zones despite being blocked, because: target release generation is 1
 * no zpools in service for NTP zones on sleds: 00320471-945d-413c-85e7-03e091a70b3c
 * discretionary zone placement waiting for NTP zones on sleds: 00320471-945d-413c-85e7-03e091a70b3c
 * zone updates waiting on zone add blockers
@@ -297,16 +286,13 @@ parent:    dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
 
 blueprint source: planner with report:
 planning report:
-planner config:
-    add zones with mupdate override:   true
-
 * zone adds and updates are blocked:
   - sleds have deployment units with image sources not set to Artifact:
     - sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c: 9 zones
     - sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6: 8 zones
     - sled d81c6a84-79b8-4958-ae41-ea46c9b19763: 8 zones
 
-* adding zones despite being blocked, as specified by the `add_zones_with_mupdate_override` planner config option
+* adding zones despite being blocked, because: target release generation is 1
 * no zpools in service for NTP zones on sleds: 00320471-945d-413c-85e7-03e091a70b3c
 * discretionary zone placement waiting for NTP zones on sleds: 00320471-945d-413c-85e7-03e091a70b3c
 * zone updates waiting on zone add blockers