Skip to content

Commit

Permalink
more import path cleanup
Browse files Browse the repository at this point in the history
Created using spr 1.3.6-beta.1
  • Loading branch information
sunshowers committed Jul 22, 2024
1 parent af9f927 commit 4ccceaf
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 5 deletions.
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions clients/nexus-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ chrono.workspace = true
futures.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-common-extended.workspace = true
omicron-passwords.workspace = true
oxnet.workspace = true
progenitor.workspace = true
Expand Down
4 changes: 3 additions & 1 deletion clients/nexus-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ progenitor::generate_api!(
NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
NetworkInterfaceKind = omicron_common::api::internal::shared::NetworkInterfaceKind,
NewPasswordHash = omicron_passwords::NewPasswordHash,
RecoverySiloConfig = nexus_types::internal_api::params::RecoverySiloConfig,
OmicronPhysicalDiskConfig = nexus_types::disk::OmicronPhysicalDiskConfig,
OmicronPhysicalDisksConfig = nexus_types::disk::OmicronPhysicalDisksConfig,
RecoverySiloConfig = omicron_common_extended::recovery_silo::RecoverySiloConfig,
TypedUuidForCollectionKind = omicron_uuid_kinds::CollectionUuid,
TypedUuidForDownstairsKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::DownstairsKind>,
TypedUuidForPropolisKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::PropolisKind>,
Expand Down
2 changes: 1 addition & 1 deletion nexus/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ impl nexus_test_interface::NexusServer for Server {
datasets: Vec<nexus_types::internal_api::params::DatasetCreateRequest>,
internal_dns_zone_config: nexus_types::internal_api::params::DnsConfigParams,
external_dns_zone_name: &str,
recovery_silo: nexus_types::internal_api::params::RecoverySiloConfig,
recovery_silo: omicron_common_extended::recovery_silo::RecoverySiloConfig,
certs: Vec<omicron_common::api::internal::nexus::Certificate>,
disable_sled_id: Uuid,
) -> Self {
Expand Down
1 change: 1 addition & 0 deletions nexus/test-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ async-trait.workspace = true
nexus-config.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-common-extended.workspace = true
slog.workspace = true
uuid.workspace = true
omicron-workspace-hack.workspace = true
2 changes: 1 addition & 1 deletion nexus/test-interface/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ pub trait NexusServer: Send + Sync + 'static {
datasets: Vec<nexus_types::internal_api::params::DatasetCreateRequest>,
internal_dns_config: nexus_types::internal_api::params::DnsConfigParams,
external_dns_zone_name: &str,
recovery_silo: nexus_types::internal_api::params::RecoverySiloConfig,
recovery_silo: omicron_common_extended::recovery_silo::RecoverySiloConfig,
tls_certificates: Vec<
omicron_common::api::internal::nexus::Certificate,
>,
Expand Down
2 changes: 1 addition & 1 deletion nexus/test-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ use nexus_types::deployment::OmicronZoneExternalFloatingIp;
use nexus_types::external_api::views::SledState;
use nexus_types::internal_api::params::DatasetCreateRequest;
use nexus_types::internal_api::params::DatasetPutRequest;
use nexus_types::internal_api::params::RecoverySiloConfig;
use omicron_common::address::DNS_OPTE_IPV4_SUBNET;
use omicron_common::address::NEXUS_OPTE_IPV4_SUBNET;
use omicron_common::api::external::Generation;
Expand All @@ -54,6 +53,7 @@ use omicron_common::api::internal::shared::SwitchLocation;
use omicron_common::zpool_name::ZpoolName;
use omicron_common_extended::inventory::OmicronZoneDataset;
use omicron_common_extended::inventory::OmicronZonesConfig;
use omicron_common_extended::recovery_silo::RecoverySiloConfig;
use omicron_sled_agent::sim;
use omicron_test_utils::dev;
use omicron_uuid_kinds::ExternalIpUuid;
Expand Down
2 changes: 1 addition & 1 deletion nexus/types/src/internal_api/params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use omicron_common::api::internal::shared::ExternalPortDiscovery;
use omicron_common::api::internal::shared::RackNetworkConfig;
use omicron_common::api::internal::shared::SourceNatConfig;
use omicron_common_extended::inventory::SledRole;
pub use omicron_common_extended::recovery_silo::RecoverySiloConfig;
use omicron_common_extended::recovery_silo::RecoverySiloConfig;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use std::fmt;
Expand Down

0 comments on commit 4ccceaf

Please sign in to comment.