From 265301cf81b933e7690ae09ece8b3b6a5613c5b3 Mon Sep 17 00:00:00 2001 From: Elizaveta Chichindaeva Date: Thu, 19 May 2022 17:07:27 +0300 Subject: [PATCH] Add non-global Generate File in acl_bearer_* Signed-off-by: Elizaveta Chichindaeva --- .../lib/robot/common_steps_acl_bearer.robot | 6 ----- .../integration/acl/acl_bearer_allow.robot | 9 +++---- .../acl/acl_bearer_allow_storagegroup.robot | 4 +-- .../integration/acl/acl_bearer_compound.robot | 26 +++++++++---------- .../acl/acl_bearer_filter_oid_equal.robot | 9 +++---- .../acl/acl_bearer_filter_oid_not_equal.robot | 8 +++--- .../acl_bearer_filter_userheader_equal.robot | 8 +++--- ...l_bearer_filter_userheader_not_equal.robot | 8 +++--- .../acl/acl_bearer_inaccessible.robot | 8 +++--- ...l_bearer_request_filter_xheader_deny.robot | 8 +++--- ..._bearer_request_filter_xheader_equal.robot | 8 +++--- ...rer_request_filter_xheader_not_equal.robot | 8 +++--- 12 files changed, 42 insertions(+), 68 deletions(-) diff --git a/robot/resources/lib/robot/common_steps_acl_bearer.robot b/robot/resources/lib/robot/common_steps_acl_bearer.robot index a2af7b6..2deef3d 100644 --- a/robot/resources/lib/robot/common_steps_acl_bearer.robot +++ b/robot/resources/lib/robot/common_steps_acl_bearer.robot @@ -2,12 +2,6 @@ Variables common.py *** Keywords *** -Generate file - [Arguments] ${SIZE} - - ${FILE_S_GEN} = Generate file of bytes ${SIZE} - [Return] ${FILE_S_GEN} - Prepare eACL Role rules [Arguments] ${CID} diff --git a/robot/testsuites/integration/acl/acl_bearer_allow.robot b/robot/testsuites/integration/acl/acl_bearer_allow.robot index 8fd0282..db3c434 100644 --- a/robot/testsuites/integration/acl/acl_bearer_allow.robot +++ b/robot/testsuites/integration/acl/acl_bearer_allow.robot @@ -1,15 +1,12 @@ *** 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 eacl_tables.robot -Resource common_steps_acl_bearer.robot Resource payment_operations.robot Resource setup_teardown.robot @@ -29,11 +26,11 @@ BearerToken Operations ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Bearer ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer ${WALLET} ${FILE_S} diff --git a/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot b/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot index fc2fabe..82dba2c 100644 --- a/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot +++ b/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot @@ -24,10 +24,10 @@ BearerToken Operations ${WALLET} ${_} ${_} = Prepare Wallet And Deposit - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Bearer Simple ${WALLET} ${FILE_S} - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer Complex ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_allow_storagegroup diff --git a/robot/testsuites/integration/acl/acl_bearer_compound.robot b/robot/testsuites/integration/acl/acl_bearer_compound.robot index f8ce47c..9e16756 100644 --- a/robot/testsuites/integration/acl/acl_bearer_compound.robot +++ b/robot/testsuites/integration/acl/acl_bearer_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 eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -20,24 +18,24 @@ ${SYSTEM_KEY} = ${NEOFS_IR_WIF} *** Test cases *** BearerToken Operations for Сompound Operations - [Documentation] Testcase to validate NeoFS operations with BearerToken for Сompound Operations. - [Tags] ACL BearerToken - [Timeout] 20 min + [Documentation] Testcase to validate NeoFS operations with BearerToken for Сompound Operations. + [Tags] ACL BearerToken + [Timeout] 20 min - [Setup] Setup + [Setup] Setup ${WALLET} ${_} ${_} = Prepare Wallet And Deposit ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit - Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} - Check Сompound Operations ${WALLET} ${WALLET_OTH} ${FILE_S} + Log Check Bearer token with simple object + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} + Check Сompound Operations ${WALLET} ${WALLET_OTH} ${FILE_S} - Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} - Check Сompound Operations ${WALLET} ${WALLET_OTH} ${FILE_S} + Log Check Bearer token with complex object + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} + Check Сompound Operations ${WALLET} ${WALLET_OTH} ${FILE_S} - [Teardown] Teardown acl_bearer_compound + [Teardown] Teardown acl_bearer_compound *** Keywords *** diff --git a/robot/testsuites/integration/acl/acl_bearer_filter_oid_equal.robot b/robot/testsuites/integration/acl/acl_bearer_filter_oid_equal.robot index b1a9174..1ff2c20 100644 --- a/robot/testsuites/integration/acl/acl_bearer_filter_oid_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_filter_oid_equal.robot @@ -1,12 +1,11 @@ *** 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 eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -26,15 +25,15 @@ BearerToken Operations with Filter OID Equal [Setup] Setup - ${WALLET} ${_} ${_} = Prepare Wallet And Deposit + ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter OID Equal ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter OID Equal ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_filter_oid_equal diff --git a/robot/testsuites/integration/acl/acl_bearer_filter_oid_not_equal.robot b/robot/testsuites/integration/acl/acl_bearer_filter_oid_not_equal.robot index 1680185..1a1a007 100644 --- a/robot/testsuites/integration/acl/acl_bearer_filter_oid_not_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_filter_oid_not_equal.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 eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -28,11 +26,11 @@ BearerToken Operations with Filter OID NotEqual ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter OID NotEqual ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter OID NotEqual ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_filter_oid_not_equal diff --git a/robot/testsuites/integration/acl/acl_bearer_filter_userheader_equal.robot b/robot/testsuites/integration/acl/acl_bearer_filter_userheader_equal.robot index 6d37bbf..155f67f 100644 --- a/robot/testsuites/integration/acl/acl_bearer_filter_userheader_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_filter_userheader_equal.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 eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -29,12 +27,12 @@ BearerToken Operations with Filter UserHeader Equal ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter UserHeader Equal ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter UserHeader Equal ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_filter_userheader_equal diff --git a/robot/testsuites/integration/acl/acl_bearer_filter_userheader_not_equal.robot b/robot/testsuites/integration/acl/acl_bearer_filter_userheader_not_equal.robot index 00fea47..5b8fbca 100644 --- a/robot/testsuites/integration/acl/acl_bearer_filter_userheader_not_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_filter_userheader_not_equal.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_bearer.robot Resource eacl_tables.robot @@ -29,11 +27,11 @@ BearerToken Operations Filter UserHeader NotEqual ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter UserHeader NotEqual ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter UserHeader NotEqual ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_filter_userheader_not_equal diff --git a/robot/testsuites/integration/acl/acl_bearer_inaccessible.robot b/robot/testsuites/integration/acl/acl_bearer_inaccessible.robot index 8f4f4c6..e8b2b19 100644 --- a/robot/testsuites/integration/acl/acl_bearer_inaccessible.robot +++ b/robot/testsuites/integration/acl/acl_bearer_inaccessible.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 eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -24,11 +22,11 @@ BearerToken Operations for Inaccessible Container ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check Container Inaccessible and Allow All Bearer ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check Container Inaccessible and Allow All Bearer ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_inaccessible diff --git a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_deny.robot b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_deny.robot index 7b78e79..7dd07b4 100644 --- a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_deny.robot +++ b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_deny.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 eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -29,11 +27,11 @@ BearerToken Operations ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Allow All Bearer Filter Requst Equal Deny ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Allow All Bearer Filter Requst Equal Deny ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_request_filter_xheader_deny diff --git a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_equal.robot b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_equal.robot index 70d736e..2575fff 100644 --- a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_equal.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 eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -29,11 +27,11 @@ BearerToken Operations with Filter Requst Equal ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter Requst Equal ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter Requst Equal ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_request_filter_xheader_equal diff --git a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_not_equal.robot b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_not_equal.robot index ac72093..f3da7b1 100644 --- a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_not_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_not_equal.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 eacl_tables.robot Resource common_steps_acl_bearer.robot @@ -29,11 +27,11 @@ BearerToken Operations with Filter Requst NotEqual ${WALLET} ${_} ${_} = Prepare Wallet And Deposit Log Check Bearer token with simple object - ${FILE_S} = Generate file ${SIMPLE_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter Requst NotEqual ${WALLET} ${FILE_S} Log Check Bearer token with complex object - ${FILE_S} = Generate file ${COMPLEX_OBJ_SIZE} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer Filter Requst NotEqual ${WALLET} ${FILE_S} [Teardown] Teardown acl_bearer_request_filter_xheader_not_equal