From 057caa54b045c2d51f6501983f19cfb9f25a759d Mon Sep 17 00:00:00 2001 From: Elizaveta Chichindaeva Date: Fri, 20 May 2022 14:15:25 +0300 Subject: [PATCH] Add non-global Generate File in acl_extended_* Signed-off-by: Elizaveta Chichindaeva --- .../lib/robot/common_steps_acl_extended.robot | 10 ----- .../acl/acl_extended_actions_other.robot | 7 ++-- .../acl/acl_extended_actions_pubkey.robot | 8 ++-- .../acl/acl_extended_actions_system.robot | 8 ++-- .../acl/acl_extended_actions_user.robot | 9 ++--- .../acl/acl_extended_compound.robot | 8 ++-- .../acl/acl_extended_deny_replication.robot | 9 ++--- .../acl/acl_extended_filters.robot | 40 +++++++++---------- 8 files changed, 37 insertions(+), 62 deletions(-) diff --git a/robot/resources/lib/robot/common_steps_acl_extended.robot b/robot/resources/lib/robot/common_steps_acl_extended.robot index 252960f8..17e85bc4 100644 --- a/robot/resources/lib/robot/common_steps_acl_extended.robot +++ b/robot/resources/lib/robot/common_steps_acl_extended.robot @@ -10,7 +10,6 @@ Library neofs_verbs.py Library Collections Library String -Resource common_steps_acl_basic.robot Resource payment_operations.robot *** Variables *** @@ -22,15 +21,6 @@ ${EACL_ERR_MSG} = * *** Keywords *** -Generate files - [Arguments] ${SIZE} - - ${FILE_S_GEN_1} = Generate file of bytes ${SIZE} - ${FILE_S_GEN_2} = Generate file of bytes ${SIZE} - Set Global Variable ${FILE_S} ${FILE_S_GEN_1} - Set Global Variable ${FILE_S_2} ${FILE_S_GEN_2} - - Check eACL Deny and Allow All [Arguments] ${WALLET} ${DENY_EACL} ${ALLOW_EACL} ${USER_WALLET} diff --git a/robot/testsuites/integration/acl/acl_extended_actions_other.robot b/robot/testsuites/integration/acl/acl_extended_actions_other.robot index bc0376f4..ee044e03 100644 --- a/robot/testsuites/integration/acl/acl_extended_actions_other.robot +++ b/robot/testsuites/integration/acl/acl_extended_actions_other.robot @@ -1,8 +1,7 @@ *** Settings *** Variables common.py -Library neofs.py -Library payment_neogo.py +Library utility_keywords.py Resource common_steps_acl_extended.robot Resource payment_operations.robot @@ -21,11 +20,11 @@ Extended ACL Operations ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit Log Check extended ACL with simple object - ${FILE_S} = Generate file of bytes ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Other ${WALLET} ${WALLET_OTH} Log Check extended ACL with complex object - ${FILE_S} = Generate file of bytes ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Other ${WALLET} ${WALLET_OTH} [Teardown] Teardown acl_extended_actions_other diff --git a/robot/testsuites/integration/acl/acl_extended_actions_pubkey.robot b/robot/testsuites/integration/acl/acl_extended_actions_pubkey.robot index 6d266fc4..76c2dbec 100644 --- a/robot/testsuites/integration/acl/acl_extended_actions_pubkey.robot +++ b/robot/testsuites/integration/acl/acl_extended_actions_pubkey.robot @@ -1,12 +1,10 @@ *** Settings *** Variables common.py -Library Collections Library acl.py Library container.py -Library neofs.py Library neofs_verbs.py -Library payment_neogo.py +Library utility_keywords.py Resource common_steps_acl_extended.robot Resource payment_operations.robot @@ -32,11 +30,11 @@ Extended ACL Operations ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit Log Check extended ACL with simple object - ${FILE_S} = Generate file of bytes ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny All Other and Allow All Pubkey ${WALLET} ${FILE_S} ${WALLET_OTH} Log Check extended ACL with complex object - ${FILE_S} = Generate file of bytes ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny All Other and Allow All Pubkey ${WALLET} ${FILE_S} ${WALLET_OTH} diff --git a/robot/testsuites/integration/acl/acl_extended_actions_system.robot b/robot/testsuites/integration/acl/acl_extended_actions_system.robot index e26ee659..a253dd29 100644 --- a/robot/testsuites/integration/acl/acl_extended_actions_system.robot +++ b/robot/testsuites/integration/acl/acl_extended_actions_system.robot @@ -1,12 +1,10 @@ *** Settings *** Variables common.py -Library Collections Library acl.py Library container.py -Library neofs.py Library neofs_verbs.py -Library payment_neogo.py +Library utility_keywords.py Resource common_steps_acl_extended.robot Resource payment_operations.robot @@ -29,11 +27,11 @@ Extended ACL Operations ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check extended ACL with simple object - ${FILE_S} = Generate file of bytes ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All System ${WALLET} ${FILE_S} Log Check extended ACL with complex object - ${FILE_S} = Generate file of bytes ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All System ${WALLET} ${FILE_S} [Teardown] Teardown acl_extended_actions_system diff --git a/robot/testsuites/integration/acl/acl_extended_actions_user.robot b/robot/testsuites/integration/acl/acl_extended_actions_user.robot index 9a5fb342..fc812942 100644 --- a/robot/testsuites/integration/acl/acl_extended_actions_user.robot +++ b/robot/testsuites/integration/acl/acl_extended_actions_user.robot @@ -1,10 +1,7 @@ *** Settings *** Variables common.py -Library Collections -Library neofs.py -Library payment_neogo.py -Library acl.py +Library utility_keywords.py Resource common_steps_acl_extended.robot Resource payment_operations.robot @@ -22,11 +19,11 @@ Extended ACL Operations ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check extended ACL with simple object - ${FILE_S} = Generate file of bytes ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All User ${WALLET} Log Check extended ACL with complex object - ${FILE_S} = Generate file of bytes ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All User ${WALLET} [Teardown] Teardown acl_extended_action_user diff --git a/robot/testsuites/integration/acl/acl_extended_compound.robot b/robot/testsuites/integration/acl/acl_extended_compound.robot index e5c8d9bc..47f5cb98 100644 --- a/robot/testsuites/integration/acl/acl_extended_compound.robot +++ b/robot/testsuites/integration/acl/acl_extended_compound.robot @@ -1,12 +1,10 @@ *** Settings *** Variables common.py -Library Collections Library acl.py Library container.py -Library neofs.py Library neofs_verbs.py -Library payment_neogo.py +Library utility_keywords.py Resource common_steps_acl_extended.robot Resource payment_operations.robot @@ -31,11 +29,11 @@ Extended ACL Operations ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit Log Check extended ACL with simple object - ${FILE_S} = Generate file of bytes ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check Сompound Operations ${WALLET} ${WALLET_OTH} ${FILE_S} Log Check extended ACL with complex object - ${FILE_S} = Generate file of bytes ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check Сompound Operations ${WALLET} ${WALLET_OTH} ${FILE_S} [Teardown] Teardown acl_extended_compound diff --git a/robot/testsuites/integration/acl/acl_extended_deny_replication.robot b/robot/testsuites/integration/acl/acl_extended_deny_replication.robot index 5c805b29..63debc73 100644 --- a/robot/testsuites/integration/acl/acl_extended_deny_replication.robot +++ b/robot/testsuites/integration/acl/acl_extended_deny_replication.robot @@ -5,11 +5,8 @@ Library container.py Library neofs.py Library neofs_verbs.py Library acl.py -Library payment_neogo.py Library contract_keywords.py -Library wallet_keywords.py - -Library Collections +Library utility_keywords.py Resource eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -38,8 +35,8 @@ eACL Deny Replication Operations # https://github.com/nspcc-dev/neofs-node/issues/881 - ${FILE} = Generate file of bytes ${SIMPLE_OBJ_SIZE} - ${CID} = Create container ${WALLET} basic_acl=${PUBLIC_ACL} rule=${FULL_PLACEMENT_RULE} + ${FILE} ${_} = Generate file ${SIMPLE_OBJ_SIZE} + ${CID} = Create container ${WALLET} basic_acl=eacl-public-read-write rule=${FULL_PLACEMENT_RULE} Prepare eACL Role rules ${CID} ${OID} = Put object ${WALLET} ${FILE} ${CID} diff --git a/robot/testsuites/integration/acl/acl_extended_filters.robot b/robot/testsuites/integration/acl/acl_extended_filters.robot index 4ec029ec..42cd8613 100644 --- a/robot/testsuites/integration/acl/acl_extended_filters.robot +++ b/robot/testsuites/integration/acl/acl_extended_filters.robot @@ -6,7 +6,6 @@ Library container.py Library contract_keywords.py Library neofs.py Library neofs_verbs.py -Library payment_neogo.py Library Collections Resource common_steps_acl_extended.robot @@ -29,16 +28,8 @@ Extended ACL Operations [Setup] Setup - ${WALLET} ${_} ${_} = Prepare Wallet And Deposit - ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit - - Log Check extended ACL with simple object - ${FILE_S} ${FILE_S_2} = Generate files ${SIMPLE_OBJ_SIZE} - Check Filters ${WALLET} ${WALLET_OTH} - - Log Check extended ACL with complex object - ${FILE_S} ${FILE_S_2} = Generate files ${COMPLEX_OBJ_SIZE} - Check Filters ${WALLET} ${WALLET_OTH} + Check Filters Simple + Check Filters Complex [Teardown] Teardown acl_extended_filters @@ -46,16 +37,23 @@ Extended ACL Operations *** Keywords *** Check Filters - [Arguments] ${WALLET} ${WALLET_OTH} + [Arguments] ${OBJ_COMPLEXITY} - Check eACL MatchType String Equal Object ${WALLET} ${WALLET_OTH} - Check eACL MatchType String Not Equal Object ${WALLET} ${WALLET_OTH} - Check eACL MatchType String Equal Request Deny ${WALLET} ${WALLET_OTH} - Check eACL MatchType String Equal Request Allow ${WALLET} ${WALLET_OTH} + ${SIZE} = Set Variable IF + ... """${OBJ_COMPLEXITY}""" == """Simple""" ${SIMPLE_OBJ_SIZE} ${COMPLEX_OBJ_SIZE} + + ${WALLET} ${_} ${_} = Prepare Wallet And Deposit + ${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} Check eACL MatchType String Equal Request Deny - [Arguments] ${USER_WALLET} ${OTHER_WALLET} + [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 ${USER_WALLET} ${CID} ${S_OID_USER} ${EMPTY} ${PATH} @@ -94,7 +92,7 @@ Check eACL MatchType String Equal Request Deny Check eACL MatchType String Equal Request Allow - [Arguments] ${USER_WALLET} ${OTHER_WALLET} + [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} @@ -134,7 +132,7 @@ Check eACL MatchType String Equal Request Allow Check eACL MatchType String Equal Object - [Arguments] ${USER_WALLET} ${OTHER_WALLET} + [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} @@ -169,12 +167,12 @@ Check eACL MatchType String Equal Object Check eACL MatchType String Not Equal Object - [Arguments] ${USER_WALLET} ${OTHER_WALLET} + [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_OTHER} = Put object ${OTHER_WALLET} ${FILE_S_2} ${CID} user_headers=${ANOTHER_HEADER} + ${S_OID_OTHER} = Put object ${OTHER_WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER} Get object ${OTHER_WALLET} ${CID} ${S_OID_USER} ${EMPTY} ${PATH} Get object ${OTHER_WALLET} ${CID} ${S_OID_OTHER} ${EMPTY} ${PATH}