From b8272a86d828b6f5c644c11c91fdf8d309d543da Mon Sep 17 00:00:00 2001 From: anastasia prasolova Date: Tue, 17 May 2022 13:25:15 +0300 Subject: [PATCH] get rid of duplicated "create container" keywords for basic acl suites Signed-off-by: anastasia prasolova --- .../lib/robot/common_steps_acl_basic.robot | 22 ------------------- .../acl/acl_basic_private_container.robot | 9 ++++---- .../acl/acl_basic_public_container.robot | 5 +++-- ..._basic_public_container_storagegroup.robot | 5 +++-- ...asic_readonly_container_storagegroup.robot | 5 +++-- 5 files changed, 14 insertions(+), 32 deletions(-) diff --git a/robot/resources/lib/robot/common_steps_acl_basic.robot b/robot/resources/lib/robot/common_steps_acl_basic.robot index 47cbab37..fbc2856f 100644 --- a/robot/resources/lib/robot/common_steps_acl_basic.robot +++ b/robot/resources/lib/robot/common_steps_acl_basic.robot @@ -1,27 +1,5 @@ -*** Settings *** -Variables common.py -Variables wellknown_acl.py - -Library container.py - *** Keywords *** -Create Private Container - [Arguments] ${USER_KEY} - ${PRIV_CID_GEN} = Create container ${USER_KEY} basic_acl=${PRIVATE_ACL_F} - [Return] ${PRIV_CID_GEN} - -Create Public Container - [Arguments] ${USER_KEY} - ${PUBLIC_CID_GEN} = Create container ${USER_KEY} basic_acl=${PUBLIC_ACL_F} - [Return] ${PUBLIC_CID_GEN} - -Create Read-Only Container - [Arguments] ${USER_KEY} - ${READONLY_CID_GEN} = Create container ${USER_KEY} basic_acl=${READONLY_ACL_F} - [Return] ${READONLY_CID_GEN} - - Generate file [Arguments] ${SIZE} ${FILE_S_GEN} = Generate file of bytes ${SIZE} diff --git a/robot/testsuites/integration/acl/acl_basic_private_container.robot b/robot/testsuites/integration/acl/acl_basic_private_container.robot index 003eb0df..174fcc56 100644 --- a/robot/testsuites/integration/acl/acl_basic_private_container.robot +++ b/robot/testsuites/integration/acl/acl_basic_private_container.robot @@ -1,6 +1,7 @@ *** Settings *** Variables common.py +Library container.py Library neofs.py Library neofs_verbs.py Library payment_neogo.py @@ -21,12 +22,12 @@ Basic ACL Operations for Private Container ${WALLET} ${_} ${_} = Prepare Wallet And Deposit ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit - ${PRIV_CID} = Create Private Container ${WALLET} - ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} + ${PRIV_CID} = Create Container ${WALLET} + ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check Private Container ${WALLET} ${FILE_S} ${PRIV_CID} ${WALLET_OTH} - ${PRIV_CID} = Create Private Container ${WALLET} - ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} + ${PRIV_CID} = Create Container ${WALLET} + ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check Private Container ${WALLET} ${FILE_S} ${PRIV_CID} ${WALLET_OTH} [Teardown] Teardown acl_basic_private_container diff --git a/robot/testsuites/integration/acl/acl_basic_public_container.robot b/robot/testsuites/integration/acl/acl_basic_public_container.robot index d52c3858..7ec0b001 100644 --- a/robot/testsuites/integration/acl/acl_basic_public_container.robot +++ b/robot/testsuites/integration/acl/acl_basic_public_container.robot @@ -1,6 +1,7 @@ *** Settings *** Variables common.py +Library container.py Library neofs.py Library neofs_verbs.py Library payment_neogo.py @@ -21,11 +22,11 @@ Basic ACL Operations for Public Container ${WALLET} ${_} ${_} = Prepare Wallet And Deposit ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit - ${PUBLIC_CID} = Create Public Container ${WALLET} + ${PUBLIC_CID} = Create Container ${WALLET} basic_acl=public-read-write ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check Public Container ${WALLET} ${FILE_S} ${PUBLIC_CID} ${WALLET_OTH} - ${PUBLIC_CID} = Create Public Container ${WALLET} + ${PUBLIC_CID} = Create Container ${WALLET} basic_acl=public-read-write ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check Public Container ${WALLET} ${FILE_S} ${PUBLIC_CID} ${WALLET_OTH} diff --git a/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot b/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot index b5ed4034..5cedcdf0 100644 --- a/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot +++ b/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot @@ -1,6 +1,7 @@ *** Settings *** Variables common.py +Library container.py Library neofs.py Library neofs_verbs.py Library payment_neogo.py @@ -24,11 +25,11 @@ Basic ACL Operations for Public Container ${WALLET} ${_} ${_} = Prepare Wallet And Deposit ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit - ${PUBLIC_CID} = Create Public Container ${WALLET} + ${PUBLIC_CID} = Create Container ${WALLET} basic_acl=public-read-write ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check Public Container Simple ${WALLET} ${FILE_S} ${PUBLIC_CID} ${WALLET_OTH} - ${PUBLIC_CID} = Create Public Container ${WALLET} + ${PUBLIC_CID} = Create Container ${WALLET} basic_acl=public-read-write ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check Public Container Complex ${WALLET} ${FILE_S} ${PUBLIC_CID} ${WALLET_OTH} diff --git a/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot b/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot index 739a9cb7..a6d47d4a 100644 --- a/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot +++ b/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot @@ -1,6 +1,7 @@ *** Settings *** Variables common.py +Library container.py Library neofs.py Library neofs_verbs.py Library payment_neogo.py @@ -23,11 +24,11 @@ Basic ACL Operations for Read-Only Container ${WALLET} ${_} ${_} = Prepare Wallet And Deposit ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit - ${READONLY_CID} = Create Read-Only Container ${WALLET} + ${READONLY_CID} = Create Container ${WALLET} basic_acl=public-read ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE} Check Read-Only Container Simple ${WALLET} ${FILE_S} ${READONLY_CID} ${WALLET_OTH} - ${READONLY_CID} = Create Read-Only Container ${WALLET} + ${READONLY_CID} = Create Container ${WALLET} basic_acl=public-read ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check Read-Only Container Complex ${WALLET} ${FILE_S} ${READONLY_CID} ${WALLET_OTH}