supply real volume data to propolis

common/src/api/external/error.rs

@@ -296,6 +296,12 @@ impl<T: ClientError> From<progenitor::progenitor_client::Error<T>> for Error {
     }
 }
 
+impl From<serde_json::Error> for Error {
+    fn from(e: serde_json::Error) -> Self {
+        Error::internal_error(&e.to_string())
+    }
+}
+
 /// Like [`assert!`], except that instead of panicking, this function returns an
 /// `Err(Error::InternalError)` with an appropriate message if the given
 /// condition is not true.

nexus/Cargo.toml

@@ -11,9 +11,10 @@ path = "../rpaths"
 anyhow = "1.0"
 async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "c849b717be" }
 async-trait = "0.1.51"
+base64 = "0.13.0"
 bb8 = "0.7.1"
 cookie = "0.16"
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "3e7e49eeb88fa8ad74375b0642aabd4224b1f2cb" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "945daedb88cefa790f1d994b3a038b8fa9ac514a" }
 # Tracking pending 2.0 version.
 diesel = { git = "https://github.com/diesel-rs/diesel", rev = "ce77c382", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 futures = "0.3.21"

nexus/src/db/model.rs

@@ -646,7 +646,11 @@ impl Sled {
 
     pub fn address(&self) -> SocketAddr {
         // TODO: avoid this unwrap
-        SocketAddr::new(self.ip.ip(), u16::try_from(self.port).unwrap())
+        self.address_with_port(u16::try_from(self.port).unwrap())
+    }
+
+    pub fn address_with_port(&self, port: u16) -> SocketAddr {
+        SocketAddr::new(self.ip.ip(), port)
     }
 }
 
@@ -787,7 +791,11 @@ impl Dataset {
 
     pub fn address(&self) -> SocketAddr {
         // TODO: avoid this unwrap
-        SocketAddr::new(self.ip.ip(), u16::try_from(self.port).unwrap())
+        self.address_with_port(u16::try_from(self.port).unwrap())
+    }
+
+    pub fn address_with_port(&self, port: u16) -> SocketAddr {
+        SocketAddr::new(self.ip.ip(), port)
     }
 }
 
@@ -905,6 +913,10 @@ impl Volume {
             data,
         }
     }
+
+    pub fn data(&self) -> &str {
+        &self.data
+    }
 }
 
 /// Describes an organization within the database.
@@ -1266,6 +1278,10 @@ impl Disk {
     pub fn runtime(&self) -> DiskRuntimeState {
         self.runtime_state.clone()
     }
+
+    pub fn id(&self) -> Uuid {
+        self.identity.id
+    }
 }
 
 /// Conversion to the external API type.
@@ -1319,6 +1335,17 @@ impl DiskRuntimeState {
         }
     }
 
+    pub fn attach(self, instance_id: Uuid) -> Self {
+        Self {
+            disk_state: external::DiskState::Attached(instance_id)
+                .label()
+                .to_string(),
+            attach_instance_id: Some(instance_id),
+            gen: self.gen.next().into(),
+            time_updated: Utc::now(),
+        }
+    }
+
     pub fn detach(self) -> Self {
         Self {
             disk_state: external::DiskState::Detached.label().to_string(),
@@ -1339,6 +1366,15 @@ impl DiskRuntimeState {
             .unwrap(),
         )
     }
+
+    pub fn faulted(self) -> Self {
+        Self {
+            disk_state: external::DiskState::Faulted.label().to_string(),
+            attach_instance_id: None,
+            gen: self.gen.next().into(),
+            time_updated: Utc::now(),
+        }
+    }
 }
 
 /// Conversion from the internal API type.

nexus/src/external_api/params.rs

@@ -105,6 +105,23 @@ impl Default for InstanceNetworkInterfaceAttachment {
     }
 }
 
+/// Describe the instance's disks at creation time
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum InstanceDiskAttachment {
+    /// During instance creation, create and attach disks
+    Create(DiskCreate),
+
+    /// During instance creation, attach this disk
+    Attach(InstanceDiskAttach),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+pub struct InstanceDiskAttach {
+    /// A disk name to attach
+    pub disk: Name,
+}
+
 /// Create-time parameters for an [`Instance`](omicron_common::api::external::Instance)
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct InstanceCreate {
@@ -117,6 +134,10 @@ pub struct InstanceCreate {
     /// The network interfaces to be created for this instance.
     #[serde(default)]
     pub network_interfaces: InstanceNetworkInterfaceAttachment,
+
+    /// The disks to be created or attached for this instance.
+    #[serde(default)]
+    pub disks: Vec<InstanceDiskAttachment>,
 }
 
 /// Migration parameters for an [`Instance`](omicron_common::api::external::Instance)

nexus/src/lib.rs

@@ -1,6 +1,7 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#![feature(async_closure)]
 
 //! Library interface to the Nexus, the heart of the control plane