Add VolumeInfo to crutest-cli (#1934)

Added the volume-info command to crutest cli.
This will get the VolumeInfo, make it json, and send it over to the CLI.

Author: leftwo

crutest/src/cli.rs

@@ -197,6 +197,8 @@ enum CliCommand {
     },
     /// Get the upstairs UUID
     Uuid,
+    /// Request volume info as JSON
+    VolumeInfo,
 }
 
 /*
@@ -546,6 +548,9 @@ async fn cmd_to_msg(
         CliCommand::WriteUnwritten { offset } => {
             fw.send(CliMessage::WriteUnwritten(offset)).await?;
         }
+        CliCommand::VolumeInfo => {
+            fw.send(CliMessage::VolumeInfoPlease).await?;
+        }
     }
     /*
      * Now, wait for our response
@@ -558,6 +563,9 @@ async fn cmd_to_msg(
         Some(CliMessage::Info(vi)) => {
             println!("Got info: {:?}", vi);
         }
+        Some(CliMessage::VolumeInfoJson(json)) => {
+            println!("{}", json);
+        }
         Some(CliMessage::DoneOk) => {
             println!("Ok");
         }
@@ -989,6 +997,15 @@ async fn process_cli_command(
             let uuid = volume.get_uuid().await?;
             fw.send(CliMessage::MyUuid(uuid)).await
         }
+        CliMessage::VolumeInfoPlease => {
+            match volume.query_volume_info().await {
+                Ok(vi) => {
+                    let json = serde_json::to_string_pretty(&vi).unwrap();
+                    fw.send(CliMessage::VolumeInfoJson(json)).await
+                }
+                Err(e) => fw.send(CliMessage::Error(e)).await,
+            }
+        }
         CliMessage::Verify => {
             if let Some(di) = di_option {
                 match verify_volume(volume, di, false).await {

crutest/src/protocol.rs

@@ -58,6 +58,8 @@ pub enum CliMessage {
     WriteUnwritten(usize),
     Unknown(u32, BytesMut),
     Uuid,
+    VolumeInfoPlease,
+    VolumeInfoJson(String),
 }
 
 #[derive(Debug)]
@@ -317,6 +319,20 @@ mod tests {
         Ok(())
     }
 
+    #[test]
+    fn rt_volume_info_please() -> Result<()> {
+        let input = CliMessage::VolumeInfoPlease;
+        assert_eq!(input, round_trip(&input)?);
+        Ok(())
+    }
+
+    #[test]
+    fn rt_volume_info_json() -> Result<()> {
+        let input = CliMessage::VolumeInfoJson(r#"{"volume": {}}"#.to_string());
+        assert_eq!(input, round_trip(&input)?);
+        Ok(())
+    }
+
     // ZZZ tests for readresponse, Error
     #[test]
     fn correctly_detect_truncated_message() -> Result<()> {