diff --git a/Cargo.lock b/Cargo.lock index 239eebcdc3..54ca3cd93e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2807,7 +2807,6 @@ dependencies = [ "num-integer", "omicron-common", "omicron-rpaths", - "omicron-sled-agent", "omicron-test-utils", "openapi-lint", "openapiv3", diff --git a/common/src/address.rs b/common/src/address.rs index e18e3639e9..d1f86fbb82 100644 --- a/common/src/address.rs +++ b/common/src/address.rs @@ -31,6 +31,9 @@ pub const DNS_PORT: u16 = 53; pub const DNS_SERVER_PORT: u16 = 5353; pub const SLED_AGENT_PORT: u16 = 12345; +/// The port propolis-server listens on inside the propolis zone. +pub const PROPOLIS_PORT: u16 = 12400; + // Anycast is a mechanism in which a single IP address is shared by multiple // devices, and the destination is located based on routing distance. // diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index 40ce71f55e..d414758633 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -69,9 +69,6 @@ features = [ "usdt-probes" ] [dependencies.omicron-common] path = "../common" -[dependencies.omicron-sled-agent] -path = "../sled-agent" - [dependencies.oximeter] version = "0.1.0" path = "../oximeter/oximeter" diff --git a/nexus/src/db/model/instance.rs b/nexus/src/db/model/instance.rs index 02f2045102..80b6e124fc 100644 --- a/nexus/src/db/model/instance.rs +++ b/nexus/src/db/model/instance.rs @@ -9,9 +9,9 @@ use crate::db::schema::{disk, instance}; use crate::external_api::params; use chrono::{DateTime, Utc}; use db_macros::Resource; +use omicron_common::address::PROPOLIS_PORT; use omicron_common::api::external; use omicron_common::api::internal; -use omicron_sled_agent::common::instance::PROPOLIS_PORT; use std::net::SocketAddr; use uuid::Uuid; diff --git a/sled-agent/src/common/instance.rs b/sled-agent/src/common/instance.rs index 8481c3c7b1..5a8e39237a 100644 --- a/sled-agent/src/common/instance.rs +++ b/sled-agent/src/common/instance.rs @@ -14,9 +14,6 @@ use omicron_common::api::external::InstanceState; use omicron_common::api::internal::nexus::InstanceRuntimeState; use propolis_client::api::InstanceState as PropolisInstanceState; -/// The port propolis-server listens on inside the propolis zone. -pub const PROPOLIS_PORT: u16 = 12400; - /// Action to be taken on behalf of state transition. #[derive(Clone, Debug, PartialEq)] pub enum Action { diff --git a/sled-agent/src/instance.rs b/sled-agent/src/instance.rs index 2ba4d435b5..9a738df36e 100644 --- a/sled-agent/src/instance.rs +++ b/sled-agent/src/instance.rs @@ -4,9 +4,7 @@ //! API for controlling a single instance. -use crate::common::instance::{ - Action as InstanceAction, InstanceStates, PROPOLIS_PORT, -}; +use crate::common::instance::{Action as InstanceAction, InstanceStates}; use crate::illumos::running_zone::{ InstalledZone, RunCommandError, RunningZone, }; @@ -23,6 +21,7 @@ use crate::params::{ }; use anyhow::anyhow; use futures::lock::{Mutex, MutexGuard}; +use omicron_common::address::PROPOLIS_PORT; use omicron_common::api::internal::nexus::InstanceRuntimeState; use omicron_common::backoff; use propolis_client::api::DiskRequest;