From 695d9a688f34a735c4e7ed496ec81b73a76ec5ec Mon Sep 17 00:00:00 2001 From: Daniel Madej Date: Wed, 6 Nov 2019 17:29:29 +0100 Subject: [PATCH] Changes after review Signed-off-by: Daniel Madej --- test/functional/api/cas/ioclass_config.py | 62 ++++++++----------- .../tests/io_class/test_io_class_cli.py | 16 ++--- 2 files changed, 34 insertions(+), 44 deletions(-) diff --git a/test/functional/api/cas/ioclass_config.py b/test/functional/api/cas/ioclass_config.py index 2261403..1830304 100644 --- a/test/functional/api/cas/ioclass_config.py +++ b/test/functional/api/cas/ioclass_config.py @@ -4,10 +4,11 @@ # import enum +import functools +import random import re import string from datetime import timedelta -from random import randint, randrange from packaging import version @@ -24,6 +25,7 @@ MAX_CLASSIFICATION_DELAY = timedelta(seconds=6) IO_CLASS_CONFIG_HEADER = "IO class id,IO class name,Eviction priority,Allocation" +@functools.total_ordering class IoClass: def __init__(self, class_id: int, rule: str = '', priority: int = None, allocation: bool = True): @@ -37,8 +39,12 @@ class IoClass: f',{int(self.allocation)}') def __eq__(self, other): - return type(other) is IoClass and self.id == other.id and self.rule == other.rule \ - and self.priority == other.priority and self.allocation == other.allocation + return ((self.id, self.rule, self.priority, self.allocation) + == (other.id, other.rule, other.priority, other.allocation)) + + def __lt__(self, other): + return ((self.id, self.rule, self.priority, self.allocation) + < (other.id, other.rule, other.priority, other.allocation)) @staticmethod def from_string(ioclass_str: str): @@ -75,63 +81,45 @@ class IoClass: IoClass.list_to_csv(ioclass_list, add_default_rule)) @staticmethod - def default(): - return IoClass(0, 'unclassified', 255) + def default(priority: int = 255, allocation: bool = True): + return IoClass(0, 'unclassified', priority, allocation) @staticmethod def compare_ioclass_lists(list1: [], list2: []): - if len(list1) != len(list2): - return False - sorted_list1 = sorted(list1, key=lambda c: (c.id, c.priority, c.allocation)) - sorted_list2 = sorted(list2, key=lambda c: (c.id, c.priority, c.allocation)) - for i in range(len(list1)): - if sorted_list1[i] != sorted_list2[i]: - return False - return True + return sorted(list1) == sorted(list2) @staticmethod def generate_random_ioclass_list(count: int, max_priority: int = MAX_IO_CLASS_PRIORITY): - random_list = [IoClass.default().set_priority(randint(0, max_priority)) - .set_allocation(bool(randint(0, 1)))] + random_list = [IoClass.default(priority=random.randint(0, max_priority), + allocation=bool(random.randint(0, 1)))] for i in range(1, count): - random_list.append(IoClass(i).set_random_rule().set_priority(randint(0, max_priority)) - .set_allocation(bool(randint(0, 1)))) + random_list.append(IoClass(i, priority=random.randint(0, max_priority), + allocation=bool(random.randint(0, 1))) + .set_random_rule()) return random_list - def set_priority(self, priority: int): - self.priority = priority - return self - - def set_allocation(self, allocation: bool): - self.allocation = allocation - return self - - def set_rule(self, rule: str): - self.rule = rule - return self - def set_random_rule(self): rules = ["metadata", "direct", "file_size", "directory", "io_class", "extension", "lba", "pid", "process_name", "file_offset", "request_size"] if os_utils.get_kernel_version() >= version.Version("4.13"): rules.append("wlth") - rule = rules[randrange(len(rules))] - self.set_rule(IoClass.add_random_params(rule)) + rule = random.choice(rules) + self.rule = IoClass.add_random_params(rule) return self @staticmethod def add_random_params(rule: str): if rule == "directory": - rule += \ - f":/{random_string(randint(1, 40), string.ascii_letters + string.digits + '/')}" + allowed_chars = string.ascii_letters + string.digits + '/' + rule += f":/{random_string(random.randint(1, 40), allowed_chars)}" elif rule in ["file_size", "lba", "pid", "file_offset", "request_size", "wlth"]: - rule += f":{Operator(randrange(len(Operator))).name}:{randrange(1000000)}" + rule += f":{Operator(random.randrange(len(Operator))).name}:{random.randrange(1000000)}" elif rule == "io_class": - rule += f":{randrange(MAX_IO_CLASS_PRIORITY + 1)}" + rule += f":{random.randrange(MAX_IO_CLASS_PRIORITY + 1)}" elif rule in ["extension", "process_name"]: - rule += f":{random_string(randint(1, 10))}" - if randrange(2): + rule += f":{random_string(random.randint(1, 10))}" + if random.randrange(2): rule += "&done" return rule diff --git a/test/functional/tests/io_class/test_io_class_cli.py b/test/functional/tests/io_class/test_io_class_cli.py index 4339afc..8dffee0 100644 --- a/test/functional/tests/io_class/test_io_class_cli.py +++ b/test/functional/tests/io_class/test_io_class_cli.py @@ -24,15 +24,16 @@ ioclass_config_path = "/tmp/opencas_ioclass.conf" def test_ioclass_export_configuration(cache_mode): """ title: Export IO class configuration to a file - description: Test CAS ability to create a properly formatted file with current IO class - configuration + description: | + Test CAS ability to create a properly formatted file with current IO class configuration pass_criteria: - CAS default IO class configuration contains unclassified class only - CAS properly imports previously exported configuration """ - cache, core = prepare(cache_mode) - saved_config_path = "/tmp/opencas_saved.conf" - default_list = [IoClass.default()] + with TestRun.LOGGER.step(f"Test prepare"): + cache, core = prepare(cache_mode) + saved_config_path = "/tmp/opencas_saved.conf" + default_list = [IoClass.default()] with TestRun.LOGGER.step(f"Check IO class configuration (should contain only default class)"): csv = casadm.list_io_classes(cache.cache_id, OutputFormat.csv).stdout @@ -50,7 +51,7 @@ def test_ioclass_export_configuration(cache_mode): with TestRun.LOGGER.step("Display and export IO class configuration - displayed configuration " "should be the same as created"): TestRun.executor.run( - f"{casadm.list_io_classes_cmd(str(cache.cache_id), OutputFormat.csv.name)}" + f"{casadm.list_io_classes_cmd(str(cache.cache_id), OutputFormat.csv.name)}" f" > {saved_config_path}") csv = fs_utils.read_file(saved_config_path) if not IoClass.compare_ioclass_lists(IoClass.csv_to_list(csv), random_list): @@ -82,7 +83,8 @@ def test_ioclass_export_configuration(cache_mode): f"Current:\n{csv}\n" f"Expected:{IoClass.list_to_csv(random_list)}") - fs_utils.remove(saved_config_path) + with TestRun.LOGGER.step(f"Test cleanup"): + fs_utils.remove(saved_config_path) def prepare(cache_mode: CacheMode = None):