anurindm/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Pull requests Activity

Add parameter S3_GATE_PUB_KEY.

Browse source 
This enables us to test s3 gateway in real environment, not just in devenv.
This commit is contained in:
Vladimir Domnich 2022-07-07 10:16:01 +04:00
parent 7e9e5e88ec
commit 0daa262fdb
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
robot/resources/lib/python_keywords/s3_gate_bucket.py
View file

@ -12,7 +12,7 @@ from robot.api import logger
from robot.api.deco import keyword from robot.api.deco import keyword
from cli_helpers import _run_with_passwd, log_command_execution from cli_helpers import _run_with_passwd, log_command_execution
from common import GATE_PUB_KEY, NEOFS_ENDPOINT, S3_GATE from common import S3_GATE_PUB_KEY, NEOFS_ENDPOINT, S3_GATE
########################################################## ##########################################################
# Disabling warnings on self-signed certificate which the # Disabling warnings on self-signed certificate which the
@ -38,7 +38,7 @@ def init_s3_credentials(wallet, s3_bearer_rules_file: str = None):
s3_bearer_rules = s3_bearer_rules_file or 'robot/resources/files/s3_bearer_rules.json' s3_bearer_rules = s3_bearer_rules_file or 'robot/resources/files/s3_bearer_rules.json'
cmd = ( cmd = (
f'{NEOFS_EXEC} --debug --with-log --timeout {CREDENTIALS_CREATE_TIMEOUT} ' f'{NEOFS_EXEC} --debug --with-log --timeout {CREDENTIALS_CREATE_TIMEOUT} '
f'issue-secret --wallet {wallet} --gate-public-key={GATE_PUB_KEY} ' f'issue-secret --wallet {wallet} --gate-public-key={S3_GATE_PUB_KEY} '
f'--peer {NEOFS_ENDPOINT} --container-friendly-name {bucket} ' f'--peer {NEOFS_ENDPOINT} --container-friendly-name {bucket} '
f'--bearer-rules {s3_bearer_rules}' f'--bearer-rules {s3_bearer_rules}'
) )

2
robot/variables/common.py
View file

@ -31,7 +31,7 @@ NEOFS_CONTRACT = os.getenv("NEOFS_IR_CONTRACTS_NEOFS")
ASSETS_DIR = os.getenv("ASSETS_DIR", "TemporaryDir/") ASSETS_DIR = os.getenv("ASSETS_DIR", "TemporaryDir/")
MORPH_MAGIC = os.getenv("MORPH_MAGIC") MORPH_MAGIC = os.getenv("MORPH_MAGIC")
GATE_PUB_KEY = '0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf' S3_GATE_PUB_KEY = os.getenv("S3_GATE_PUB_KEY", '0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf')
DEVENV_SERVICES_PATH = f"{os.getenv('DEVENV_PATH')}/services" DEVENV_SERVICES_PATH = f"{os.getenv('DEVENV_PATH')}/services"