[api][nexus] Migrate DB-specific types into Nexus, away from API (#188)

omicron-common/src/api/external/mod.rs

@@ -459,7 +459,7 @@ impl Display for ResourceType {
 
 pub async fn to_list<T, U>(object_stream: ObjectStream<T>) -> Vec<U>
 where
-    U: From<T>,
+    T: Into<U>,
 {
     object_stream
         .filter(|maybe_object| ready(maybe_object.is_ok()))
@@ -532,12 +532,6 @@ pub struct ProjectView {
     pub identity: IdentityMetadata,
 }
 
-impl From<crate::api::internal::nexus::Project> for ProjectView {
-    fn from(project: crate::api::internal::nexus::Project) -> Self {
-        ProjectView { identity: project.identity }
-    }
-}
-
 /**
  * Create-time parameters for an [`Project`]
  */
@@ -728,19 +722,6 @@ pub struct InstanceView {
     pub runtime: InstanceRuntimeStateView,
 }
 
-impl From<crate::api::internal::nexus::Instance> for InstanceView {
-    fn from(instance: crate::api::internal::nexus::Instance) -> Self {
-        InstanceView {
-            identity: instance.identity.clone(),
-            project_id: instance.project_id,
-            ncpus: instance.ncpus,
-            memory: instance.memory,
-            hostname: instance.hostname.clone(),
-            runtime: instance.runtime.into(),
-        }
-    }
-}
-
 /**
  * Create-time parameters for an [`Instance`]
  */
@@ -788,24 +769,6 @@ pub struct DiskView {
     pub device_path: String,
 }
 
-impl From<crate::api::internal::nexus::Disk> for DiskView {
-    fn from(disk: crate::api::internal::nexus::Disk) -> Self {
-        /*
-         * TODO-correctness: can the name always be used as a path like this
-         * or might it need to be sanitized?
-         */
-        let device_path = format!("/mnt/{}", disk.identity.name.as_str());
-        DiskView {
-            identity: disk.identity.clone(),
-            project_id: disk.project_id,
-            snapshot_id: disk.create_snapshot_id,
-            size: disk.size,
-            state: disk.runtime.disk_state,
-            device_path,
-        }
-    }
-}
-
 /**
  * State of a Disk (primarily: attached or not)
  */
@@ -948,12 +911,6 @@ pub struct RackView {
     pub identity: IdentityMetadata,
 }
 
-impl From<crate::api::internal::nexus::Rack> for RackView {
-    fn from(rack: crate::api::internal::nexus::Rack) -> Self {
-        RackView { identity: rack.identity }
-    }
-}
-
 /*
  * SLEDS
  */
@@ -969,15 +926,6 @@ pub struct SledView {
     pub service_address: SocketAddr,
 }
 
-impl From<crate::api::internal::nexus::Sled> for SledView {
-    fn from(sled: crate::api::internal::nexus::Sled) -> Self {
-        SledView {
-            identity: sled.identity.clone(),
-            service_address: sled.service_address,
-        }
-    }
-}
-
 /*
  * Sagas
  *

omicron-common/src/api/internal/nexus.rs

@@ -1,47 +1,13 @@
 //! APIs exposed by Nexus.
 
-use crate::api::external::{
-    ByteCount, DiskState, Generation, IdentityMetadata, InstanceCpuCount,
-    InstanceState,
-};
+use crate::api::external::{DiskState, Generation, InstanceState};
 use chrono::{DateTime, Utc};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 use std::time::Duration;
 use uuid::Uuid;
 
-pub struct Rack {
-    pub identity: IdentityMetadata,
-}
-
-pub struct Sled {
-    pub identity: IdentityMetadata,
-    pub service_address: SocketAddr,
-}
-
-/// A collection of associated resources.
-pub struct Project {
-    /// common identifying metadata.
-    pub identity: IdentityMetadata,
-}
-
-/// A Disk (network block device).
-#[derive(Clone, Debug)]
-pub struct Disk {
-    /// common identifying metadata.
-    pub identity: IdentityMetadata,
-    /// id for the project containing this Disk
-    pub project_id: Uuid,
-    /// id for the snapshot from which this Disk was created (None means a blank
-    /// disk)
-    pub create_snapshot_id: Option<Uuid>,
-    /// size of the Disk
-    pub size: ByteCount,
-    /// runtime state of the Disk
-    pub runtime: DiskRuntimeState,
-}
-
 /// Runtime state of the Disk, which includes its attach state and some minimal
 /// metadata
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
@@ -54,28 +20,6 @@ pub struct DiskRuntimeState {
     pub time_updated: DateTime<Utc>,
 }
 
-/// An Instance (VM).
-#[derive(Clone, Debug)]
-pub struct Instance {
-    /// common identifying metadata
-    pub identity: IdentityMetadata,
-
-    /// id for the project containing this Instance
-    pub project_id: 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,
-
-    /// state owned by the data plane
-    pub runtime: InstanceRuntimeState,
-    // TODO-completeness: add disks, network, tags, metrics
-}
-
 /// Runtime state of the Instance, including the actual running state and minimal
 /// metadata
 ///
@@ -129,11 +73,3 @@ pub struct OximeterInfo {
     /// The address on which this oximeter instance listens for requests
     pub address: SocketAddr,
 }
-
-/// An assignment of an Oximeter instance to a metric producer for collection.
-// TODO: Goes to storage
-#[derive(Debug, Clone, Copy, JsonSchema, Serialize, Deserialize)]
-pub struct OximeterAssignment {
-    pub oximeter_id: Uuid,
-    pub producer_id: Uuid,
-}

omicron-common/src/api/internal/sled_agent.rs

@@ -39,12 +39,15 @@ impl DiskStateRequested {
     }
 }
 
+/// Runtime state of an instance.
+pub type InstanceRuntimeState = internal::nexus::InstanceRuntimeState;
+
 /// Sent to a sled agent to establish the runtime state of an Instance
 #[derive(Serialize, Deserialize, JsonSchema)]
 pub struct InstanceEnsureBody {
     /// Last runtime state of the Instance known to Nexus (used if the agent
     /// has never seen this Instance before).
-    pub initial_runtime: internal::nexus::InstanceRuntimeState,
+    pub initial_runtime: InstanceRuntimeState,
     /// requested runtime state of the Instance
     pub target: InstanceRuntimeStateRequested,
 }