github/open-cas-linux
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #299 from Deixx/stats-flat

Browse Source 
Refactor statistics
This commit is contained in:
Katarzyna Łapińska
2020-01-24 08:57:54 +01:00
committed by GitHub
parent 96c1700b2a 9ad85e3338
commit ed6cf8a76b
8 changed files with 126 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/functional/api/cas/cache.py
View File

@@ -3,12 +3,9 @@
# SPDX-License-Identifier: BSD-3-Clause-Clear
#
from api.cas.cache_config import *
from api.cas.casadm_params import *
from api.cas.casadm_parser import *
from api.cas.cli import *
from api.cas.statistics import CacheStats, IoClassStats
from core.test_run import TestRun
from storage_devices.device import Device
from test_utils.os_utils import *
@@ -108,13 +105,10 @@ class Cache:
stat_filter, percentage_val)
return CacheStats(stats)
# TODO: Get rid of this method below by tuning 'stats' and 'io_class' tests
# to utilize new statistics API with method above.
def get_statistics_deprecated(self,
io_class_id: int = None,
stat_filter: List[StatsFilter] = None,
percentage_val: bool = False):
def get_statistics_flat(self,
io_class_id: int = None,
stat_filter: List[StatsFilter] = None,
percentage_val: bool = False):
return get_statistics(self.cache_id, None, io_class_id,
stat_filter, percentage_val)

14
test/functional/api/cas/core.py
View File

@@ -4,9 +4,6 @@
#
from datetime import timedelta
from api.cas.cache import Device
from api.cas.casadm_parser import *
from api.cas.cli import *
from api.cas.statistics import CoreStats, IoClassStats
@@ -67,13 +64,10 @@ class Core(Device):
stat_filter, percentage_val)
return CoreStats(stats)
# TODO: Get rid of this method below by tuning 'stats' and 'io_class' tests
# to utilize new statistics API with method above.
def get_statistics_deprecated(self,
io_class_id: int = None,
stat_filter: List[StatsFilter] = None,
percentage_val: bool = False):
def get_statistics_flat(self,
io_class_id: int = None,
stat_filter: List[StatsFilter] = None,
percentage_val: bool = False):
return get_statistics(self.cache_id, self.core_id, io_class_id,
stat_filter, percentage_val)