diff --git a/robot/testsuites/integration/acl/common_steps_acl_basic.robot b/robot/testsuites/integration/acl/common_steps_acl_basic.robot index 10cae06..9860fdf 100644 --- a/robot/testsuites/integration/acl/common_steps_acl_basic.robot +++ b/robot/testsuites/integration/acl/common_steps_acl_basic.robot @@ -1,19 +1,20 @@ *** Settings *** Variables ../../../variables/common.py +Variables ../../../variables/acl.py *** Keywords *** Create Containers Log Create Private Container - ${PRIV_CID_GEN} = Create container ${USER_KEY} 0x18888888 ${COMMON_PLACEMENT_RULE} + ${PRIV_CID_GEN} = Create container ${USER_KEY} ${PRIVATE_ACL} ${COMMON_PLACEMENT_RULE} Container Existing ${USER_KEY} ${PRIV_CID_GEN} Log Create Public Container - ${PUBLIC_CID_GEN} = Create container ${USER_KEY} 0x1FFFFFFF ${COMMON_PLACEMENT_RULE} + ${PUBLIC_CID_GEN} = Create container ${USER_KEY} ${PUBLIC_ACL} ${COMMON_PLACEMENT_RULE} Container Existing ${USER_KEY} ${PUBLIC_CID_GEN} Log Create Read-Only Container - ${READONLY_CID_GEN} = Create container ${USER_KEY} 0x1FFF88FF ${COMMON_PLACEMENT_RULE} + ${READONLY_CID_GEN} = Create container ${USER_KEY} ${READONLY_ACL} ${COMMON_PLACEMENT_RULE} Container Existing ${USER_KEY} ${READONLY_CID_GEN} Set Global Variable ${PRIV_CID} ${PRIV_CID_GEN} diff --git a/robot/testsuites/integration/acl/common_steps_acl_bearer.robot b/robot/testsuites/integration/acl/common_steps_acl_bearer.robot index 46af5a1..4166f15 100644 --- a/robot/testsuites/integration/acl/common_steps_acl_bearer.robot +++ b/robot/testsuites/integration/acl/common_steps_acl_bearer.robot @@ -1,5 +1,6 @@ *** Settings *** Variables ../../../variables/common.py +Variables ../../../variables/acl.py *** Variables *** ${FILE_USR_HEADER} = key1=1,key2=abc @@ -16,8 +17,8 @@ Create Container Public Create Container Inaccessible Log Create Inaccessible Container - ${PUBLIC_CID_GEN} = Create container ${USER_KEY} 0x40000000 ${COMMON_PLACEMENT_RULE} - [Return] ${PUBLIC_CID_GEN} + ${INACCESSIBLE_CID_GEN} = Create container ${USER_KEY} ${INACCESSIBLE_ACL} ${COMMON_PLACEMENT_RULE} + [Return] ${INACCESSIBLE_CID_GEN} Generate file diff --git a/robot/testsuites/integration/container/container_delete.robot b/robot/testsuites/integration/container/container_delete.robot index e2058ff..c9f7f5a 100644 --- a/robot/testsuites/integration/container/container_delete.robot +++ b/robot/testsuites/integration/container/container_delete.robot @@ -1,5 +1,6 @@ *** Settings *** Variables ../../../variables/common.py +Variables ../../../variables/acl.py Library ../${RESOURCES}/neofs.py Library ../${RESOURCES}/payment_neogo.py @@ -21,7 +22,7 @@ Delete Containers ${WALLET_OTH} ${ADDR_OTH} ${OTHER_KEY} = Init Wallet with Address ${ASSETS_DIR} Payment Operations ${ADDR_OTH} ${OTHER_KEY} - ${CID} = Create container ${USER_KEY} 0x1FFFFFFF ${COMMON_PLACEMENT_RULE} + ${CID} = Create container ${USER_KEY} ${PUBLIC_ACL} ${COMMON_PLACEMENT_RULE} Container Existing ${USER_KEY} ${CID} Run Keyword And Expect Error * diff --git a/robot/testsuites/integration/object/object_attributes.robot b/robot/testsuites/integration/object/object_attributes.robot index 45631fe..06871e0 100644 --- a/robot/testsuites/integration/object/object_attributes.robot +++ b/robot/testsuites/integration/object/object_attributes.robot @@ -1,5 +1,6 @@ *** Settings *** Variables ../../../variables/common.py +Variables ../../../variables/acl.py Library Collections Library ../${RESOURCES}/neofs.py @@ -28,7 +29,7 @@ Duplicated Object Attributes ${WALLET} ${ADDR} ${USER_KEY} = Init Wallet with Address ${ASSETS_DIR} Payment Operations ${ADDR} ${USER_KEY} - ${PUBLIC_CID} = Create container ${USER_KEY} 0x1FFFFFFF ${POLICY} ${EMPTY} + ${PUBLIC_CID} = Create container ${USER_KEY} ${PUBLIC_ACL} ${POLICY} ${EMPTY} ${FILE_S} = Generate file of bytes ${SIMPLE_OBJ_SIZE} diff --git a/robot/variables/acl.py b/robot/variables/acl.py new file mode 100644 index 0000000..ebac128 --- /dev/null +++ b/robot/variables/acl.py @@ -0,0 +1,4 @@ +PUBLIC_ACL = "0x1FFFFFFF" +PRIVATE_ACL = "0x18888888" +READONLY_ACL = "0x1FFF88FF" +INACCESSIBLE_ACL = "0x40000000 "