Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions dev-tools/omdb/tests/successes.out
Original file line number Diff line number Diff line change
Expand Up @@ -1565,6 +1565,12 @@ parent: <none>
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
-----------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -1607,6 +1613,12 @@ parent: <none>
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
----------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -1695,6 +1707,12 @@ parent: <none>
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
-----------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -1737,6 +1755,12 @@ parent: <none>
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
----------------------------------------------------------------
vendor model serial disposition
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
-------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -102,6 +108,12 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -170,6 +182,12 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -235,6 +253,12 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down
75 changes: 75 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -212,6 +218,12 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -326,6 +338,12 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -519,6 +537,12 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -1174,6 +1198,12 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -1229,6 +1259,12 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -1284,6 +1320,12 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
B current contents


measurements:
----------------------
hash version prune
----------------------


physical disks:
------------------------------------------------------------------------------------
vendor model serial disposition
Expand Down Expand Up @@ -1564,13 +1606,22 @@ LEDGERED SLED CONFIG
b61b7c3c-d665-44b3-9312-794aa81c59de crucible install-dataset
b957d6cf-f7b2-4bee-9928-c5fde8c59e04 crucible install-dataset
e246f5e3-0650-4afc-860f-ee7114d309c5 crucible install-dataset
measurements:
install dataset
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this mean? That the current set of measurements that are in-use are coming from the install dataset?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


zone image resolver status:
zone manifest:
path on boot disk: /fake/path/install/zones.json
boot disk inventory:
manifest generated by installinator (mupdate ID: 00000000-0000-0000-0000-000000000000)
no artifacts in install dataset (this should only be seen in simulated systems)
no non-boot disks
measurement manifest:
path on boot disk: /fake/path/install/zones.json
boot disk inventory:
manifest generated by installinator (mupdate ID: 00000000-0000-0000-0000-000000000000)
no artifacts in install dataset (this should only be seen in simulated systems)
no non-boot disks
Comment on lines +1620 to +1624
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it right that this duplicates the block above it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should at least change the path for testing but this is going to look very similar since they are being generated in very similar circumstances. The mupdate-id does get duplicated but I found it difficult to pull the mupdate ID up a level.

mupdate override:
path on boot disk: /fake/path/install/mupdate_override.json
no override on boot disk
Expand All @@ -1590,6 +1641,8 @@ LEDGERED SLED CONFIG
all disks reconciled successfully
all datasets reconciled successfully
all zones reconciled successfully
reference measurements:
(measurement set is empty)
Comment on lines +1644 to +1645
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's "reference measurements" here? Is this the set of measurements that Nexus has told Sled Agent are allowed right now?

I think more generally I'm confused about the difference between these three sections here ("measurements", "measurement manifest", and "reference measurements").

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's "reference measurements" here? Is this the set of measurements that Nexus has told Sled Agent are allowed right now?

Correct

I think more generally I'm confused about the difference between these three sections here ("measurements", "measurement manifest", and "reference measurements").

"measurement manifest" is the set of measurements on the install dataset that get placed during a MUPdate.

the "measurements" above are either a list of hashes for reconfigurator based update or a directive to use the install dataset.

the "reference measurements" are the resolved paths we should actually pass to sprockets

reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)

sled 32d8d836-4d8a-4e54-8fa9-f31d79c42646 (role = Gimlet, serial serial2)
Expand Down Expand Up @@ -1691,13 +1744,22 @@ LEDGERED SLED CONFIG
6c2a57b0-2de0-4409-a6b9-c9aa5614eefa crucible install-dataset
99a750b2-724d-4828-ae5f-0df1aad90166 crucible install-dataset
e668d83e-a28c-42dc-b574-467e57403cc1 crucible install-dataset
measurements:
install dataset

zone image resolver status:
zone manifest:
path on boot disk: /fake/path/install/zones.json
boot disk inventory:
manifest generated by installinator (mupdate ID: 00000000-0000-0000-0000-000000000000)
no artifacts in install dataset (this should only be seen in simulated systems)
no non-boot disks
measurement manifest:
path on boot disk: /fake/path/install/zones.json
boot disk inventory:
manifest generated by installinator (mupdate ID: 00000000-0000-0000-0000-000000000000)
no artifacts in install dataset (this should only be seen in simulated systems)
no non-boot disks
mupdate override:
path on boot disk: /fake/path/install/mupdate_override.json
no override on boot disk
Expand All @@ -1717,6 +1779,8 @@ LEDGERED SLED CONFIG
all disks reconciled successfully
all datasets reconciled successfully
all zones reconciled successfully
reference measurements:
(measurement set is empty)
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)

sled 89d02b1b-478c-401a-8e28-7a26f74fa41b (role = Gimlet, serial serial0)
Expand Down Expand Up @@ -1911,13 +1975,22 @@ LEDGERED SLED CONFIG
dc2666e6-4c3e-4b8e-99bc-bcdb5f8986e1 crucible_pantry install-dataset
f4dc5b5d-6eb6-40a9-a079-971eca862285 crucible install-dataset
ffbf02f0-261d-4723-b613-eb861245acbd internal_dns install-dataset
measurements:
install dataset

zone image resolver status:
zone manifest:
path on boot disk: /fake/path/install/zones.json
boot disk inventory:
manifest generated by installinator (mupdate ID: 00000000-0000-0000-0000-000000000000)
no artifacts in install dataset (this should only be seen in simulated systems)
no non-boot disks
measurement manifest:
path on boot disk: /fake/path/install/zones.json
boot disk inventory:
manifest generated by installinator (mupdate ID: 00000000-0000-0000-0000-000000000000)
no artifacts in install dataset (this should only be seen in simulated systems)
no non-boot disks
mupdate override:
path on boot disk: /fake/path/install/mupdate_override.json
no override on boot disk
Expand All @@ -1937,6 +2010,8 @@ LEDGERED SLED CONFIG
all disks reconciled successfully
all datasets reconciled successfully
all zones reconciled successfully
reference measurements:
(measurement set is empty)
reconciler task status: idle (finished at <REDACTED_TIMESTAMP> after running for <REDACTED_DURATION>s)

KEEPER MEMBERSHIP
Expand Down
Loading