diff options
Diffstat (limited to 'yardstick/benchmark/scenarios/availability')
4 files changed, 9 insertions, 8 deletions
diff --git a/yardstick/benchmark/scenarios/availability/attacker/baseattacker.py b/yardstick/benchmark/scenarios/availability/attacker/baseattacker.py index a20b26396..61698da43 100644 --- a/yardstick/benchmark/scenarios/availability/attacker/baseattacker.py +++ b/yardstick/benchmark/scenarios/availability/attacker/baseattacker.py @@ -8,11 +8,11 @@ ############################################################################## from __future__ import absolute_import import pkg_resources -import yaml import logging import os import yardstick.common.utils as utils +from yardstick.common.yaml_loader import yaml_load LOG = logging.getLogger(__name__) @@ -56,7 +56,7 @@ class BaseAttacker(object): def __init__(self, config, context): if not BaseAttacker.attacker_cfgs: with open(attacker_conf_path) as stream: - BaseAttacker.attacker_cfgs = yaml.safe_load(stream) + BaseAttacker.attacker_cfgs = yaml_load(stream) self._config = config self._context = context diff --git a/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py b/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py index 6165aba74..0027925d6 100644 --- a/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py +++ b/yardstick/benchmark/scenarios/availability/monitor/basemonitor.py @@ -13,7 +13,8 @@ import multiprocessing import time import os import yardstick.common.utils as utils -import yaml + +from yardstick.common.yaml_loader import yaml_load LOG = logging.getLogger(__name__) @@ -74,7 +75,7 @@ class BaseMonitor(multiprocessing.Process): def __init__(self, config, context, data): if not BaseMonitor.monitor_cfgs: with open(monitor_conf_path) as stream: - BaseMonitor.monitor_cfgs = yaml.safe_load(stream) + BaseMonitor.monitor_cfgs = yaml_load(stream) multiprocessing.Process.__init__(self) self._config = config self._context = context diff --git a/yardstick/benchmark/scenarios/availability/operation/baseoperation.py b/yardstick/benchmark/scenarios/availability/operation/baseoperation.py index 4c2ce82d9..d21b857b5 100644 --- a/yardstick/benchmark/scenarios/availability/operation/baseoperation.py +++ b/yardstick/benchmark/scenarios/availability/operation/baseoperation.py @@ -8,11 +8,11 @@ ############################################################################## from __future__ import absolute_import import pkg_resources -import yaml import logging import os import yardstick.common.utils as utils +from yardstick.common.yaml_loader import yaml_load LOG = logging.getLogger(__name__) @@ -54,7 +54,7 @@ class BaseOperation(object): def __init__(self, config, context): if not BaseOperation.operation_cfgs: with open(operation_conf_path) as stream: - BaseOperation.operation_cfgs = yaml.safe_load(stream) + BaseOperation.operation_cfgs = yaml_load(stream) self.key = '' self._config = config self._context = context diff --git a/yardstick/benchmark/scenarios/availability/result_checker/baseresultchecker.py b/yardstick/benchmark/scenarios/availability/result_checker/baseresultchecker.py index ce34d8be0..05b660105 100644 --- a/yardstick/benchmark/scenarios/availability/result_checker/baseresultchecker.py +++ b/yardstick/benchmark/scenarios/availability/result_checker/baseresultchecker.py @@ -8,11 +8,11 @@ ############################################################################## from __future__ import absolute_import import pkg_resources -import yaml import logging import os import yardstick.common.utils as utils +from yardstick.common.yaml_loader import yaml_load LOG = logging.getLogger(__name__) @@ -58,7 +58,7 @@ class BaseResultChecker(object): def __init__(self, config, context): if not BaseResultChecker.resultchecker_cfgs: with open(resultchecker_conf_path) as stream: - BaseResultChecker.resultchecker_cfgs = yaml.safe_load(stream) + BaseResultChecker.resultchecker_cfgs = yaml_load(stream) self.actualResult = object() self.expectedResult = object() self.success = False |