fmt

Author: labbott

nexus/db-model/src/deployment.rs

@@ -25,12 +25,11 @@ use nexus_db_schema::schema::{
     bp_omicron_physical_disk, bp_omicron_zone, bp_omicron_zone_nic,
     bp_oximeter_read_policy, bp_pending_mgs_update_host_phase_1,
     bp_pending_mgs_update_rot, bp_pending_mgs_update_rot_bootloader,
-    bp_pending_mgs_update_sp, bp_sled_metadata, bp_target,
-    debug_log_blueprint_planning,
-    bp_single_measurements,
+    bp_pending_mgs_update_sp, bp_single_measurements, bp_sled_metadata,
+    bp_target, debug_log_blueprint_planning,
 };
-use nexus_types::deployment::BlueprintSingleMeasurement;
 use nexus_types::deployment::BlueprintPhysicalDiskDisposition;
+use nexus_types::deployment::BlueprintSingleMeasurement;
 use nexus_types::deployment::BlueprintTarget;
 use nexus_types::deployment::BlueprintZoneConfig;
 use nexus_types::deployment::BlueprintZoneDisposition;
@@ -66,9 +65,9 @@ use omicron_common::disk::DiskIdentity;
 use omicron_common::zpool_name::ZpoolName;
 use omicron_uuid_kinds::{
     BlueprintKind, BlueprintUuid, DatasetKind, ExternalIpKind, ExternalIpUuid,
-    GenericUuid, MupdateOverrideKind, OmicronZoneKind, OmicronZoneUuid,
-    PhysicalDiskKind, SledKind, SledUuid, ZpoolKind, ZpoolUuid,
-    MeasurementKind,
+    GenericUuid, MeasurementKind, MupdateOverrideKind, OmicronZoneKind,
+    OmicronZoneUuid, PhysicalDiskKind, SledKind, SledUuid, ZpoolKind,
+    ZpoolUuid,
 };
 use sled_agent_types::inventory::OmicronZoneDataset;
 use sled_hardware_types::BaseboardId;
@@ -1268,8 +1267,6 @@ impl BpSingleMeasurement {
     }
 }
 
-
-
 #[derive(Queryable, Clone, Debug, Selectable, Insertable)]
 #[diesel(table_name = bp_omicron_zone_nic)]
 pub struct BpOmicronZoneNic {

nexus/db-queries/src/db/datastore/deployment.rs

@@ -58,6 +58,7 @@ use nexus_db_model::BpPendingMgsUpdateHostPhase1;
 use nexus_db_model::BpPendingMgsUpdateRot;
 use nexus_db_model::BpPendingMgsUpdateRotBootloader;
 use nexus_db_model::BpPendingMgsUpdateSp;
+use nexus_db_model::BpSingleMeasurement;
 use nexus_db_model::BpSledMetadata;
 use nexus_db_model::BpTarget;
 use nexus_db_model::DbArtifactVersion;
@@ -72,7 +73,6 @@ use nexus_db_model::SpType;
 use nexus_db_model::SqlU16;
 use nexus_db_model::TufArtifact;
 use nexus_db_model::to_db_typed_uuid;
-use nexus_db_model::BpSingleMeasurement;
 use nexus_db_schema::enums::HwM2SlotEnum;
 use nexus_db_schema::enums::HwRotSlotEnum;
 use nexus_db_schema::enums::SpTypeEnum;
@@ -286,8 +286,6 @@ impl DataStore {
             })
             .collect::<Vec<_>>();
 
-
-
         let omicron_physical_disks = blueprint
             .sleds
             .iter()
@@ -1325,7 +1323,6 @@ impl DataStore {
             }
         }
 
-
         // Assemble a mutable map of all the NICs found, by NIC id.  As we
         // match these up with the corresponding zone below, we'll remove items
         // from this set.  That way we can tell if the same NIC was used twice

nexus/db-schema/src/schema.rs

@@ -2215,7 +2215,6 @@ table! {
 
 allow_tables_to_appear_in_same_query!(bp_single_measurements, tuf_artifact);
 
-
 table! {
     bp_omicron_zone (blueprint_id, id) {
         blueprint_id -> Uuid,

nexus/src/app/background/tasks/blueprint_execution.rs

@@ -241,12 +241,12 @@ mod test {
         StepOutcome, StepStatus,
     };
     use nexus_types::deployment::{
-        Blueprint, BlueprintHostPhase2DesiredSlots, BlueprintSledConfig,
-        BlueprintSource, BlueprintTarget, BlueprintZoneConfig,
-        BlueprintZoneDisposition, BlueprintZoneImageSource, BlueprintZoneType,
+        Blueprint, BlueprintHostPhase2DesiredSlots, BlueprintMeasurements,
+        BlueprintSledConfig, BlueprintSource, BlueprintTarget,
+        BlueprintZoneConfig, BlueprintZoneDisposition,
+        BlueprintZoneImageSource, BlueprintZoneType,
         CockroachDbPreserveDowngrade, OximeterReadMode, PendingMgsUpdates,
         blueprint_zone_type,
-        BlueprintMeasurements,
     };
     use nexus_types::external_api::views::SledState;
     use omicron_common::address::Ipv6Subnet;