feat: Add instance_uuid to the instance action schema

Change-Id: I5912a18f1a7f60b6eff96aeb9580eb2d05c3ebb6

Changes are triggered by https://review.opendev.org/947667

Author: gtema

openstack_tui/.config/config.yaml

@@ -326,9 +326,9 @@ views:
   compute.hypervisor:
     fields: [IP, HOSTNAME, STATUS, STATE]
   compute.server/instance_action/event:
-    fields: [EVENT, RESULT, STARTED, FINISHED, HOST]
+    fields: [EVENT, RESULT, START_TIME, FINISH_TIME, HOST]
   compute.server/instance_action:
-    fields: [ID, ACTION, MESSAGE, STARTED, USER, "SERVER ID"]
+    fields: [ID, ACTION, MESSAGE, START_TIME, USER_ID]
   compute.server:
     fields: [ID, NAME, STATUS, CREATED, UPDATED]
   # DNS

openstack_tui/src/components/compute/server_instance_action_events.rs

@@ -30,25 +30,45 @@ use crate::{
     config::Config,
     error::TuiError,
     mode::Mode,
-    utils::{ResourceKey, as_string},
+    utils::ResourceKey,
 };
 
 const TITLE: &str = "InstanceAction Events";
 const VIEW_CONFIG_KEY: &str = "compute.server/instance_action/event";
 
