Bump openapi-lint from 9b20f89 to 2609285

common/src/api/internal/nexus.rs

@@ -36,15 +36,15 @@ pub struct InstanceRuntimeState {
     /// runtime state of the Instance
     pub run_state: InstanceState,
     /// which sled is running this Instance
-    pub sled_uuid: Uuid,
+    pub sled_id: Uuid,
     /// which propolis-server is running this Instance
-    pub propolis_uuid: Uuid,
+    pub propolis_id: Uuid,
     /// the target propolis-server during a migration of this Instance
-    pub dst_propolis_uuid: Option<Uuid>,
+    pub dst_propolis_id: Option<Uuid>,
     /// address of propolis-server running this Instance
     pub propolis_addr: Option<SocketAddr>,
     /// migration id (if one in process)
-    pub migration_uuid: Option<Uuid>,
+    pub migration_id: Option<Uuid>,
     /// number of CPUs allocated for this Instance
     pub ncpus: InstanceCpuCount,
     /// memory allocated for this Instance

nexus-client/src/lib.rs

@@ -62,11 +62,11 @@ impl From<omicron_common::api::internal::nexus::InstanceRuntimeState>
     ) -> Self {
         Self {
             run_state: s.run_state.into(),
-            sled_uuid: s.sled_uuid,
-            propolis_uuid: s.propolis_uuid,
-            dst_propolis_uuid: s.dst_propolis_uuid,
+            sled_id: s.sled_id,
+            propolis_id: s.propolis_id,
+            dst_propolis_id: s.dst_propolis_id,
             propolis_addr: s.propolis_addr.map(|addr| addr.to_string()),
-            migration_uuid: s.migration_uuid,
+            migration_id: s.migration_id,
             ncpus: s.ncpus.into(),
             memory: s.memory.into(),
             hostname: s.hostname,

nexus/src/app/instance.rs

@@ -343,7 +343,7 @@ impl super::Nexus {
         &self,
         instance: &db::model::Instance,
     ) -> Result<Arc<SledAgentClient>, Error> {
-        let sa_id = &instance.runtime().sled_uuid;
+        let sa_id = &instance.runtime().sled_id;
         self.sled_client(&sa_id).await
     }
 
@@ -787,15 +787,15 @@ impl super::Nexus {
             Ok(true) => {
                 info!(log, "instance updated by sled agent";
                     "instance_id" => %id,
-                    "propolis_id" => %new_runtime_state.propolis_uuid,
+                    "propolis_id" => %new_runtime_state.propolis_id,
                     "new_state" => %new_runtime_state.run_state);
                 Ok(())
             }
 
             Ok(false) => {
                 info!(log, "instance update from sled agent ignored (old)";
                     "instance_id" => %id,
-                    "propolis_id" => %new_runtime_state.propolis_uuid,
+                    "propolis_id" => %new_runtime_state.propolis_id,
                     "requested_state" => %new_runtime_state.run_state);
                 Ok(())
             }

nexus/src/app/sagas/instance_create.rs

@@ -628,14 +628,14 @@ async fn sic_create_instance_record(
 
     let runtime = InstanceRuntimeState {
         run_state: InstanceState::Creating,
-        sled_uuid,
-        propolis_uuid,
-        dst_propolis_uuid: None,
+        sled_id: sled_uuid,
+        propolis_id: propolis_uuid,
+        dst_propolis_id: None,
         propolis_addr: Some(std::net::SocketAddr::new(
             propolis_addr.into(),
             12400,
         )),
-        migration_uuid: None,
+        migration_id: None,
         hostname: params.create_params.hostname.clone(),
         memory: params.create_params.memory,
         ncpus: params.create_params.ncpus,

nexus/src/app/sagas/instance_migrate.rs

@@ -141,21 +141,21 @@ async fn sim_instance_migrate(
     let opctx = OpContext::for_saga_action(&sagactx, &params.serialized_authn);
 
     let migration_id = sagactx.lookup::<Uuid>("migrate_id")?;
-    let dst_sled_uuid = params.migrate_params.dst_sled_uuid;
-    let dst_propolis_uuid = sagactx.lookup::<Uuid>("dst_propolis_id")?;
+    let dst_sled_id = params.migrate_params.dst_sled_id;
+    let dst_propolis_id = sagactx.lookup::<Uuid>("dst_propolis_id")?;
     let (instance_id, old_runtime) =
         sagactx.lookup::<(Uuid, InstanceRuntimeState)>("migrate_instance")?;
 
     // Allocate an IP address the destination sled for the new Propolis server.
     let propolis_addr = osagactx
         .datastore()
-        .next_ipv6_address(&opctx, dst_sled_uuid)
+        .next_ipv6_address(&opctx, dst_sled_id)
         .await
         .map_err(ActionError::action_failed)?;
 
     let runtime = InstanceRuntimeState {
-        sled_uuid: dst_sled_uuid,
-        propolis_uuid: dst_propolis_uuid,
+        sled_id: dst_sled_id,
+        propolis_id: dst_propolis_id,
         propolis_addr: Some(std::net::SocketAddr::new(
             propolis_addr.into(),
             12400,
@@ -175,19 +175,19 @@ async fn sim_instance_migrate(
         run_state: InstanceStateRequested::Migrating,
         migration_params: Some(InstanceRuntimeStateMigrateParams {
             migration_id,
-            dst_propolis_id: dst_propolis_uuid,
+            dst_propolis_id,
         }),
     };
 
-    let src_propolis_uuid = old_runtime.propolis_uuid;
+    let src_propolis_id = old_runtime.propolis_id;
     let src_propolis_addr = old_runtime.propolis_addr.ok_or_else(|| {
         ActionError::action_failed(Error::invalid_request(
             "expected source propolis-addr",
         ))
     })?;
 
     let dst_sa = osagactx
-        .sled_client(&dst_sled_uuid)
+        .sled_client(&dst_sled_id)
         .await
         .map_err(ActionError::action_failed)?;
 
@@ -199,7 +199,7 @@ async fn sim_instance_migrate(
                 target,
                 migrate: Some(InstanceMigrateParams {
                     src_propolis_addr: src_propolis_addr.to_string(),
-                    src_propolis_uuid,
+                    src_propolis_id,
                 }),
             },
         )

nexus/src/db/datastore.rs

@@ -970,7 +970,7 @@ impl DataStore {
             .filter(
                 dsl::migration_id
                     .is_null()
-                    .or(dsl::target_propolis_id.eq(new_runtime.propolis_uuid)),
+                    .or(dsl::target_propolis_id.eq(new_runtime.propolis_id)),
             )
             .set(new_runtime.clone())
             .check_if_exists::<Instance>(*instance_id)

nexus/src/db/model/instance.rs

@@ -100,15 +100,15 @@ pub struct InstanceRuntimeState {
     /// which sled is running this Instance
     // TODO: should this be optional?
     #[diesel(column_name = active_server_id)]
-    pub sled_uuid: Uuid,
+    pub sled_id: Uuid,
     #[diesel(column_name = active_propolis_id)]
-    pub propolis_uuid: Uuid,
+    pub propolis_id: Uuid,
     #[diesel(column_name = active_propolis_ip)]
     pub propolis_ip: Option<ipnetwork::IpNetwork>,
     #[diesel(column_name = target_propolis_id)]
-    pub dst_propolis_uuid: Option<Uuid>,
+    pub dst_propolis_id: Option<Uuid>,
     #[diesel(column_name = migration_id)]
-    pub migration_uuid: Option<Uuid>,
+    pub migration_id: Option<Uuid>,
     #[diesel(column_name = ncpus)]
     pub ncpus: InstanceCpuCount,
     #[diesel(column_name = memory)]
@@ -124,13 +124,13 @@ impl From<InstanceRuntimeState>
     fn from(s: InstanceRuntimeState) -> Self {
         Self {
             run_state: s.state.into(),
-            sled_uuid: s.sled_uuid,
-            propolis_uuid: s.propolis_uuid,
-            dst_propolis_uuid: s.dst_propolis_uuid,
+            sled_id: s.sled_id,
+            propolis_id: s.propolis_id,
+            dst_propolis_id: s.dst_propolis_id,
             propolis_addr: s
                 .propolis_ip
                 .map(|ip| SocketAddr::new(ip.ip(), PROPOLIS_PORT).to_string()),
-            migration_uuid: s.migration_uuid,
+            migration_id: s.migration_id,
             ncpus: s.ncpus.into(),
             memory: s.memory.into(),
             hostname: s.hostname,
@@ -155,11 +155,11 @@ impl From<internal::nexus::InstanceRuntimeState> for InstanceRuntimeState {
     fn from(state: internal::nexus::InstanceRuntimeState) -> Self {
         Self {
             state: InstanceState::new(state.run_state),
-            sled_uuid: state.sled_uuid,
-            propolis_uuid: state.propolis_uuid,
-            dst_propolis_uuid: state.dst_propolis_uuid,
+            sled_id: state.sled_id,
+            propolis_id: state.propolis_id,
+            dst_propolis_id: state.dst_propolis_id,
             propolis_ip: state.propolis_addr.map(|addr| addr.ip().into()),
-            migration_uuid: state.migration_uuid,
+            migration_id: state.migration_id,
             ncpus: state.ncpus.into(),
             memory: state.memory.into(),
             hostname: state.hostname,
@@ -174,13 +174,13 @@ impl Into<internal::nexus::InstanceRuntimeState> for InstanceRuntimeState {
     fn into(self) -> internal::nexus::InstanceRuntimeState {
         internal::nexus::InstanceRuntimeState {
             run_state: *self.state.state(),
-            sled_uuid: self.sled_uuid,
-            propolis_uuid: self.propolis_uuid,
-            dst_propolis_uuid: self.dst_propolis_uuid,
+            sled_id: self.sled_id,
+            propolis_id: self.propolis_id,
+            dst_propolis_id: self.dst_propolis_id,
             propolis_addr: self
                 .propolis_ip
                 .map(|ip| SocketAddr::new(ip.ip(), PROPOLIS_PORT)),
-            migration_uuid: self.migration_uuid,
+            migration_id: self.migration_id,
             ncpus: self.ncpus.into(),
             memory: self.memory.into(),
             hostname: self.hostname,

nexus/src/external_api/params.rs

@@ -199,7 +199,7 @@ mod serde_user_data {
 /// Migration parameters for an [`Instance`](omicron_common::api::external::Instance)
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
 pub struct InstanceMigrate {
-    pub dst_sled_uuid: Uuid,
+    pub dst_sled_id: Uuid,
 }
 
 // VPCS

nexus/tests/integration_tests/endpoints.rs

@@ -825,7 +825,7 @@ lazy_static! {
             allowed_methods: vec![
                 AllowedMethod::Post(serde_json::to_value(
                     params::InstanceMigrate {
-                        dst_sled_uuid: uuid::Uuid::new_v4(),
+                        dst_sled_id: uuid::Uuid::new_v4(),
                     }
                 ).unwrap()),
             ],

openapi/nexus-internal.json

@@ -1368,7 +1368,7 @@
         "description": "Runtime state of the Instance, including the actual running state and minimal metadata\n\nThis state is owned by the sled agent running that Instance.",
         "type": "object",
         "properties": {
-          "dst_propolis_uuid": {
+          "dst_propolis_id": {
             "nullable": true,
             "description": "the target propolis-server during a migration of this Instance",
             "type": "string",
@@ -1394,7 +1394,7 @@
               }
             ]
           },
-          "migration_uuid": {
+          "migration_id": {
             "nullable": true,
             "description": "migration id (if one in process)",
             "type": "string",
@@ -1413,7 +1413,7 @@
             "description": "address of propolis-server running this Instance",
             "type": "string"
           },
-          "propolis_uuid": {
+          "propolis_id": {
             "description": "which propolis-server is running this Instance",
             "type": "string",
             "format": "uuid"
@@ -1426,7 +1426,7 @@
               }
             ]
           },
-          "sled_uuid": {
+          "sled_id": {
             "description": "which sled is running this Instance",
             "type": "string",
             "format": "uuid"
@@ -1442,9 +1442,9 @@
           "hostname",
           "memory",
           "ncpus",
-          "propolis_uuid",
+          "propolis_id",
           "run_state",
-          "sled_uuid",
+          "sled_id",
           "time_updated"
         ]
       },

openapi/nexus.json

@@ -6329,13 +6329,13 @@
         "description": "Migration parameters for an [`Instance`](omicron_common::api::external::Instance)",
         "type": "object",
         "properties": {
-          "dst_sled_uuid": {
+          "dst_sled_id": {
             "type": "string",
             "format": "uuid"
           }
         },
         "required": [
-          "dst_sled_uuid"
+          "dst_sled_id"
         ]
       },
       "InstanceNetworkInterfaceAttachment": {