Merge pull request #495 from Ostrokrzew/zero_meta

Swap formatting NVMe to metadata zeroing in functional tests CAS API
This commit is contained in:
Robert Baldyga 2020-08-17 10:47:57 +02:00 committed by GitHub
commit 0c64a44cf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions

View File

@ -140,11 +140,11 @@ def print_version(output_format: OutputFormat = None, shortcut: bool = False):
return output
def format_nvme(cache_dev: Device, force: bool = False, shortcut: bool = False):
def zero_metadata(cache_dev: Device, shortcut: bool = False):
output = TestRun.executor.run(
format_cmd(cache_dev=cache_dev.system_path, force=force, shortcut=shortcut))
zero_metadata_cmd(cache_dev=cache_dev.system_path, shortcut=shortcut))
if output.exit_code != 0:
raise CmdException("Format command failed.", output)
raise CmdException("Failed to wipe metadata.", output)
return output

View File

@ -104,10 +104,9 @@ def print_statistics_cmd(cache_id: str, core_id: str = None, per_io_class: bool
return casadm_bin + command
def format_cmd(cache_dev: str, force: bool = False, shortcut: bool = False):
command = (" -N -F -d " if shortcut else " --nvme --format --device ") + cache_dev
if force:
command += " -f" if shortcut else " --force"
def zero_metadata_cmd(cache_dev: str, shortcut: bool):
command = " --zero-metadata"
command += (" -d " if shortcut else " --device ") + cache_dev
return casadm_bin + command