Skip to content

Commit

Permalink
tests pass
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewjstone
andrewjstone committed May 11, 2024
1 parent 53f3f25 commit 1bd7a19
Show file tree
Hide file tree
Showing 11 changed files with 314 additions and 305 deletions.
2 changes: 1 addition & 1 deletion dev-tools/omdb/src/bin/omdb/nexus.rs
View file
Expand Up @@ -1064,7 +1064,7 @@ async fn cmd_nexus_blueprints_diff(
args.blueprint2_id.resolve_to_blueprint(client),
)
.await?;
let diff = b2.diff_since_blueprint(&b1).context("diffing blueprints")?;
let diff = b2.diff_since_blueprint(&b1);
println!("{}", diff.display());
Ok(())
}
Expand Down
157 changes: 86 additions & 71 deletions dev-tools/omdb/tests/successes.out
View file
Expand Up @@ -474,31 +474,38 @@ stdout:
blueprint ......<REDACTED_BLUEPRINT_ID>.......
parent: <none>

-----------------------------------------------------------------------------------------
zone type zone ID disposition underlay IP
-----------------------------------------------------------------------------------------

sled ..........<REDACTED_UUID>...........: blueprint zones at generation 2
(no zones)

sled ..........<REDACTED_UUID>...........: blueprint zones at generation 2
clickhouse ..........<REDACTED_UUID>........... in service ::1
cockroach_db ..........<REDACTED_UUID>........... in service ::1
crucible_pantry ..........<REDACTED_UUID>........... in service ::1
external_dns ..........<REDACTED_UUID>........... in service ::1
internal_dns ..........<REDACTED_UUID>........... in service ::1
nexus ..........<REDACTED_UUID>........... in service ::ffff:127.0.0.1

-------------------------
vendor model serial
-------------------------

METADATA:
created by: nexus-test-utils
created at: <REDACTED TIMESTAMP>
comment: initial test blueprint
internal DNS version: 1
external DNS version: 2
!..........<REDACTED_UUID>...........
WARNING: Zones exist without physical disks!
omicron zones at generation 2:
-----------------------------------------------
zone type zone id disposition underlay IP
-----------------------------------------------




!..........<REDACTED_UUID>...........
WARNING: Zones exist without physical disks!
omicron zones at generation 2:
---------------------------------------------------------------------------------------
zone type zone id disposition underlay IP
---------------------------------------------------------------------------------------
clickhouse ..........<REDACTED_UUID>........... in service ::1
cockroach_db ..........<REDACTED_UUID>........... in service ::1
crucible_pantry ..........<REDACTED_UUID>........... in service ::1
external_dns ..........<REDACTED_UUID>........... in service ::1
internal_dns ..........<REDACTED_UUID>........... in service ::1
nexus ..........<REDACTED_UUID>........... in service ::ffff:127.0.0.1



METADATA:
created by::::::::::: nexus-test-utils
created at::::::::::: <REDACTED TIMESTAMP>
comment:::::::::::::: initial test blueprint
internal DNS version: 1
external DNS version: 2


---------------------------------------------
stderr:
Expand All @@ -511,31 +518,38 @@ stdout:
blueprint ......<REDACTED_BLUEPRINT_ID>.......
parent: <none>

-----------------------------------------------------------------------------------------
zone type zone ID disposition underlay IP
-----------------------------------------------------------------------------------------

sled ..........<REDACTED_UUID>...........: blueprint zones at generation 2
(no zones)

sled ..........<REDACTED_UUID>...........: blueprint zones at generation 2
clickhouse ..........<REDACTED_UUID>........... in service ::1
cockroach_db ..........<REDACTED_UUID>........... in service ::1
crucible_pantry ..........<REDACTED_UUID>........... in service ::1
external_dns ..........<REDACTED_UUID>........... in service ::1
internal_dns ..........<REDACTED_UUID>........... in service ::1
nexus ..........<REDACTED_UUID>........... in service ::ffff:127.0.0.1

-------------------------
vendor model serial
-------------------------

