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 91af26ab39 HDDS-10414. Some acceptance tests fail with Docker Compose
V2 (#6269)
91af26ab39 is described below
commit 91af26ab3982ac729feaef5018119d8297f1b3ec
Author: Arafat2198 <[email protected]>
AuthorDate: Tue Mar 12 21:35:05 2024 +0530
HDDS-10414. Some acceptance tests fail with Docker Compose V2 (#6269)
---
.../dist/src/main/smoketest/recon/recon-api.robot | 12 ++++++------
.../dist/src/main/smoketest/topology/cli.robot | 21 ++++++++++++++++-----
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
b/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
index 391448864d..43860b75d9 100644
--- a/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
@@ -71,17 +71,17 @@ Check if Recon picks up OM data
Check if Recon picks up DN heartbeats
${result} = Execute curl --negotiate
-u : -LSs ${API_ENDPOINT_URL}/datanodes
Should contain ${result} datanodes
- Should contain ${result} datanode_1
- Should contain ${result} datanode_2
- Should contain ${result} datanode_3
+ Should Match Regexp ${result} datanode[-_]1
+ Should Match Regexp ${result} datanode[-_]2
+ Should Match Regexp ${result} datanode[-_]3
${result} = Execute curl --negotiate
-u : -LSs ${API_ENDPOINT_URL}/pipelines
Should contain ${result} pipelines
Should contain ${result} RATIS
Should contain ${result} OPEN
- Should contain ${result} datanode_1
- Should contain ${result} datanode_2
- Should contain ${result} datanode_3
+ Should Match Regexp ${result} datanode[-_]1
+ Should Match Regexp ${result} datanode[-_]2
+ Should Match Regexp ${result} datanode[-_]3
${result} = Execute curl --negotiate
-u : -LSs ${API_ENDPOINT_URL}/clusterState
Should contain ${result} \"totalDatanodes\"
diff --git a/hadoop-ozone/dist/src/main/smoketest/topology/cli.robot
b/hadoop-ozone/dist/src/main/smoketest/topology/cli.robot
index 3af6fd120a..3a20c91046 100644
--- a/hadoop-ozone/dist/src/main/smoketest/topology/cli.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/topology/cli.robot
@@ -22,18 +22,29 @@ Test Timeout 5 minutes
*** Variables ***
+*** Keywords ***
+Validate PrintTopology Output
+ [Arguments] ${output}
+ Should Contain ${output} State = HEALTHY
+ Should Contain ${output} IN_SERVICE
+ Should Match Regexp ${output}
.*ozone.*datanode[-_]\\d+.*IN_SERVICE.*rack.*
+
*** Test Cases ***
Run printTopology
${output} = Execute ozone admin printTopology
- Should contain ${output}
10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net) IN_SERVICE /rack2
+ Validate PrintTopology Output ${output}
+
Run printTopology -o
${output} = Execute ozone admin printTopology -o
- Should contain ${output} Location: /rack2
- Should contain ${output}
10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net) IN_SERVICE
+ Should Match Regexp ${output} Location:
/.*rack.*
+ Should Match Regexp ${output}
.*ozone.*datanode[-_]\\d+.*IN_SERVICE.*
+
Run printTopology --operational-state IN_SERVICE
${output} = Execute ozone admin printTopology
--operational-state IN_SERVICE
- Should contain ${output}
10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net) IN_SERVICE /rack2
+ Validate PrintTopology Output ${output}
+
Run printTopology --node-state HEALTHY
${output} = Execute ozone admin printTopology
--node-state HEALTHY
- Should contain ${output}
10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net) IN_SERVICE /rack2
\ No newline at end of file
+ Validate PrintTopology Output ${output}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
