get rid of duplicated "create container" keywords for bearer acl suites

Signed-off-by: anastasia prasolova <anastasia@nspcc.ru>
This commit is contained in:
anastasia prasolova 2022-05-17 16:54:57 +03:00 committed by Anastasia Prasolova
parent c56f79fee0
commit b75cfebf22
12 changed files with 42 additions and 45 deletions

View file

@ -1,22 +1,7 @@
*** Settings ***
Variables common.py
Variables wellknown_acl.py
Library container.py
*** Keywords ***
Create Container Public
[Arguments] ${USER_KEY}
${PUBLIC_CID_GEN} = Create container ${USER_KEY} basic_acl=${PUBLIC_ACL}
[Return] ${PUBLIC_CID_GEN}
Create Container Inaccessible
[Arguments] ${USER_KEY}
${INACCESSIBLE_CID_GEN} = Create container ${USER_KEY} basic_acl=${INACCESSIBLE_ACL}
[Return] ${INACCESSIBLE_CID_GEN}
Generate file
[Arguments] ${SIZE}

View file

@ -2,9 +2,10 @@
Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library acl.py
Library payment_neogo.py
Resource eacl_tables.robot
@ -45,7 +46,7 @@ BearerToken Operations
Check eACL Deny and Allow All Bearer
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${D_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER_DEL}
@{S_OBJ_H} = Create List ${S_OID_USER}

View file

@ -3,6 +3,7 @@ Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
@ -38,7 +39,7 @@ BearerToken Operations
Check eACL Deny and Allow All Bearer
[Arguments] ${RUN_TYPE} ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
${OID} = Put object ${WALLET} ${FILE_S} ${CID}
@{OBJECTS} = Create List ${OID}

View file

