Skip to content

HDDS-8787. Reduce ozone sh calls in robot tests #4854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 1 commit into from
Jun 8, 2023
Merged

HDDS-8787. Reduce ozone sh calls in robot tests #4854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ Test Timeout 5 minutes

*** Test Cases ***
List datanodes
${output} = Execute ozone admin datanode list
Execute ozone admin datanode list > datanode.list
${output} = Get File datanode.list
Should contain ${output} Datanode:
Should contain ${output} Related pipelines:

Filter list by UUID
${uuid} = Execute ozone admin datanode list | grep '^Datanode:' | head -1 | awk '{ print \$2 }'
${uuid} = Execute grep '^Datanode:' datanode.list | head -1 | awk '{ print \$2 }'
${output} = Execute ozone admin datanode list --id "${uuid}"
Should contain ${output} Datanode: ${uuid}
${datanodes} = Get Lines Containing String ${output} Datanode:
Expand All @@ -35,8 +36,8 @@ Filter list by UUID
Should Be Equal As Integers ${count} 1

Filter list by NodeOperationalState
${uuid} = Execute ozone admin datanode list | grep '^Datanode:' | head -1 | awk '{ print \$2 }'
${expected} = Execute ozone admin datanode list | grep -c 'Operational State: IN_SERVICE'
${uuid} = Execute grep '^Datanode:' datanode.list | head -1 | awk '{ print \$2 }'
${expected} = Execute grep -c 'Operational State: IN_SERVICE' datanode.list
${output} = Execute ozone admin datanode list --operational-state IN_SERVICE
Should contain ${output} Datanode: ${uuid}
${datanodes} = Get Lines Containing String ${output} Datanode:
Expand All @@ -45,8 +46,8 @@ Filter list by NodeOperationalState
Should Be Equal As Integers ${count} ${expected}

Filter list by NodeState
${uuid} = Execute ozone admin datanode list | grep '^Datanode:' | head -1 | awk '{ print \$2 }'
${expected} = Execute ozone admin datanode list | grep -c 'Health State: HEALTHY'
${uuid} = Execute grep '^Datanode:' datanode.list | head -1 | awk '{ print \$2 }'
${expected} = Execute grep -c 'Health State: HEALTHY' datanode.list
${output} = Execute ozone admin datanode list --node-state HEALTHY
Should contain ${output} Datanode: ${uuid}
${datanodes} = Get Lines Containing String ${output} Datanode:
Expand Down
24 changes: 13 additions & 11 deletions hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ Test ozone shell
Should Be Empty ${result}
${result} = Execute ozone sh volume list ${protocol}${server}/ | jq -r '.[] | select(.name=="${volume}")'
Should contain ${result} creationTime
${result} = Execute ozone sh volume list | jq -r '.[] | select(.name=="${volume}")'
Should contain ${result} creationTime
# TODO: Disable updating the owner, acls should be used to give access to other user.
Execute ozone sh volume setquota ${protocol}${server}/${volume} --space-quota 10TB --namespace-quota 100
# ${result} = Execute ozone sh volume info ${protocol}${server}/${volume} | jq -r '. | select(.volumeName=="${volume}") | .owner | .name'
Expand All @@ -46,16 +44,18 @@ Test ozone shell
Should Be Equal ${result} 10995116277760
${result} = Execute ozone sh bucket create ${protocol}${server}/${volume}/bb1 --space-quota 10TB --namespace-quota 100
Should Be Empty ${result}
${result} = Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") | .storageType'
Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 > bb1.json
${result} = Execute jq -r '. | select(.name=="bb1") | .storageType' bb1.json
Should Be Equal ${result} DISK
${result} = Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") | .quotaInBytes'
${result} = Execute jq -r '. | select(.name=="bb1") | .quotaInBytes' bb1.json
Should Be Equal ${result} 10995116277760
${result} = Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") | .quotaInNamespace'
${result} = Execute jq -r '. | select(.name=="bb1") | .quotaInNamespace' bb1.json
Should Be Equal ${result} 100
Execute ozone sh bucket setquota ${protocol}${server}/${volume}/bb1 --space-quota 1TB --namespace-quota 1000
${result} = Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") | .quotaInBytes'
Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 > bb1.json
${result} = Execute jq -r '. | select(.name=="bb1") | .quotaInBytes' bb1.json
Should Be Equal ${result} 1099511627776
${result} = Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") | .quotaInNamespace'
${result} = Execute jq -r '. | select(.name=="bb1") | .quotaInNamespace' bb1.json
Should Be Equal ${result} 1000
${result} = Execute ozone sh bucket list ${protocol}${server}/${volume}/ | jq -r '.[] | select(.name=="bb1") | .volumeName'
Should Be Equal ${result} ${volume}
Expand All @@ -75,14 +75,16 @@ Test ozone shell
Execute ozone sh bucket delete ${protocol}${server}/${volume}/bb1
Execute ozone sh volume delete ${protocol}${server}/${volume}
Execute ozone sh volume create ${protocol}${server}/${volume}
${result} = Execute ozone sh volume info ${protocol}${server}/${volume} | jq -r '. | select(.name=="${volume}") | .quotaInBytes'
Execute ozone sh volume info ${protocol}${server}/${volume} > volume.json
${result} = Execute jq -r '. | select(.name=="${volume}") | .quotaInBytes' volume.json
Should Be Equal ${result} -1
${result} = Execute ozone sh volume info ${protocol}${server}/${volume} | jq -r '. | select(.name=="${volume}") | .quotaInNamespace'
${result} = Execute jq -r '. | select(.name=="${volume}") | .quotaInNamespace' volume.json
Should Be Equal ${result} -1
Execute ozone sh bucket create ${protocol}${server}/${volume}/bb1
${result} = Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") | .quotaInBytes'
Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 > bb1.json
${result} = Execute jq -r '. | select(.name=="bb1") | .quotaInBytes' bb1.json
Should Be Equal ${result} -1
${result} = Execute ozone sh bucket info ${protocol}${server}/${volume}/bb1 | jq -r '. | select(.name=="bb1") | .quotaInNamespace'
${result} = Execute jq -r '. | select(.name=="bb1") | .quotaInNamespace' bb1.json
Should Be Equal ${result} -1
Execute ozone sh bucket delete ${protocol}${server}/${volume}/bb1
Execute ozone sh volume delete ${protocol}${server}/${volume}
Expand Down