bump dendrite/maghemite

.github/buildomat/jobs/deploy.sh

@@ -4,9 +4,7 @@
 #: variety = "basic"
 #: target = "lab-opte-0.23"
 #: output_rules = [
-#:	"%/var/svc/log/oxide-sled-agent:default.log",
-#:	"%/zone/oxz_*/root/var/svc/log/oxide-*.log",
-#:	"%/zone/oxz_*/root/var/svc/log/system-illumos-*.log",
+#:  "%/snapshot/*.log",
 #: ]
 #: skip_clone = true
 #:
@@ -24,6 +22,15 @@ set -o xtrace
 # If we fail, try to collect some debugging information
 #
 _exit_trap() {
+    # Take a snapshot of logs. If these disappear or change while buildomat is
+    # collecting them, the CI job will fail.
+    pfexec mkdir /snapshot
+    pfexec cp /var/svc/log/oxide-sled-agent:default.log /snapshot/
+    pfexec find /zone/oxz_* -name proc -prune -o -name oxide-*.log -exec cp "{}" /snapshot/ \;
+    pfexec find /zone/oxz_* -name proc -prune -o -name system-illumos-*.log -exec cp "{}" /snapshot/ \;
+    pfexec zlogin softnpu cat /softnpu.log > /tmp/softnpu.log
+    pfexec cp /tmp/softnpu.log /snapshot/
+
 	local status=$?
 	[[ $status -eq 0 ]] && exit 0
 
@@ -44,6 +51,11 @@ _exit_trap() {
 		standalone \
 		dump-state
 	pfexec /opt/oxide/opte/bin/opteadm list-ports
+    z_swadm link ls
+    z_swadm addr list
+    z_swadm route list
+    z_swadm arp list
+
 	PORTS=$(pfexec /opt/oxide/opte/bin/opteadm list-ports | tail +2 | awk '{ print $1; }')
 	for p in $PORTS; do
 		LAYERS=$(pfexec /opt/oxide/opte/bin/opteadm list-layers -p $p | tail +2 | awk '{ print $1; }')
@@ -67,10 +79,16 @@ _exit_trap() {
 		pfexec zlogin "$z" arp -an
 	done
 
+    pfexec zlogin softnpu cat /softnpu.log
+
 	exit $status
 }
 trap _exit_trap EXIT
 
+z_swadm () {
+    pfexec zlogin oxz_switch /opt/oxide/dendrite/bin/swadm $@
+}
+
 #
 # XXX work around 14537 (UFS should not allow directories to be unlinked) which
 # is probably not yet fixed in xde branch?  Once the xde branch merges from

nexus/src/app/rack.rs

@@ -321,7 +321,7 @@ impl super::Nexus {
             let loopback_address_params = LoopbackAddressCreate {
                 address_lot: NameOrId::Name(address_lot_name.clone()),
                 rack_id,
-                switch_location,
+                switch_location: switch_location.clone(),
                 address: first_address,
                 mask: 64,
             };
@@ -344,14 +344,26 @@ impl super::Nexus {
                     Error::internal_error(&format!("unable to retrieve authz_address_lot for infra address_lot: {e}"))
                 })?;
 
-            self.db_datastore
-                .loopback_address_create(
-                    opctx,
-                    &loopback_address_params,
-                    None,
-                    &authz_address_lot,
-                )
-                .await?;
+            if self
+                .loopback_address_lookup(
+                    &opctx,
+                    rack_id,
+                    switch_location.into(),
+                    first_address.into(),
+                )?
+                .lookup_for(authz::Action::Read)
+                .await
+                .is_err()
+            {
+                self.db_datastore
+                    .loopback_address_create(
+                        opctx,
+                        &loopback_address_params,
+                        None,
+                        &authz_address_lot,
+                    )
+                    .await?;
+            }
 
             let body = Ipv6Entry {
                 addr: Ipv6Addr::from_str("fd00:99::1").map_err(|e| {
@@ -374,7 +386,7 @@ impl super::Nexus {
             })?;
 
             let identity = IdentityMetadataCreateParams {
-                name,
+                name: name.clone(),
                 description: "initial uplink configuration".to_string(),
             };
 
@@ -431,9 +443,16 @@ impl super::Nexus {
                 RouteConfig { routes: vec![route] },
             );
 
-            self.db_datastore
-                .switch_port_settings_create(opctx, &port_settings_params)
-                .await?;
+            if self
+                .db_datastore
+                .switch_port_settings_get(opctx, &name.into())
+                .await
+                .is_err()
+            {
+                self.db_datastore
+                    .switch_port_settings_create(opctx, &port_settings_params)
+                    .await?;
+            }
 
             let mut dpd_port_settings = PortSettings {
                 tag: NEXUS_DPD_TAG.into(),

package-manifest.toml

@@ -264,10 +264,10 @@ source.repo = "maghemite"
 # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
 # building `ddm-admin-client` (which will instruct you to update
 # `tools/maghemite_openapi_version`).
-source.commit = "ae633485f570554455ce180acf0091db79d46850"
+source.commit = "043744da65a016a214c9eaa78e65931a785e6690"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/maghemite.sha256.txt
-source.sha256 = "efb6333f392278a49b7ae347857d83b9bb921f0a3a86ade6c8968ba0cd3da5a0"
+source.sha256 = "a24e6e637d7909f168692ffced927f392481bbf4eec05ab1108b44e5d09fa6b8"
 output.type = "tarball"
 
 [package.mg-ddm]
@@ -280,10 +280,10 @@ source.repo = "maghemite"
 # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
 # building `ddm-admin-client` (which will instruct you to update
 # `tools/maghemite_openapi_version`).
-source.commit = "ae633485f570554455ce180acf0091db79d46850"
+source.commit = "043744da65a016a214c9eaa78e65931a785e6690"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
-source.sha256 = "bb4ce993eae149c7a94ae889b9c835a4415bd14c5f4fd45bd18d4bea2c197329"
+source.sha256 = "7916dfefdefba37e9738e4e486c3da5946132e0cae8fb00b76a4ba362bc2737d"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -300,8 +300,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "60a7c97d08d9fc26cda1e133f7f25e65895fe167"
-source.sha256 = "f4742daf8b26dc2977f5d2ff4ba8ccc9d7e06a620e019e09ba57c4b14854cc77"
+source.commit = "4096aa9c61431bf9b0f781b0ab5e249788ff2480"
+source.sha256 = "5bdd39324bf676b90ccbb38a31d548f3e586c26f3d284687ff6f480fb1e5b68c"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -325,8 +325,8 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "60a7c97d08d9fc26cda1e133f7f25e65895fe167"
-source.sha256 = "7c795ca9bc252efd6c5443e845ed6b1fa1f07a1971fda28b4b2c943c6efe0d33"
+source.commit = "4096aa9c61431bf9b0f781b0ab5e249788ff2480"
+source.sha256 = "960c1f8aaa1cc20ced62060e5cdc465886dfe09f4bf2d1a73e81dafb06425d4b"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -343,8 +343,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "60a7c97d08d9fc26cda1e133f7f25e65895fe167"
-source.sha256 = "19fcb003b5070e0b8d029f015d2ba31a00518317bffa0fc24a58058e0ed5b32c"
+source.commit = "4096aa9c61431bf9b0f781b0ab5e249788ff2480"
+source.sha256 = "52b9c7b6f7d263ebf9e7a5c9bc6df54f4d50c460c9b132a8148da1774ec6639e"
 output.type = "zone"
 output.intermediate_only = true
 

tools/ci_download_softnpu_machinery

@@ -12,16 +12,17 @@
 if [[ ! -f out/softnpu/softnpu ]]; then
     echo "fetching softnpu"
     # This comes from a separate repo from the below artifacts,
-    # and lacks public Buildomat URLs based on the commit.
-    curl -OL https://buildomat.eng.oxide.computer/wg/0/artefact/01GTD3CPEENJZ9K1VA0J3GYD5D/WZ2Rw4MGOeSr06SEfmyuMfsp7i5rgwzvENWnAUjShI8FGryp/01GTD3D91TCD903Z0BAYSA31JR/01GTD3T8VFSZTE59Y0SVAR4CWC/softnpu
+    SOFTNPU_COMMIT="88f5f1334364e5580fe778c44ac0746a35927351"
+    COMMIT_URL="https://buildomat.eng.oxide.computer/public/file/oxidecomputer/softnpu/image/$SOFTNPU_COMMIT"
+    curl -OL "$COMMIT_URL/softnpu"
     chmod +x softnpu
     mkdir -p out/softnpu
     mv softnpu out/softnpu/
 fi
 
 # Commit and base URL that's pinned for softnpu tools
-SOFTNPU_COMMIT="9fcec13bd4a4e25035003413f085f448b250884a"
-COMMIT_URL="https://buildomat.eng.oxide.computer/public/file/oxidecomputer/sidecar-lite/release/$SOFTNPU_COMMIT"
+SIDECAR_LITE_COMMIT="b74895bce931202209a1b958be6ec3062d51742b"
+COMMIT_URL="https://buildomat.eng.oxide.computer/public/file/oxidecomputer/sidecar-lite/release/$SIDECAR_LITE_COMMIT"
 
 # This is an ASIC administration program.
 if [[ ! -f out/softnpu/scadm ]]; then

tools/create_virtual_hardware.sh

@@ -132,7 +132,7 @@ function enable_softnpu {
         exit 1
     }
     zlogin softnpu pgrep softnpu || {
-        zlogin softnpu /stuff/softnpu /stuff/softnpu.toml &
+        zlogin softnpu 'RUST_LOG=debug /stuff/softnpu /stuff/softnpu.toml &> /softnpu.log &'
     }
     success "softnpu started"
 }

tools/dendrite_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="60a7c97d08d9fc26cda1e133f7f25e65895fe167"
-SHA2="b3052b2e06fd40f4b446b0ffb9535489673db5ddc4fc44bde1a5b0eb8e40e9b4"
+COMMIT="4096aa9c61431bf9b0f781b0ab5e249788ff2480"
+SHA2="4073eeb768014d6073ba18a7b7b12b2f767467969bf69217f19ff2b974debd51"

tools/dendrite_stub_checksums

@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="f4742daf8b26dc2977f5d2ff4ba8ccc9d7e06a620e019e09ba57c4b14854cc77"
-CIDL_SHA256_LINUX_DPD="b56b9158f9f9feb26778809b286f4465a00e0f7f0207a9e76465a050d2c20f5d"
-CIDL_SHA256_LINUX_SWADM="b3258f6d77562c4328d06b985f0d8b7b73b3c572121f1492c92157c742ffcee4"
+CIDL_SHA256_ILLUMOS="5bdd39324bf676b90ccbb38a31d548f3e586c26f3d284687ff6f480fb1e5b68c"
+CIDL_SHA256_LINUX_DPD="60996645f1f302d3520af8366c23f3ba76199d031e770346d0f972251bff6814"
+CIDL_SHA256_LINUX_SWADM="5e471b38d145e223b39932f559eef69ebb839295061fedc13da72b050e314f6a"

tools/maghemite_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="ae633485f570554455ce180acf0091db79d46850"
-SHA2="9355a191a5046123efce0da5d11b2519acaf4d283b381b815550386d9950c844"
+COMMIT="043744da65a016a214c9eaa78e65931a785e6690"
+SHA2="9737906555a60911636532f00f1dc2866dc7cd6553beb106e9e57beabad41cdf"