diff --git a/doc/source/miscellaneous/concepts.rst b/doc/source/miscellaneous/concepts.rst index 2afbb514e0..dc4fcf6049 100644 --- a/doc/source/miscellaneous/concepts.rst +++ b/doc/source/miscellaneous/concepts.rst @@ -79,14 +79,14 @@ Note that inside each scenario configuration, the benchmark scenario is actually Developer's view ^^^^^^^^^^^^^^^^ -From the developer's perspective, a benchmark scenario is a method marked by a **@scenario** decorator and placed in a class that inherits from the base `Scenario `_ class and located in some subpackage of `rally.benchmark.scenarios `_. There may be arbitrary many benchmark scenarios in a scenario class; each of them should be referenced to (in the task configuration file) as *ScenarioClassName.method_name*. +From the developer's perspective, a benchmark scenario is a method marked by a **@scenario** decorator and placed in a class that inherits from the base `Scenario `_ class and located in some subpackage of `rally.task.scenarios `_. There may be arbitrary many benchmark scenarios in a scenario class; each of them should be referenced to (in the task configuration file) as *ScenarioClassName.method_name*. In a toy example below, we define a scenario class *MyScenario* with one benchmark scenario *MyScenario.scenario*. This benchmark scenario tests the performance of a sequence of 2 actions, implemented via private methods in the same class. Both methods are marked with the **@atomic_action_timer** decorator. This allows Rally to handle those actions in a special way and, after benchmarks complete, show runtime statistics not only for the whole scenarios, but for separate actions as well. :: - from rally.benchmark.scenarios import base - from rally.benchmark import utils + from rally.task.scenarios import base + from rally.task import utils class MyScenario(base.Scenario): @@ -171,7 +171,7 @@ It is possible to extend Rally with new Scenario Runner types, if needed. Basica .. parsed-literal:: - from rally.benchmark import runner + from rally.task import runner from rally import consts class MyScenarioRunner(runner.ScenarioRunner): @@ -267,7 +267,7 @@ From the developer's view, contexts management is implemented via **Context clas .. parsed-literal:: - from rally.benchmark import context + from rally.task import context from rally import consts @context.context(name="your_context", *# Corresponds to the context field name in task configuration files* @@ -320,4 +320,4 @@ Consequently, the algorithm of initiating the contexts can be roughly seen as fo The *hidden* attribute defines whether the context should be a *hidden* one. **Hidden contexts** cannot be configured by end-users through the task configuration file as shown above, but should be specified by a benchmark scenario developer through a special *@base.scenario(context={...})* decorator. Hidden contexts are typically needed to satisfy some specific benchmark scenario-specific needs, which don't require the end-user's attention. For example, the hidden **"cleanup" context** (:mod:`rally.plugins.openstack.context.cleanup.context`) is used to make generic cleanup after running benchmark. So user can't change it configuration via task and break his cloud. -If you want to dive deeper, also see the context manager (:mod:`rally.benchmark.context`) class that actually implements the algorithm described above. +If you want to dive deeper, also see the context manager (:mod:`rally.task.context`) class that actually implements the algorithm described above. diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst index d7468e6a38..0030378fbd 100644 --- a/doc/source/plugins.rst +++ b/doc/source/plugins.rst @@ -41,7 +41,7 @@ Inherit a class for your plugin from the base *Scenario* class and implement a s .. code-block:: none - from rally.benchmark.scenarios import base + from rally.task.scenarios import base class ScenarioPlugin(base.Scenario): @@ -111,7 +111,7 @@ Inherit a class for your plugin from the base *Context* class. Then, implement t .. code-block:: none - from rally.benchmark import context + from rally.task import context from rally.common import log as logging from rally import consts from rally import osclients @@ -125,7 +125,7 @@ Inherit a class for your plugin from the base *Context* class. Then, implement t delete it after task completion. To create your own context plugin, inherit it from - rally.benchmark.context.Context + rally.task.context.Context """ CONFIG_SCHEMA = { @@ -235,7 +235,7 @@ Inherit a class for your plugin from the base *SLA* class and implement its API .. code-block:: none - from rally.benchmark import sla + from rally.task import sla from rally.common.i18n import _ @sla.configure(name="max_duration_range") @@ -322,7 +322,7 @@ Inherit a class for your plugin from the base *ScenarioRunner* class and impleme import random - from rally.benchmark import runner + from rally.task import runner from rally import consts diff --git a/rally-jobs/plugins/fake_plugin.py b/rally-jobs/plugins/fake_plugin.py index d8cd08f8bf..2de2e67e7a 100644 --- a/rally-jobs/plugins/fake_plugin.py +++ b/rally-jobs/plugins/fake_plugin.py @@ -17,7 +17,7 @@ import random import time -from rally.benchmark.scenarios import base +from rally.task.scenarios import base # This is used to test relative import from test_relative_import import zzz diff --git a/rally/api.py b/rally/api.py index f936c3909b..dc3d068ff2 100644 --- a/rally/api.py +++ b/rally/api.py @@ -21,13 +21,13 @@ import jinja2 import jinja2.meta import jsonschema -from rally.benchmark import engine from rally.common.i18n import _ from rally.common import log as logging from rally import consts from rally.deploy import engine as deploy_engine from rally import exceptions from rally import objects +from rally.task import engine from rally.verification.tempest import tempest LOG = logging.getLogger(__name__) diff --git a/rally/cli/commands/info.py b/rally/cli/commands/info.py index 7cc9cd3aaa..f0145be45e 100644 --- a/rally/cli/commands/info.py +++ b/rally/cli/commands/info.py @@ -49,14 +49,14 @@ Samples: from __future__ import print_function -from rally.benchmark.scenarios import base as scenario_base -from rally.benchmark import sla from rally.cli import cliutils from rally.common.plugin import discover from rally.common import utils from rally.deploy import engine from rally.deploy.serverprovider import provider from rally import exceptions +from rally.task.scenarios import base as scenario_base +from rally.task import sla class InfoCommands(object): diff --git a/rally/cli/commands/task.py b/rally/cli/commands/task.py index 5739f90600..7509747052 100644 --- a/rally/cli/commands/task.py +++ b/rally/cli/commands/task.py @@ -26,8 +26,6 @@ from oslo_utils import uuidutils import yaml from rally import api -from rally.benchmark.processing import plot -from rally.benchmark.processing import utils from rally.cli import cliutils from rally.cli import envutils from rally.common import fileutils @@ -39,6 +37,8 @@ from rally import consts from rally import db from rally import exceptions from rally import objects +from rally.task.processing import plot +from rally.task.processing import utils class FailedToLoadTask(exceptions.RallyException): diff --git a/rally/deploy/serverprovider/providers/openstack.py b/rally/deploy/serverprovider/providers/openstack.py index d9f6170e08..4c5420fdde 100644 --- a/rally/deploy/serverprovider/providers/openstack.py +++ b/rally/deploy/serverprovider/providers/openstack.py @@ -18,13 +18,13 @@ import time import novaclient.exceptions -from rally.benchmark import utils as benchmark_utils from rally.common.i18n import _ from rally.common import log as logging from rally.deploy.serverprovider import provider from rally import exceptions from rally import objects from rally import osclients +from rally.task import utils LOG = logging.getLogger(__name__) @@ -196,14 +196,14 @@ class OpenStackProvider(provider.ProviderFactory): self.resources.create({"id": server.id}, type=SERVER_TYPE) kwargs = { - "is_ready": benchmark_utils.resource_is("ACTIVE"), - "update_resource": benchmark_utils.get_from_manager(), + "is_ready": utils.resource_is("ACTIVE"), + "update_resource": utils.get_from_manager(), "timeout": 120, "check_interval": 5 } for os_server in os_servers: - benchmark_utils.wait_for(os_server, **kwargs) + utils.wait_for(os_server, **kwargs) servers = [provider.Server(host=s.addresses.values()[0][0]["addr"], user="root", key=public_key_path) diff --git a/rally/plugins/common/context/dummy.py b/rally/plugins/common/context/dummy.py index b78e26d53b..cffd839a7f 100644 --- a/rally/plugins/common/context/dummy.py +++ b/rally/plugins/common/context/dummy.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context from rally import consts from rally import exceptions +from rally.task import context @context.context(name="dummy_context", order=750) diff --git a/rally/plugins/common/runners/constant.py b/rally/plugins/common/runners/constant.py index b103574512..d2207c318d 100644 --- a/rally/plugins/common/runners/constant.py +++ b/rally/plugins/common/runners/constant.py @@ -18,11 +18,11 @@ import multiprocessing import threading import time -from rally.benchmark import runner -from rally.benchmark import utils as butils from rally.common import log as logging from rally.common import utils from rally import consts +from rally.task import runner +from rally.task import utils as butils LOG = logging.getLogger(__name__) diff --git a/rally/plugins/common/runners/rps.py b/rally/plugins/common/runners/rps.py index a850911bb2..2dcaee1412 100644 --- a/rally/plugins/common/runners/rps.py +++ b/rally/plugins/common/runners/rps.py @@ -18,11 +18,10 @@ import multiprocessing import threading import time -from rally.benchmark import runner from rally.common import log as logging from rally.common import utils from rally import consts - +from rally.task import runner LOG = logging.getLogger(__name__) diff --git a/rally/plugins/common/runners/serial.py b/rally/plugins/common/runners/serial.py index 65b7e628ec..3334beadc5 100644 --- a/rally/plugins/common/runners/serial.py +++ b/rally/plugins/common/runners/serial.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import runner from rally import consts +from rally.task import runner @runner.configure(name="serial") diff --git a/rally/plugins/common/scenarios/dummy/dummy.py b/rally/plugins/common/scenarios/dummy/dummy.py index 0e6e24e18a..2f8a0d81f1 100644 --- a/rally/plugins/common/scenarios/dummy/dummy.py +++ b/rally/plugins/common/scenarios/dummy/dummy.py @@ -13,10 +13,10 @@ import random import time -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally.common.i18n import _ from rally import exceptions +from rally.task.scenarios import base +from rally.task import validation class DummyScenarioException(exceptions.RallyException): diff --git a/rally/plugins/common/scenarios/requests/http_requests.py b/rally/plugins/common/scenarios/requests/http_requests.py index dc0a0d78e0..50591eeb94 100644 --- a/rally/plugins/common/scenarios/requests/http_requests.py +++ b/rally/plugins/common/scenarios/requests/http_requests.py @@ -12,8 +12,8 @@ import random -from rally.benchmark.scenarios import base from rally.plugins.common.scenarios.requests import utils +from rally.task.scenarios import base class HttpRequests(utils.RequestScenario): diff --git a/rally/plugins/common/scenarios/requests/utils.py b/rally/plugins/common/scenarios/requests/utils.py index 2778adad53..560d0c3afa 100644 --- a/rally/plugins/common/scenarios/requests/utils.py +++ b/rally/plugins/common/scenarios/requests/utils.py @@ -12,8 +12,8 @@ import requests -from rally.benchmark.scenarios import base from rally.common.i18n import _ +from rally.task.scenarios import base class RequestScenario(base.Scenario): diff --git a/rally/plugins/common/sla/failure_rate.py b/rally/plugins/common/sla/failure_rate.py index 2cf4e0bf00..b6be764a80 100644 --- a/rally/plugins/common/sla/failure_rate.py +++ b/rally/plugins/common/sla/failure_rate.py @@ -19,9 +19,9 @@ SLA (Service-level agreement) is set of details for determining compliance with contracted values such as maximum error rate or minimum response time. """ -from rally.benchmark import sla from rally.common.i18n import _ from rally import consts +from rally.task import sla @sla.configure(name="failure_rate") diff --git a/rally/plugins/common/sla/iteraion_time.py b/rally/plugins/common/sla/iteraion_time.py index f8fc1e812c..f09a5c8822 100644 --- a/rally/plugins/common/sla/iteraion_time.py +++ b/rally/plugins/common/sla/iteraion_time.py @@ -19,8 +19,8 @@ SLA (Service-level agreement) is set of details for determining compliance with contracted values such as maximum error rate or minimum response time. """ -from rally.benchmark import sla from rally.common.i18n import _ +from rally.task import sla @sla.configure(name="max_seconds_per_iteration") diff --git a/rally/plugins/common/sla/max_average_duration.py b/rally/plugins/common/sla/max_average_duration.py index 8a50d99b9a..8d22bd1685 100644 --- a/rally/plugins/common/sla/max_average_duration.py +++ b/rally/plugins/common/sla/max_average_duration.py @@ -19,9 +19,9 @@ SLA (Service-level agreement) is set of details for determining compliance with contracted values such as maximum error rate or minimum response time. """ -from rally.benchmark import sla from rally.common.i18n import _ from rally.common import streaming_algorithms +from rally.task import sla @sla.configure(name="max_avg_duration") diff --git a/rally/plugins/common/sla/outliers.py b/rally/plugins/common/sla/outliers.py index 543e2c8fd3..92e8cb8003 100644 --- a/rally/plugins/common/sla/outliers.py +++ b/rally/plugins/common/sla/outliers.py @@ -19,10 +19,10 @@ SLA (Service-level agreement) is set of details for determining compliance with contracted values such as maximum error rate or minimum response time. """ -from rally.benchmark import sla from rally.common.i18n import _ from rally.common import streaming_algorithms from rally import consts +from rally.task import sla @sla.configure(name="outliers") diff --git a/rally/plugins/openstack/context/ceilometer.py b/rally/plugins/openstack/context/ceilometer.py index 97ba839005..431938d941 100644 --- a/rally/plugins/openstack/context/ceilometer.py +++ b/rally/plugins/openstack/context/ceilometer.py @@ -12,13 +12,13 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils from rally import consts from rally import osclients from rally.plugins.openstack.scenarios.ceilometer import utils as ceilo_utils +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/cleanup/base.py b/rally/plugins/openstack/context/cleanup/base.py index 5fdd02412b..cf3fd1967e 100644 --- a/rally/plugins/openstack/context/cleanup/base.py +++ b/rally/plugins/openstack/context/cleanup/base.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import utils +from rally.task import utils def resource(service, resource, order=0, admin_required=False, diff --git a/rally/plugins/openstack/context/cleanup/context.py b/rally/plugins/openstack/context/cleanup/context.py index e9e569f71d..0537f48514 100644 --- a/rally/plugins/openstack/context/cleanup/context.py +++ b/rally/plugins/openstack/context/cleanup/context.py @@ -15,13 +15,13 @@ import sys -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils from rally import consts from rally import exceptions from rally.plugins.openstack.context.cleanup import manager +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/existing_users.py b/rally/plugins/openstack/context/existing_users.py index fea9103da1..28b8071209 100644 --- a/rally/plugins/openstack/context/existing_users.py +++ b/rally/plugins/openstack/context/existing_users.py @@ -13,12 +13,12 @@ # under the License. -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils from rally import objects from rally import osclients +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/flavors.py b/rally/plugins/openstack/context/flavors.py index 6012c888dc..53b653a54e 100644 --- a/rally/plugins/openstack/context/flavors.py +++ b/rally/plugins/openstack/context/flavors.py @@ -15,12 +15,12 @@ from novaclient import exceptions as nova_exceptions -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils from rally import consts from rally import osclients +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/images.py b/rally/plugins/openstack/context/images.py index 90a18f9582..c322bf8926 100644 --- a/rally/plugins/openstack/context/images.py +++ b/rally/plugins/openstack/context/images.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -20,6 +19,7 @@ from rally import consts from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager from rally.plugins.openstack.scenarios.glance import utils as glance_utils +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/keypair.py b/rally/plugins/openstack/context/keypair.py index e7cfc6ac6e..72053fbfee 100644 --- a/rally/plugins/openstack/context/keypair.py +++ b/rally/plugins/openstack/context/keypair.py @@ -15,12 +15,12 @@ import novaclient.exceptions -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/murano_packages.py b/rally/plugins/openstack/context/murano_packages.py index 66e089451a..19fe112c21 100644 --- a/rally/plugins/openstack/context/murano_packages.py +++ b/rally/plugins/openstack/context/murano_packages.py @@ -15,13 +15,14 @@ import zipfile -from rally.benchmark import context -from rally.common.i18n import _, _LE +from rally.common.i18n import _ +from rally.common.i18n import _LE from rally.common import log as logging from rally.common import utils from rally import consts from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/network.py b/rally/plugins/openstack/context/network.py index 53e7396898..d3261f0bd2 100644 --- a/rally/plugins/openstack/context/network.py +++ b/rally/plugins/openstack/context/network.py @@ -15,13 +15,13 @@ import six -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils from rally import consts from rally import osclients from rally.plugins.openstack.wrappers import network as network_wrapper +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/quotas/quotas.py b/rally/plugins/openstack/context/quotas/quotas.py index 6591eaccc6..89d86b6179 100644 --- a/rally/plugins/openstack/context/quotas/quotas.py +++ b/rally/plugins/openstack/context/quotas/quotas.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils @@ -24,6 +23,7 @@ from rally.plugins.openstack.context.quotas import designate_quotas from rally.plugins.openstack.context.quotas import manila_quotas from rally.plugins.openstack.context.quotas import neutron_quotas from rally.plugins.openstack.context.quotas import nova_quotas +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/roles.py b/rally/plugins/openstack/context/roles.py index b74069dbed..d4ea7715e4 100644 --- a/rally/plugins/openstack/context/roles.py +++ b/rally/plugins/openstack/context/roles.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -21,6 +20,7 @@ from rally import consts from rally import exceptions from rally import osclients from rally.plugins.openstack.wrappers import keystone +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/sahara/sahara_cluster.py b/rally/plugins/openstack/context/sahara/sahara_cluster.py index c929522947..271b599e1a 100644 --- a/rally/plugins/openstack/context/sahara/sahara_cluster.py +++ b/rally/plugins/openstack/context/sahara/sahara_cluster.py @@ -15,8 +15,6 @@ from oslo_config import cfg -from rally.benchmark import context -from rally.benchmark import utils as bench_utils from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -25,6 +23,8 @@ from rally import exceptions from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager from rally.plugins.openstack.scenarios.sahara import utils +from rally.task import context +from rally.task import utils as bench_utils CONF = cfg.CONF diff --git a/rally/plugins/openstack/context/sahara/sahara_edp.py b/rally/plugins/openstack/context/sahara/sahara_edp.py index ace885f01e..fe817e0471 100644 --- a/rally/plugins/openstack/context/sahara/sahara_edp.py +++ b/rally/plugins/openstack/context/sahara/sahara_edp.py @@ -15,7 +15,6 @@ import requests -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -23,6 +22,7 @@ from rally import consts from rally import exceptions from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/sahara/sahara_image.py b/rally/plugins/openstack/context/sahara/sahara_image.py index 93726e1317..0b8c70ea44 100644 --- a/rally/plugins/openstack/context/sahara/sahara_image.py +++ b/rally/plugins/openstack/context/sahara/sahara_image.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -21,6 +20,7 @@ from rally import exceptions from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager from rally.plugins.openstack.scenarios.glance import utils as glance_utils +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/secgroup.py b/rally/plugins/openstack/context/secgroup.py index 8c3069b6b0..3fe4aaf0e8 100644 --- a/rally/plugins/openstack/context/secgroup.py +++ b/rally/plugins/openstack/context/secgroup.py @@ -15,12 +15,12 @@ import six -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils from rally import osclients from rally.plugins.openstack.wrappers import network +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/servers.py b/rally/plugins/openstack/context/servers.py index a820677d5f..0c47d49fab 100644 --- a/rally/plugins/openstack/context/servers.py +++ b/rally/plugins/openstack/context/servers.py @@ -12,8 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context -from rally.benchmark import types as types from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -21,6 +19,8 @@ from rally import consts from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager from rally.plugins.openstack.scenarios.nova import utils as nova_utils +from rally.task import context +from rally.task import types LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/stacks.py b/rally/plugins/openstack/context/stacks.py index 2c62035fd7..cb3182e855 100644 --- a/rally/plugins/openstack/context/stacks.py +++ b/rally/plugins/openstack/context/stacks.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -21,6 +20,7 @@ from rally import consts from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager from rally.plugins.openstack.scenarios.heat import utils as heat_utils +from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/tempest.py b/rally/plugins/openstack/context/tempest.py index 15fed2b342..415ea58142 100644 --- a/rally/plugins/openstack/context/tempest.py +++ b/rally/plugins/openstack/context/tempest.py @@ -17,12 +17,12 @@ import os import shutil import tempfile -from rally.benchmark import context from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils from rally import consts from rally import exceptions +from rally.task import context from rally.verification.tempest import config from rally.verification.tempest import tempest diff --git a/rally/plugins/openstack/context/users.py b/rally/plugins/openstack/context/users.py index 0e0ac124f1..4fad0c2f42 100644 --- a/rally/plugins/openstack/context/users.py +++ b/rally/plugins/openstack/context/users.py @@ -18,8 +18,6 @@ import uuid from oslo_config import cfg -from rally.benchmark import context -from rally.benchmark import utils from rally.common import broker from rally.common.i18n import _ from rally.common import log as logging @@ -30,6 +28,8 @@ from rally import objects from rally import osclients from rally.plugins.openstack.wrappers import keystone from rally.plugins.openstack.wrappers import network +from rally.task import context +from rally.task import utils LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/vm/custom_image.py b/rally/plugins/openstack/context/vm/custom_image.py index 29b2a84f25..b16cb3fd5e 100644 --- a/rally/plugins/openstack/context/vm/custom_image.py +++ b/rally/plugins/openstack/context/vm/custom_image.py @@ -17,8 +17,6 @@ import abc import six -from rally.benchmark import context -from rally.benchmark import types from rally.common import broker from rally.common.i18n import _ from rally.common import log as logging @@ -27,6 +25,8 @@ from rally import consts from rally import osclients from rally.plugins.openstack.scenarios.nova import utils as nova_utils from rally.plugins.openstack.scenarios.vm import vmtasks +from rally.task import context +from rally.task import types LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/volumes.py b/rally/plugins/openstack/context/volumes.py index 53f4ceed5b..244af63617 100644 --- a/rally/plugins/openstack/context/volumes.py +++ b/rally/plugins/openstack/context/volumes.py @@ -12,8 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context -from rally.benchmark.scenarios import base as scenario_base from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -21,6 +19,8 @@ from rally import consts from rally import osclients from rally.plugins.openstack.context.cleanup import manager as resource_manager from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils +from rally.task import context +from rally.task.scenarios import base as scenario_base LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/authenticate/authenticate.py b/rally/plugins/openstack/scenarios/authenticate/authenticate.py index 2f7090e72f..0f45eac303 100644 --- a/rally/plugins/openstack/scenarios/authenticate/authenticate.py +++ b/rally/plugins/openstack/scenarios/authenticate/authenticate.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation +from rally.task.scenarios import base +from rally.task import validation class Authenticate(base.Scenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/alarms.py b/rally/plugins/openstack/scenarios/ceilometer/alarms.py index 326795b3e1..ea0c40789a 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/alarms.py +++ b/rally/plugins/openstack/scenarios/ceilometer/alarms.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally.task.scenarios import base +from rally.task import validation class CeilometerAlarms(ceiloutils.CeilometerScenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/events.py b/rally/plugins/openstack/scenarios/ceilometer/events.py index 721479484f..341f4533f5 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/events.py +++ b/rally/plugins/openstack/scenarios/ceilometer/events.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.ceilometer import utils as cutils from rally.plugins.openstack.scenarios.keystone import utils as kutils +from rally.task.scenarios import base +from rally.task import validation class CeilometerEvents(cutils.CeilometerScenario, kutils.KeystoneScenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/meters.py b/rally/plugins/openstack/scenarios/ceilometer/meters.py index ea3e4ee8a4..236fb38bbc 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/meters.py +++ b/rally/plugins/openstack/scenarios/ceilometer/meters.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally.task.scenarios import base +from rally.task import validation class CeilometerMeters(ceiloutils.CeilometerScenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/queries.py b/rally/plugins/openstack/scenarios/ceilometer/queries.py index 8a789e2418..8a67d87e8b 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/queries.py +++ b/rally/plugins/openstack/scenarios/ceilometer/queries.py @@ -14,10 +14,10 @@ import json -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally.task.scenarios import base +from rally.task import validation class CeilometerQueries(ceiloutils.CeilometerScenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/resources.py b/rally/plugins/openstack/scenarios/ceilometer/resources.py index 366ea383fe..8046e14999 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/resources.py +++ b/rally/plugins/openstack/scenarios/ceilometer/resources.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally import exceptions from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally.task.scenarios import base +from rally.task import validation class CeilometerResource(ceiloutils.CeilometerScenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/samples.py b/rally/plugins/openstack/scenarios/ceilometer/samples.py index 6aa5a53006..b7c8fafdd9 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/samples.py +++ b/rally/plugins/openstack/scenarios/ceilometer/samples.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally.task.scenarios import base +from rally.task import validation class CeilometerSamples(ceiloutils.CeilometerScenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/stats.py b/rally/plugins/openstack/scenarios/ceilometer/stats.py index 4c2bb3b092..5273509d07 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/stats.py +++ b/rally/plugins/openstack/scenarios/ceilometer/stats.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.ceilometer import utils +from rally.task.scenarios import base +from rally.task import validation class CeilometerStats(utils.CeilometerScenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/traits.py b/rally/plugins/openstack/scenarios/ceilometer/traits.py index 2b235e6123..bb5fa7e0e3 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/traits.py +++ b/rally/plugins/openstack/scenarios/ceilometer/traits.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.ceilometer import utils as cutils from rally.plugins.openstack.scenarios.keystone import utils as kutils +from rally.task.scenarios import base +from rally.task import validation class CeilometerTraits(cutils.CeilometerScenario, kutils.KeystoneScenario): diff --git a/rally/plugins/openstack/scenarios/ceilometer/utils.py b/rally/plugins/openstack/scenarios/ceilometer/utils.py index a3c91d11ae..31596d1a42 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/utils.py +++ b/rally/plugins/openstack/scenarios/ceilometer/utils.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils +from rally.task.scenarios import base +from rally.task import utils as bench_utils class CeilometerScenario(base.Scenario): diff --git a/rally/plugins/openstack/scenarios/cinder/utils.py b/rally/plugins/openstack/scenarios/cinder/utils.py index 87824486fc..19185e82f6 100644 --- a/rally/plugins/openstack/scenarios/cinder/utils.py +++ b/rally/plugins/openstack/scenarios/cinder/utils.py @@ -18,9 +18,9 @@ import time from oslo_config import cfg -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils from rally import exceptions +from rally.task.scenarios import base +from rally.task import utils as bench_utils CINDER_BENCHMARK_OPTS = [ cfg.FloatOpt("cinder_volume_create_prepoll_delay", diff --git a/rally/plugins/openstack/scenarios/cinder/volumes.py b/rally/plugins/openstack/scenarios/cinder/volumes.py index b7102c17fd..45bd17da2d 100644 --- a/rally/plugins/openstack/scenarios/cinder/volumes.py +++ b/rally/plugins/openstack/scenarios/cinder/volumes.py @@ -15,15 +15,15 @@ import random -from rally.benchmark.scenarios import base -from rally.benchmark import types as types -from rally.benchmark import validation from rally.common import log as logging from rally import consts from rally import exceptions from rally.plugins.openstack.scenarios.cinder import utils from rally.plugins.openstack.scenarios.glance import utils as glance_utils from rally.plugins.openstack.scenarios.nova import utils as nova_utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/designate/basic.py b/rally/plugins/openstack/scenarios/designate/basic.py index 65bad3480c..1f3e5906b1 100644 --- a/rally/plugins/openstack/scenarios/designate/basic.py +++ b/rally/plugins/openstack/scenarios/designate/basic.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.designate import utils +from rally.task.scenarios import base +from rally.task import validation class DesignateBasic(utils.DesignateScenario): diff --git a/rally/plugins/openstack/scenarios/designate/utils.py b/rally/plugins/openstack/scenarios/designate/utils.py index 9481449e99..1e38e3be6b 100644 --- a/rally/plugins/openstack/scenarios/designate/utils.py +++ b/rally/plugins/openstack/scenarios/designate/utils.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base +from rally.task.scenarios import base class DesignateScenario(base.Scenario): diff --git a/rally/plugins/openstack/scenarios/ec2/servers.py b/rally/plugins/openstack/scenarios/ec2/servers.py index 5d1d5ffddc..288ba77581 100644 --- a/rally/plugins/openstack/scenarios/ec2/servers.py +++ b/rally/plugins/openstack/scenarios/ec2/servers.py @@ -12,12 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import types -from rally.benchmark import validation from rally.common import log as logging from rally import consts from rally.plugins.openstack.scenarios.ec2 import utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/ec2/utils.py b/rally/plugins/openstack/scenarios/ec2/utils.py index 4c39dcb1ca..392bf15cf0 100644 --- a/rally/plugins/openstack/scenarios/ec2/utils.py +++ b/rally/plugins/openstack/scenarios/ec2/utils.py @@ -16,8 +16,8 @@ import time from oslo_config import cfg -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils +from rally.task.scenarios import base +from rally.task import utils EC2_BENCHMARK_OPTS = [ @@ -72,7 +72,7 @@ class EC2Scenario(base.Scenario): server = reservation.instances[0] time.sleep(CONF.benchmark.ec2_server_boot_prepoll_delay) - server = bench_utils.wait_for( + server = utils.wait_for( server, is_ready=ec2_resource_is("RUNNING"), update_resource=self._update_resource, diff --git a/rally/plugins/openstack/scenarios/fuel/environments.py b/rally/plugins/openstack/scenarios/fuel/environments.py index 553f62b40e..3a4d0aa399 100644 --- a/rally/plugins/openstack/scenarios/fuel/environments.py +++ b/rally/plugins/openstack/scenarios/fuel/environments.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally.plugins.openstack.scenarios.fuel import utils +from rally.task.scenarios import base +from rally.task import validation class FuelEnvironments(utils.FuelScenario): diff --git a/rally/plugins/openstack/scenarios/fuel/utils.py b/rally/plugins/openstack/scenarios/fuel/utils.py index 88e353f74a..db9b489e93 100644 --- a/rally/plugins/openstack/scenarios/fuel/utils.py +++ b/rally/plugins/openstack/scenarios/fuel/utils.py @@ -17,8 +17,8 @@ import os import six -from rally.benchmark.scenarios import base from rally import osclients +from rally.task.scenarios import base class FuelClient(object): diff --git a/rally/plugins/openstack/scenarios/glance/images.py b/rally/plugins/openstack/scenarios/glance/images.py index ae01461941..56d84e5b1c 100644 --- a/rally/plugins/openstack/scenarios/glance/images.py +++ b/rally/plugins/openstack/scenarios/glance/images.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import types as types -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.glance import utils from rally.plugins.openstack.scenarios.nova import utils as nova_utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation class GlanceImages(utils.GlanceScenario, nova_utils.NovaScenario): diff --git a/rally/plugins/openstack/scenarios/glance/utils.py b/rally/plugins/openstack/scenarios/glance/utils.py index 1775419c7c..b0f48998f9 100644 --- a/rally/plugins/openstack/scenarios/glance/utils.py +++ b/rally/plugins/openstack/scenarios/glance/utils.py @@ -18,8 +18,8 @@ import time from oslo_config import cfg -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils +from rally.task.scenarios import base +from rally.task import utils GLANCE_BENCHMARK_OPTS = [ @@ -95,10 +95,10 @@ class GlanceScenario(base.Scenario): time.sleep(CONF.benchmark.glance_image_create_prepoll_delay) - image = bench_utils.wait_for( + image = utils.wait_for( image, - is_ready=bench_utils.resource_is("active"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("active"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.glance_image_create_timeout, check_interval=CONF.benchmark. glance_image_create_poll_interval) @@ -118,8 +118,8 @@ class GlanceScenario(base.Scenario): :param image: Image object """ image.delete() - bench_utils.wait_for_delete( + utils.wait_for_delete( image, - update_resource=bench_utils.get_from_manager(), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.glance_image_delete_timeout, check_interval=CONF.benchmark.glance_image_delete_poll_interval) diff --git a/rally/plugins/openstack/scenarios/heat/stacks.py b/rally/plugins/openstack/scenarios/heat/stacks.py index 86be957d94..4534066944 100644 --- a/rally/plugins/openstack/scenarios/heat/stacks.py +++ b/rally/plugins/openstack/scenarios/heat/stacks.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import types -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.heat import utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation class HeatStacks(utils.HeatScenario): diff --git a/rally/plugins/openstack/scenarios/heat/utils.py b/rally/plugins/openstack/scenarios/heat/utils.py index 29fafc4e47..e025401105 100644 --- a/rally/plugins/openstack/scenarios/heat/utils.py +++ b/rally/plugins/openstack/scenarios/heat/utils.py @@ -17,8 +17,8 @@ import time from oslo_config import cfg -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils +from rally.task.scenarios import base +from rally.task import utils HEAT_BENCHMARK_OPTS = [ @@ -133,10 +133,10 @@ class HeatScenario(base.Scenario): time.sleep(CONF.benchmark.heat_stack_create_prepoll_delay) - stack = bench_utils.wait_for( + stack = utils.wait_for( stack, - is_ready=bench_utils.resource_is("CREATE_COMPLETE"), - update_resource=bench_utils.get_from_manager(["CREATE_FAILED"]), + is_ready=utils.resource_is("CREATE_COMPLETE"), + update_resource=utils.get_from_manager(["CREATE_FAILED"]), timeout=CONF.benchmark.heat_stack_create_timeout, check_interval=CONF.benchmark.heat_stack_create_poll_interval) @@ -167,10 +167,10 @@ class HeatScenario(base.Scenario): self.clients("heat").stacks.update(stack.id, **kw) time.sleep(CONF.benchmark.heat_stack_update_prepoll_delay) - stack = bench_utils.wait_for( + stack = utils.wait_for( stack, - is_ready=bench_utils.resource_is("UPDATE_COMPLETE"), - update_resource=bench_utils.get_from_manager(["UPDATE_FAILED"]), + is_ready=utils.resource_is("UPDATE_COMPLETE"), + update_resource=utils.get_from_manager(["UPDATE_FAILED"]), timeout=CONF.benchmark.heat_stack_update_timeout, check_interval=CONF.benchmark.heat_stack_update_poll_interval) return stack @@ -184,10 +184,10 @@ class HeatScenario(base.Scenario): :param stack: stack that needs to be checked """ self.clients("heat").actions.check(stack.id) - bench_utils.wait_for( + utils.wait_for( stack, - is_ready=bench_utils.resource_is("CHECK_COMPLETE"), - update_resource=bench_utils.get_from_manager(["CHECK_FAILED"]), + is_ready=utils.resource_is("CHECK_COMPLETE"), + update_resource=utils.get_from_manager(["CHECK_FAILED"]), timeout=CONF.benchmark.heat_stack_check_timeout, check_interval=CONF.benchmark.heat_stack_check_poll_interval) @@ -200,9 +200,9 @@ class HeatScenario(base.Scenario): :param stack: stack object """ stack.delete() - bench_utils.wait_for_delete( + utils.wait_for_delete( stack, - update_resource=bench_utils.get_from_manager(), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.heat_stack_delete_timeout, check_interval=CONF.benchmark.heat_stack_delete_poll_interval) @@ -214,10 +214,10 @@ class HeatScenario(base.Scenario): """ self.clients("heat").actions.suspend(stack.id) - bench_utils.wait_for( + utils.wait_for( stack, - is_ready=bench_utils.resource_is("SUSPEND_COMPLETE"), - update_resource=bench_utils.get_from_manager( + is_ready=utils.resource_is("SUSPEND_COMPLETE"), + update_resource=utils.get_from_manager( ["SUSPEND_FAILED"]), timeout=CONF.benchmark.heat_stack_suspend_timeout, check_interval=CONF.benchmark.heat_stack_suspend_poll_interval) @@ -230,10 +230,10 @@ class HeatScenario(base.Scenario): """ self.clients("heat").actions.resume(stack.id) - bench_utils.wait_for( + utils.wait_for( stack, - is_ready=bench_utils.resource_is("RESUME_COMPLETE"), - update_resource=bench_utils.get_from_manager( + is_ready=utils.resource_is("RESUME_COMPLETE"), + update_resource=utils.get_from_manager( ["RESUME_FAILED"]), timeout=CONF.benchmark.heat_stack_resume_timeout, check_interval=CONF.benchmark.heat_stack_resume_poll_interval) @@ -247,10 +247,10 @@ class HeatScenario(base.Scenario): """ snapshot = self.clients("heat").stacks.snapshot( stack.id) - bench_utils.wait_for( + utils.wait_for( stack, - is_ready=bench_utils.resource_is("SNAPSHOT_COMPLETE"), - update_resource=bench_utils.get_from_manager( + is_ready=utils.resource_is("SNAPSHOT_COMPLETE"), + update_resource=utils.get_from_manager( ["SNAPSHOT_FAILED"]), timeout=CONF.benchmark.heat_stack_snapshot_timeout, check_interval=CONF.benchmark.heat_stack_snapshot_poll_interval) @@ -264,10 +264,10 @@ class HeatScenario(base.Scenario): :param snapshot_id: id of given snapshot """ self.clients("heat").stacks.restore(stack.id, snapshot_id) - bench_utils.wait_for( + utils.wait_for( stack, - is_ready=bench_utils.resource_is("RESTORE_COMPLETE"), - update_resource=bench_utils.get_from_manager( + is_ready=utils.resource_is("RESTORE_COMPLETE"), + update_resource=utils.get_from_manager( ["RESTORE_FAILED"]), timeout=CONF.benchmark.heat_stack_restore_timeout, check_interval=CONF.benchmark.heat_stack_restore_poll_interval diff --git a/rally/plugins/openstack/scenarios/keystone/basic.py b/rally/plugins/openstack/scenarios/keystone/basic.py index 3256e8a842..2b276fad59 100644 --- a/rally/plugins/openstack/scenarios/keystone/basic.py +++ b/rally/plugins/openstack/scenarios/keystone/basic.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally.plugins.openstack.scenarios.keystone import utils as kutils +from rally.task.scenarios import base +from rally.task import validation class KeystoneBasic(kutils.KeystoneScenario): diff --git a/rally/plugins/openstack/scenarios/keystone/utils.py b/rally/plugins/openstack/scenarios/keystone/utils.py index 2953c5196e..ab650687a2 100644 --- a/rally/plugins/openstack/scenarios/keystone/utils.py +++ b/rally/plugins/openstack/scenarios/keystone/utils.py @@ -15,7 +15,7 @@ import uuid -from rally.benchmark.scenarios import base +from rally.task.scenarios import base def is_temporary(resource): diff --git a/rally/plugins/openstack/scenarios/manila/shares.py b/rally/plugins/openstack/scenarios/manila/shares.py index dad80dc66c..9c96475bff 100644 --- a/rally/plugins/openstack/scenarios/manila/shares.py +++ b/rally/plugins/openstack/scenarios/manila/shares.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.manila import utils +from rally.task.scenarios import base +from rally.task import validation class ManilaShares(utils.ManilaScenario): diff --git a/rally/plugins/openstack/scenarios/manila/utils.py b/rally/plugins/openstack/scenarios/manila/utils.py index c6df34587b..4808c0c7f4 100644 --- a/rally/plugins/openstack/scenarios/manila/utils.py +++ b/rally/plugins/openstack/scenarios/manila/utils.py @@ -17,8 +17,8 @@ import time from oslo_config import cfg -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils +from rally.task.scenarios import base +from rally.task import utils MANILA_BENCHMARK_OPTS = [ @@ -77,10 +77,10 @@ class ManilaScenario(base.Scenario): share = self.clients("manila").shares.create( share_proto, size, **kwargs) time.sleep(CONF.benchmark.manila_share_create_prepoll_delay) - share = bench_utils.wait_for( + share = utils.wait_for( share, - is_ready=bench_utils.resource_is("available"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("available"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.manila_share_create_timeout, check_interval=CONF.benchmark.manila_share_create_poll_interval, ) @@ -94,9 +94,9 @@ class ManilaScenario(base.Scenario): """ share.delete() error_statuses = ("error_deleting", ) - bench_utils.wait_for_delete( + utils.wait_for_delete( share, - update_resource=bench_utils.get_from_manager(error_statuses), + update_resource=utils.get_from_manager(error_statuses), timeout=CONF.benchmark.manila_share_delete_timeout, check_interval=CONF.benchmark.manila_share_delete_poll_interval) @@ -141,9 +141,9 @@ class ManilaScenario(base.Scenario): :param share_network: instance of :class:`ShareNetwork`. """ share_network.delete() - bench_utils.wait_for_delete( + utils.wait_for_delete( share_network, - update_resource=bench_utils.get_from_manager(), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.manila_share_delete_timeout, check_interval=CONF.benchmark.manila_share_delete_poll_interval) diff --git a/rally/plugins/openstack/scenarios/mistral/utils.py b/rally/plugins/openstack/scenarios/mistral/utils.py index ae50db769f..7f3c13aed7 100644 --- a/rally/plugins/openstack/scenarios/mistral/utils.py +++ b/rally/plugins/openstack/scenarios/mistral/utils.py @@ -15,7 +15,7 @@ import yaml -from rally.benchmark.scenarios import base +from rally.task.scenarios import base class MistralScenario(base.Scenario): diff --git a/rally/plugins/openstack/scenarios/mistral/workbooks.py b/rally/plugins/openstack/scenarios/mistral/workbooks.py index a56c4f3027..5c8129ada7 100644 --- a/rally/plugins/openstack/scenarios/mistral/workbooks.py +++ b/rally/plugins/openstack/scenarios/mistral/workbooks.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import types as types -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.mistral import utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation class MistralWorkbooks(utils.MistralScenario): diff --git a/rally/plugins/openstack/scenarios/murano/environments.py b/rally/plugins/openstack/scenarios/murano/environments.py index 7c20310809..11cb13b730 100644 --- a/rally/plugins/openstack/scenarios/murano/environments.py +++ b/rally/plugins/openstack/scenarios/murano/environments.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally.common import log as logging from rally import consts from rally.plugins.openstack.scenarios.murano import utils from rally.plugins.openstack.scenarios.vm import utils as vm_utils +from rally.task.scenarios import base +from rally.task import validation LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/murano/utils.py b/rally/plugins/openstack/scenarios/murano/utils.py index 9e5f3e2e42..2e2e9beb8b 100644 --- a/rally/plugins/openstack/scenarios/murano/utils.py +++ b/rally/plugins/openstack/scenarios/murano/utils.py @@ -17,8 +17,8 @@ import uuid from oslo_config import cfg -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils +from rally.task.scenarios import base +from rally.task import utils CONF = cfg.CONF @@ -65,9 +65,9 @@ class MuranoScenario(base.Scenario): :param environment: Environment instance """ self.clients("murano").environments.delete(environment.id) - bench_utils.wait_for_delete( + utils.wait_for_delete( environment, - update_resource=bench_utils.get_from_manager(), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.delete_environment_timeout, check_interval=CONF.benchmark.delete_environment_check_interval ) @@ -118,9 +118,9 @@ class MuranoScenario(base.Scenario): """ self.clients("murano").sessions.deploy(environment.id, session.id) - bench_utils.wait_for( - environment, is_ready=bench_utils.resource_is("READY"), - update_resource=bench_utils.get_from_manager(["DEPLOY FAILURE"]), + utils.wait_for( + environment, is_ready=utils.resource_is("READY"), + update_resource=utils.get_from_manager(["DEPLOY FAILURE"]), timeout=CONF.benchmark.deploy_environment_timeout, check_interval=CONF.benchmark.deploy_environment_check_interval ) diff --git a/rally/plugins/openstack/scenarios/neutron/loadbalancer_v1.py b/rally/plugins/openstack/scenarios/neutron/loadbalancer_v1.py index 13981f314c..cf62dfbdd4 100644 --- a/rally/plugins/openstack/scenarios/neutron/loadbalancer_v1.py +++ b/rally/plugins/openstack/scenarios/neutron/loadbalancer_v1.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.neutron import utils +from rally.task.scenarios import base +from rally.task import validation class NeutronLoadbalancerV1(utils.NeutronScenario): diff --git a/rally/plugins/openstack/scenarios/neutron/network.py b/rally/plugins/openstack/scenarios/neutron/network.py index 71fd080346..f7b738133b 100644 --- a/rally/plugins/openstack/scenarios/neutron/network.py +++ b/rally/plugins/openstack/scenarios/neutron/network.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.neutron import utils +from rally.task.scenarios import base +from rally.task import validation class NeutronNetworks(utils.NeutronScenario): diff --git a/rally/plugins/openstack/scenarios/neutron/utils.py b/rally/plugins/openstack/scenarios/neutron/utils.py index bb69e871c6..bd8a36d5c7 100644 --- a/rally/plugins/openstack/scenarios/neutron/utils.py +++ b/rally/plugins/openstack/scenarios/neutron/utils.py @@ -15,9 +15,9 @@ from oslo_utils import uuidutils as uid -from rally.benchmark.scenarios import base from rally.common import log as logging from rally.plugins.openstack.wrappers import network as network_wrapper +from rally.task.scenarios import base LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/nova/floating_ips_bulk.py b/rally/plugins/openstack/scenarios/nova/floating_ips_bulk.py index c38711f8f9..b3ab99a9af 100644 --- a/rally/plugins/openstack/scenarios/nova/floating_ips_bulk.py +++ b/rally/plugins/openstack/scenarios/nova/floating_ips_bulk.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.nova import utils +from rally.task.scenarios import base +from rally.task import validation class NovaFloatingIpsBulk(utils.NovaScenario): diff --git a/rally/plugins/openstack/scenarios/nova/hypervisors.py b/rally/plugins/openstack/scenarios/nova/hypervisors.py index e5f6027660..1e801ae664 100644 --- a/rally/plugins/openstack/scenarios/nova/hypervisors.py +++ b/rally/plugins/openstack/scenarios/nova/hypervisors.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally.common import log as logging from rally import consts from rally.plugins.openstack.scenarios.nova import utils +from rally.task.scenarios import base +from rally.task import validation LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/nova/keypairs.py b/rally/plugins/openstack/scenarios/nova/keypairs.py index 47b277122c..178792d30a 100644 --- a/rally/plugins/openstack/scenarios/nova/keypairs.py +++ b/rally/plugins/openstack/scenarios/nova/keypairs.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import types -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.nova import utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation class NovaKeypair(utils.NovaScenario): diff --git a/rally/plugins/openstack/scenarios/nova/security_group.py b/rally/plugins/openstack/scenarios/nova/security_group.py index 409f727549..8fee1866fe 100644 --- a/rally/plugins/openstack/scenarios/nova/security_group.py +++ b/rally/plugins/openstack/scenarios/nova/security_group.py @@ -13,13 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import types -from rally.benchmark import validation from rally.common.i18n import _ from rally import consts from rally import exceptions from rally.plugins.openstack.scenarios.nova import utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation class NovaSecurityGroupException(exceptions.RallyException): diff --git a/rally/plugins/openstack/scenarios/nova/servers.py b/rally/plugins/openstack/scenarios/nova/servers.py index 100f14a8cf..e6c0a2d5ce 100644 --- a/rally/plugins/openstack/scenarios/nova/servers.py +++ b/rally/plugins/openstack/scenarios/nova/servers.py @@ -15,16 +15,16 @@ import jsonschema -from rally.benchmark.scenarios import base -from rally.benchmark import types as types -from rally.benchmark import utils as bench_utils -from rally.benchmark import validation from rally.common import log as logging from rally import consts from rally import exceptions as rally_exceptions from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils from rally.plugins.openstack.scenarios.nova import utils from rally.plugins.openstack.wrappers import network as network_wrapper +from rally.task.scenarios import base +from rally.task import types +from rally.task import utils as task_utils +from rally.task import validation LOG = logging.getLogger(__name__) @@ -301,7 +301,7 @@ class NovaServers(utils.NovaScenario, def _bind_actions(self): actions = ["hard_reboot", "soft_reboot", "stop_start", "rescue_unrescue"] - action_builder = bench_utils.ActionBuilder(actions) + action_builder = task_utils.ActionBuilder(actions) action_builder.bind_action("hard_reboot", self._reboot_server) action_builder.bind_action("soft_reboot", self._soft_reboot_server) action_builder.bind_action("stop_start", diff --git a/rally/plugins/openstack/scenarios/nova/utils.py b/rally/plugins/openstack/scenarios/nova/utils.py index a986fccaab..266491a8e1 100644 --- a/rally/plugins/openstack/scenarios/nova/utils.py +++ b/rally/plugins/openstack/scenarios/nova/utils.py @@ -19,10 +19,10 @@ import time from oslo_config import cfg import six -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils from rally import exceptions from rally.plugins.openstack.wrappers import network as network_wrapper +from rally.task.scenarios import base +from rally.task import utils NOVA_BENCHMARK_OPTS = [] option_names_and_defaults = [ @@ -136,10 +136,10 @@ class NovaScenario(base.Scenario): server_name, image_id, flavor_id, **kwargs) time.sleep(CONF.benchmark.nova_server_boot_prepoll_delay) - server = bench_utils.wait_for( + server = utils.wait_for( server, - is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_boot_timeout, check_interval=CONF.benchmark.nova_server_boot_poll_interval ) @@ -148,9 +148,9 @@ class NovaScenario(base.Scenario): def _do_server_reboot(self, server, reboottype): server.reboot(reboot_type=reboottype) time.sleep(CONF.benchmark.nova_server_reboot_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_reboot_timeout, check_interval=CONF.benchmark.nova_server_reboot_poll_interval ) @@ -187,10 +187,10 @@ class NovaScenario(base.Scenario): """ server.rebuild(image, **kwargs) time.sleep(CONF.benchmark.nova_server_rebuild_prepoll_delay) - bench_utils.wait_for( + utils.wait_for( server, - is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_rebuild_timeout, check_interval=CONF.benchmark.nova_server_rebuild_poll_interval ) @@ -205,9 +205,9 @@ class NovaScenario(base.Scenario): :param server: The server to start and wait to become ACTIVE. """ server.start() - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_start_timeout, check_interval=CONF.benchmark.nova_server_start_poll_interval ) @@ -222,9 +222,9 @@ class NovaScenario(base.Scenario): :param server: The server to stop. """ server.stop() - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("SHUTOFF"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("SHUTOFF"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_stop_timeout, check_interval=CONF.benchmark.nova_server_stop_poll_interval ) @@ -240,9 +240,9 @@ class NovaScenario(base.Scenario): """ server.rescue() time.sleep(CONF.benchmark.nova_server_rescue_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("RESCUE"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("RESCUE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_rescue_timeout, check_interval=CONF.benchmark.nova_server_rescue_poll_interval ) @@ -257,9 +257,9 @@ class NovaScenario(base.Scenario): """ server.unrescue() time.sleep(CONF.benchmark.nova_server_unrescue_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_unrescue_timeout, check_interval=CONF.benchmark.nova_server_unrescue_poll_interval ) @@ -275,9 +275,9 @@ class NovaScenario(base.Scenario): """ server.suspend() time.sleep(CONF.benchmark.nova_server_suspend_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("SUSPENDED"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("SUSPENDED"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_suspend_timeout, check_interval=CONF.benchmark.nova_server_suspend_poll_interval ) @@ -293,9 +293,9 @@ class NovaScenario(base.Scenario): """ server.resume() time.sleep(CONF.benchmark.nova_server_resume_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_resume_timeout, check_interval=CONF.benchmark.nova_server_resume_poll_interval ) @@ -311,9 +311,9 @@ class NovaScenario(base.Scenario): """ server.pause() time.sleep(CONF.benchmark.nova_server_pause_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("PAUSED"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("PAUSED"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_pause_timeout, check_interval=CONF.benchmark.nova_server_pause_poll_interval ) @@ -329,9 +329,9 @@ class NovaScenario(base.Scenario): """ server.unpause() time.sleep(CONF.benchmark.nova_server_unpause_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_unpause_timeout, check_interval=CONF.benchmark.nova_server_unpause_poll_interval ) @@ -347,9 +347,9 @@ class NovaScenario(base.Scenario): """ server.shelve() time.sleep(CONF.benchmark.nova_server_shelve_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("SHELVED_OFFLOADED"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("SHELVED_OFFLOADED"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_shelve_timeout, check_interval=CONF.benchmark.nova_server_shelve_poll_interval ) @@ -364,9 +364,9 @@ class NovaScenario(base.Scenario): """ server.unshelve() time.sleep(CONF.benchmark.nova_server_unshelve_prepoll_delay) - bench_utils.wait_for( - server, is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + utils.wait_for( + server, is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_unshelve_timeout, check_interval=CONF.benchmark.nova_server_unshelve_poll_interval ) @@ -386,9 +386,9 @@ class NovaScenario(base.Scenario): else: server.delete() - bench_utils.wait_for_delete( + utils.wait_for_delete( server, - update_resource=bench_utils.get_from_manager(), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_delete_timeout, check_interval=CONF.benchmark.nova_server_delete_poll_interval ) @@ -408,9 +408,9 @@ class NovaScenario(base.Scenario): server.delete() for server in servers: - bench_utils.wait_for_delete( + utils.wait_for_delete( server, - update_resource=bench_utils.get_from_manager(), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_delete_timeout, check_interval=CONF. benchmark.nova_server_delete_poll_interval @@ -426,9 +426,9 @@ class NovaScenario(base.Scenario): """ image.delete() check_interval = CONF.benchmark.nova_server_image_delete_poll_interval - bench_utils.wait_for_delete( + utils.wait_for_delete( image, - update_resource=bench_utils.get_from_manager(), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_image_delete_timeout, check_interval=check_interval ) @@ -448,10 +448,10 @@ class NovaScenario(base.Scenario): server.name) image = self.clients("nova").images.get(image_uuid) check_interval = CONF.benchmark.nova_server_image_create_poll_interval - image = bench_utils.wait_for( + image = utils.wait_for( image, - is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_image_create_timeout, check_interval=check_interval ) @@ -511,10 +511,10 @@ class NovaScenario(base.Scenario): servers = filter(lambda server: server.name.startswith(name_prefix), self.clients("nova").servers.list()) time.sleep(CONF.benchmark.nova_server_boot_prepoll_delay) - servers = [bench_utils.wait_for( + servers = [utils.wait_for( server, - is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils. + is_ready=utils.resource_is("ACTIVE"), + update_resource=utils. get_from_manager(), timeout=CONF.benchmark.nova_server_boot_timeout, check_interval=CONF.benchmark.nova_server_boot_poll_interval @@ -531,10 +531,10 @@ class NovaScenario(base.Scenario): associated with (optional) """ server.add_floating_ip(address, fixed_address=fixed_address) - bench_utils.wait_for( + utils.wait_for( server, is_ready=self.check_ip_address(address), - update_resource=bench_utils.get_from_manager() + update_resource=utils.get_from_manager() ) # Update server data server.addresses = server.manager.get(server.id).addresses @@ -547,10 +547,10 @@ class NovaScenario(base.Scenario): :param address: The ip address or FloatingIP to remove """ server.remove_floating_ip(address) - bench_utils.wait_for( + utils.wait_for( server, is_ready=self.check_ip_address(address, must_exist=False), - update_resource=bench_utils.get_from_manager() + update_resource=utils.get_from_manager() ) # Update server data server.addresses = server.manager.get(server.id).addresses @@ -575,10 +575,10 @@ class NovaScenario(base.Scenario): @base.atomic_action_timer("nova.resize") def _resize(self, server, flavor): server.resize(flavor) - bench_utils.wait_for( + utils.wait_for( server, - is_ready=bench_utils.resource_is("VERIFY_RESIZE"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("VERIFY_RESIZE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_resize_timeout, check_interval=CONF.benchmark.nova_server_resize_poll_interval ) @@ -586,10 +586,10 @@ class NovaScenario(base.Scenario): @base.atomic_action_timer("nova.resize_confirm") def _resize_confirm(self, server, status="ACTIVE"): server.confirm_resize() - bench_utils.wait_for( + utils.wait_for( server, - is_ready=bench_utils.resource_is(status), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is(status), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_resize_confirm_timeout, check_interval=( CONF.benchmark.nova_server_resize_confirm_poll_interval) @@ -598,10 +598,10 @@ class NovaScenario(base.Scenario): @base.atomic_action_timer("nova.resize_revert") def _resize_revert(self, server, status="ACTIVE"): server.revert_resize() - bench_utils.wait_for( + utils.wait_for( server, - is_ready=bench_utils.resource_is(status), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is(status), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_resize_revert_timeout, check_interval=( CONF.benchmark.nova_server_resize_revert_poll_interval) @@ -614,10 +614,10 @@ class NovaScenario(base.Scenario): self.clients("nova").volumes.create_server_volume(server_id, volume_id, device) - bench_utils.wait_for( + utils.wait_for( volume, - is_ready=bench_utils.resource_is("in-use"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("in-use"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_resize_revert_timeout, check_interval=( CONF.benchmark.nova_server_resize_revert_poll_interval) @@ -629,10 +629,10 @@ class NovaScenario(base.Scenario): volume_id = volume.id self.clients("nova").volumes.delete_server_volume(server_id, volume_id) - bench_utils.wait_for( + utils.wait_for( volume, - is_ready=bench_utils.resource_is("available"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("available"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_detach_volume_timeout, check_interval=CONF.benchmark.nova_detach_volume_poll_interval ) @@ -655,10 +655,10 @@ class NovaScenario(base.Scenario): server_admin.live_migrate(target_host, block_migration=block_migration, disk_over_commit=disk_over_commit) - bench_utils.wait_for( + utils.wait_for( server, - is_ready=bench_utils.resource_is("ACTIVE"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("ACTIVE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_live_migrate_timeout, check_interval=( CONF.benchmark.nova_server_live_migrate_poll_interval) @@ -705,10 +705,10 @@ class NovaScenario(base.Scenario): server_admin = self.admin_clients("nova").servers.get(server.id) host_pre_migrate = getattr(server_admin, "OS-EXT-SRV-ATTR:host") server_admin.migrate() - bench_utils.wait_for( + utils.wait_for( server, - is_ready=bench_utils.resource_is("VERIFY_RESIZE"), - update_resource=bench_utils.get_from_manager(), + is_ready=utils.resource_is("VERIFY_RESIZE"), + update_resource=utils.get_from_manager(), timeout=CONF.benchmark.nova_server_migrate_timeout, check_interval=( CONF.benchmark.nova_server_migrate_poll_interval) diff --git a/rally/plugins/openstack/scenarios/quotas/quotas.py b/rally/plugins/openstack/scenarios/quotas/quotas.py index c33aed9174..7d45249f03 100644 --- a/rally/plugins/openstack/scenarios/quotas/quotas.py +++ b/rally/plugins/openstack/scenarios/quotas/quotas.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.quotas import utils +from rally.task.scenarios import base +from rally.task import validation class Quotas(utils.QuotasScenario): diff --git a/rally/plugins/openstack/scenarios/quotas/utils.py b/rally/plugins/openstack/scenarios/quotas/utils.py index 08dd7bfa40..82b09df8be 100644 --- a/rally/plugins/openstack/scenarios/quotas/utils.py +++ b/rally/plugins/openstack/scenarios/quotas/utils.py @@ -15,7 +15,7 @@ import random -from rally.benchmark.scenarios import base +from rally.task.scenarios import base class QuotasScenario(base.Scenario): diff --git a/rally/plugins/openstack/scenarios/sahara/clusters.py b/rally/plugins/openstack/scenarios/sahara/clusters.py index c4ac9bccf6..aed5161249 100644 --- a/rally/plugins/openstack/scenarios/sahara/clusters.py +++ b/rally/plugins/openstack/scenarios/sahara/clusters.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import types -from rally.benchmark import validation from rally.common import log as logging from rally import consts from rally.plugins.openstack.scenarios.sahara import utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/sahara/jobs.py b/rally/plugins/openstack/scenarios/sahara/jobs.py index fec986a49f..1840688555 100644 --- a/rally/plugins/openstack/scenarios/sahara/jobs.py +++ b/rally/plugins/openstack/scenarios/sahara/jobs.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally.common import log as logging from rally import consts from rally.plugins.openstack.scenarios.sahara import utils +from rally.task.scenarios import base +from rally.task import validation LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/sahara/node_group_templates.py b/rally/plugins/openstack/scenarios/sahara/node_group_templates.py index ffed4a9b3a..725e7b0a8c 100644 --- a/rally/plugins/openstack/scenarios/sahara/node_group_templates.py +++ b/rally/plugins/openstack/scenarios/sahara/node_group_templates.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import types -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.sahara import utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation class SaharaNodeGroupTemplates(utils.SaharaScenario): diff --git a/rally/plugins/openstack/scenarios/sahara/utils.py b/rally/plugins/openstack/scenarios/sahara/utils.py index 0384f8bffb..cae38e1e16 100644 --- a/rally/plugins/openstack/scenarios/sahara/utils.py +++ b/rally/plugins/openstack/scenarios/sahara/utils.py @@ -19,13 +19,13 @@ from oslo_config import cfg from oslo_utils import uuidutils from saharaclient.api import base as sahara_base -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils from rally.common.i18n import _ from rally.common import log as logging from rally import consts from rally import exceptions from rally.plugins.openstack.scenarios.sahara import consts as sahara_consts +from rally.task.scenarios import base +from rally.task import utils LOG = logging.getLogger(__name__) CONF = cfg.CONF @@ -108,7 +108,7 @@ class SaharaScenario(base.Scenario): self.clients("sahara").node_group_templates.delete(node_group.id) def _wait_active(self, cluster_object): - bench_utils.wait_for( + utils.wait_for( resource=cluster_object, ready_statuses=["active"], failure_statuses=["error"], update_resource=self._update_cluster, timeout=CONF.benchmark.cluster_create_timeout, @@ -392,7 +392,7 @@ class SaharaScenario(base.Scenario): LOG.debug("Deleting cluster `%s`" % cluster.name) self.clients("sahara").clusters.delete(cluster.id) - bench_utils.wait_for( + utils.wait_for( resource=cluster, timeout=CONF.benchmark.cluster_delete_timeout, check_interval=CONF.benchmark.cluster_check_interval, @@ -458,7 +458,7 @@ class SaharaScenario(base.Scenario): output_id=output_id, configs=configs) - bench_utils.wait_for( + utils.wait_for( resource=job_execution.id, is_ready=self._job_execution_is_finished, timeout=CONF.benchmark.job_execution_timeout, diff --git a/rally/plugins/openstack/scenarios/swift/objects.py b/rally/plugins/openstack/scenarios/swift/objects.py index c3975c7a9e..2adc651859 100644 --- a/rally/plugins/openstack/scenarios/swift/objects.py +++ b/rally/plugins/openstack/scenarios/swift/objects.py @@ -15,10 +15,10 @@ import tempfile -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.swift import utils +from rally.task.scenarios import base +from rally.task import validation class SwiftObjects(utils.SwiftScenario): diff --git a/rally/plugins/openstack/scenarios/swift/utils.py b/rally/plugins/openstack/scenarios/swift/utils.py index 36222965d6..562f84b8b2 100644 --- a/rally/plugins/openstack/scenarios/swift/utils.py +++ b/rally/plugins/openstack/scenarios/swift/utils.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base +from rally.task.scenarios import base class SwiftScenario(base.Scenario): diff --git a/rally/plugins/openstack/scenarios/tempest/tempest.py b/rally/plugins/openstack/scenarios/tempest/tempest.py index b8af098f72..f89e42a272 100644 --- a/rally/plugins/openstack/scenarios/tempest/tempest.py +++ b/rally/plugins/openstack/scenarios/tempest/tempest.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally.plugins.openstack.scenarios.tempest import utils +from rally.task.scenarios import base +from rally.task import validation class TempestScenario(base.Scenario): diff --git a/rally/plugins/openstack/scenarios/vm/utils.py b/rally/plugins/openstack/scenarios/vm/utils.py index c1b75a4b11..3a9a665497 100644 --- a/rally/plugins/openstack/scenarios/vm/utils.py +++ b/rally/plugins/openstack/scenarios/vm/utils.py @@ -19,13 +19,13 @@ import sys import netaddr import six -from rally.benchmark.scenarios import base -from rally.benchmark import utils as bench_utils -from rally.benchmark import validation from rally.common.i18n import _ from rally.common import log as logging from rally.common import sshutils from rally.plugins.openstack.wrappers import network as network_wrapper +from rally.task.scenarios import base +from rally.task import utils +from rally.task import validation LOG = logging.getLogger(__name__) @@ -129,10 +129,10 @@ class VMScenario(base.Scenario): @base.atomic_action_timer("vm.wait_for_ping") def _wait_for_ping(self, server_ip): server_ip = netaddr.IPAddress(server_ip) - bench_utils.wait_for( + utils.wait_for( server_ip, - is_ready=bench_utils.resource_is(ICMP_UP_STATUS, - self._ping_ip_address), + is_ready=utils.resource_is(ICMP_UP_STATUS, + self._ping_ip_address), timeout=120 ) diff --git a/rally/plugins/openstack/scenarios/vm/vmtasks.py b/rally/plugins/openstack/scenarios/vm/vmtasks.py index e3b2b07c02..d8f03115d1 100644 --- a/rally/plugins/openstack/scenarios/vm/vmtasks.py +++ b/rally/plugins/openstack/scenarios/vm/vmtasks.py @@ -15,14 +15,14 @@ import json -from rally.benchmark.scenarios import base -from rally.benchmark import types as types -from rally.benchmark import validation from rally import consts from rally import exceptions from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils from rally.plugins.openstack.scenarios.nova import utils as nova_utils from rally.plugins.openstack.scenarios.vm import utils as vm_utils +from rally.task.scenarios import base +from rally.task import types +from rally.task import validation class VMTasks(nova_utils.NovaScenario, vm_utils.VMScenario, diff --git a/rally/plugins/openstack/scenarios/zaqar/basic.py b/rally/plugins/openstack/scenarios/zaqar/basic.py index 9c5a7a38cd..5590984e3b 100644 --- a/rally/plugins/openstack/scenarios/zaqar/basic.py +++ b/rally/plugins/openstack/scenarios/zaqar/basic.py @@ -14,9 +14,9 @@ import random -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally.plugins.openstack.scenarios.zaqar import utils as zutils +from rally.task.scenarios import base +from rally.task import validation class ZaqarBasic(zutils.ZaqarScenario): diff --git a/rally/plugins/openstack/scenarios/zaqar/utils.py b/rally/plugins/openstack/scenarios/zaqar/utils.py index b0bf507b6c..9769d3e753 100644 --- a/rally/plugins/openstack/scenarios/zaqar/utils.py +++ b/rally/plugins/openstack/scenarios/zaqar/utils.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base +from rally.task.scenarios import base class ZaqarScenario(base.Scenario): diff --git a/rally/plugins/openstack/wrappers/network.py b/rally/plugins/openstack/wrappers/network.py index 308169b3fa..edf9bab574 100644 --- a/rally/plugins/openstack/wrappers/network.py +++ b/rally/plugins/openstack/wrappers/network.py @@ -18,12 +18,12 @@ import abc import netaddr import six -from rally.benchmark import utils as bench_utils from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils from rally import consts from rally import exceptions +from rally.task import utils as task_utils from neutronclient.common import exceptions as neutron_exceptions from novaclient import exceptions as nova_exceptions @@ -170,7 +170,7 @@ class NovaNetworkWrapper(NetworkWrapper): self.client.floating_ips.delete(fip_id) if not wait: return - bench_utils.wait_for_delete( + task_utils.wait_for_delete( fip_id, update_resource=lambda i: self._get_floating_ip(i, do_raise=True)) diff --git a/rally/benchmark/__init__.py b/rally/task/__init__.py similarity index 100% rename from rally/benchmark/__init__.py rename to rally/task/__init__.py diff --git a/rally/benchmark/context.py b/rally/task/context.py similarity index 99% rename from rally/benchmark/context.py rename to rally/task/context.py index ac076b33f5..889d00c681 100644 --- a/rally/benchmark/context.py +++ b/rally/task/context.py @@ -18,10 +18,10 @@ import abc import jsonschema import six -from rally.benchmark import functional from rally.common import log as logging from rally.common.plugin import plugin from rally import exceptions +from rally.task import functional LOG = logging.getLogger(__name__) diff --git a/rally/benchmark/engine.py b/rally/task/engine.py similarity index 98% rename from rally/benchmark/engine.py rename to rally/task/engine.py index a569c31998..e2ac133cec 100644 --- a/rally/benchmark/engine.py +++ b/rally/task/engine.py @@ -21,10 +21,6 @@ import traceback import jsonschema import six -from rally.benchmark import context -from rally.benchmark import runner -from rally.benchmark.scenarios import base as base_scenario -from rally.benchmark import sla from rally.common.i18n import _ from rally.common import log as logging from rally.common import utils as rutils @@ -34,6 +30,10 @@ from rally import objects from rally import osclients from rally.plugins.openstack.context import existing_users as existingusers_ctx from rally.plugins.openstack.context import users as users_ctx +from rally.task import context +from rally.task import runner +from rally.task.scenarios import base as base_scenario +from rally.task import sla LOG = logging.getLogger(__name__) diff --git a/rally/benchmark/functional.py b/rally/task/functional.py similarity index 100% rename from rally/benchmark/functional.py rename to rally/task/functional.py diff --git a/rally/benchmark/processing/__init__.py b/rally/task/processing/__init__.py similarity index 100% rename from rally/benchmark/processing/__init__.py rename to rally/task/processing/__init__.py diff --git a/rally/benchmark/processing/charts/__init__.py b/rally/task/processing/charts/__init__.py similarity index 100% rename from rally/benchmark/processing/charts/__init__.py rename to rally/task/processing/charts/__init__.py diff --git a/rally/benchmark/processing/charts/histogram.py b/rally/task/processing/charts/histogram.py similarity index 100% rename from rally/benchmark/processing/charts/histogram.py rename to rally/task/processing/charts/histogram.py diff --git a/rally/benchmark/processing/plot.py b/rally/task/processing/plot.py similarity index 99% rename from rally/benchmark/processing/plot.py rename to rally/task/processing/plot.py index 390f4f25ab..c5f12f54b0 100644 --- a/rally/benchmark/processing/plot.py +++ b/rally/task/processing/plot.py @@ -18,8 +18,8 @@ import json import six -from rally.benchmark.processing.charts import histogram as histo -from rally.benchmark.processing import utils +from rally.task.processing.charts import histogram as histo +from rally.task.processing import utils from rally.ui import utils as ui_utils diff --git a/rally/benchmark/processing/utils.py b/rally/task/processing/utils.py similarity index 100% rename from rally/benchmark/processing/utils.py rename to rally/task/processing/utils.py diff --git a/rally/benchmark/runner.py b/rally/task/runner.py similarity index 98% rename from rally/benchmark/runner.py rename to rally/task/runner.py index b2114c5d70..2fb7007acf 100644 --- a/rally/benchmark/runner.py +++ b/rally/task/runner.py @@ -22,14 +22,14 @@ import time import jsonschema import six -from rally.benchmark.scenarios import base as scenario_base -from rally.benchmark import types -from rally.benchmark import utils from rally.common import log as logging from rally.common.plugin import plugin from rally.common import utils as rutils from rally import consts from rally import osclients +from rally.task.scenarios import base as scenario_base +from rally.task import types +from rally.task import utils LOG = logging.getLogger(__name__) diff --git a/rally/benchmark/scenarios/__init__.py b/rally/task/scenarios/__init__.py similarity index 100% rename from rally/benchmark/scenarios/__init__.py rename to rally/task/scenarios/__init__.py diff --git a/rally/benchmark/scenarios/base.py b/rally/task/scenarios/base.py similarity index 99% rename from rally/benchmark/scenarios/base.py rename to rally/task/scenarios/base.py index 491fd2cdd5..67144f21bb 100644 --- a/rally/benchmark/scenarios/base.py +++ b/rally/task/scenarios/base.py @@ -19,13 +19,13 @@ import itertools import random import time -from rally.benchmark import functional from rally.common import costilius from rally.common import log as logging from rally.common.plugin import discover from rally.common import utils from rally import consts from rally import exceptions +from rally.task import functional LOG = logging.getLogger(__name__) diff --git a/rally/benchmark/sla.py b/rally/task/sla.py similarity index 100% rename from rally/benchmark/sla.py rename to rally/task/sla.py diff --git a/rally/benchmark/types.py b/rally/task/types.py similarity index 99% rename from rally/benchmark/types.py rename to rally/task/types.py index 5facac23ae..693e5a7fbe 100644 --- a/rally/benchmark/types.py +++ b/rally/task/types.py @@ -18,9 +18,9 @@ import copy import operator import re -from rally.benchmark.scenarios import base from rally import exceptions from rally import osclients +from rally.task.scenarios import base def set(**kwargs): diff --git a/rally/benchmark/utils.py b/rally/task/utils.py similarity index 100% rename from rally/benchmark/utils.py rename to rally/task/utils.py diff --git a/rally/benchmark/validation.py b/rally/task/validation.py similarity index 99% rename from rally/benchmark/validation.py rename to rally/task/validation.py index 03210c0e3e..620d1f33ab 100644 --- a/rally/benchmark/validation.py +++ b/rally/task/validation.py @@ -22,13 +22,13 @@ from glanceclient import exc as glance_exc from novaclient import exceptions as nova_exc import six -from rally.benchmark import types as types from rally.common.i18n import _ from rally import consts from rally import exceptions from rally import objects from rally import osclients from rally.plugins.openstack.context import flavors as flavors_ctx +from rally.task import types from rally.verification.tempest import tempest # TODO(boris-42): make the validators usable as a functions as well. diff --git a/samples/plugins/context/context_plugin.py b/samples/plugins/context/context_plugin.py index 5a8ae91e8e..c1fcae0ffe 100644 --- a/samples/plugins/context/context_plugin.py +++ b/samples/plugins/context/context_plugin.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import context from rally.common import log as logging from rally import consts from rally import osclients +from rally.task import context LOG = logging.getLogger(__name__) @@ -28,7 +28,7 @@ class CreateFlavorContext(context.Context): This sample create flavor with specified options before task starts and delete it after task completion. To create your own context plugin, inherit it from - rally.benchmark.context.Context + rally.task.context.Context """ CONFIG_SCHEMA = { diff --git a/samples/plugins/runner/runner_plugin.py b/samples/plugins/runner/runner_plugin.py index cf71c4af1b..48ba9fa6e3 100644 --- a/samples/plugins/runner/runner_plugin.py +++ b/samples/plugins/runner/runner_plugin.py @@ -15,9 +15,9 @@ import random -from rally.benchmark import runner from rally.common.plugin import plugin from rally import consts +from rally.task import runner @plugin.configure(name="random_times") diff --git a/samples/plugins/scenario/scenario_plugin.py b/samples/plugins/scenario/scenario_plugin.py index f1703feb0e..00045fb853 100644 --- a/samples/plugins/scenario/scenario_plugin.py +++ b/samples/plugins/scenario/scenario_plugin.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base +from rally.task.scenarios import base class ScenarioPlugin(base.Scenario): diff --git a/samples/plugins/sla/sla_plugin.py b/samples/plugins/sla/sla_plugin.py index da9e914ea8..f051862d65 100644 --- a/samples/plugins/sla/sla_plugin.py +++ b/samples/plugins/sla/sla_plugin.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark import sla from rally.common.i18n import _ from rally.common.plugin import plugin +from rally.task import sla @plugin.configure(name="max_duration_range") diff --git a/tests/functional/extra/fake_dir1/fake_plugin1.py b/tests/functional/extra/fake_dir1/fake_plugin1.py index 67bb098acb..f637f4aae8 100644 --- a/tests/functional/extra/fake_dir1/fake_plugin1.py +++ b/tests/functional/extra/fake_dir1/fake_plugin1.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base +from rally.task.scenarios import base class FakeScenarioPlugin1(base.Scenario): diff --git a/tests/functional/extra/fake_dir2/fake_plugin2.py b/tests/functional/extra/fake_dir2/fake_plugin2.py index 06140c7d77..fb3ea00324 100644 --- a/tests/functional/extra/fake_dir2/fake_plugin2.py +++ b/tests/functional/extra/fake_dir2/fake_plugin2.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base +from rally.task.scenarios import base class FakeScenarioPlugin2(base.Scenario): diff --git a/tests/unit/cli/commands/test_info.py b/tests/unit/cli/commands/test_info.py index cba672da20..2e9dfbc1cd 100644 --- a/tests/unit/cli/commands/test_info.py +++ b/tests/unit/cli/commands/test_info.py @@ -15,8 +15,6 @@ import mock -from rally.benchmark.scenarios import base as scenario_base -from rally.benchmark import sla from rally.cli.commands import info from rally.deploy import engine from rally.deploy.engines import existing as existing_cloud @@ -25,6 +23,8 @@ from rally.deploy.serverprovider.providers import existing as existing_servers from rally import exceptions from rally.plugins.common.scenarios.dummy import dummy from rally.plugins.common.sla import failure_rate +from rally.task.scenarios import base as scenario_base +from rally.task import sla from tests.unit import test diff --git a/tests/unit/deploy/serverprovider/providers/test_openstack.py b/tests/unit/deploy/serverprovider/providers/test_openstack.py index 912d2a7777..0911d573e2 100644 --- a/tests/unit/deploy/serverprovider/providers/test_openstack.py +++ b/tests/unit/deploy/serverprovider/providers/test_openstack.py @@ -149,8 +149,8 @@ class OpenStackProviderTestCase(test.TestCase): @mock.patch("time.sleep") @mock.patch(MOD_NAME + ".provider.Server") @mock.patch(MOD_NAME + ".osclients") - @mock.patch(MOD_NAME + ".benchmark_utils") - def test_create_servers(self, mock_benchmark_utils, mock_osclients, + @mock.patch(MOD_NAME + ".utils") + def test_create_servers(self, mock_utils, mock_osclients, mock_server, mock_sleep): fake_keypair = mock.Mock() fake_keypair.name = "fake_key_name" diff --git a/tests/unit/doc/test_task_samples.py b/tests/unit/doc/test_task_samples.py index f15d821446..612242a91d 100644 --- a/tests/unit/doc/test_task_samples.py +++ b/tests/unit/doc/test_task_samples.py @@ -21,8 +21,8 @@ import traceback import yaml -from rally.benchmark.scenarios import base -from rally.benchmark import engine +from rally.task.scenarios import base +from rally.task import engine from tests.unit import test @@ -32,7 +32,7 @@ class TaskSampleTestCase(test.TestCase): os.pardir, os.pardir, os.pardir, "samples", "tasks") - @mock.patch("rally.benchmark.engine.BenchmarkEngine" + @mock.patch("rally.task.engine.BenchmarkEngine" "._validate_config_semantic") def test_schema_is_valid(self, mock_benchmark_engine__validate_config_semantic): diff --git a/tests/unit/fakes.py b/tests/unit/fakes.py index 99edbf3f8c..a724a6df95 100644 --- a/tests/unit/fakes.py +++ b/tests/unit/fakes.py @@ -27,11 +27,11 @@ from novaclient import exceptions as nova_exceptions import six from swiftclient import exceptions as swift_exceptions -from rally.benchmark import context -from rally.benchmark.scenarios import base from rally.common import utils as rally_utils from rally import consts from rally import objects +from rally.task import context +from rally.task.scenarios import base def generate_uuid(): diff --git a/tests/unit/plugins/common/runners/test_constant.py b/tests/unit/plugins/common/runners/test_constant.py index 4caab27b80..22151d5aa2 100644 --- a/tests/unit/plugins/common/runners/test_constant.py +++ b/tests/unit/plugins/common/runners/test_constant.py @@ -16,13 +16,13 @@ import jsonschema import mock -from rally.benchmark import runner from rally.plugins.common.runners import constant +from rally.task import runner from tests.unit import fakes from tests.unit import test -RUNNERS_BASE = "rally.benchmark.runner." +RUNNERS_BASE = "rally.task.runner." RUNNERS = "rally.plugins.common.runners." diff --git a/tests/unit/plugins/common/runners/test_rps.py b/tests/unit/plugins/common/runners/test_rps.py index 88c30183ee..493ec8c7aa 100644 --- a/tests/unit/plugins/common/runners/test_rps.py +++ b/tests/unit/plugins/common/runners/test_rps.py @@ -16,13 +16,13 @@ import jsonschema import mock -from rally.benchmark import runner from rally.plugins.common.runners import rps +from rally.task import runner from tests.unit import fakes from tests.unit import test -RUNNERS_BASE = "rally.benchmark.runner." +RUNNERS_BASE = "rally.task.runner." RUNNERS = "rally.plugins.common.runners." diff --git a/tests/unit/plugins/common/runners/test_serial.py b/tests/unit/plugins/common/runners/test_serial.py index 246da1c940..1ae4a8464c 100644 --- a/tests/unit/plugins/common/runners/test_serial.py +++ b/tests/unit/plugins/common/runners/test_serial.py @@ -25,7 +25,7 @@ class SerialScenarioRunnerTestCase(test.TestCase): def setUp(self): super(SerialScenarioRunnerTestCase, self).setUp() - @mock.patch("rally.benchmark.runner._run_scenario_once") + @mock.patch("rally.task.runner._run_scenario_once") def test__run_scenario(self, mock__run_scenario_once): times = 5 result = {"duration": 10, "idle_duration": 0, "error": [], diff --git a/tests/unit/plugins/openstack/context/sahara/test_sahara_image.py b/tests/unit/plugins/openstack/context/sahara/test_sahara_image.py index f4e8e39922..4e4a71487b 100644 --- a/tests/unit/plugins/openstack/context/sahara/test_sahara_image.py +++ b/tests/unit/plugins/openstack/context/sahara/test_sahara_image.py @@ -19,9 +19,9 @@ from rally.plugins.openstack.context.sahara import sahara_image from tests.unit import test -BASE_CTX = "rally.benchmark.context" +BASE_CTX = "rally.task.context" CTX = "rally.plugins.openstack.context.sahara.sahara_image" -BASE_SCN = "rally.benchmark.scenarios" +BASE_SCN = "rally.task.scenarios" SCN = "rally.plugins.openstack.scenarios" diff --git a/tests/unit/plugins/openstack/context/test_ceilometer.py b/tests/unit/plugins/openstack/context/test_ceilometer.py index 82b2f90f3d..27fb56dc8c 100644 --- a/tests/unit/plugins/openstack/context/test_ceilometer.py +++ b/tests/unit/plugins/openstack/context/test_ceilometer.py @@ -22,7 +22,7 @@ from tests.unit import fakes from tests.unit import test CTX = "rally.plugins.openstack.context" -SCN = "rally.benchmark.scenarios" +SCN = "rally.task.scenarios" class CeilometerSampleGeneratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/test_servers.py b/tests/unit/plugins/openstack/context/test_servers.py index d730ae3dd8..e3eeec4951 100644 --- a/tests/unit/plugins/openstack/context/test_servers.py +++ b/tests/unit/plugins/openstack/context/test_servers.py @@ -23,7 +23,7 @@ from tests.unit import test CTX = "rally.plugins.openstack.context" SCN = "rally.plugins.openstack.scenarios" -TYP = "rally.benchmark.types" +TYP = "rally.task.types" class ServerGeneratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/test_users.py b/tests/unit/plugins/openstack/context/test_users.py index b60a2639c4..308e74e2b5 100644 --- a/tests/unit/plugins/openstack/context/test_users.py +++ b/tests/unit/plugins/openstack/context/test_users.py @@ -83,7 +83,7 @@ class UserGeneratorTestCase(test.TestCase): @mock.patch("rally.common.utils.iterate_per_tenants") @mock.patch("rally.plugins.openstack.context.users.network") - @mock.patch("rally.benchmark.utils.check_service_status", + @mock.patch("rally.task.utils.check_service_status", return_value=False) def test__remove_default_security_group( self, mock_check_service_status, mock_network, @@ -128,7 +128,7 @@ class UserGeneratorTestCase(test.TestCase): nova_admin.delete_security_group.assert_has_calls(expected_deletes, any_order=True) - @mock.patch("rally.benchmark.utils.check_service_status", + @mock.patch("rally.task.utils.check_service_status", return_value=True) def test__remove_associated_networks(self, mock_check_service_status): def fake_get_network(req_network): @@ -153,7 +153,7 @@ class UserGeneratorTestCase(test.TestCase): "nova-network") nova_admin.networks.disassociate.assert_called_once_with(networks[0]) - @mock.patch("rally.benchmark.utils.check_service_status", + @mock.patch("rally.task.utils.check_service_status", return_value=True) def test__remove_associated_networks_failure(self, mock_check_service_status): diff --git a/tests/unit/plugins/openstack/context/vm/test_custom_image.py b/tests/unit/plugins/openstack/context/vm/test_custom_image.py index 75fd17db8f..8ecb872bb4 100644 --- a/tests/unit/plugins/openstack/context/vm/test_custom_image.py +++ b/tests/unit/plugins/openstack/context/vm/test_custom_image.py @@ -17,8 +17,8 @@ import mock -from rally.benchmark import context from rally.plugins.openstack.context.vm import custom_image +from rally.task import context from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/authenticate/test_authenticate.py b/tests/unit/plugins/openstack/scenarios/authenticate/test_authenticate.py index 97ffbb5f7e..4f22014e5b 100644 --- a/tests/unit/plugins/openstack/scenarios/authenticate/test_authenticate.py +++ b/tests/unit/plugins/openstack/scenarios/authenticate/test_authenticate.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base from rally.plugins.openstack.scenarios.authenticate import authenticate +from rally.task.scenarios import base from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py b/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py index 54703a3c41..9c38ff3e35 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py @@ -20,7 +20,7 @@ from oslotest import mockpatch from rally.plugins.openstack.scenarios.ceilometer import utils from tests.unit import test -BM_UTILS = "rally.benchmark.utils" +BM_UTILS = "rally.task.utils" CEILOMETER_UTILS = "rally.plugins.openstack.scenarios.ceilometer.utils" diff --git a/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py b/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py index 94c4790cbc..dc73bbf0d8 100644 --- a/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py @@ -22,7 +22,7 @@ from rally.plugins.openstack.scenarios.cinder import utils from tests.unit import fakes from tests.unit import test -BM_UTILS = "rally.benchmark.utils" +BM_UTILS = "rally.task.utils" CINDER_UTILS = "rally.plugins.openstack.scenarios.cinder.utils" diff --git a/tests/unit/plugins/openstack/scenarios/ec2/test_servers.py b/tests/unit/plugins/openstack/scenarios/ec2/test_servers.py index 4ca419cd32..5591514e65 100644 --- a/tests/unit/plugins/openstack/scenarios/ec2/test_servers.py +++ b/tests/unit/plugins/openstack/scenarios/ec2/test_servers.py @@ -23,7 +23,7 @@ UTILS = "rally.plugins.openstack.scenarios.ec2.utils." class EC2ServersTestCase(test.ClientsTestCase): - @mock.patch("rally.benchmark.utils.wait_for", + @mock.patch("rally.task.utils.wait_for", return_value="running_server") @mock.patch(UTILS + "ec2_resource_is", return_value="foo_state") @mock.patch(UTILS + "time") diff --git a/tests/unit/plugins/openstack/scenarios/ec2/test_utils.py b/tests/unit/plugins/openstack/scenarios/ec2/test_utils.py index 5ffcc16f93..1f5ece348b 100644 --- a/tests/unit/plugins/openstack/scenarios/ec2/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/ec2/test_utils.py @@ -47,7 +47,7 @@ class EC2ScenarioTestCase(test.ClientsTestCase): self.res_is = mockpatch.Patch(EC2_UTILS + ".ec2_resource_is") self.update_res = mockpatch.Patch( EC2_UTILS + ".EC2Scenario._update_resource") - self.wait_for = mockpatch.Patch(EC2_UTILS + ".bench_utils.wait_for") + self.wait_for = mockpatch.Patch(EC2_UTILS + ".utils.wait_for") self.useFixture(self.wait_for) self.useFixture(self.res_is) self.useFixture(self.update_res) diff --git a/tests/unit/plugins/openstack/scenarios/glance/test_utils.py b/tests/unit/plugins/openstack/scenarios/glance/test_utils.py index 919822029c..85578a86c0 100644 --- a/tests/unit/plugins/openstack/scenarios/glance/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/glance/test_utils.py @@ -20,7 +20,7 @@ from oslotest import mockpatch from rally.plugins.openstack.scenarios.glance import utils from tests.unit import test -BM_UTILS = "rally.benchmark.utils" +BM_UTILS = "rally.task.utils" GLANCE_UTILS = "rally.plugins.openstack.scenarios.glance.utils" @@ -32,9 +32,9 @@ class GlanceScenarioTestCase(test.ClientsTestCase): self.image1 = mock.Mock() self.res_is = mockpatch.Patch(BM_UTILS + ".resource_is") self.get_fm = mockpatch.Patch(BM_UTILS + ".get_from_manager") - self.wait_for = mockpatch.Patch(GLANCE_UTILS + ".bench_utils.wait_for") + self.wait_for = mockpatch.Patch(GLANCE_UTILS + ".utils.wait_for") self.wait_for_delete = mockpatch.Patch( - GLANCE_UTILS + ".bench_utils.wait_for_delete") + GLANCE_UTILS + ".utils.wait_for_delete") self.useFixture(self.wait_for) self.useFixture(self.wait_for_delete) self.useFixture(self.res_is) diff --git a/tests/unit/plugins/openstack/scenarios/heat/test_utils.py b/tests/unit/plugins/openstack/scenarios/heat/test_utils.py index 8a6e773104..4290412caf 100644 --- a/tests/unit/plugins/openstack/scenarios/heat/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/heat/test_utils.py @@ -20,7 +20,7 @@ from rally import exceptions from rally.plugins.openstack.scenarios.heat import utils from tests.unit import test -BM_UTILS = "rally.benchmark.utils" +BM_UTILS = "rally.task.utils" HEAT_UTILS = "rally.plugins.openstack.scenarios.heat.utils" CONF = utils.CONF @@ -32,9 +32,9 @@ class HeatScenarioTestCase(test.ClientsTestCase): self.stack = mock.Mock() self.res_is = mockpatch.Patch(BM_UTILS + ".resource_is") self.get_fm = mockpatch.Patch(BM_UTILS + ".get_from_manager") - self.wait_for = mockpatch.Patch(HEAT_UTILS + ".bench_utils.wait_for") + self.wait_for = mockpatch.Patch(HEAT_UTILS + ".utils.wait_for") self.wait_for_delete = mockpatch.Patch( - HEAT_UTILS + ".bench_utils.wait_for_delete") + HEAT_UTILS + ".utils.wait_for_delete") self.useFixture(self.wait_for) self.useFixture(self.wait_for_delete) self.useFixture(self.res_is) diff --git a/tests/unit/plugins/openstack/scenarios/manila/test_utils.py b/tests/unit/plugins/openstack/scenarios/manila/test_utils.py index 050710fae6..6df668bec1 100644 --- a/tests/unit/plugins/openstack/scenarios/manila/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/manila/test_utils.py @@ -19,7 +19,7 @@ import mock from rally.plugins.openstack.scenarios.manila import utils from tests.unit import test -BM_UTILS = "rally.benchmark.utils." +BM_UTILS = "rally.task.utils." @ddt.ddt diff --git a/tests/unit/plugins/openstack/scenarios/murano/test_environments.py b/tests/unit/plugins/openstack/scenarios/murano/test_environments.py index 18d7bdbe80..27b879159a 100644 --- a/tests/unit/plugins/openstack/scenarios/murano/test_environments.py +++ b/tests/unit/plugins/openstack/scenarios/murano/test_environments.py @@ -18,7 +18,7 @@ import mock from rally.plugins.openstack.scenarios.murano import environments from tests.unit import test -CTX = "rally.benchmark.context" +CTX = "rally.task.context" MURANO_SCENARIO = ("rally.plugins.openstack.scenarios.murano." "environments.MuranoEnvironments") diff --git a/tests/unit/plugins/openstack/scenarios/murano/test_utils.py b/tests/unit/plugins/openstack/scenarios/murano/test_utils.py index 858a158f42..6587588e92 100644 --- a/tests/unit/plugins/openstack/scenarios/murano/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/murano/test_utils.py @@ -19,7 +19,7 @@ from oslotest import mockpatch from rally.plugins.openstack.scenarios.murano import utils from tests.unit import test -BM_UTILS = "rally.benchmark.utils" +BM_UTILS = "rally.task.utils" MRN_UTILS = "rally.plugins.openstack.scenarios.murano.utils" @@ -29,9 +29,9 @@ class MuranoScenarioTestCase(test.ClientsTestCase): super(MuranoScenarioTestCase, self).setUp() self.res_is = mockpatch.Patch(BM_UTILS + ".resource_is") self.get_fm = mockpatch.Patch(BM_UTILS + ".get_from_manager") - self.wait_for = mockpatch.Patch(MRN_UTILS + ".bench_utils.wait_for") + self.wait_for = mockpatch.Patch(MRN_UTILS + ".utils.wait_for") self.wait_for_delete = mockpatch.Patch( - MRN_UTILS + ".bench_utils.wait_for_delete") + MRN_UTILS + ".utils.wait_for_delete") self.useFixture(self.wait_for) self.useFixture(self.wait_for_delete) self.useFixture(self.res_is) diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_utils.py b/tests/unit/plugins/openstack/scenarios/nova/test_utils.py index df44d50ee3..86c3758d95 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/nova/test_utils.py @@ -22,7 +22,7 @@ from rally.plugins.openstack.scenarios.nova import utils from tests.unit import fakes from tests.unit import test -BM_UTILS = "rally.benchmark.utils" +BM_UTILS = "rally.task.utils" NOVA_UTILS = "rally.plugins.openstack.scenarios.nova.utils" CONF = cfg.CONF @@ -39,9 +39,9 @@ class NovaScenarioTestCase(test.ClientsTestCase): self.keypair = mock.Mock() self.res_is = mockpatch.Patch(BM_UTILS + ".resource_is") self.get_fm = mockpatch.Patch(BM_UTILS + ".get_from_manager") - self.wait_for = mockpatch.Patch(NOVA_UTILS + ".bench_utils.wait_for") + self.wait_for = mockpatch.Patch(NOVA_UTILS + ".utils.wait_for") self.wait_for_delete = mockpatch.Patch(NOVA_UTILS + - ".bench_utils.wait_for_delete") + ".utils.wait_for_delete") self.useFixture(self.wait_for_delete) self.useFixture(self.wait_for) self.useFixture(self.res_is) diff --git a/tests/unit/plugins/openstack/scenarios/vm/test_utils.py b/tests/unit/plugins/openstack/scenarios/vm/test_utils.py index 7efd9862ef..f8261ec9e6 100644 --- a/tests/unit/plugins/openstack/scenarios/vm/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/vm/test_utils.py @@ -31,7 +31,7 @@ class VMScenarioTestCase(test.TestCase): def setUp(self): super(VMScenarioTestCase, self).setUp() self.wait_for = mockpatch.Patch(VMTASKS_UTILS + - ".bench_utils.wait_for") + ".utils.wait_for") self.useFixture(self.wait_for) @mock.patch("%s.open" % VMTASKS_UTILS, @@ -92,7 +92,7 @@ class VMScenarioTestCase(test.TestCase): vm_scenario._wait_for_ssh(ssh) ssh.wait.assert_called_once_with() - @mock.patch(VMTASKS_UTILS + ".bench_utils.resource_is") + @mock.patch(VMTASKS_UTILS + ".utils.resource_is") @mock.patch(VMTASKS_UTILS + ".VMScenario._ping_ip_address", return_value=True) def test__wait_for_ping(self, mock_vm_scenario__ping_ip_address, diff --git a/tests/unit/rally_jobs/test_jobs.py b/tests/unit/rally_jobs/test_jobs.py index 83cb10d0d3..94f9b5e336 100644 --- a/tests/unit/rally_jobs/test_jobs.py +++ b/tests/unit/rally_jobs/test_jobs.py @@ -19,8 +19,8 @@ import mock import yaml from rally import api -from rally.benchmark import engine from rally.common.plugin import discover +from rally.task import engine from tests.unit import test @@ -28,7 +28,7 @@ class RallyJobsTestCase(test.TestCase): rally_jobs_path = os.path.join( os.path.dirname(__file__), "..", "..", "..", "rally-jobs") - @mock.patch("rally.benchmark.engine.BenchmarkEngine" + @mock.patch("rally.task.engine.BenchmarkEngine" "._validate_config_semantic") def test_schema_is_valid( self, mock_benchmark_engine__validate_config_semantic): diff --git a/tests/unit/benchmark/__init__.py b/tests/unit/task/__init__.py similarity index 100% rename from tests/unit/benchmark/__init__.py rename to tests/unit/task/__init__.py diff --git a/tests/unit/benchmark/processing/__init__.py b/tests/unit/task/processing/__init__.py similarity index 100% rename from tests/unit/benchmark/processing/__init__.py rename to tests/unit/task/processing/__init__.py diff --git a/tests/unit/benchmark/processing/test_plot.py b/tests/unit/task/processing/test_plot.py similarity index 98% rename from tests/unit/benchmark/processing/test_plot.py rename to tests/unit/task/processing/test_plot.py index 092597f6ba..b551500889 100644 --- a/tests/unit/benchmark/processing/test_plot.py +++ b/tests/unit/task/processing/test_plot.py @@ -19,10 +19,10 @@ import sys import mock import testtools -from rally.benchmark.processing import plot +from rally.task.processing import plot from tests.unit import test -PLOT = "rally.benchmark.processing.plot." +PLOT = "rally.task.processing.plot." class PlotTestCase(test.TestCase): @@ -307,7 +307,7 @@ class PlotTestCase(test.TestCase): ] }, output) - @mock.patch("rally.benchmark.processing.utils.compress") + @mock.patch("rally.task.processing.utils.compress") def test__prepare_data(self, mock_compress): mock_compress.side_effect = lambda i, **kv: i diff --git a/tests/unit/benchmark/processing/test_utils.py b/tests/unit/task/processing/test_utils.py similarity index 99% rename from tests/unit/benchmark/processing/test_utils.py rename to tests/unit/task/processing/test_utils.py index ed938ab8d8..34c8f747bb 100644 --- a/tests/unit/benchmark/processing/test_utils.py +++ b/tests/unit/task/processing/test_utils.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.processing import utils from rally import exceptions +from rally.task.processing import utils from tests.unit import test diff --git a/tests/unit/benchmark/scenarios/__init__.py b/tests/unit/task/scenarios/__init__.py similarity index 100% rename from tests/unit/benchmark/scenarios/__init__.py rename to tests/unit/task/scenarios/__init__.py diff --git a/tests/unit/benchmark/scenarios/test_base.py b/tests/unit/task/scenarios/test_base.py similarity index 95% rename from tests/unit/benchmark/scenarios/test_base.py rename to tests/unit/task/scenarios/test_base.py index 5243db9dbc..98b04a8a40 100644 --- a/tests/unit/benchmark/scenarios/test_base.py +++ b/tests/unit/task/scenarios/test_base.py @@ -18,12 +18,12 @@ import traceback import mock import six -from rally.benchmark import context -from rally.benchmark.scenarios import base -from rally.benchmark import validation from rally import consts from rally import exceptions from rally.plugins.common.scenarios.dummy import dummy +from rally.task import context +from rally.task.scenarios import base +from rally.task import validation from tests.unit import fakes from tests.unit import test @@ -97,7 +97,7 @@ class ScenarioTestCase(test.TestCase): base.Scenario._validate_helper, validators, clients, args, "fake_uuid") - @mock.patch("rally.benchmark.scenarios.base.Scenario.get_by_name") + @mock.patch("rally.task.scenarios.base.Scenario.get_by_name") def test_validate__no_validators(self, mock_scenario_get_by_name): class FakeScenario(fakes.FakeScenario): @@ -111,8 +111,8 @@ class ScenarioTestCase(test.TestCase): mock_scenario_get_by_name.assert_called_once_with("FakeScenario") - @mock.patch("rally.benchmark.scenarios.base.Scenario._validate_helper") - @mock.patch("rally.benchmark.scenarios.base.Scenario.get_by_name") + @mock.patch("rally.task.scenarios.base.Scenario._validate_helper") + @mock.patch("rally.task.scenarios.base.Scenario.get_by_name") def test_validate__admin_validators(self, mock_scenario_get_by_name, mock_scenario__validate_helper): @@ -134,8 +134,8 @@ class ScenarioTestCase(test.TestCase): mock_scenario__validate_helper.assert_called_once_with( validators, "admin", args, deployment) - @mock.patch("rally.benchmark.scenarios.base.Scenario._validate_helper") - @mock.patch("rally.benchmark.scenarios.base.Scenario.get_by_name") + @mock.patch("rally.task.scenarios.base.Scenario._validate_helper") + @mock.patch("rally.task.scenarios.base.Scenario.get_by_name") def test_validate_user_validators(self, mock_scenario_get_by_name, mock_scenario__validate_helper): @@ -236,8 +236,8 @@ class ScenarioTestCase(test.TestCase): scenario.sleep_between(0.004, 0.004) self.assertEqual(scenario.idle_duration(), 0.005) - @mock.patch("rally.benchmark.scenarios.base.time.sleep") - @mock.patch("rally.benchmark.scenarios.base.random.uniform") + @mock.patch("rally.task.scenarios.base.time.sleep") + @mock.patch("rally.task.scenarios.base.random.uniform") def test_sleep_between_internal(self, mock_uniform, mock_sleep): scenario = base.Scenario() diff --git a/tests/unit/benchmark/test_context.py b/tests/unit/task/test_context.py similarity index 93% rename from tests/unit/benchmark/test_context.py rename to tests/unit/task/test_context.py index eba7a112a7..47bf003b17 100644 --- a/tests/unit/benchmark/test_context.py +++ b/tests/unit/task/test_context.py @@ -17,8 +17,8 @@ import jsonschema import mock -from rally.benchmark import context from rally import exceptions +from rally.task import context from tests.unit import fakes from tests.unit import test @@ -123,7 +123,7 @@ class BaseContextTestCase(test.TestCase): class ContextManagerTestCase(test.TestCase): - @mock.patch("rally.benchmark.context.Context.get") + @mock.patch("rally.task.context.Context.get") def test_validate(self, mock_context_get): config = { "ctx1": mock.MagicMock(), @@ -137,7 +137,7 @@ class ContextManagerTestCase(test.TestCase): mock.call().validate(config[ctx], non_hidden=False), ]) - @mock.patch("rally.benchmark.context.Context.get") + @mock.patch("rally.task.context.Context.get") def test_validate_non_hidden(self, mock_context_get): config = { "ctx1": mock.MagicMock(), @@ -158,7 +158,7 @@ class ContextManagerTestCase(test.TestCase): self.assertRaises(exceptions.PluginNotFound, context.ContextManager.validate, config) - @mock.patch("rally.benchmark.context.Context.get") + @mock.patch("rally.task.context.Context.get") def test_setup(self, mock_context_get): mock_context = mock.MagicMock() mock_context.return_value = mock.MagicMock(__lt__=lambda x, y: True) @@ -177,7 +177,7 @@ class ContextManagerTestCase(test.TestCase): mock_context.return_value.assert_has_calls( [mock.call.setup(), mock.call.setup()], any_order=True) - @mock.patch("rally.benchmark.context.Context.get") + @mock.patch("rally.task.context.Context.get") def test_cleanup(self, mock_context_get): mock_context = mock.MagicMock() mock_context.return_value = mock.MagicMock(__lt__=lambda x, y: True) @@ -193,7 +193,7 @@ class ContextManagerTestCase(test.TestCase): mock_context.return_value.assert_has_calls( [mock.call.cleanup(), mock.call.cleanup()], any_order=True) - @mock.patch("rally.benchmark.context.Context.get") + @mock.patch("rally.task.context.Context.get") def test_cleanup_exception(self, mock_context_get): mock_context = mock.MagicMock() mock_context.return_value = mock.MagicMock(__lt__=lambda x, y: True) @@ -210,8 +210,8 @@ class ContextManagerTestCase(test.TestCase): mock_context.return_value.assert_has_calls( [mock.call.cleanup(), mock.call.cleanup()], any_order=True) - @mock.patch("rally.benchmark.context.ContextManager.cleanup") - @mock.patch("rally.benchmark.context.ContextManager.setup") + @mock.patch("rally.task.context.ContextManager.cleanup") + @mock.patch("rally.task.context.ContextManager.setup") def test_with_statement( self, mock_context_manager_setup, mock_context_manager_cleanup): with context.ContextManager(mock.MagicMock()): @@ -221,8 +221,8 @@ class ContextManagerTestCase(test.TestCase): self.assertFalse(mock_context_manager_setup.called) mock_context_manager_cleanup.assert_called_once_with() - @mock.patch("rally.benchmark.context.ContextManager.cleanup") - @mock.patch("rally.benchmark.context.ContextManager.setup") + @mock.patch("rally.task.context.ContextManager.cleanup") + @mock.patch("rally.task.context.ContextManager.setup") def test_with_statement_excpetion_during_setup( self, mock_context_manager_setup, mock_context_manager_cleanup): mock_context_manager_setup.side_effect = Exception("abcdef") diff --git a/tests/unit/benchmark/test_engine.py b/tests/unit/task/test_engine.py similarity index 82% rename from tests/unit/benchmark/test_engine.py rename to tests/unit/task/test_engine.py index 17fb4613cb..c999514e5e 100644 --- a/tests/unit/benchmark/test_engine.py +++ b/tests/unit/task/test_engine.py @@ -21,9 +21,9 @@ import copy import jsonschema import mock -from rally.benchmark import engine from rally import consts from rally import exceptions +from rally.task import engine from tests.unit import fakes from tests.unit import test @@ -37,7 +37,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertEqual(eng.config, config) self.assertEqual(eng.task, task) - @mock.patch("rally.benchmark.engine.jsonschema.validate") + @mock.patch("rally.task.engine.jsonschema.validate") def test_validate(self, mock_validate): config = mock.MagicMock() eng = engine.BenchmarkEngine(config, mock.MagicMock()) @@ -66,7 +66,7 @@ class BenchmarkEngineTestCase(test.TestCase): eng.validate) self.assertTrue(task.set_failed.called) - @mock.patch("rally.benchmark.engine.jsonschema.validate") + @mock.patch("rally.task.engine.jsonschema.validate") def test_validate__wrong_scenarios_name(self, mock_validate): task = mock.MagicMock() eng = engine.BenchmarkEngine(mock.MagicMock(), task) @@ -76,7 +76,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertRaises(exceptions.InvalidTaskException, eng.validate) self.assertTrue(task.set_failed.called) - @mock.patch("rally.benchmark.engine.jsonschema.validate") + @mock.patch("rally.task.engine.jsonschema.validate") def test_validate__wrong_syntax(self, mock_validate): task = mock.MagicMock() eng = engine.BenchmarkEngine(mock.MagicMock(), task) @@ -87,7 +87,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertRaises(exceptions.InvalidTaskException, eng.validate) self.assertTrue(task.set_failed.called) - @mock.patch("rally.benchmark.engine.jsonschema.validate") + @mock.patch("rally.task.engine.jsonschema.validate") def test_validate__wrong_semantic(self, mock_validate): task = mock.MagicMock() eng = engine.BenchmarkEngine(mock.MagicMock(), task) @@ -99,7 +99,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertRaises(exceptions.InvalidTaskException, eng.validate) self.assertTrue(task.set_failed.called) - @mock.patch("rally.benchmark.engine.base_scenario.Scenario") + @mock.patch("rally.task.engine.base_scenario.Scenario") def test__validate_config_scenarios_name(self, mock_scenario): config = { "a": [], @@ -109,7 +109,7 @@ class BenchmarkEngineTestCase(test.TestCase): eng = engine.BenchmarkEngine(config, mock.MagicMock()) eng._validate_config_scenarios_name(config) - @mock.patch("rally.benchmark.engine.base_scenario.Scenario") + @mock.patch("rally.task.engine.base_scenario.Scenario") def test__validate_config_scenarios_name_non_exsisting(self, mock_scenario): config = { @@ -123,8 +123,8 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertRaises(exceptions.NotFoundScenarios, eng._validate_config_scenarios_name, config) - @mock.patch("rally.benchmark.engine.runner.ScenarioRunner.validate") - @mock.patch("rally.benchmark.engine.context.ContextManager.validate") + @mock.patch("rally.task.engine.runner.ScenarioRunner.validate") + @mock.patch("rally.task.engine.context.ContextManager.validate") def test__validate_config_syntax( self, mock_context_manager_validate, mock_scenario_runner_validate): @@ -137,8 +137,8 @@ class BenchmarkEngineTestCase(test.TestCase): [mock.call("a", non_hidden=True), mock.call({}, non_hidden=True)], any_order=True) - @mock.patch("rally.benchmark.engine.runner.ScenarioRunner") - @mock.patch("rally.benchmark.engine.context.ContextManager.validate") + @mock.patch("rally.task.engine.runner.ScenarioRunner") + @mock.patch("rally.task.engine.context.ContextManager.validate") def test__validate_config_syntax__wrong_runner( self, mock_context_manager_validate, mock_scenario_runner): config = {"sca": [{"context": "a"}], "scb": [{"runner": "b"}]} @@ -149,8 +149,8 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertRaises(exceptions.InvalidBenchmarkConfig, eng._validate_config_syntax, config) - @mock.patch("rally.benchmark.engine.runner.ScenarioRunner.validate") - @mock.patch("rally.benchmark.engine.context.ContextManager") + @mock.patch("rally.task.engine.runner.ScenarioRunner.validate") + @mock.patch("rally.task.engine.context.ContextManager") def test__validate_config_syntax__wrong_context( self, mock_context_manager, mock_scenario_runner_validate): config = {"sca": [{"context": "a"}], "scb": [{"runner": "b"}]} @@ -161,7 +161,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertRaises(exceptions.InvalidBenchmarkConfig, eng._validate_config_syntax, config) - @mock.patch("rally.benchmark.engine.base_scenario.Scenario.validate") + @mock.patch("rally.task.engine.base_scenario.Scenario.validate") def test__validate_config_semantic_helper(self, mock_scenario_validate): deployment = mock.MagicMock() eng = engine.BenchmarkEngine(mock.MagicMock(), mock.MagicMock()) @@ -171,7 +171,7 @@ class BenchmarkEngineTestCase(test.TestCase): "name", {"args": "args"}, admin="admin", users=["user"], deployment=deployment) - @mock.patch("rally.benchmark.engine.base_scenario.Scenario.validate", + @mock.patch("rally.task.engine.base_scenario.Scenario.validate", side_effect=exceptions.InvalidScenarioArgument) def test__validate_config_semanitc_helper_invalid_arg( self, mock_scenario_validate): @@ -181,7 +181,7 @@ class BenchmarkEngineTestCase(test.TestCase): eng._validate_config_semantic_helper, "a", "u", "n", "p", mock.MagicMock(), {}) - @mock.patch("rally.benchmark.engine.existingusers_ctx.ExistingUsers") + @mock.patch("rally.task.engine.existingusers_ctx.ExistingUsers") def test_get_user_ctx_for_validation_existing_users( self, mock_existing_users): @@ -198,11 +198,11 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertEqual(mock_existing_users.return_value, result) - @mock.patch("rally.benchmark.engine.osclients.Clients") - @mock.patch("rally.benchmark.engine.users_ctx") - @mock.patch("rally.benchmark.engine.BenchmarkEngine" + @mock.patch("rally.task.engine.osclients.Clients") + @mock.patch("rally.task.engine.users_ctx") + @mock.patch("rally.task.engine.BenchmarkEngine" "._validate_config_semantic_helper") - @mock.patch("rally.benchmark.engine.objects.Deployment.get", + @mock.patch("rally.task.engine.objects.Deployment.get", return_value="FakeDeployment") def test__validate_config_semantic( self, mock_deployment_get, @@ -240,11 +240,11 @@ class BenchmarkEngineTestCase(test.TestCase): mock__validate_config_semantic_helper.assert_has_calls( expected_calls, any_order=True) - @mock.patch("rally.benchmark.engine.BenchmarkEngine.consume_results") - @mock.patch("rally.benchmark.engine.context.ContextManager.cleanup") - @mock.patch("rally.benchmark.engine.context.ContextManager.setup") - @mock.patch("rally.benchmark.engine.base_scenario.Scenario") - @mock.patch("rally.benchmark.engine.runner.ScenarioRunner") + @mock.patch("rally.task.engine.BenchmarkEngine.consume_results") + @mock.patch("rally.task.engine.context.ContextManager.cleanup") + @mock.patch("rally.task.engine.context.ContextManager.setup") + @mock.patch("rally.task.engine.base_scenario.Scenario") + @mock.patch("rally.task.engine.runner.ScenarioRunner") def test_run__update_status( self, mock_scenario_runner, mock_scenario, mock_context_manager_setup, mock_context_manager_cleanup, @@ -257,11 +257,11 @@ class BenchmarkEngineTestCase(test.TestCase): mock.call(consts.TaskStatus.FINISHED) ]) - @mock.patch("rally.benchmark.engine.BenchmarkEngine.consume_results") - @mock.patch("rally.benchmark.engine.base_scenario.Scenario") - @mock.patch("rally.benchmark.engine.runner.ScenarioRunner") - @mock.patch("rally.benchmark.engine.context.ContextManager.cleanup") - @mock.patch("rally.benchmark.engine.context.ContextManager.setup") + @mock.patch("rally.task.engine.BenchmarkEngine.consume_results") + @mock.patch("rally.task.engine.base_scenario.Scenario") + @mock.patch("rally.task.engine.runner.ScenarioRunner") + @mock.patch("rally.task.engine.context.ContextManager.cleanup") + @mock.patch("rally.task.engine.context.ContextManager.setup") def test_run__config_has_args( self, mock_context_manager_setup, mock_context_manager_cleanup, mock_scenario_runner, mock_scenario, @@ -274,11 +274,11 @@ class BenchmarkEngineTestCase(test.TestCase): eng = engine.BenchmarkEngine(config, task) eng.run() - @mock.patch("rally.benchmark.engine.BenchmarkEngine.consume_results") - @mock.patch("rally.benchmark.engine.base_scenario.Scenario") - @mock.patch("rally.benchmark.engine.runner.ScenarioRunner") - @mock.patch("rally.benchmark.engine.context.ContextManager.cleanup") - @mock.patch("rally.benchmark.engine.context.ContextManager.setup") + @mock.patch("rally.task.engine.BenchmarkEngine.consume_results") + @mock.patch("rally.task.engine.base_scenario.Scenario") + @mock.patch("rally.task.engine.runner.ScenarioRunner") + @mock.patch("rally.task.engine.context.ContextManager.cleanup") + @mock.patch("rally.task.engine.context.ContextManager.setup") def test_run__config_has_runner( self, mock_context_manager_setup, mock_context_manager_cleanup, mock_scenario_runner, mock_scenario, mock_consume_results): @@ -290,11 +290,11 @@ class BenchmarkEngineTestCase(test.TestCase): eng = engine.BenchmarkEngine(config, task) eng.run() - @mock.patch("rally.benchmark.engine.BenchmarkEngine.consume_results") - @mock.patch("rally.benchmark.engine.base_scenario.Scenario") - @mock.patch("rally.benchmark.engine.runner.ScenarioRunner") - @mock.patch("rally.benchmark.engine.context.ContextManager.cleanup") - @mock.patch("rally.benchmark.engine.context.ContextManager.setup") + @mock.patch("rally.task.engine.BenchmarkEngine.consume_results") + @mock.patch("rally.task.engine.base_scenario.Scenario") + @mock.patch("rally.task.engine.runner.ScenarioRunner") + @mock.patch("rally.task.engine.context.ContextManager.cleanup") + @mock.patch("rally.task.engine.context.ContextManager.setup") def test_run__config_has_context( self, mock_context_manager_setup, mock_context_manager_cleanup, mock_scenario_runner, mock_scenario, mock_consume_results): @@ -306,12 +306,12 @@ class BenchmarkEngineTestCase(test.TestCase): eng = engine.BenchmarkEngine(config, task) eng.run() - @mock.patch("rally.benchmark.engine.LOG") - @mock.patch("rally.benchmark.engine.BenchmarkEngine.consume_results") - @mock.patch("rally.benchmark.engine.base_scenario.Scenario") - @mock.patch("rally.benchmark.engine.runner.ScenarioRunner") - @mock.patch("rally.benchmark.engine.context.ContextManager.cleanup") - @mock.patch("rally.benchmark.engine.context.ContextManager.setup") + @mock.patch("rally.task.engine.LOG") + @mock.patch("rally.task.engine.BenchmarkEngine.consume_results") + @mock.patch("rally.task.engine.base_scenario.Scenario") + @mock.patch("rally.task.engine.runner.ScenarioRunner") + @mock.patch("rally.task.engine.context.ContextManager.cleanup") + @mock.patch("rally.task.engine.context.ContextManager.setup") def test_run_exception_is_logged( self, mock_context_manager_setup, mock_context_manager_cleanup, mock_scenario_runner, mock_scenario, mock_consume_results, @@ -329,7 +329,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertEqual(2, mock_log.exception.call_count) - @mock.patch("rally.benchmark.engine.base_scenario.Scenario.meta") + @mock.patch("rally.task.engine.base_scenario.Scenario.meta") def test__prepare_context(self, mock_scenario_meta): default_context = {"a": 1, "b": 2} mock_scenario_meta.return_value = default_context @@ -354,7 +354,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertEqual(result, expected_result) mock_scenario_meta.assert_called_once_with(name, "context") - @mock.patch("rally.benchmark.engine.base_scenario.Scenario.meta") + @mock.patch("rally.task.engine.base_scenario.Scenario.meta") def test__prepare_context_with_existing_users(self, mock_scenario_meta): mock_scenario_meta.return_value = {} task = mock.MagicMock() @@ -378,7 +378,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertEqual(result, expected_result) mock_scenario_meta.assert_called_once_with(name, "context") - @mock.patch("rally.benchmark.sla.SLAChecker") + @mock.patch("rally.task.sla.SLAChecker") def test_consume_results(self, mock_sla_checker): mock_sla_instance = mock.MagicMock() mock_sla_checker.return_value = mock_sla_instance @@ -400,7 +400,7 @@ class BenchmarkEngineTestCase(test.TestCase): self.assertEqual(expected_iteration_calls, mock_sla_instance.add_iteration.mock_calls) - @mock.patch("rally.benchmark.sla.SLAChecker") + @mock.patch("rally.task.sla.SLAChecker") def test_consume_results_sla_failure_abort(self, mock_sla_checker): mock_sla_instance = mock.MagicMock() mock_sla_checker.return_value = mock_sla_instance @@ -422,7 +422,7 @@ class BenchmarkEngineTestCase(test.TestCase): mock_sla_checker.assert_called_once_with({"fake": 2}) self.assertTrue(runner.abort.called) - @mock.patch("rally.benchmark.sla.SLAChecker") + @mock.patch("rally.task.sla.SLAChecker") def test_consume_results_sla_failure_continue(self, mock_sla_checker): mock_sla_instance = mock.MagicMock() mock_sla_checker.return_value = mock_sla_instance diff --git a/tests/unit/benchmark/test_functional.py b/tests/unit/task/test_functional.py similarity index 99% rename from tests/unit/benchmark/test_functional.py rename to tests/unit/task/test_functional.py index 8a7e66c130..192ac6c05b 100644 --- a/tests/unit/benchmark/test_functional.py +++ b/tests/unit/task/test_functional.py @@ -17,8 +17,8 @@ import sys import testtools -from rally.benchmark import functional from rally import exceptions +from rally.task import functional from tests.unit import test diff --git a/tests/unit/benchmark/test_runner.py b/tests/unit/task/test_runner.py similarity index 98% rename from tests/unit/benchmark/test_runner.py rename to tests/unit/task/test_runner.py index fece699332..47539df993 100644 --- a/tests/unit/benchmark/test_runner.py +++ b/tests/unit/task/test_runner.py @@ -19,14 +19,14 @@ import multiprocessing import jsonschema import mock -from rally.benchmark import runner -from rally.benchmark.scenarios import base as scenario_base from rally.plugins.common.runners import serial +from rally.task import runner +from rally.task.scenarios import base as scenario_base from tests.unit import fakes from tests.unit import test -BASE = "rally.benchmark.runner." +BASE = "rally.task.runner." class ScenarioHelpersTestCase(test.TestCase): diff --git a/tests/unit/benchmark/test_sla.py b/tests/unit/task/test_sla.py similarity index 98% rename from tests/unit/benchmark/test_sla.py rename to tests/unit/task/test_sla.py index ec582faf79..5e9f29d28b 100644 --- a/tests/unit/benchmark/test_sla.py +++ b/tests/unit/task/test_sla.py @@ -14,8 +14,8 @@ # under the License. -from rally.benchmark import sla from rally.common.plugin import plugin +from rally.task import sla from tests.unit import test diff --git a/tests/unit/benchmark/test_types.py b/tests/unit/task/test_types.py similarity index 98% rename from tests/unit/benchmark/test_types.py rename to tests/unit/task/test_types.py index 18061a66eb..4022b1f514 100644 --- a/tests/unit/benchmark/test_types.py +++ b/tests/unit/task/test_types.py @@ -15,8 +15,8 @@ import mock -from rally.benchmark import types from rally import exceptions +from rally.task import types from tests.unit import fakes from tests.unit import test @@ -334,8 +334,8 @@ class NeutronNetworkResourceTypeTestCase(test.TestCase): class PreprocessTestCase(test.TestCase): - @mock.patch("rally.benchmark.types.base.Scenario.meta") - @mock.patch("rally.benchmark.types.osclients") + @mock.patch("rally.task.types.base.Scenario.meta") + @mock.patch("rally.task.types.osclients") def test_preprocess(self, mock_osclients, mock_scenario_meta): cls = "some_class" method_name = "method_name" @@ -364,7 +364,7 @@ class PreprocessTestCase(test.TestCase): class FileTypeTestCase(test.TestCase): - @mock.patch("rally.benchmark.types.open", + @mock.patch("rally.task.types.open", side_effect=mock.mock_open(read_data="file_context"), create=True) def test_transform_by_path(self, mock_open): @@ -373,7 +373,7 @@ class FileTypeTestCase(test.TestCase): clients=None, resource_config=resource_config) self.assertEqual(file_context, "file_context") - @mock.patch("rally.benchmark.types.open", + @mock.patch("rally.task.types.open", side_effect=IOError, create=True) def test_transform_by_path_no_match(self, mock_open): resource_config = "nonexistant.yaml" @@ -385,7 +385,7 @@ class FileTypeTestCase(test.TestCase): class FileTypeDictTestCase(test.TestCase): - @mock.patch("rally.benchmark.types.open", + @mock.patch("rally.task.types.open", side_effect=mock.mock_open(read_data="file_context"), create=True) def test_transform_by_path(self, mock_open): @@ -395,7 +395,7 @@ class FileTypeDictTestCase(test.TestCase): resource_config=resource_config) self.assertEqual(file_context, {"file.yaml": "file_context"}) - @mock.patch("rally.benchmark.types.open", + @mock.patch("rally.task.types.open", side_effect=IOError, create=True) def test_transform_by_path_no_match(self, mock_open): resource_config = ["nonexistant.yaml"] diff --git a/tests/unit/benchmark/test_utils.py b/tests/unit/task/test_utils.py similarity index 98% rename from tests/unit/benchmark/test_utils.py rename to tests/unit/task/test_utils.py index 42452a2c8f..02a44e4db8 100644 --- a/tests/unit/benchmark/test_utils.py +++ b/tests/unit/task/test_utils.py @@ -18,8 +18,8 @@ import datetime from jsonschema import exceptions as schema_exceptions import mock -from rally.benchmark import utils from rally import exceptions +from rally.task import utils from tests.unit import fakes from tests.unit import test @@ -421,7 +421,7 @@ class WaitForStatusTestCase(test.TestCase): self.assertRaises(ValueError, utils.wait_for, {}, ready_statuses=["ready"]) - @mock.patch("rally.benchmark.utils.time.sleep") + @mock.patch("rally.task.utils.time.sleep") def test_exit_instantly(self, mock_sleep): res = {"status": "ready"} upd = mock.MagicMock(return_value=res) @@ -432,8 +432,8 @@ class WaitForStatusTestCase(test.TestCase): upd.assert_called_once_with(res) self.assertFalse(mock_sleep.called) - @mock.patch("rally.benchmark.utils.time.sleep") - @mock.patch("rally.benchmark.utils.time.time", return_value=1) + @mock.patch("rally.task.utils.time.sleep") + @mock.patch("rally.task.utils.time.time", return_value=1) def test_wait_successful(self, mock_time, mock_sleep): res = {"status": "not_ready"} upd = mock.MagicMock(side_effect=[{"status": "not_ready"}, @@ -449,8 +449,8 @@ class WaitForStatusTestCase(test.TestCase): mock.call({"status": "still_not_ready"}), mock.call({"status": "almost_ready"})]) - @mock.patch("rally.benchmark.utils.time.sleep") - @mock.patch("rally.benchmark.utils.time.time", return_value=1) + @mock.patch("rally.task.utils.time.sleep") + @mock.patch("rally.task.utils.time.time", return_value=1) def test_wait_failure(self, mock_time, mock_sleep): res = {"status": "not_ready"} upd = mock.MagicMock(side_effect=[{"status": "not_ready"}, diff --git a/tests/unit/benchmark/test_validation.py b/tests/unit/task/test_validation.py similarity index 99% rename from tests/unit/benchmark/test_validation.py rename to tests/unit/task/test_validation.py index ef194539b7..46a00300d9 100644 --- a/tests/unit/benchmark/test_validation.py +++ b/tests/unit/task/test_validation.py @@ -21,15 +21,15 @@ import mock from novaclient import exceptions as nova_exc import six -from rally.benchmark import validation from rally import consts from rally import exceptions import rally.osclients +from rally.task import validation from rally.verification.tempest import tempest from tests.unit import test -MODULE = "rally.benchmark.validation." +MODULE = "rally.task.validation." class ValidationUtilsTestCase(test.TestCase): @@ -155,7 +155,7 @@ class ValidatorsTestCase(test.TestCase): result = validation.check_command_dict(command) self.assertIsNone(result) - @mock.patch("rally.benchmark.validation._file_access_ok") + @mock.patch("rally.task.validation._file_access_ok") def test_valid_command(self, mock__file_access_ok): validator = self._unwrap_validator(validation.valid_command, param_name="p") @@ -174,7 +174,7 @@ class ValidatorsTestCase(test.TestCase): result = validator({"args": {"p": None}}, None, None) self.assertFalse(result.is_valid, result.msg) - @mock.patch("rally.benchmark.validation._file_access_ok") + @mock.patch("rally.task.validation._file_access_ok") def test_valid_command_unreadable_script_file(self, mock__file_access_ok): mock__file_access_ok.return_value = validation.ValidationResult(False) @@ -185,7 +185,7 @@ class ValidatorsTestCase(test.TestCase): result = validator({"args": {"p": command}}, None, None) self.assertFalse(result.is_valid, result.msg) - @mock.patch("rally.benchmark.validation.check_command_dict") + @mock.patch("rally.task.validation.check_command_dict") def test_valid_command_fail_check_command_dict(self, mock_check_command_dict): validator = self._unwrap_validator(validation.valid_command, diff --git a/tests/unit/test.py b/tests/unit/test.py index e90c27998b..4c20c3b07c 100644 --- a/tests/unit/test.py +++ b/tests/unit/test.py @@ -94,9 +94,9 @@ class ClientsTestCase(TestCase): super(ClientsTestCase, self).setUp() self._clients = {} self._client_mocks = [ - mock.patch("rally.benchmark.scenarios.base.Scenario.clients", + mock.patch("rally.task.scenarios.base.Scenario.clients", mock.Mock(side_effect=self.clients)), - mock.patch("rally.benchmark.scenarios.base.Scenario.admin_clients", + mock.patch("rally.task.scenarios.base.Scenario.admin_clients", mock.Mock(side_effect=self.admin_clients)) ] for patcher in self._client_mocks: diff --git a/tests/unit/test_docstrings.py b/tests/unit/test_docstrings.py index f52ca5e7f1..f900fcb07c 100644 --- a/tests/unit/test_docstrings.py +++ b/tests/unit/test_docstrings.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.benchmark.scenarios import base -from rally.benchmark import sla from rally.common.plugin import discover from rally.common import utils from rally.deploy import engine from rally.deploy.serverprovider import provider +from rally.task.scenarios import base +from rally.task import sla from tests.unit import test