@ -3,6 +3,7 @@ Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library payment_neogo.py
@ -54,13 +55,13 @@ Check Сompound Operations
Check Bearer Сompound Delete ${USER_WALLET} USER ${EACL_DENY_ALL_USER} ${FILE_S} ${USER_WALLET} ${WALLET_SYS}
Check Bearer Сompound Delete ${WALLET_SYS} SYSTEM ${EACL_DENY_ALL_SYSTEM} ${FILE_S} ${USER_WALLET} ${WALLET_SYS}
Check Bearer Сompound Get Range Hash ${OTHER_WALLET} OTHERS ${EACL_DENY_ALL_OTHERS} ${USER_WALLET} ${FILE_S} ${WALLET_SYS}
Check Bearer Сompound Get Range Hash ${OTHER_WALLET} OTHERS ${EACL_DENY_ALL_OTHERS} ${USER_WALLET} ${FILE_S} ${WALLET_SYS}
Check Bearer Сompound Get Range Hash ${USER_WALLET} USER ${EACL_DENY_ALL_USER} ${USER_WALLET} ${FILE_S} ${WALLET_SYS}
Check Bearer Сompound Get Range Hash ${WALLET_SYS} SYSTEM ${EACL_DENY_ALL_SYSTEM} ${USER_WALLET} ${FILE_S} ${WALLET_SYS}
Check Bearer Сompound Get
[Arguments] ${WALLET} ${DENY_GROUP} ${DENY_EACL} ${FILE_S} ${USER_WALLET} ${WALLET_SYS}
${CID} = Create Container Public ${USER_WALLET}
${CID} = Create Container ${USER_WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
@{S_OBJ_H} = Create List ${S_OID_USER}
@ -95,7 +96,7 @@ Check Bearer Сompound Get
Check Bearer Сompound Delete
[Arguments] ${WALLET} ${DENY_GROUP} ${DENY_EACL} ${FILE_S} ${USER_WALLET} ${WALLET_SYS}
${CID} = Create Container Public ${USER_WALLET}
${CID} = Create Container ${USER_WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${D_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID}
@ -130,13 +131,13 @@ Check Bearer Сompound Delete
Check Bearer Сompound Get Range Hash
[Arguments] ${WALLET} ${DENY_GROUP} ${DENY_EACL} ${USER_WALLET} ${FILE_S} ${WALLET_SYS}
${CID} = Create Container Public ${USER_WALLET}
${CID} = Create Container ${USER_WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
Put object ${WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER}
Get Range hash ${WALLET_SYS} ${CID} ${S_OID_USER} ${EMPTY} 0:256
Set eACL ${USER_WALLET} ${CID} ${DENY_EACL}
${S_OID_USER} = Put object ${USER_WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
Put object ${WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER}
Get Range hash ${WALLET_SYS} ${CID} ${S_OID_USER} ${EMPTY} 0:256
Set eACL ${USER_WALLET} ${CID} ${DENY_EACL}
# The current ACL cache lifetime is 30 sec
Sleep ${NEOFS_CONTRACT_CACHE_TIMEOUT}

View file

@ -2,9 +2,10 @@
Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library acl.py
Library payment_neogo.py
Resource eacl_tables.robot
@ -45,7 +46,7 @@ BearerToken Operations with Filter OID Equal
Check eACL Deny and Allow All Bearer Filter OID Equal
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${S_OID_USER_2} = Put object ${WALLET} ${FILE_S} ${CID}

View file

@ -2,9 +2,10 @@
Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library acl.py
Library payment_neogo.py
Resource eacl_tables.robot
@ -43,7 +44,7 @@ BearerToken Operations with Filter OID NotEqual
Check eACL Deny and Allow All Bearer Filter OID NotEqual
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${S_OID_USER_2} = Put object ${WALLET} ${FILE_S} ${CID}

View file

@ -3,6 +3,7 @@ Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library payment_neogo.py
@ -41,7 +42,7 @@ BearerToken Operations with Filter UserHeader Equal
*** Keywords ***
Check eACL Deny and Allow All Bearer Filter UserHeader Equal
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${S_OID_USER_2} = Put object ${WALLET} ${FILE_S} ${CID}

View file

@ -2,9 +2,10 @@
Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library acl.py
Library payment_neogo.py
Resource common_steps_acl_bearer.robot
@ -42,7 +43,7 @@ BearerToken Operations Filter UserHeader NotEqual
Check eACL Deny and Allow All Bearer Filter UserHeader NotEqual
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_HEADER}
${S_OID_USER_2} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}

View file

@ -2,9 +2,10 @@
Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library acl.py
Library payment_neogo.py
Resource eacl_tables.robot
@ -37,7 +38,8 @@ BearerToken Operations for Inaccessible Container
Check Container Inaccessible and Allow All Bearer
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Inaccessible ${WALLET}
# 0x40000000 is inaccessible ACL
${CID} = Create Container ${WALLET} basic_acl=0x40000000
Prepare eACL Role rules ${CID}
Run Keyword And Expect Error *

View file

@ -2,9 +2,10 @@
Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library acl.py
Library payment_neogo.py
Resource eacl_tables.robot
@ -44,7 +45,7 @@ BearerToken Operations
Check eACL Allow All Bearer Filter Requst Equal Deny
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${S_OID_USER_2} = Put object ${WALLET} ${FILE_S} ${CID}

View file

@ -3,6 +3,7 @@ Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library payment_neogo.py
@ -44,7 +45,7 @@ BearerToken Operations with Filter Requst Equal
Check eACL Deny and Allow All Bearer Filter Requst Equal
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
Prepare eACL Role rules ${CID}
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${S_OID_USER_2} = Put object ${WALLET} ${FILE_S} ${CID}

View file

@ -3,6 +3,7 @@ Variables common.py
Library Collections
Library acl.py
Library container.py
Library neofs.py
Library neofs_verbs.py
Library payment_neogo.py
@ -43,11 +44,11 @@ BearerToken Operations with Filter Requst NotEqual
Check eACL Deny and Allow All Bearer Filter Requst NotEqual
[Arguments] ${WALLET} ${FILE_S}
${CID} = Create Container Public ${WALLET}
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${S_OID_USER_2} = Put object ${WALLET} ${FILE_S} ${CID}
${D_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER_DEL}
@{S_OBJ_H} = Create List ${S_OID_USER}
${CID} = Create Container ${WALLET} basic_acl=eacl-public-read-write
${S_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
${S_OID_USER_2} = Put object ${WALLET} ${FILE_S} ${CID}
${D_OID_USER} = Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER_DEL}
@{S_OBJ_H} = Create List ${S_OID_USER}
Put object ${WALLET} ${FILE_S} ${CID} user_headers=${ANOTHER_USER_HEADER}
Get object ${WALLET} ${CID} ${S_OID_USER} ${EMPTY} local_file_eacl
@ -73,7 +74,7 @@ Check eACL Deny and Allow All Bearer Filter Requst NotEqual
${EACL_TOKEN} = Form BearerToken File ${WALLET} ${CID} ${eACL_gen}
Run Keyword And Expect Error *
... Put object ${WALLET} ${FILE_S} ${CID} user_headers=${USER_HEADER}
... Put object ${WALLET} ${FILE_S} ${CID}
Run Keyword And Expect Error *
... Get object ${WALLET} ${CID} ${S_OID_USER} ${EMPTY} local_file_eacl
#Run Keyword And Expect Error *
@ -85,7 +86,7 @@ Check eACL Deny and Allow All Bearer Filter Requst NotEqual
Run Keyword And Expect Error *
... Delete object ${WALLET} ${CID} ${S_OID_USER}
Put object ${WALLET} ${FILE_S} ${CID} bearer=${EACL_TOKEN} user_headers=${USER_HEADER} options=--xhdr a=2
Put object ${WALLET} ${FILE_S} ${CID} bearer=${EACL_TOKEN} user_headers=${USER_HEADER} options=--xhdr a=2
Get object ${WALLET} ${CID} ${S_OID_USER} ${EACL_TOKEN} local_file_eacl ${EMPTY} --xhdr a=2
Search object ${WALLET} ${CID} ${EMPTY} ${EACL_TOKEN} ${USER_HEADER} ${EMPTY} --xhdr a=2
Head object ${WALLET} ${CID} ${S_OID_USER} bearer_token=${EACL_TOKEN} options=--xhdr a=2