HDDS-4579. Add acceptance test for Ozone Client Key Validator

hadoop-ozone/dist/src/main/compose/testlib.sh

@@ -22,7 +22,7 @@ RESULT_DIR_INSIDE="/tmp/smoketest/$(basename "$COMPOSE_ENV_NAME")/result"
 SMOKETEST_DIR_INSIDE="${OZONE_DIR:-/opt/hadoop}/smoketest"
 
 OM_HA_PARAM=""
-if [[ -n "${OM_SERVICE_ID}" ]]; then
+if [[ -n "${OM_SERVICE_ID}" ]] && [[ "${OM_SERVICE_ID}" != "om" ]]; then
   OM_HA_PARAM="--om-service-id=${OM_SERVICE_ID}"
 else
   OM_SERVICE_ID=om

hadoop-ozone/dist/src/main/compose/upgrade/test.sh

@@ -45,7 +45,8 @@ source "${COMPOSE_DIR}/../testlib.sh"
 
 # prepare pre-upgrade cluster
 start_docker_env
-execute_robot_test scm topology/loaddata.robot
+execute_robot_test scm -v PREFIX:pre freon/generate.robot
+execute_robot_test scm -v PREFIX:pre freon/validate.robot
 KEEP_RUNNING=false stop_docker_env
 
 # run upgrade scripts
@@ -63,7 +64,10 @@ source "${COMPOSE_DIR}/../testlib.sh"
 # re-start cluster with new version and check after upgrade
 export OZONE_KEEP_RESULTS=true
 start_docker_env
-execute_robot_test scm topology/readdata.robot
+execute_robot_test scm -v PREFIX:pre freon/validate.robot
+# TODO can be enabled with HDDS-4562:
+# execute_robot_test scm -v PREFIX:post freon/generate.robot
+# execute_robot_test scm -v PREFIX:post freon/validate.robot
 stop_docker_env
 
 generate_report

hadoop-ozone/dist/src/main/smoketest/freon/generate.robot

@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+Documentation       Test freon data generation commands
+Resource            ../lib/os.robot
+Test Timeout        5 minutes
+
+*** Variables ***
+${PREFIX}    ${EMPTY}
+
+*** Test Cases ***
+Ozone Client Key Generator
+    ${result} =        Execute          ozone freon ockg ${OM_HA_PARAM} -t=1 -n=1 -p ockg${PREFIX}
+                       Should contain   ${result}   Successful executions: 1
+
+OM Key Generator
+    ${result} =        Execute          ozone freon omkg ${OM_HA_PARAM} -t=1 -n=1 -p omkg${PREFIX}
+                       Should contain   ${result}   Successful executions: 1
+
+OM Bucket Generator
+    ${result} =        Execute          ozone freon ombg ${OM_HA_PARAM} -t=1 -n=1 -p ombg${PREFIX}
+                       Should contain   ${result}   Successful executions: 1

hadoop-ozone/dist/src/main/smoketest/freon/validate.robot

@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+Documentation       Test freon data validation commands
+Resource            ../lib/os.robot
+Test Timeout        5 minutes
+
+*** Variables ***
+${PREFIX}    ${EMPTY}
+
+*** Test Cases ***
+Ozone Client Key Validator
+    ${result} =        Execute          ozone freon ockv ${OM_HA_PARAM} -t=1 -n=1 -p ockg${PREFIX}
+                       Should contain   ${result}   Successful executions: 1