normalize function names

oxidecomputer · Apr 12, 2023 · 09a68fb · 09a68fb
1 parent 7672fcf
commit 09a68fb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/nexus/src/app/instance.rs b/nexus/src/app/instance.rs
@@ -629,8 +629,8 @@ impl super::Nexus {
 
         let sa = self.instance_sled(&db_instance).await?;
 
-        let instance_put_result = sa
-            .instance_put(
+        let instance_register_result = sa
+            .instance_register(
                 &db_instance.id(),
                 &sled_agent_client::types::InstanceEnsureBody {
                     initial: instance_hardware,
@@ -639,7 +639,7 @@ impl super::Nexus {
             .await
             .map(|res| Some(res.into_inner()));
 
-        self.handle_instance_put_result(db_instance, instance_put_result)
+        self.handle_instance_put_result(db_instance, instance_register_result)
             .await
             .map(|_| ())
     }

diff --git a/openapi/sled-agent.json b/openapi/sled-agent.json
@@ -82,7 +82,7 @@
     },
     "/instances/{instance_id}": {
       "put": {
-        "operationId": "instance_put",
+        "operationId": "instance_register",
         "parameters": [
           {
             "in": "path",

diff --git a/sled-agent/src/http_entrypoints.rs b/sled-agent/src/http_entrypoints.rs
@@ -32,7 +32,7 @@ pub fn api() -> SledApiDescription {
         api.register(services_put)?;
         api.register(zpools_get)?;
         api.register(filesystem_put)?;
-        api.register(instance_put)?;
+        api.register(instance_register)?;
         api.register(instance_put_state)?;
         api.register(disk_put)?;
         api.register(update_artifact)?;
@@ -107,7 +107,7 @@ struct InstancePathParam {
     method = PUT,
     path = "/instances/{instance_id}",
 }]
-async fn instance_put(
+async fn instance_register(
     rqctx: RequestContext<SledAgent>,
     path_params: Path<InstancePathParam>,
     body: TypedBody<InstanceEnsureBody>,
@@ -116,7 +116,7 @@ async fn instance_put(
     let instance_id = path_params.into_inner().instance_id;
     let body_args = body.into_inner();
     Ok(HttpResponseOk(
-        sa.instance_ensure(instance_id, body_args.initial)
+        sa.instance_ensure_registered(instance_id, body_args.initial)
             .await
             .map_err(Error::from)?,
     ))

diff --git a/sled-agent/src/sled_agent.rs b/sled-agent/src/sled_agent.rs
@@ -518,7 +518,7 @@ impl SledAgent {
     /// Idempotently ensures that a given instance is registered with this sled,
     /// i.e., that it can be addressed by future calls to
     /// [`instance_ensure_state`].
-    pub async fn instance_ensure(
+    pub async fn instance_ensure_registered(
         &self,
         instance_id: Uuid,
         initial: InstanceHardware,