this is a mess

ahl · ahl · commit 38c1a09c4610 · 2021-11-03T10:07:34.000-07:00
diff --git a/common/src/api/external/mod.rs b/common/src/api/external/mod.rs
@@ -752,10 +752,10 @@ pub struct InstanceRuntimeState {
     pub time_run_state_updated: DateTime<Utc>,
 }
 
-impl From<crate::api::internal::nexus::InstanceRuntimeState>
+impl From<crate::api::internal::common::InstanceRuntimeState>
     for InstanceRuntimeState
 {
-    fn from(state: crate::api::internal::nexus::InstanceRuntimeState) -> Self {
+    fn from(state: crate::api::internal::common::InstanceRuntimeState) -> Self {
         InstanceRuntimeState {
             run_state: state.run_state,
             time_run_state_updated: state.time_updated,
diff --git a/common/src/api/internal/mod.rs b/common/src/api/internal/mod.rs
@@ -1,5 +1,6 @@
 //! Internally facing APIs.
 
 pub mod bootstrap_agent;
+pub mod common;
 pub mod nexus;
 pub mod sled_agent;
diff --git a/common/src/api/internal/nexus.rs b/common/src/api/internal/nexus.rs
@@ -1,50 +1,11 @@
 //! APIs exposed by Nexus.
 
-use crate::api::external::{
-    ByteCount, DiskState, Generation, InstanceCpuCount, InstanceState,
-};
-use chrono::{DateTime, Utc};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 use std::time::Duration;
 use uuid::Uuid;
 
-/// Runtime state of the Disk, which includes its attach state and some minimal
-/// metadata
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
-pub struct DiskRuntimeState {
-    /// runtime state of the Disk
-    pub disk_state: DiskState,
-    /// generation number for this state
-    pub gen: Generation,
-    /// timestamp for this information
-    pub time_updated: DateTime<Utc>,
-}
-
-/// Runtime state of the Instance, including the actual running state and minimal
-/// metadata
-///
-/// This state is owned by the sled agent running that Instance.
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
-pub struct InstanceRuntimeState {
-    /// runtime state of the Instance
-    pub run_state: InstanceState,
-    /// which sled is running this Instance
-    pub sled_uuid: Uuid,
-    /// number of CPUs allocated for this Instance
-    pub ncpus: InstanceCpuCount,
-    /// memory allocated for this Instance
-    pub memory: ByteCount,
-    /// RFC1035-compliant hostname for the Instance.
-    // TODO-cleanup different type?
-    pub hostname: String,
-    /// generation number for this state
-    pub gen: Generation,
-    /// timestamp for this information
-    pub time_updated: DateTime<Utc>,
-}
-
 /// Sent by a sled agent on startup to Nexus to request further instruction
 #[derive(Serialize, Deserialize, JsonSchema)]
 pub struct SledAgentStartupInfo {
diff --git a/common/src/api/internal/sled_agent.rs b/common/src/api/internal/sled_agent.rs
@@ -11,7 +11,7 @@ use uuid::Uuid;
 pub struct DiskEnsureBody {
     /// Last runtime state of the Disk known to Nexus (used if the agent has
     /// never seen this Disk before).
-    pub initial_runtime: internal::nexus::DiskRuntimeState,
+    pub initial_runtime: internal::common::DiskRuntimeState,
     /// requested runtime state of the Disk
     pub target: DiskStateRequested,
 }
@@ -42,7 +42,7 @@ impl DiskStateRequested {
 /// Describes the instance hardware.
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 pub struct InstanceHardware {
-    pub runtime: internal::nexus::InstanceRuntimeState,
+    pub runtime: internal::common::InstanceRuntimeState,
     pub nics: Vec<external::NetworkInterface>,
 }
 
diff --git a/common/src/nexus_client.rs b/common/src/nexus_client.rs
@@ -64,6 +64,22 @@ impl From<types::InstanceState> for crate::api::external::InstanceState {
     }
 }
 
+impl From<types::InstanceRuntimeState>
+    for crate::api::internal::common::InstanceRuntimeState
+{
+    fn from(_: types::InstanceRuntimeState) -> Self {
+        todo!()
+    }
+}
+
+impl From<types::DiskRuntimeState>
+    for crate::api::internal::common::DiskRuntimeState
+{
+    fn from(_: types::DiskRuntimeState) -> Self {
+        todo!()
+    }
+}
+
 /*
 /** Client for a nexus instance */
 pub struct Client {
diff --git a/nexus/src/http_entrypoints_internal.rs b/nexus/src/http_entrypoints_internal.rs
@@ -11,8 +11,8 @@ use dropshot::HttpResponseUpdatedNoContent;
 use dropshot::Path;
 use dropshot::RequestContext;
 use dropshot::TypedBody;
-use omicron_common::api::internal::nexus::DiskRuntimeState;
-use omicron_common::api::internal::nexus::InstanceRuntimeState;
+use omicron_common::api::internal::common::DiskRuntimeState;
+use omicron_common::api::internal::common::InstanceRuntimeState;
 use omicron_common::api::internal::nexus::OximeterInfo;
 use omicron_common::api::internal::nexus::ProducerEndpoint;
 use omicron_common::api::internal::nexus::SledAgentStartupInfo;
diff --git a/sled-agent/src/common/disk.rs b/sled-agent/src/common/disk.rs
@@ -3,8 +3,8 @@
 use chrono::Utc;
 use omicron_common::api::external::DiskState;
 use omicron_common::api::external::Error;
+use omicron_common::api::internal::common::DiskRuntimeState;
 use omicron_common::api::internal::sled_agent::DiskStateRequested;
-use omicron_common::nexus_client::types::DiskRuntimeState;
 use propolis_client::api::DiskAttachmentState as PropolisDiskState;
 use uuid::Uuid;
 
diff --git a/sled-agent/src/common/instance.rs b/sled-agent/src/common/instance.rs
@@ -2,14 +2,10 @@
 
 use chrono::Utc;
 use omicron_common::api::external::Error;
-//use omicron_common::api::external::InstanceState;
-//use omicron_common::api::internal::nexus::InstanceRuntimeState;
+use omicron_common::api::external::InstanceState;
+use omicron_common::api::internal::common::InstanceRuntimeState;
 use omicron_common::api::internal::sled_agent::InstanceRuntimeStateRequested;
 use omicron_common::api::internal::sled_agent::InstanceStateRequested;
-use omicron_common::nexus_client::types::InstanceRuntimeState;
-use omicron_common::nexus_client::types::InstanceState;
-use omicron_common::nexus_client::GenNext;
-use omicron_common::nexus_client::InstanceStateExt;
 use propolis_client::api::InstanceState as PropolisInstanceState;
 
 /// Action to be taken on behalf of state transition.
@@ -262,24 +258,25 @@ impl InstanceStates {
 mod test {
     use super::{Action, InstanceStates};
     use chrono::Utc;
-    use omicron_common::nexus_client::types::InstanceState as State;
-    use omicron_common::{
-        api::{
-            external::ByteCount,
-            internal::sled_agent::InstanceStateRequested as Requested,
-        },
-        nexus_client::types,
+    use omicron_common::api::external::{
+        Generation, InstanceCpuCount, InstanceState,
+    };
+    use omicron_common::api::internal::common::InstanceRuntimeState;
+    use omicron_common::api::{
+        external::ByteCount,
+        internal::sled_agent::InstanceStateRequested as Requested,
     };
+    use omicron_common::nexus_client::types::InstanceState as State;
     use propolis_client::api::InstanceState as Observed;
 
     fn make_instance() -> InstanceStates {
-        InstanceStates::new(types::InstanceRuntimeState {
-            run_state: types::InstanceState::Creating,
+        InstanceStates::new(InstanceRuntimeState {
+            run_state: InstanceState::Creating,
             sled_uuid: uuid::Uuid::new_v4(),
-            ncpus: types::InstanceCpuCount(2),
+            ncpus: InstanceCpuCount(2),
             memory: ByteCount::from_mebibytes_u32(512).into(),
             hostname: "myvm".to_string(),
-            gen: types::Generation(0),
+            gen: Generation::new(),
             time_updated: Utc::now(),
         })
     }
diff --git a/sled-agent/src/http_entrypoints.rs b/sled-agent/src/http_entrypoints.rs
@@ -7,8 +7,8 @@ use dropshot::HttpResponseOk;
 use dropshot::Path;
 use dropshot::RequestContext;
 use dropshot::TypedBody;
-use omicron_common::api::internal::nexus::DiskRuntimeState;
-use omicron_common::api::internal::nexus::InstanceRuntimeState;
+use omicron_common::api::internal::common::DiskRuntimeState;
+use omicron_common::api::internal::common::InstanceRuntimeState;
 use omicron_common::api::internal::sled_agent::DiskEnsureBody;
 use omicron_common::api::internal::sled_agent::InstanceEnsureBody;
 use schemars::JsonSchema;
diff --git a/sled-agent/src/sim/collection.rs b/sled-agent/src/sim/collection.rs
@@ -342,8 +342,8 @@ mod test {
     use omicron_common::api::external::Generation;
     use omicron_common::api::external::InstanceCpuCount;
     use omicron_common::api::external::InstanceState;
-    use omicron_common::api::internal::nexus::DiskRuntimeState;
-    use omicron_common::api::internal::nexus::InstanceRuntimeState;
+    use omicron_common::api::internal::common::DiskRuntimeState;
+    use omicron_common::api::internal::common::InstanceRuntimeState;
     use omicron_common::api::internal::sled_agent::DiskStateRequested;
     use omicron_common::api::internal::sled_agent::InstanceRuntimeStateRequested;
     use omicron_common::api::internal::sled_agent::InstanceStateRequested;
diff --git a/sled-agent/src/sim/http_entrypoints.rs b/sled-agent/src/sim/http_entrypoints.rs
@@ -10,8 +10,8 @@ use dropshot::HttpResponseUpdatedNoContent;
 use dropshot::Path;
 use dropshot::RequestContext;
 use dropshot::TypedBody;
-use omicron_common::api::internal::nexus::DiskRuntimeState;
-use omicron_common::api::internal::nexus::InstanceRuntimeState;
+use omicron_common::api::internal::common::DiskRuntimeState;
+use omicron_common::api::internal::common::InstanceRuntimeState;
 use omicron_common::api::internal::sled_agent::DiskEnsureBody;
 use omicron_common::api::internal::sled_agent::InstanceEnsureBody;
 use schemars::JsonSchema;
@@ -62,10 +62,12 @@ async fn instance_put(
     let sa = rqctx.context();
     let instance_id = path_params.into_inner().instance_id;
     let body_args = body.into_inner();
-    Ok(HttpResponseOk(
+    // TODO errors
+    Ok(HttpResponseOk(InstanceRuntimeState::from(
         sa.instance_ensure(instance_id, body_args.initial, body_args.target)
-            .await?,
-    ))
+            .await
+            .unwrap(),
+    )))
 }
 
 #[endpoint {
@@ -102,14 +104,16 @@ async fn disk_put(
     let sa = rqctx.context();
     let disk_id = path_params.into_inner().disk_id;
     let body_args = body.into_inner();
-    Ok(HttpResponseOk(
+    // TODO errors
+    Ok(HttpResponseOk(DiskRuntimeState::from(
         sa.disk_ensure(
             disk_id,
             body_args.initial_runtime.clone(),
             body_args.target.clone(),
         )
-        .await?,
-    ))
+        .await
+        .unwrap(),
+    )))
 }
 
 #[endpoint {
diff --git a/sled-agent/src/sim/instance.rs b/sled-agent/src/sim/instance.rs
@@ -7,11 +7,10 @@ use super::simulatable::Simulatable;
 use async_trait::async_trait;
 use omicron_common::api::external::Error;
 use omicron_common::api::external::Generation;
-//use omicron_common::api::internal::nexus::InstanceRuntimeState;
+use omicron_common::api::external::InstanceState;
+use omicron_common::api::internal::common::InstanceRuntimeState;
 use omicron_common::api::internal::sled_agent::InstanceRuntimeStateRequested;
 use omicron_common::api::internal::sled_agent::InstanceStateRequested;
-use omicron_common::nexus_client::types::InstanceRuntimeState;
-use omicron_common::nexus_client::types::InstanceState;
 use omicron_common::NexusClient;
 use propolis_client::api::InstanceState as PropolisInstanceState;
 use std::sync::Arc;

Original file line number	Diff line number	Diff line change
`@@ -752,10 +752,10 @@ pub struct InstanceRuntimeState {`
`752`	`752`	`pub time_run_state_updated: DateTime<Utc>,`
`753`	`753`	`}`
`754`	`754`
`755`		`-impl From<crate::api::internal::nexus::InstanceRuntimeState>`
	`755`	`+impl From<crate::api::internal::common::InstanceRuntimeState>`
`756`	`756`	`for InstanceRuntimeState`
`757`	`757`	`{`
`758`		`- fn from(state: crate::api::internal::nexus::InstanceRuntimeState) -> Self {`
	`758`	`+ fn from(state: crate::api::internal::common::InstanceRuntimeState) -> Self {`
`759`	`759`	`InstanceRuntimeState {`
`760`	`760`	`run_state: state.run_state,`
`761`	`761`	`time_run_state_updated: state.time_updated,`