From e09498bc4ee542c556266537fa9c33b0e8eea852 Mon Sep 17 00:00:00 2001 From: anastasia prasolova Date: Mon, 8 Aug 2022 18:02:41 +0300 Subject: [PATCH] tests duplications removed from `acl_extended_filters` testsuite Signed-off-by: anastasia prasolova --- .../lib/robot/common_steps_acl_extended.robot | 47 +++++---- .../acl/acl_extended_filters.robot | 98 ++----------------- .../object_attributes/object_id_filter.robot | 19 ++-- 3 files changed, 39 insertions(+), 125 deletions(-) diff --git a/robot/resources/lib/robot/common_steps_acl_extended.robot b/robot/resources/lib/robot/common_steps_acl_extended.robot index d8cde7ec..0eb28e60 100644 --- a/robot/resources/lib/robot/common_steps_acl_extended.robot +++ b/robot/resources/lib/robot/common_steps_acl_extended.robot @@ -13,9 +13,6 @@ Resource payment_operations.robot *** Variables *** &{USER_HEADER} = key1=1 key2=abc -&{USER_HEADER_DEL} = key1=del key2=del -&{ANOTHER_HEADER} = key1=oth key2=oth -${OBJECT_PATH} = testfile ${EACL_ERR_MSG} = * *** Keywords *** @@ -26,13 +23,13 @@ Check eACL Deny and Allow All ${CID} = Create Container ${USER_WALLET} basic_acl=eacl-public-read-write ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} ${S_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER} - ${D_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER_DEL} + ${D_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} @{S_OBJ_H} = Create List ${S_OID_USER} - Put object ${WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER} + Put object ${WALLET} ${FILE_S} ${CID} - Get object ${WALLET} ${CID} ${S_OID_USER} ${EMPTY} local_file_eacl - Search object ${WALLET} ${CID} ${EMPTY} ${EMPTY} ${USER_HEADER} ${S_OBJ_H} + Get object ${WALLET} ${CID} ${S_OID_USER} + Search object ${WALLET} ${CID} filters=${USER_HEADER} expected_objects_list=${S_OBJ_H} Head object ${WALLET} ${CID} ${S_OID_USER} Get Range ${WALLET} ${CID} ${S_OID_USER} 0:256 @@ -47,9 +44,9 @@ Check eACL Deny and Allow All Run Keyword And Expect Error * ... Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER} Run Keyword And Expect Error * - ... Get object ${WALLET} ${CID} ${S_OID_USER} ${EMPTY} local_file_eacl + ... Get object ${WALLET} ${CID} ${S_OID_USER} Run Keyword And Expect Error * - ... Search object ${WALLET} ${CID} ${EMPTY} ${EMPTY} ${USER_HEADER} ${S_OBJ_H} + ... Search object ${WALLET} ${CID} filters=${USER_HEADER} expected_objects_list=${S_OBJ_H} Run Keyword And Expect Error * ... Head object ${WALLET} ${CID} ${S_OID_USER} Run Keyword And Expect Error * @@ -64,9 +61,9 @@ Check eACL Deny and Allow All # The current ACL cache lifetime is 30 sec Sleep ${NEOFS_CONTRACT_CACHE_TIMEOUT} - Put object ${WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER} - Get object ${WALLET} ${CID} ${S_OID_USER} ${EMPTY} local_file_eacl - Search object ${WALLET} ${CID} ${EMPTY} ${EMPTY} ${USER_HEADER} ${S_OBJ_H} + Put object ${WALLET} ${FILE_S} ${CID} + Get object ${WALLET} ${CID} ${S_OID_USER} + Search object ${WALLET} ${CID} filters=${USER_HEADER} expected_objects_list=${S_OBJ_H} Head object ${WALLET} ${CID} ${S_OID_USER} Get Range ${WALLET} ${CID} ${S_OID_USER} 0:256 Get Range Hash ${WALLET} ${CID} ${S_OID_USER} ${EMPTY} 0:256 @@ -100,12 +97,12 @@ Check eACL Filters with MatchType String Equal ${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} - ${S_OID_USER} = Put Object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER} + ${S_OID_USER} = Put Object ${WALLET} ${FILE_S} ${CID} ${D_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} @{S_OBJ_H} = Create List ${S_OID_USER} - Get Object ${WALLET_OTH} ${CID} ${S_OID_USER} ${EMPTY} local_file_eacl - Search Object ${WALLET_OTH} ${CID} ${EMPTY} ${EMPTY} ${USER_HEADER} ${S_OBJ_H} + Get Object ${WALLET_OTH} ${CID} ${S_OID_USER} + Search Object ${WALLET_OTH} ${CID} keys=--oid ${S_OID_USER} expected_objects_list=${S_OBJ_H} &{HEADER} = Head Object ${WALLET_OTH} ${CID} ${S_OID_USER} Get Range ${WALLET_OTH} ${CID} ${S_OID_USER} 0:256 Get Range Hash ${WALLET_OTH} ${CID} ${S_OID_USER} ${EMPTY} 0:256 @@ -127,7 +124,7 @@ Check eACL Filters with MatchType String Equal IF 'GET' in ${VERB_FILTER_DEP}[${FILTER}] Run Keyword And Expect Error ${EACL_ERR_MSG} - ... Get object ${WALLET_OTH} ${CID} ${S_OID_USER} ${EMPTY} ${OBJECT_PATH} + ... Get object ${WALLET_OTH} ${CID} ${S_OID_USER} END IF 'HEAD' in ${VERB_FILTER_DEP}[${FILTER}] Run Keyword And Expect error ${EACL_ERR_MSG} @@ -139,7 +136,7 @@ Check eACL Filters with MatchType String Equal END IF 'SEARCH' in ${VERB_FILTER_DEP}[${FILTER}] Run Keyword And Expect Error ${EACL_ERR_MSG} - ... Search Object ${WALLET_OTH} ${CID} ${EMPTY} ${EMPTY} ${USER_HEADER} ${S_OBJ_H} + ... Search Object ${WALLET_OTH} ${CID} keys=--oid ${S_OID_USER} expected_objects_list=${S_OBJ_H} END IF 'RANGEHASH' in ${VERB_FILTER_DEP}[${FILTER}] Run Keyword And Expect error ${EACL_ERR_MSG} @@ -159,14 +156,14 @@ Check eACL Filters with MatchType String Not Equal ${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} - ${S_OID_OTH} = Put Object ${WALLET_OTH} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER} - ${S_OID_USER} = Put Object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER} + ${S_OID_OTH} = Put Object ${WALLET_OTH} ${FILE_S} ${CID} + ${S_OID_USER} = Put Object ${WALLET} ${FILE_S} ${CID} ${D_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} @{S_OBJ_H} = Create List ${S_OID_USER} - Get Object ${WALLET} ${CID} ${S_OID_USER} ${EMPTY} local_file_eacl + Get Object ${WALLET} ${CID} ${S_OID_USER} &{HEADER} = Head Object ${WALLET} ${CID} ${S_OID_USER} - Search Object ${WALLET} ${CID} ${EMPTY} ${EMPTY} ${USER_HEADER} ${S_OBJ_H} + Search Object ${WALLET} ${CID} keys=--oid ${S_OID_USER} expected_objects_list=${S_OBJ_H} Get Range ${WALLET} ${CID} ${S_OID_USER} 0:256 Get Range Hash ${WALLET} ${CID} ${S_OID_USER} ${EMPTY} 0:256 @@ -186,8 +183,8 @@ Check eACL Filters with MatchType String Not Equal IF 'GET' in ${VERB_FILTER_DEP}[${FILTER}] Run Keyword And Expect Error ${EACL_ERR_MSG} - ... Get object ${WALLET_OTH} ${CID} ${S_OID_OTH} ${EMPTY} ${OBJECT_PATH} - Get object ${WALLET_OTH} ${CID} ${S_OID_USER} ${EMPTY} ${OBJECT_PATH} + ... Get object ${WALLET_OTH} ${CID} ${S_OID_OTH} + Get object ${WALLET_OTH} ${CID} ${S_OID_USER} END IF 'HEAD' in ${VERB_FILTER_DEP}[${FILTER}] Run Keyword And Expect error ${EACL_ERR_MSG} @@ -196,8 +193,8 @@ Check eACL Filters with MatchType String Not Equal END IF 'SEARCH' in ${VERB_FILTER_DEP}[${FILTER}] Run Keyword And Expect error ${EACL_ERR_MSG} - ... Search object ${WALLET_OTH} ${CID} ${EMPTY} ${EMPTY} ${ANOTHER_HEADER} ${S_OBJ_H} - Search object ${WALLET_OTH} ${CID} ${EMPTY} ${EMPTY} ${USER_HEADER} ${S_OBJ_H} + ... Search object ${WALLET_OTH} ${CID} keys=--oid ${S_OID_OTH} expected_objects_list=${S_OBJ_H} + Search object ${WALLET_OTH} ${CID} keys=--oid ${S_OID_USER} expected_objects_list=${S_OBJ_H} END IF 'RANGE' in ${VERB_FILTER_DEP}[${FILTER}] Run Keyword And Expect error ${EACL_ERR_MSG} diff --git a/robot/testsuites/integration/acl/acl_extended_filters.robot b/robot/testsuites/integration/acl/acl_extended_filters.robot index 8a53262f..8b8f1bbf 100644 --- a/robot/testsuites/integration/acl/acl_extended_filters.robot +++ b/robot/testsuites/integration/acl/acl_extended_filters.robot @@ -10,17 +10,11 @@ Resource common_steps_acl_extended.robot Resource payment_operations.robot Resource eacl_tables.robot -*** Variables *** -&{USER_HEADER} = key1=1 key2=abc -&{ANOTHER_HEADER} = key1=oth key2=oth -${ID_FILTER} = $Object:objectID -${CUSTOM_FILTER} = key1 - *** Test cases *** Extended ACL Operations [Documentation] Testcase to validate NeoFS operations with extended ACL. [Tags] ACL eACL - [Timeout] 3 min + [Timeout] 5 min Check Filters Simple @@ -40,8 +34,6 @@ Check Filters ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit ${FILE_S} ${_} = Generate File ${SIZE} - Check eACL MatchType String Equal Object ${WALLET} ${WALLET_OTH} ${FILE_S} - Check eACL MatchType String Not Equal Object ${WALLET} ${WALLET_OTH} ${FILE_S} Check eACL MatchType String Equal Request Deny ${WALLET} ${WALLET_OTH} ${FILE_S} Check eACL MatchType String Equal Request Allow ${WALLET} ${WALLET_OTH} ${FILE_S} @@ -49,7 +41,7 @@ Check Filters Check eACL MatchType String Equal Request Deny [Arguments] ${USER_WALLET} ${OTHER_WALLET} ${FILE_S} ${CID} = Create Container ${USER_WALLET} basic_acl=eacl-public-read-write - ${S_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER} + ${S_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} Get object ${USER_WALLET} ${CID} ${S_OID_USER} Set eACL ${USER_WALLET} ${CID} ${EACL_XHEADER_DENY_ALL} @@ -62,11 +54,11 @@ Check eACL MatchType String Equal Request Deny Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=256 Run Keyword And Expect Error * - ... Put object ${OTHER_WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER} options=--xhdr a=2 + ... Put object ${OTHER_WALLET} ${FILE_S} ${CID} options=--xhdr a=2 Run Keyword And Expect Error * ... Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=2 Run Keyword And Expect Error * - ... Search object ${OTHER_WALLET} ${CID} filters=${USER_HEADER} options=--xhdr a=2 + ... Search object ${OTHER_WALLET} ${CID} keys=--oid ${S_OID_USER} options=--xhdr a=2 Run Keyword And Expect Error * ... Head object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=2 Run Keyword And Expect Error * @@ -76,9 +68,9 @@ Check eACL MatchType String Equal Request Deny Run Keyword And Expect Error * ... Delete object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=2 - Put object ${OTHER_WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER} options=--xhdr a=256 + Put object ${OTHER_WALLET} ${FILE_S} ${CID} options=--xhdr a=256 Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=* - Search object ${OTHER_WALLET} ${CID} filters=${USER_HEADER} options=--xhdr a= + Search object ${OTHER_WALLET} ${CID} keys=--oid ${S_OID_USER} options=--xhdr a= Head object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=.* Get Range ${OTHER_WALLET} ${CID} ${S_OID_USER} 0:256 options=--xhdr a="2 2" Get Range Hash ${OTHER_WALLET} ${CID} ${S_OID_USER} bearer_token=${EMPTY} range_cut=0:256 options=--xhdr a=256 @@ -106,7 +98,7 @@ Check eACL MatchType String Equal Request Allow Run Keyword And Expect Error * ... Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} Run Keyword And Expect Error * - ... Search object ${OTHER_WALLET} ${CID} filters=${USER_HEADER} + ... Search object ${OTHER_WALLET} ${CID} keys=--oid ${S_OID_USER} Run Keyword And Expect Error * ... Head object ${OTHER_WALLET} ${CID} ${S_OID_USER} Run Keyword And Expect Error * @@ -118,82 +110,8 @@ Check eACL MatchType String Equal Request Allow Put object ${OTHER_WALLET} ${FILE_S} ${CID} options=--xhdr a=2 Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=2 - Search object ${OTHER_WALLET} ${CID} filters=${USER_HEADER} options=--xhdr a=2 + Search object ${OTHER_WALLET} ${CID} keys=--oid ${S_OID_USER} options=--xhdr a=2 Head object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=2 Get Range ${OTHER_WALLET} ${CID} ${S_OID_USER} 0:256 options=--xhdr a=2 Get Range Hash ${OTHER_WALLET} ${CID} ${S_OID_USER} bearer_token=${EMPTY} range_cut=0:256 options=--xhdr a=2 Delete object ${OTHER_WALLET} ${CID} ${S_OID_USER} options=--xhdr a=2 - - -Check eACL MatchType String Equal Object - [Arguments] ${USER_WALLET} ${OTHER_WALLET} ${FILE_S} - - ${CID} = Create Container ${USER_WALLET} basic_acl=eacl-public-read-write - ${S_OID_USER} = Put Object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER} - Get Object ${OTHER_WALLET} ${CID} ${S_OID_USER} - - Log Set eACL for Deny GET operation with StringEqual Object ID - - &{HEADER_DICT} = Head Object ${USER_WALLET} ${CID} ${S_OID_USER} - ${ID_value} = Get From dictionary ${HEADER_DICT} ${EACL_OBJ_FILTERS}[${ID_FILTER}] - - ${filters} = Set Variable obj:${ID_FILTER}=${ID_value} - ${rule1} = Set Variable deny get ${filters} others - ${eACL_gen} = Create List ${rule1} - ${EACL_CUSTOM} = Create eACL ${CID} ${eACL_gen} - Set eACL ${USER_WALLET} ${CID} ${EACL_CUSTOM} - Run Keyword And Expect Error * - ... Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} - - Log Set eACL for Deny GET operation with StringEqual Object Extended User Header - - ${S_OID_USER_OTH} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER} - - ${filters} = Set Variable obj:${CUSTOM_FILTER}=1 - ${rule1} = Set Variable deny get ${filters} others - ${eACL_gen} = Create List ${rule1} - ${EACL_CUSTOM} = Create eACL ${CID} ${eACL_gen} - - Set eACL ${USER_WALLET} ${CID} ${EACL_CUSTOM} - Run Keyword And Expect Error * - ... Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} - Get object ${OTHER_WALLET} ${CID} ${S_OID_USER_OTH} - - -Check eACL MatchType String Not Equal Object - [Arguments] ${USER_WALLET} ${OTHER_WALLET} ${FILE_S} - - ${CID} = Create Container ${USER_WALLET} basic_acl=eacl-public-read-write - - ${S_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} - ${S_OID_OTHER} = Put object ${OTHER_WALLET} ${FILE_S} ${CID} - Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} - Get object ${OTHER_WALLET} ${CID} ${S_OID_OTHER} - - Log Set eACL for Deny GET operation with StringNotEqual Object ID - - &{HEADER_DICT} = Head object ${USER_WALLET} ${CID} ${S_OID_USER} - ${ID_value} = Get From Dictionary ${HEADER_DICT} ${EACL_OBJ_FILTERS}[${ID_FILTER}] - - ${filters} = Set Variable obj:${ID_FILTER}!=${ID_value} - ${rule1} = Set Variable deny get ${filters} others - ${eACL_gen} = Create List ${rule1} - ${EACL_CUSTOM} = Create eACL ${CID} ${eACL_gen} - - Set eACL ${USER_WALLET} ${CID} ${EACL_CUSTOM} - Run Keyword And Expect Error * - ... Get object ${OTHER_WALLET} ${CID} ${S_OID_OTHER} - Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} - - Log Set eACL for Deny GET operation with StringEqual Object Extended User Header - - ${S_OID_USER_OTH} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER} - ${filters} = Set Variable obj:${CUSTOM_FILTER}!=1 - ${rule1} = Set Variable deny get ${filters} others - ${eACL_gen} = Create List ${rule1} - ${EACL_CUSTOM} = Create eACL ${CID} ${eACL_gen} - - Set eACL ${USER_WALLET} ${CID} ${EACL_CUSTOM} - Run Keyword And Expect Error * - ... Get object ${OTHER_WALLET} ${CID} ${S_OID_USER_OTH} - Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} diff --git a/robot/testsuites/integration/acl/object_attributes/object_id_filter.robot b/robot/testsuites/integration/acl/object_attributes/object_id_filter.robot index 3f53a252..2115a4f7 100644 --- a/robot/testsuites/integration/acl/object_attributes/object_id_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/object_id_filter.robot @@ -10,7 +10,6 @@ Resource common_steps_acl_extended.robot Resource payment_operations.robot *** Variables *** -${OBJECT_PATH} = testfile ${EACL_ERR_MSG} = * *** Test cases *** @@ -46,9 +45,9 @@ Check eACL Filters with MatchType String Equal with two contradicting filters ${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write ${FILE_S_USER} ${_} = Generate file ${SIMPLE_OBJ_SIZE} - ${S_OID_USER} = Put Object ${WALLET} ${FILE_S_USER} ${CID} ${EMPTY} + ${S_OID_USER} = Put Object ${WALLET} ${FILE_S_USER} ${CID} - Get Object ${WALLET_OTH} ${CID} ${S_OID_USER} ${EMPTY} ${OBJECT_PATH} + Get Object ${WALLET_OTH} ${CID} ${S_OID_USER} &{HEADER} = Head Object ${WALLET} ${CID} ${S_OID_USER} ${filter_value} = Get From Dictionary ${HEADER} ${EACL_OBJ_FILTERS}[${FILTER}] @@ -60,7 +59,7 @@ Check eACL Filters with MatchType String Equal with two contradicting filters ${EACL_CUSTOM} = Create eACL ${CID} ${eACL_gen} Set eACL ${WALLET} ${CID} ${EACL_CUSTOM} - Get object ${WALLET_OTH} ${CID} ${S_OID_USER} ${EMPTY} ${OBJECT_PATH} + Get object ${WALLET_OTH} ${CID} ${S_OID_USER} Check eACL Filters, two matchTypes @@ -72,12 +71,12 @@ Check eACL Filters, two matchTypes ${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} - ${S_OID_USER} = Put Object ${WALLET} ${FILE_S} ${CID} ${EMPTY} - ${S_OID_OTHER} = Put Object ${WALLET_OTH} ${FILE_S} ${CID} ${EMPTY} + ${S_OID_USER} = Put Object ${WALLET} ${FILE_S} ${CID} + ${S_OID_OTHER} = Put Object ${WALLET_OTH} ${FILE_S} ${CID} &{HEADER} = Head Object ${WALLET} ${CID} ${S_OID_USER} - Get Object ${WALLET_OTH} ${CID} ${S_OID_USER} ${EMPTY} ${OBJECT_PATH} - Get Object ${WALLET_OTH} ${CID} ${S_OID_OTHER} ${EMPTY} ${OBJECT_PATH} + Get Object ${WALLET_OTH} ${CID} ${S_OID_USER} + Get Object ${WALLET_OTH} ${CID} ${S_OID_OTHER} ${filter_value} = Get From Dictionary ${HEADER} ${EACL_OBJ_FILTERS}[${FILTER}] ${noneq_filters} = Set Variable obj:${FILTER}!=${filter_value} @@ -89,6 +88,6 @@ Check eACL Filters, two matchTypes Set eACL ${WALLET} ${CID} ${EACL_CUSTOM} Run Keyword And Expect Error * - ... Get object ${WALLET_OTH} ${CID} ${S_OID_OTHER} ${EMPTY} ${OBJECT_PATH} + ... Get object ${WALLET_OTH} ${CID} ${S_OID_OTHER} Run Keyword And Expect Error * - ... Get Object ${WALLET_OTH} ${CID} ${S_OID_USER} ${EMPTY} ${OBJECT_PATH} + ... Get Object ${WALLET_OTH} ${CID} ${S_OID_USER}