From 0f3b5e9a9030087b8ba05452eec9635323cb361f Mon Sep 17 00:00:00 2001
From: Will Xiao <weiwei695@hotmail.com>
Date: Wed, 27 Mar 2024 14:50:25 +0800
Subject: [PATCH] HDDS-9764. Add Robot test for JSON output where missing

---
 .../src/main/smoketest/admincli/container.robot   | 15 +++++++++++++++
 .../src/main/smoketest/admincli/datanode.robot    | 14 ++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/container.robot b/hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
index ea10fb98d874..c50daa724dad 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
@@ -71,6 +71,19 @@ Verbose container info
     ${output} =         Execute          ozone admin --verbose container info "${CONTAINER}"
                         Should contain   ${output}   Pipeline Info
 
+List containers as JSON
+    ${output} =         Execute          ozone admin container info "${CONTAINER}" --json | jq -r '.'
+                        Should contain   ${output}    containerInfo
+                        Should contain   ${output}    pipeline
+                        Should contain   ${output}    replicas
+                        Should contain   ${output}    writePipelineID
+
+Report containers as JSON
+     ${output} =         Execute          ozone admin container report --json | jq -r '.'
+                         Should contain   ${output}   reportTimeStamp
+                         Should contain   ${output}   stats
+                         Should contain   ${output}   samples
+
 Close container
     ${container} =      Execute          ozone admin container list --state OPEN | jq -r 'select(.replicationConfig.replicationFactor == "THREE") | .containerID' | head -1
                         Execute          ozone admin container close "${container}"
@@ -85,6 +98,8 @@ Incomplete command
                         Should contain   ${output}   info
                         Should contain   ${output}   create
                         Should contain   ${output}   close
+                        Should contain   ${output}   report
+                        Should contain   ${output}   upgrade
 
 #List containers on unknown host
 #    ${output} =         Execute And Ignore Error     ozone admin --verbose container list --scm unknown-host
diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot b/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot
index b4ee5b952906..5b6c2fe97e25 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot
@@ -99,3 +99,17 @@ List datanodes as JSON
                         Should contain   ${output}    datanodeDetails
                         Should contain   ${output}    healthState
                         Should contain   ${output}    opState
+
+Get usage info as JSON
+    ${output} =         Execute          ozone admin datanode usageinfo -m --json | jq -r '.'
+                        Should contain   ${output}  capacity
+                        Should contain   ${output}  committed
+                        Should contain   ${output}  containerCount
+                        Should contain   ${output}  datanodeDetails
+                        Should contain   ${output}  freeSpaceToSpare
+                        Should contain   ${output}  ozoneUsed
+                        Should contain   ${output}  ozoneUsedPercent
+                        Should contain   ${output}  remaining
+                        Should contain   ${output}  remainingPercent
+                        Should contain   ${output}  totalUsed
+                        Should contain   ${output}  totalUsedPercent