fixups

Signed-off-by: johnsonw <[email protected]>
whamcloud · Nov 17, 2020 · 27b9fd4 · 27b9fd4
1 parent 47ad645
commit 27b9fd4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/iml-graphql-queries/src/target.rs b/iml-graphql-queries/src/target.rs
@@ -18,6 +18,7 @@ pub mod list {
                 filesystems
                 uuid
                 mount_path: mountPath
+                fs_type: fsType
               }
             }
         "#;

diff --git a/iml-manager-cli/src/display_utils.rs b/iml-manager-cli/src/display_utils.rs
@@ -283,7 +283,7 @@ impl IntoTable for (Vec<Host>, Vec<TargetRecord>) {
         let (hosts, targets) = self;
 
         generate_table(
-            &["Name", "State", "Active Host", "Filesystems", "UUID"],
+            &["Name", "State", "Active Host", "Filesystems", "UUID", "fs_type"],
             targets.into_iter().map(|x| {
                 let active_host = x
                     .active_host_id
@@ -298,6 +298,7 @@ impl IntoTable for (Vec<Host>, Vec<TargetRecord>) {
                     active_host,
                     x.filesystems.join(" "),
                     x.uuid,
+                    x.fs_type.map(|x| x.to_string().to_lowercase()).unwrap_or_else(|| "".into()),
                 ]
             }),
         )

diff --git a/iml-wire-types/src/lib.rs b/iml-wire-types/src/lib.rs
@@ -2111,6 +2111,7 @@ pub struct LustreClient {
 #[cfg_attr(feature = "postgres-interop", derive(sqlx::Type))]
 #[cfg_attr(feature = "postgres-interop", sqlx(rename = "fs_type"))]
 #[cfg_attr(feature = "postgres-interop", sqlx(rename_all = "lowercase"))]
+#[serde(rename_all = "lowercase")]
 #[derive(PartialEq, Eq, Clone, Debug, serde::Serialize, serde::Deserialize, Ord, PartialOrd)]
 pub enum FsType {
     Zfs,
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ pub mod list { @@
                     filesystems
                     uuid
                     mount_path: mountPath
+                    fs_type: fsType
                   }
                 }
             "#;
@@ Expand Down @@