This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new 140cf0f162 HDDS-9764. Add Robot test for JSON output where missing 
(#6448)
140cf0f162 is described below

commit 140cf0f162c1dd6a5152d66a9a19b76e2b265f51
Author: Will Xiao <[email protected]>
AuthorDate: Thu Mar 28 16:24:58 2024 +0800

    HDDS-9764. Add Robot test for JSON output where missing (#6448)
---
 .../dist/src/main/smoketest/admincli/container.robot      | 15 +++++++++++++++
 .../dist/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 ea10fb98d8..c50daa724d 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 b4ee5b9529..5b6c2fe97e 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


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to