METADATA:
created by: nexus-test-utils
created at: <REDACTED TIMESTAMP>
comment: initial test blueprint
internal DNS version: 1
external DNS version: 2
!..........<REDACTED_UUID>...........
WARNING: Zones exist without physical disks!
omicron zones at generation 2:
-----------------------------------------------
zone type zone id disposition underlay IP
-----------------------------------------------




!..........<REDACTED_UUID>...........
WARNING: Zones exist without physical disks!
omicron zones at generation 2:
---------------------------------------------------------------------------------------
zone type zone id disposition underlay IP
---------------------------------------------------------------------------------------
clickhouse ..........<REDACTED_UUID>........... in service ::1
cockroach_db ..........<REDACTED_UUID>........... in service ::1
crucible_pantry ..........<REDACTED_UUID>........... in service ::1
external_dns ..........<REDACTED_UUID>........... in service ::1
internal_dns ..........<REDACTED_UUID>........... in service ::1
nexus ..........<REDACTED_UUID>........... in service ::ffff:127.0.0.1



METADATA:
created by::::::::::: nexus-test-utils
created at::::::::::: <REDACTED TIMESTAMP>
comment:::::::::::::: initial test blueprint
internal DNS version: 1
external DNS version: 2


---------------------------------------------
stderr:
Expand All @@ -548,27 +562,28 @@ stdout:
from: blueprint ......<REDACTED_BLUEPRINT_ID>.......
to: blueprint ......<REDACTED_BLUEPRINT_ID>.......

---------------------------------------------------------------------------------------------------
zone type zone ID disposition underlay IP status
---------------------------------------------------------------------------------------------------

UNCHANGED SLEDS:

sled ..........<REDACTED_UUID>...........: blueprint zones at generation 2
clickhouse ..........<REDACTED_UUID>........... in service ::1
cockroach_db ..........<REDACTED_UUID>........... in service ::1
crucible_pantry ..........<REDACTED_UUID>........... in service ::1
external_dns ..........<REDACTED_UUID>........... in service ::1
internal_dns ..........<REDACTED_UUID>........... in service ::1
nexus ..........<REDACTED_UUID>........... in service ::ffff:127.0.0.1

----------------------------------
vendor model serial status
----------------------------------

METADATA:
internal DNS version: 1 (unchanged)
external DNS version: 2 (unchanged)
UNCHANGED SLEDS:

sled ..........<REDACTED_UUID>...........:

sled ..........<REDACTED_UUID>...........:

omicron zones at generation 2:
---------------------------------------------------------------------------------------
zone type zone id disposition underlay IP
---------------------------------------------------------------------------------------
cockroach_db ..........<REDACTED_UUID>........... in service ::1
nexus ..........<REDACTED_UUID>........... in service ::ffff:127.0.0.1
clickhouse ..........<REDACTED_UUID>........... in service ::1
external_dns ..........<REDACTED_UUID>........... in service ::1
crucible_pantry ..........<REDACTED_UUID>........... in service ::1
internal_dns ..........<REDACTED_UUID>........... in service ::1


METADATA:
internal DNS version: 1 (unchanged)
external DNS version: 2 (unchanged)


---------------------------------------------
stderr:
Expand Down
8 changes: 2 additions & 6 deletions dev-tools/reconfigurator-cli/src/main.rs
View file
Expand Up @@ -777,9 +777,7 @@ fn cmd_blueprint_diff(
let blueprint1 = sim.blueprint_lookup(blueprint1_id)?;
let blueprint2 = sim.blueprint_lookup(blueprint2_id)?;

let sled_diff = blueprint2
.diff_since_blueprint(&blueprint1)
.context("failed to diff blueprints")?;
let sled_diff = blueprint2.diff_since_blueprint(&blueprint1);
swriteln!(rv, "{}", sled_diff.display());

// Diff'ing DNS is a little trickier. First, compute what DNS should be for
Expand Down Expand Up @@ -894,9 +892,7 @@ fn cmd_blueprint_diff_inventory(
anyhow!("no such inventory collection: {}", collection_id)
})?;
let blueprint = sim.blueprint_lookup(blueprint_id)?;
let diff = blueprint
.diff_since_collection(&collection)
.context("failed to diff blueprint from inventory collection")?;
let diff = blueprint.diff_since_collection(&collection);
Ok(Some(diff.display().to_string()))
}

