sic_create_disk_requests

Author: jmpesp

Cargo.lock

@@ -51,6 +51,7 @@ thiserror = "1.0"
 toml = "0.5.6"
 tough = { version = "0.12", features = [ "http" ] }
 usdt = "0.3.1"
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "832a86afce308d3210685af987ace1ba74c2ecd6" }
 
 [dependencies.api_identity]
 path = "../api_identity"

nexus/Cargo.toml

@@ -136,9 +136,10 @@ pub enum InstanceDiskAttachment {
     Attach(InstanceDiskAttach),
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, Default)]
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct InstanceDiskAttach {
-    disks: Vec<Uuid>,
+    /// A disk name to attach
+    pub disk: Name,
 }
 
 /**

nexus/src/external_api/params.rs

@@ -188,6 +188,12 @@ pub fn saga_instance_create() -> SagaTemplate<SagaInstanceCreate> {
         new_action_noop_undo(sic_create_network_interfaces),
     );
 
+    template_builder.append(
+        "disk_requests",
+        "CreateDiskRequests",
+        new_action_noop_undo(sic_create_disk_requests),
+    );
+
     template_builder.append(
         "initial_runtime",
         "CreateInstanceRecord",
@@ -455,6 +461,55 @@ async fn sic_create_network_interfaces_undo(
     Ok(())
 }
 
+async fn sic_create_disk_requests(
+    sagactx: ActionContext<SagaInstanceCreate>,
+) -> Result<Vec<sled_agent_client::types::DiskRequest>, ActionError> {
+    let osagactx = sagactx.user_data();
+    let datastore = osagactx.datastore();
+    let saga_params = sagactx.saga_params();
+    let opctx = OpContext::for_saga_action(&sagactx, &saga_params.serialized_authn);
+
+    let authz_project = datastore
+        .project_lookup_by_id(saga_params.project_id)
+        .await
+        .map_err(ActionError::action_failed)?;
+
+    let saga_disks = &sagactx.saga_params().create_params.disks;
+
+    let mut reqs = Vec::with_capacity(saga_disks.len());
+
+    for (i, disk) in saga_disks.iter().enumerate() {
+        match disk {
+            params::InstanceDiskAttachment::Create(_) => {
+                // TODO attach disk created in a previous step
+                todo!();
+            },
+            params::InstanceDiskAttachment::Attach(instance_disk_attach) => {
+                let disk_name = &instance_disk_attach.disk;
+                let (_, disk) = datastore.disk_fetch(&opctx, &authz_project, &db::model::Name::from(disk_name.clone()))
+                    .await
+                    .map_err(ActionError::action_failed)?;
+
+                let volume = datastore.volume_get(disk.id()).await.map_err(ActionError::action_failed)?;
+
+                reqs.push(sled_agent_client::types::DiskRequest {
+                    name: disk.name().to_string(),
+                    slot: sled_agent_client::types::Slot(i as u8),
+                    // TODO offer ability to attach read-only?
+                    read_only: false,
+                    device: "nvme".to_string(),
+                    // TODO Nexus has to send the highest gen of the volume + 1
+                    gen: 0,
+                    volume_construction_request: serde_json::from_str(&volume.data())
+                        .map_err(|e| e.to_string()).map_err(ActionError::action_failed)?,
+                });
+            }
+        }
+    }
+
+    Ok(reqs)
+}
+
 async fn sic_create_instance_record(
     sagactx: ActionContext<SagaInstanceCreate>,
 ) -> Result<InstanceHardware, ActionError> {
@@ -466,6 +521,8 @@ async fn sic_create_instance_record(
     let nics = sagactx
         .lookup::<Option<Vec<NetworkInterface>>>("network_interfaces")?
         .unwrap_or_default();
+    let disks = sagactx
+        .lookup::<Vec<sled_agent_client::types::DiskRequest>>("disk_requests")?;
 
     let runtime = InstanceRuntimeState {
         run_state: InstanceState::Creating,
@@ -498,9 +555,14 @@ async fn sic_create_instance_record(
     Ok(InstanceHardware {
         runtime: instance.runtime().clone().into(),
         nics,
-        // TODO disks are currently only attached in instance_set_runtime, but
-        // InstanceCreate could grow to request disks too.
-        disks: vec![],
+        disks: disks.iter().map(|x| propolis_client::api::DiskRequest {
+            name: x.name.clone(),
+            slot: propolis_client::api::Slot(x.slot.0),
+            read_only: x.read_only,
+            device: x.device.clone(),
+            gen: x.gen,
+            volume_construction_request: serde_json::from_str(&serde_json::to_string(&x.volume_construction_request).unwrap()).unwrap(),
+        }).collect(),
     })
 }
 

nexus/src/sagas.rs

@@ -4414,12 +4414,13 @@
             "description": "During instance creation, attach this disk",
             "type": "object",
             "properties": {
-              "disks": {
-                "type": "array",
-                "items": {
-                  "type": "string",
-                  "format": "uuid"
-                }
+              "disk": {
+                "description": "A disk name to attach",
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/Name"
+                  }
+                ]
               },
               "type": {
                 "type": "string",
@@ -4429,7 +4430,7 @@
               }
             },
             "required": [
-              "disks",
+              "disk",
               "type"
             ]
           }