Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NBS] ability to override the NBS's binary file path; tweak encryption_at_rest #2853

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[NBS] ability to override the NBS's binary file path; tweak encryption_at_rest #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloud/blockstore/tests/encryption_at_rest/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def read_first_block():
assert vol0.EncryptionDesc.Mode == ENCRYPTION_DEFAULT_AES_XTS

assert vol0.EncryptionDesc.EncryptionKey.KekId == KEK_ID
assert len(vol0.EncryptionDesc.EncryptionKey.EncryptedDEK) == 512
assert len(vol0.EncryptionDesc.EncryptionKey.EncryptedDEK) >= 32

expected_data = os.urandom(4096)

Expand Down
18 changes: 15 additions & 3 deletions cloud/blockstore/tests/python/lib/daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import json
import os
import requests
import subprocess
import socket
import subprocess
import time

from .config import NbsConfigurator
Expand All @@ -22,6 +23,11 @@
ensure_path_exists


def __get_bin_path(name, default):
return yatest_common.binary_path(
yatest_common.get_param(name) or os.environ.get(name, default))


def _match(labels, query):
for name, value in query.items():
v = labels.get(name)
Expand Down Expand Up @@ -145,7 +151,10 @@ def wait_for_registration(self, delay_sec=1, max_retry_number=None):


def start_nbs(config: NbsConfigurator, name='nbs-server'):
exe_path = yatest_common.binary_path("cloud/blockstore/apps/server/nbsd")

exe_path = __get_bin_path(
"NBS_SERVER_PATH",
"cloud/blockstore/apps/server/nbsd")

cwd = get_unique_path_for_current_test(
output_path=yatest_common.output_path(),
Expand Down Expand Up @@ -176,7 +185,10 @@ def start_nbs(config: NbsConfigurator, name='nbs-server'):


def start_disk_agent(config: NbsConfigurator, name='disk-agent'):
exe_path = yatest_common.binary_path("cloud/blockstore/apps/disk_agent/diskagentd")

exe_path = __get_bin_path(
"DISK_AGENT_PATH",
"cloud/blockstore/apps/disk_agent/diskagentd")

cwd = get_unique_path_for_current_test(
output_path=yatest_common.output_path(),
Expand Down
Loading