omdb nits, regenerate spec

oxidecomputer · Jan 11, 2024 · b1f2fb9 · b1f2fb9
1 parent f0b0451
commit b1f2fb9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/dev-tools/omdb/src/bin/omdb/nexus.rs b/dev-tools/omdb/src/bin/omdb/nexus.rs
@@ -714,7 +714,6 @@ async fn cmd_nexus_blueprints_list(
         is_target: &'static str,
         id: String,
         parent: String,
-        reason: String,
         time_created: String,
     }
 
@@ -750,7 +749,6 @@ async fn cmd_nexus_blueprints_list(
                     .parent_blueprint_id
                     .map(|s| s.to_string())
                     .unwrap_or_else(|| String::from("<none>")),
-                reason: blueprint.reason,
                 time_created: humantime::format_rfc3339_millis(
                     blueprint.time_created.into(),
                 )
@@ -797,7 +795,7 @@ async fn cmd_nexus_blueprints_show(
         "created at {}",
         humantime::format_rfc3339_millis(blueprint.time_created.into(),)
     );
-    println!("created for: {}", blueprint.reason);
+    println!("comment: {}", blueprint.comment);
     println!("zones:\n");
     for (sled_id, sled_zones) in &blueprint.omicron_zones {
         println!(

diff --git a/nexus/types/src/deployment.rs b/nexus/types/src/deployment.rs
@@ -158,7 +158,7 @@ pub mod views {
         pub parent_blueprint_id: Option<Uuid>,
         pub time_created: chrono::DateTime<chrono::Utc>,
         pub creator: String,
-        pub reason: String,
+        pub comment: String,
 
         pub sleds_in_cluster: BTreeSet<Uuid>,
         pub omicron_zones: BTreeMap<Uuid, OmicronZonesConfig>,
@@ -171,7 +171,7 @@ pub mod views {
                 parent_blueprint_id: generic.parent_blueprint_id,
                 time_created: generic.time_created,
                 creator: generic.creator,
-                reason: generic.comment,
+                comment: generic.comment,
                 sleds_in_cluster: generic.sleds_in_cluster,
                 omicron_zones: generic.omicron_zones,
                 zones_in_service: generic.zones_in_service,

diff --git a/openapi/nexus-internal.json b/openapi/nexus-internal.json
@@ -2072,6 +2072,9 @@
         "description": "Describes all automatically-managed software and configuration in the rack",
         "type": "object",
         "properties": {
+          "comment": {
+            "type": "string"
+          },
           "creator": {
             "type": "string"
           },
@@ -2090,9 +2093,6 @@
             "type": "string",
             "format": "uuid"
           },
-          "reason": {
-            "type": "string"
-          },
           "sleds_in_cluster": {
             "type": "array",
             "items": {
@@ -2115,10 +2115,10 @@
           }
         },
         "required": [
+          "comment",
           "creator",
           "id",
           "omicron_zones",
-          "reason",
           "sleds_in_cluster",
           "time_created",
           "zones_in_service"
@@ -2153,21 +2153,21 @@
             "description": "policy: should the system actively work towards this blueprint\n\nThis should generally be left enabled.",
             "type": "boolean"
           },
-          "time_set": {
-            "description": "when this blueprint was made the target",
-            "type": "string",
-            "format": "date-time"
-          },
           "target_id": {
             "description": "id of the blueprint that the system is trying to make real",
             "type": "string",
             "format": "uuid"
+          },
+          "time_set": {
+            "description": "when this blueprint was made the target",
+            "type": "string",
+            "format": "date-time"
           }
         },
         "required": [
           "enabled",
-          "time_set",
-          "target_id"
+          "target_id",
+          "time_set"
         ]
       },
       "BlueprintTargetSet": {
@@ -6559,4 +6559,4 @@
       }
     }
   }
-}
+}