Expand Down
6 changes: 2 additions & 4 deletions nexus/db-queries/src/db/datastore/deployment.rs
View file
Expand Up @@ -1586,7 +1586,7 @@ mod tests {
let blueprint2 = builder.build();
let authz_blueprint2 = authz_blueprint_from_id(blueprint2.id);

let diff = blueprint2.diff_since_blueprint(&blueprint1).unwrap();
let diff = blueprint2.diff_since_blueprint(&blueprint1);
println!("b1 -> b2: {}", diff.display());
println!("b1 disks: {:?}", blueprint1.blueprint_disks);
println!("b2 disks: {:?}", blueprint2.blueprint_disks);
Expand Down Expand Up @@ -1627,9 +1627,7 @@ mod tests {
.blueprint_read(&opctx, &authz_blueprint2)
.await
.expect("failed to read collection back");
let diff = blueprint_read
.diff_since_blueprint(&blueprint2)
.expect("failed to diff blueprints");
let diff = blueprint_read.diff_since_blueprint(&blueprint2);
println!("diff: {}", diff.display());
assert_eq!(blueprint2, blueprint_read);
assert_eq!(blueprint2.internal_dns_version, new_internal_dns_version);
Expand Down
60 changes: 30 additions & 30 deletions nexus/reconfigurator/planning/tests/output/blueprint_builder_initial_diff.txt
View file
Expand Up @@ -8,16 +8,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-168a7bf9-d38d-4373-a425-462c3b1125df
fake-vendor fake-model serial-2ff53468-5481-4899-85be-5a951b2b9bf4
fake-vendor fake-model serial-3530fab0-87da-4965-971c-9e3d318039d1
fake-vendor fake-model serial-53cbe754-94cb-470c-b1a0-54aff4d351ee
fake-vendor fake-model serial-941ddb83-033e-4fde-875b-f23642273982
fake-vendor fake-model serial-b8d6ddf9-6450-4c15-b288-149ff9970190
fake-vendor fake-model serial-c9ab5986-7763-4a3e-8e80-e76816eb253d
fake-vendor fake-model serial-dade42b0-be3f-4e34-afb0-dd1c792030d8
fake-vendor fake-model serial-dbd371a9-11bf-4530-8ee6-7f9c2ca9f421
fake-vendor fake-model serial-f829e6fa-4dd4-4d3d-bf21-01d6da3a2c00
fake-vendor fake-model serial-295728ea-573d-40d4-91bb-4c1221bf7f67
fake-vendor fake-model serial-57377757-2593-49ce-b00f-b8df342afd69
fake-vendor fake-model serial-73bc6b86-f7bd-4596-9a1e-45c0c352b0d0
fake-vendor fake-model serial-8e804b7f-c7cc-4d5d-a48a-7118c4856f05
fake-vendor fake-model serial-a6eb1d29-e5cb-43be-96ca-8eca22b86230
fake-vendor fake-model serial-c67007ad-9752-48d7-8a85-2b7a503834af
fake-vendor fake-model serial-d40f3e4e-0907-4ad0-b08a-d23000108d52
fake-vendor fake-model serial-dc920418-d9b8-42d5-b080-06ef4e862a3b
fake-vendor fake-model serial-f4c6ca3d-b594-468b-8863-04280cbf5221
fake-vendor fake-model serial-fcec098c-26b9-428f-b646-5d08024a1746


omicron zones at generation 2:
Expand All @@ -44,16 +44,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-049bfe76-ef0b-4efb-8d06-1ee867a86a6f
fake-vendor fake-model serial-05b37e69-16ca-4f42-a07c-4af715c17301
fake-vendor fake-model serial-12d37fc1-c950-43e7-96a2-0980fe736468
fake-vendor fake-model serial-62b79334-6006-47f1-99d2-bff891b14db1
fake-vendor fake-model serial-7b6a7a9b-d683-4669-9bd0-ce5ae14e2993
fake-vendor fake-model serial-bf6682e9-1612-48a3-affa-e719559cbc82
fake-vendor fake-model serial-cd2f59cb-5ae8-4a8d-9708-6991cd4b1642
fake-vendor fake-model serial-def73b94-7448-4f19-90db-12153ceae067
fake-vendor fake-model serial-e6d27128-74c4-4607-b5ad-ad803db1d418
fake-vendor fake-model serial-ff6ce539-b83f-44ca-b717-8a58a4099c04
fake-vendor fake-model serial-251ebdd5-d425-4d11-98fa-f4861222193f
fake-vendor fake-model serial-57ce1797-4cd1-469f-895a-899009986c6e
fake-vendor fake-model serial-7398bd1b-a911-40be-aa58-9c9bc63a0441
fake-vendor fake-model serial-a0f4dafb-c66f-4052-8580-6b93cc03538b
fake-vendor fake-model serial-a7598ca5-4c30-4bb8-a911-31db9f21fa31
fake-vendor fake-model serial-b6340ae6-c639-4466-9c3b-9f2215bd45e1
fake-vendor fake-model serial-ba23a50f-dbc8-4958-91d7-25cbab852fff
fake-vendor fake-model serial-c6e75a20-ad8d-4ef4-85d3-f04085c2dff1
fake-vendor fake-model serial-da610888-6b39-416f-99fd-382c0525796d
fake-vendor fake-model serial-fb40e025-ccbf-40eb-9714-ea9060f6803d


omicron zones at generation 2:
Expand All @@ -80,16 +80,16 @@ to: blueprint e4aeb3b3-272f-4967-be34-2d34daa46aa1
----------------------------------------------------------------------
vendor model serial
----------------------------------------------------------------------
fake-vendor fake-model serial-0adc64f9-187a-4404-954a-16d754c9175e
fake-vendor fake-model serial-22c93b73-d848-4976-a312-3f6ac4b221db
fake-vendor fake-model serial-3ab3ffeb-3dd9-4ada-8c2a-0ee13216dd36
fake-vendor fake-model serial-48c12c9c-ff78-418e-b7d9-feb36e59c299
fake-vendor fake-model serial-64774322-555d-40b6-8bce-e18c97210298
fake-vendor fake-model serial-66aa33fa-783e-4cd7-8601-1ec23db2c496
fake-vendor fake-model serial-b2bb4101-d148-4029-be16-a476ee19230d
fake-vendor fake-model serial-b8d3bb85-396e-489a-9f32-ee23c83bff01
fake-vendor fake-model serial-b97dc860-765e-4047-985c-bd731dcc9962
fake-vendor fake-model serial-fa6ffa96-1a47-4a7e-ba7c-34d7df251dd8
fake-vendor fake-model serial-0c3e311a-ed81-44db-aeb9-2c15b5096d7e
fake-vendor fake-model serial-1ea3a707-7981-432e-adea-1e1a5c2406ba
fake-vendor fake-model serial-4b85e434-fb53-4f61-acd4-565c36818fdd
fake-vendor fake-model serial-70cd9f84-e328-43eb-ae6a-8a33f4ac7d3c
fake-vendor fake-model serial-71a49a58-0226-4be6-9d84-a236daf3b792
fake-vendor fake-model serial-89b759da-3e38-4cea-b02c-8be95b8250ca
fake-vendor fake-model serial-9071a4f6-9033-48a2-a63c-89a5d74cbf46
fake-vendor fake-model serial-a619976d-dd84-4098-a641-fcae75428c47
fake-vendor fake-model serial-ab69dfa5-cd88-41c7-9895-1a1409ec6b3a
fake-vendor fake-model serial-da971f12-1a4c-474c-a5ad-90c00d15e6ac


omicron zones at generation 2:
Expand Down

0 comments on commit 1bd7a19

Please sign in to comment.