Tejaskriya commented on code in PR #6706:
URL: https://github.com/apache/ozone/pull/6706#discussion_r1607697499
##########
hadoop-ozone/dist/src/main/smoketest/s3/awss3.robot:
##########
@@ -25,10 +25,11 @@ Suite Setup Setup s3 tests
*** Variables ***
${ENDPOINT_URL} http://s3g:9878
${BUCKET} generated
+${BUCKET1} generated
Review Comment:
Same for this variable as well, And all other files having BUCKET1 can be
changed to something more sensible
##########
hadoop-ozone/dist/src/main/smoketest/s3/MultipartUpload.robot:
##########
@@ -406,3 +415,84 @@ Test Multipart Upload list
${count} = Execute and checkrc echo '${result}' | jq -r
'.Uploads | length' 0
Should Be Equal ${count} 2
+
+*** Variables ***
+${ENDPOINT_URL} http://s3g:9878
+${BUCKET} generated
+${BUCKET1} generated
Review Comment:
Could we improve the naming of variables here? BUCKET1 is very ambiguous, it
can be changed to BUCKET_FSO or anything similar.
##########
hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot:
##########
@@ -23,7 +23,9 @@ ${ENDPOINT_URL} http://s3g:9878
${OZONE_S3_HEADER_VERSION} v4
${OZONE_S3_SET_CREDENTIALS} true
${BUCKET} generated
+${BUCKET1} generated
${BUCKET_LAYOUT} OBJECT_STORE
+${BUCKET_LAYOUT1} FILE_SYSTEM_OPTIMIZED
Review Comment:
The naming of ${BUCKET_LAYOUT} and ${BUCKET_LAYOUT1} can also be changed
to ${BUCKET_LAYOUT_OBS} and ${BUCKET_LAYOUT_FSO} respectively.
##########
hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot:
##########
@@ -154,11 +157,16 @@ Setup links for S3 tests
Execute ozone sh bucket create --layout ${BUCKET_LAYOUT}
o3://${OM_SERVICE_ID}/legacy/source-bucket
Create link link
-Create generated bucket
+Create generated bucket with OBS
[Arguments] ${layout}=OBJECT_STORE
${BUCKET} = Create bucket with layout ${layout}
Set Global Variable ${BUCKET}
+Create generated bucket with FSO
+ [Arguments] ${layout}=FILE_SYSTEM_OPTIMIZED
+ ${BUCKET1} = Create bucket with layout ${layout}
+ Set Global Variable ${BUCKET1}
+
Review Comment:
As we have 2 different key words for creating FSO and OBS buckets, there is
no need to pass an argument to these keywords. `[Arguments]
${layout}=FILE_SYSTEM_OPTIMIZED` can be ommitted.
Instead of passing `${layout}` to ` Create bucket with layout `, we can
directly mention the layouts ${BUCKET_LAYOUT_OBS} and ${BUCKET_LAYOUT_FSO}
respectively.
##########
hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot:
##########
@@ -141,7 +143,8 @@ Setup s3 tests
Run Keyword Generate random prefix
Run Keyword Install aws cli
Run Keyword if '${OZONE_S3_SET_CREDENTIALS}' == 'true' Setup v4
headers
- Run Keyword if '${BUCKET}' == 'generated' Create generated
bucket ${BUCKET_LAYOUT}
+ Run Keyword if '${BUCKET}' == 'generated' Create generated
bucket with OBS ${BUCKET_LAYOUT}
+ Run Keyword if '${BUCKET1}' == 'generated' Create generated
bucket with FSO ${BUCKET_LAYOUT1}
Review Comment:
Referring to the below comment, the BUCKET_LAYOUT variables wouldn't need to
be passed here.
--
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]