-#[derive(Deserialize, StructTable)]
+/// Event type
+#[derive(Clone, Debug, Deserialize, StructTable)]
 pub struct ServerInstanceActionEventData {
-    #[structable(title = "EVENT")]
-    event: String,
-    #[structable(title = "RESULT")]
-    #[serde(deserialize_with = "as_string")]
-    result: String,
-    #[structable(title = "STARTED", optional)]
-    start_time: Option<String>,
-    #[structable(title = "FINISHED", optional)]
-    finish_time: Option<String>,
-    #[structable(title = "HOST", optional)]
-    host: Option<String>,
+    /// Even details
+    #[structable(optional)]
+    pub details: Option<String>,
+
+    /// Event summary
+    pub event: String,
+
+    /// Finish time of the event
+    #[structable(optional)]
+    pub finish_time: Option<String>,
+
+    /// Hostname
+    #[structable(optional)]
+    pub host: Option<String>,
+
+    /// Host ID
+    #[structable(optional)]
+    pub host_id: Option<String>,
+
+    /// Result
+    #[structable(optional)]
+    pub result: Option<String>,
+
+    /// Event start time
+    #[structable(optional)]
+    pub start_time: Option<String>,
+
+    /// Traceback
+    #[structable(optional)]
+    pub traceback: Option<String>,
 }
 
 impl ResourceKey for ServerInstanceActionEventData {

openstack_tui/src/components/compute/server_instance_actions.rs

@@ -15,10 +15,10 @@
 use crossterm::event::KeyEvent;
 use eyre::{Result, WrapErr};
 use ratatui::prelude::*;
-use serde::Deserialize;
-use structable::{StructTable, StructTableOptions};
 use tokio::sync::mpsc::UnboundedSender;
 
+use openstack_types::compute::v2::server::instance_action::response::list::InstanceActionResponse;
+
 use crate::{
     action::Action,
     cloud_worker::compute::v2::{
@@ -36,31 +36,14 @@ use crate::{
 const TITLE: &str = "ServerInstanceAction Actions";
 const VIEW_CONFIG_KEY: &str = "compute.server/instance_action";
 
-#[derive(Deserialize, StructTable)]
-pub struct ServerInstanceActionData {
-    #[structable(title = "ID", wide)]
-    #[serde(rename = "request_id")]
-    id: String,
-    #[structable(title = "ACTION")]
-    action: String,
-    #[structable(title = "MESSAGE", optional)]
-    message: Option<String>,
-    #[structable(title = "STARTED")]
-    start_time: String,
-    #[structable(title = "USER")]
-    user_id: String,
-    #[structable(title = "SERVER ID", wide)]
-    instance_uuid: String,
-}
-
-impl ResourceKey for ServerInstanceActionData {
+impl ResourceKey for InstanceActionResponse {
     fn get_key() -> &'static str {
         VIEW_CONFIG_KEY
     }
 }
 
 pub type ComputeServerInstanceActions<'a> =
-    TableViewComponentBase<'a, ServerInstanceActionData, ComputeServerInstanceActionList>;
+    TableViewComponentBase<'a, InstanceActionResponse, ComputeServerInstanceActionList>;
 
 impl Component for ComputeServerInstanceActions<'_> {
     fn register_config_handler(&mut self, config: Config) -> Result<(), TuiError> {
@@ -130,8 +113,10 @@ impl Component for ComputeServerInstanceActions<'_> {
                         if let Some(selected_entry) = self.get_selected() {
                             // send action to set server instance action filters
                             let mut req = ComputeServerInstanceActionShowBuilder::default();
-                            req.id(selected_entry.id.clone());
-                            req.server_id(selected_entry.instance_uuid.clone());
+                            req.id(selected_entry.request_id.clone());
+                            if let Some(sid) = &selected_entry.instance_uuid {
+                                req.server_id(sid.clone());
+                            }
                             if let Some(name) = &self.get_filters().server_name {
                                 req.server_name(name.clone());
                             }

openstack_types/src/compute/v2/server/instance_action/response/get.rs

@@ -37,6 +37,11 @@ pub struct InstanceActionResponse {
     #[structable(serialize)]
     pub events: Vec<Events>,
 
+    /// The UUID of the server.
+    #[serde(default)]
+    #[structable(optional)]
+    pub instance_uuid: Option<String>,
+
     /// The related error message for when an action fails.
     #[serde(default)]
     #[structable(optional)]
@@ -50,7 +55,17 @@ pub struct InstanceActionResponse {
     #[structable()]
     pub request_id: String,
 
-    /// The date and time when the action was started.
+    /// The date and time when the action was started. The date and time stamp
+    /// format is [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601)
+    ///
+    /// ```text
+    /// CCYY-MM-DDThh:mm:ss±hh:mm
+    ///
+    /// ```
+    ///
+    /// For example, `2015-08-27T09:49:58-05:00`. The `±hh:mm` value, if
+    /// included, is the time zone as an offset from UTC. In the previous
+    /// example, the offset value is `-05:00`.
     #[serde(default)]
     #[structable(optional)]
     pub start_time: Option<String>,
@@ -74,10 +89,11 @@ pub struct InstanceActionResponse {
     pub updated_at: Option<String>,
 
     /// The ID of the user which initiated the server action.
-    #[structable()]
-    pub user_id: String,
+    #[structable(optional)]
+    pub user_id: Option<String>,
 }
 
+/// Event
 /// `Events` type
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Events {

openstack_types/src/compute/v2/server/instance_action/response/list.rs

@@ -26,16 +26,10 @@ pub struct InstanceActionResponse {
     #[structable()]
     pub action: String,
 
-    /// The events which occurred in this action in descending order of
-    /// creation.
-    ///
-    /// Policy defaults enable only users with the administrative role or the
-    /// owner of the server to see instance action event information. Cloud
-    /// providers can change these permissions through the `policy.json` file.
-    ///
-    /// **New in version 2.51**
-    #[structable(serialize)]
-    pub events: Vec<Events>,
+    /// The UUID of the server.
+    #[serde(default)]
+    #[structable(optional)]
+    pub instance_uuid: Option<String>,
 
     /// The related error message for when an action fails.
     #[serde(default)]
@@ -50,7 +44,17 @@ pub struct InstanceActionResponse {
     #[structable()]
     pub request_id: String,
 
-    /// The date and time when the action was started.
+    /// The date and time when the action was started. The date and time stamp
+    /// format is [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601)
+    ///
+    /// ```text
+    /// CCYY-MM-DDThh:mm:ss±hh:mm
+    ///
+    /// ```
+    ///
+    /// For example, `2015-08-27T09:49:58-05:00`. The `±hh:mm` value, if
+    /// included, is the time zone as an offset from UTC. In the previous
+    /// example, the offset value is `-05:00`.
     #[serde(default)]
     #[structable(optional)]
     pub start_time: Option<String>,
@@ -74,19 +78,6 @@ pub struct InstanceActionResponse {
     pub updated_at: Option<String>,
 
     /// The ID of the user which initiated the server action.
-    #[structable()]
-    pub user_id: String,
-}
-
-/// `Events` type
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct Events {
-    pub details: Option<String>,
-    pub event: String,
-    pub finish_time: Option<String>,
-    pub host: Option<String>,
-    pub host_id: Option<String>,
-    pub result: Option<String>,
-    pub start_time: Option<String>,
-    pub traceback: Option<String>,
+    #[structable(optional)]
+    pub user_id: Option<String>,
 }