adoroszlai commented on code in PR #12055:
URL: https://github.com/apache/ozone/pull/12055#discussion_r4610855625
##########
hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot:
##########
@@ -138,177 +160,244 @@ Test ozone shell errors
Test Volume Acls
[arguments] ${protocol} ${server} ${volume}
- Execute ozone sh volume create ${protocol}${server}/${volume}
- ${result} = Execute ozone sh volume getacl
${protocol}${server}/${volume}
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="USER" and .aclScope=="ACCESS" and (.aclList |
contains(["ALL"]))) | .name'
- Should Not Be Empty ${acl_check}
- ${result} = Execute ozone sh volume addacl
${protocol}${server}/${volume} -a user:superuser1:rwxy[DEFAULT]
- ${result} = Execute ozone sh volume getacl
${protocol}${server}/${volume}
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="USER" and .name=="superuser1" and .aclScope=="DEFAULT" and
(.aclList | contains(["READ", "WRITE", "READ_ACL", "WRITE_ACL"]))) | .name'
- Should Be Equal ${acl_check} superuser1
- ${result} = Execute ozone sh volume removeacl
${protocol}${server}/${volume} -a user:superuser1:xy
- ${result} = Execute ozone sh volume getacl
${protocol}${server}/${volume}
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="USER" and .name=="superuser1" and .aclScope=="DEFAULT" and
(.aclList | contains(["READ", "WRITE"]))) | .name'
- Should Be Equal ${acl_check} superuser1
- ${result} = Execute ozone sh volume setacl
${protocol}${server}/${volume} -al
user:superuser1:rwxy[DEFAULT],group:superuser1:a,user:testuser:rwxyc,group:superuser1:a[DEFAULT]
- ${result} = Execute ozone sh volume getacl
${protocol}${server}/${volume}
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="USER" and .name=="superuser1" and .aclScope=="DEFAULT" and
(.aclList | contains(["READ", "WRITE", "READ_ACL", "WRITE_ACL"]))) | .name'
- Should Be Equal ${acl_check} superuser1
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="GROUP" and .name=="superuser1" and .aclScope=="DEFAULT" and
(.aclList | contains(["ALL"]))) | .name'
- Should Be Equal ${acl_check} superuser1
+
+ Execute Later ozone sh volume create ${protocol}${server}/${volume}
+
+ ${result} = Execute Later ozone sh volume getacl
${protocol}${server}/${volume}
+ ${filter} = Set Variable jq -r '.[] | select(.type=="USER" and
.aclScope=="ACCESS" and (.aclList | contains(["ALL"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Not Be
Equal ${EMPTY}
+
+ ${result} = Execute Later ozone sh volume addacl
${protocol}${server}/${volume} -a user:superuser1:rwxy[DEFAULT]
+ ${result} = Execute Later ozone sh volume getacl
${protocol}${server}/${volume}
+ ${filter} = Set Variable jq -r '.[] | select(.type=="USER" and
.name=="superuser1" and .aclScope=="DEFAULT" and (.aclList | contains(["READ",
"WRITE", "READ_ACL", "WRITE_ACL"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
superuser1
+
+ ${result} = Execute Later ozone sh volume removeacl
${protocol}${server}/${volume} -a user:superuser1:xy
+ ${result} = Execute Later ozone sh volume getacl
${protocol}${server}/${volume}
+ ${filter} = Set Variable jq -r '.[] | select(.type=="USER" and
.name=="superuser1" and .aclScope=="DEFAULT" and (.aclList | contains(["READ",
"WRITE"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
superuser1
+
+ ${result} = Execute Later ozone sh volume setacl
${protocol}${server}/${volume} -al
user:superuser1:rwxy[DEFAULT],group:superuser1:a,user:testuser:rwxyc,group:superuser1:a[DEFAULT]
+ ${result} = Execute Later ozone sh volume getacl
${protocol}${server}/${volume}
+ ${filter} = Set Variable jq -r '.[] | select(.type=="USER" and
.name=="superuser1" and .aclScope=="DEFAULT" and (.aclList | contains(["READ",
"WRITE", "READ_ACL", "WRITE_ACL"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
superuser1
+ ${filter} = Set Variable jq -r '.[] | select(.type=="GROUP" and
.name=="superuser1" and .aclScope=="DEFAULT" and (.aclList |
contains(["ALL"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
superuser1
Test Bucket Acls
[arguments] ${protocol} ${server} ${volume}
- Execute ozone sh bucket create ${protocol}${server}/${volume}/bb1
- ${result} = Execute ozone sh bucket getacl
${protocol}${server}/${volume}/bb1
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="USER" and .aclScope=="ACCESS" and (.aclList |
contains(["ALL"]))) | .name'
- Should Not Be Empty ${acl_check}
- ${result} = Execute ozone sh bucket addacl
${protocol}${server}/${volume}/bb1 -a user:superuser1:rwxy
- ${result} = Execute ozone sh bucket getacl
${protocol}${server}/${volume}/bb1
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="USER" and .name=="superuser1" and .aclScope=="ACCESS" and
(.aclList | contains(["READ", "WRITE", "READ_ACL", "WRITE_ACL"]))) | .name'
- Should Be Equal ${acl_check} superuser1
- ${result} = Execute ozone sh bucket removeacl
${protocol}${server}/${volume}/bb1 -a user:superuser1:xy
- ${result} = Execute ozone sh bucket getacl
${protocol}${server}/${volume}/bb1
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="USER" and .name=="superuser1" and .aclScope=="ACCESS" and
(.aclList | contains(["READ", "WRITE"]))) | .name'
- Should Be Equal ${acl_check} superuser1
- ${result} = Execute ozone sh bucket setacl
${protocol}${server}/${volume}/bb1 -al
user:superuser1:rwxy,group:superuser1:a,user:testuser:rwxyc,group:superuser1:a[DEFAULT]
- ${result} = Execute ozone sh bucket getacl
${protocol}${server}/${volume}/bb1
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="USER" and .name=="superuser1" and .aclScope=="ACCESS" and
(.aclList | contains(["READ", "WRITE", "READ_ACL", "WRITE_ACL"]))) | .name'
- Should Be Equal ${acl_check} superuser1
- ${acl_check} = Execute echo '${result}' | jq -r '.[] |
select(.type=="GROUP" and .name=="superuser1" and .aclScope=="DEFAULT" and
(.aclList | contains(["ALL"]))) | .name'
- Should Be Equal ${acl_check} superuser1
+
+ Execute Later ozone sh bucket create ${protocol}${server}/${volume}/bb1
+
+ ${result} = Execute Later ozone sh bucket getacl
${protocol}${server}/${volume}/bb1
+ ${filter} = Set Variable jq -r '.[] | select(.type=="USER" and
.aclScope=="ACCESS" and (.aclList | contains(["ALL"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Not Be
Equal ${EMPTY}
+
+ ${result} = Execute Later ozone sh bucket addacl
${protocol}${server}/${volume}/bb1 -a user:superuser1:rwxy
+ ${result} = Execute Later ozone sh bucket getacl
${protocol}${server}/${volume}/bb1
+ ${filter} = Set Variable jq -r '.[] | select(.type=="USER" and
.name=="superuser1" and .aclScope=="ACCESS" and (.aclList | contains(["READ",
"WRITE", "READ_ACL", "WRITE_ACL"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
superuser1
+
+ ${result} = Execute Later ozone sh bucket removeacl
${protocol}${server}/${volume}/bb1 -a user:superuser1:xy
+ ${result} = Execute Later ozone sh bucket getacl
${protocol}${server}/${volume}/bb1
+ ${filter} = Set Variable jq -r '.[] | select(.type=="USER" and
.name=="superuser1" and .aclScope=="ACCESS" and (.aclList | contains(["READ",
"WRITE"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
superuser1
+
+ ${result} = Execute Later ozone sh bucket setacl
${protocol}${server}/${volume}/bb1 -al
user:superuser1:rwxy,group:superuser1:a,user:testuser:rwxyc,group:superuser1:a[DEFAULT]
+ ${result} = Execute Later ozone sh bucket getacl
${protocol}${server}/${volume}/bb1
+ ${filter} = Set Variable jq -r '.[] | select(.type=="USER" and
.name=="superuser1" and .aclScope=="ACCESS" and (.aclList | contains(["READ",
"WRITE", "READ_ACL", "WRITE_ACL"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
superuser1
+
+ ${filter} = Set Variable jq -r '.[] | select(.type=="GROUP" and
.name=="superuser1" and .aclScope=="DEFAULT" and (.aclList |
contains(["ALL"]))) | .name'
+ Assert Later File ${result} Filtered By ${filter} Should Be Equal
superuser1
Test key handling
[arguments] ${protocol} ${server} ${volume}
- Execute rm -f /tmp/NOTICE.txt.1
/tmp/key1_RATIS /tmp/key1-copy
- Ozone Shell Batch key put
${protocol}${server}/${volume}/bb1/key1 /opt/hadoop/NOTICE.txt
- ... key get
${protocol}${server}/${volume}/bb1/key1 /tmp/NOTICE.txt.1
- ... key put -t RATIS
${protocol}${server}/${volume}/bb1/key1_RATIS /opt/hadoop/NOTICE.txt
- ... key get
${protocol}${server}/${volume}/bb1/key1_RATIS /tmp/key1_RATIS
- ... key cp
${protocol}${server}/${volume}/bb1 key1 key1-copy
- ... key get
${protocol}${server}/${volume}/bb1/key1-copy /tmp/key1-copy
- Execute diff -q /opt/hadoop/NOTICE.txt
/tmp/NOTICE.txt.1
- Execute diff -q /opt/hadoop/NOTICE.txt
/tmp/key1_RATIS
-
- ${result} = Execute ozone sh key info
${protocol}${server}/${volume}/bb1/key1_RATIS | jq -r '. |
select(.name=="key1_RATIS")'
- Should contain ${result} RATIS
-
- Execute diff -q /opt/hadoop/NOTICE.txt
/tmp/key1-copy
-
- ${result} = Execute And Ignore Error ozone sh key get
${protocol}${server}/${volume}/bb1/key1 /tmp/NOTICE.txt.1
- Should Contain ${result} NOTICE.txt.1 exists
- ${result} = Execute ozone sh key get --force
${protocol}${server}/${volume}/bb1/key1 /tmp/NOTICE.txt.1
- Should Not Contain ${result} NOTICE.txt.1 exists
- ${result} = Execute and checkrc ozone sh key put
${protocol}${server}/${volume}/bb1/key1 sample.txt 255
- Should Contain ${result} File not found:
sample.txt
- ${result} = Execute ozone sh key info
${protocol}${server}/${volume}/bb1/key1 | jq -r '. | select(.name=="key1")'
- Should contain ${result} creationTime
- Should not contain ${result} ETag
- ${result} = Execute ozone sh key list
${protocol}${server}/${volume}/bb1 | jq -r '.[] | select(.name=="key1") | .name'
- Should Be Equal ${result} key1
- Execute ozone sh key rename
${protocol}${server}/${volume}/bb1 key1 key2
- ${result} = Execute ozone sh key list
${protocol}${server}/${volume}/bb1 | jq -r '.[] | select(.name=="key2") | .name'
- Should Be Equal ${result} key2
- Ozone Shell Batch key delete
${protocol}${server}/${volume}/bb1/key2
- ... key delete
${protocol}${server}/${volume}/bb1/key1_RATIS
- ... key delete
${protocol}${server}/${volume}/bb1/key1-copy
+
+ Put and Get Key Later ${protocol}${server}/${volume}/bb1/key1
put_from=/opt/hadoop/NOTICE.txt
+
+ Execute Later ozone sh key put -t RATIS
${protocol}${server}/${volume}/bb1/key1_ratis /opt/hadoop/NOTICE.txt
+ ${file2} = Get Key Later
${protocol}${server}/${volume}/bb1/key1_ratis
+ Assert Later Compare Files /opt/hadoop/NOTICE.txt ${file2}
+
+ Execute Later ozone sh key cp ${protocol}${server}/${volume}/bb1 key1
key1-copy
+ ${file3} = Get Key Later ${protocol}${server}/${volume}/bb1/key1-copy
+ Assert Later Compare Files /opt/hadoop/NOTICE.txt ${file3}
+
+ ${result} = Execute Later ozone sh key info
${protocol}${server}/${volume}/bb1/key1_ratis
+ ${filter} = Set Variable jq -r '. | select(.name=="key1_ratis")'
+ Assert Later File ${result} Filtered By ${filter} Should Contain
RATIS
+
+ ${result} = Execute Later ozone sh key get
${protocol}${server}/${volume}/bb1/key1 ${file3}
+ Assert Later File ${result} Should Contain ${file3} exists
+
+ ${result} = Execute Later ozone sh key get --force
${protocol}${server}/${volume}/bb1/key1 ${file3}
Review Comment:
It is a problem here. Thanks for spotting this, updated.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]