Rename rally/benchmark to rally/task

We need to reduce amount of works in our glossary
Rally task commands are based on what is in rally/benchmark
So it will be better to call this directory properly

Change-Id: I7dccdec82c24942517cb2611a8e12218db6118f1

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 <https://github.com/openstack/rally/blob/master/rally/benchmark/scenarios/base.py#L40>`_ class and located in some subpackage of `rally.benchmark.scenarios <https://github.com/openstack/rally/tree/master/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 <https://github.com/openstack/rally/blob/master/rally/benchmark/scenarios/base.py#L40>`_ class and located in some subpackage of `rally.task.scenarios <https://github.com/openstack/rally/tree/master/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*.
 
 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.task.scenarios import base
-    from rally.benchmark import utils
+    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.

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
 
 

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

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__)

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):

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):

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"),
+            "is_ready": utils.resource_is("ACTIVE"),
-            "update_resource": benchmark_utils.get_from_manager(),
+            "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)

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)

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__)
 

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__)
 

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")

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):

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):

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):

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")

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")

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")

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")

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__)

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,

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__)

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__)

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__)
 

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__)

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__)

rally/plugins/openstack/context/murano_packages.py

@@ -15,13 +15,14 @@
 
 import zipfile
 
-from rally.benchmark import context
+from rally.common.i18n import _
-from rally.common.i18n import _, _LE
+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__)

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__)

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__)

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__)
 

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

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__)

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__)

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__)

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__)

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__)
 

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
 

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__)
 

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__)
 

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__)

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.task.scenarios import base
-from rally.benchmark import validation
+from rally.task import validation
 
 
 class Authenticate(base.Scenario):

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):

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):

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):

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):

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):

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):

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):

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):

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.task.scenarios import base
-from rally.benchmark import utils as bench_utils
+from rally.task import utils as bench_utils
 
 
 class CeilometerScenario(base.Scenario):

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",

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__)
 

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):

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):

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__)

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.task.scenarios import base
-from rally.benchmark import utils as bench_utils
+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,

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):

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):

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):

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.task.scenarios import base
-from rally.benchmark import utils as bench_utils
+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"),
+                is_ready=utils.resource_is("active"),
-                update_resource=bench_utils.get_from_manager(),
+                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)

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):

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.task.scenarios import base
-from rally.benchmark import utils as bench_utils
+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"),
+            is_ready=utils.resource_is("CREATE_COMPLETE"),
-            update_resource=bench_utils.get_from_manager(["CREATE_FAILED"]),
+            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"),
+            is_ready=utils.resource_is("UPDATE_COMPLETE"),
-            update_resource=bench_utils.get_from_manager(["UPDATE_FAILED"]),
+            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"),
+            is_ready=utils.resource_is("CHECK_COMPLETE"),
-            update_resource=bench_utils.get_from_manager(["CHECK_FAILED"]),
+            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"),
+            is_ready=utils.resource_is("SUSPEND_COMPLETE"),
-            update_resource=bench_utils.get_from_manager(
+            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"),
+            is_ready=utils.resource_is("RESUME_COMPLETE"),
-            update_resource=bench_utils.get_from_manager(
+            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"),
+            is_ready=utils.resource_is("SNAPSHOT_COMPLETE"),
-            update_resource=bench_utils.get_from_manager(
+            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"),
+            is_ready=utils.resource_is("RESTORE_COMPLETE"),
-            update_resource=bench_utils.get_from_manager(
+            update_resource=utils.get_from_manager(
                 ["RESTORE_FAILED"]),
             timeout=CONF.benchmark.heat_stack_restore_timeout,
             check_interval=CONF.benchmark.heat_stack_restore_poll_interval

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):

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):

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):

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.task.scenarios import base
-from rally.benchmark import utils as bench_utils
+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"),
+            is_ready=utils.resource_is("available"),
-            update_resource=bench_utils.get_from_manager(),
+            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)
 

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):

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):

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__)
 

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.task.scenarios import base
-from rally.benchmark import utils as bench_utils
+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(
+        utils.wait_for(
-            environment, is_ready=bench_utils.resource_is("READY"),
+            environment, is_ready=utils.resource_is("READY"),
-            update_resource=bench_utils.get_from_manager(["DEPLOY FAILURE"]),
+            update_resource=utils.get_from_manager(["DEPLOY FAILURE"]),
             timeout=CONF.benchmark.deploy_environment_timeout,
             check_interval=CONF.benchmark.deploy_environment_check_interval
         )

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):

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):

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__)
 

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):

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__)

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):

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):

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",

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"),
+            is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("ACTIVE"),
+            server, is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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"),
+            is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("ACTIVE"),
+            server, is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("SHUTOFF"),
+            server, is_ready=utils.resource_is("SHUTOFF"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("RESCUE"),
+            server, is_ready=utils.resource_is("RESCUE"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("ACTIVE"),
+            server, is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("SUSPENDED"),
+            server, is_ready=utils.resource_is("SUSPENDED"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("ACTIVE"),
+            server, is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("PAUSED"),
+            server, is_ready=utils.resource_is("PAUSED"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("ACTIVE"),
+            server, is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("SHELVED_OFFLOADED"),
+            server, is_ready=utils.resource_is("SHELVED_OFFLOADED"),
-            update_resource=bench_utils.get_from_manager(),
+            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(
+        utils.wait_for(
-            server, is_ready=bench_utils.resource_is("ACTIVE"),
+            server, is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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"),
+            is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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"),
+            is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.
+            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"),
+            is_ready=utils.resource_is("VERIFY_RESIZE"),
-            update_resource=bench_utils.get_from_manager(),
+            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),
+            is_ready=utils.resource_is(status),
-            update_resource=bench_utils.get_from_manager(),
+            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),
+            is_ready=utils.resource_is(status),
-            update_resource=bench_utils.get_from_manager(),
+            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"),
+            is_ready=utils.resource_is("in-use"),
-            update_resource=bench_utils.get_from_manager(),
+            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"),
+            is_ready=utils.resource_is("available"),
-            update_resource=bench_utils.get_from_manager(),
+            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"),
+            is_ready=utils.resource_is("ACTIVE"),
-            update_resource=bench_utils.get_from_manager(),
+            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"),
+            is_ready=utils.resource_is("VERIFY_RESIZE"),
-            update_resource=bench_utils.get_from_manager(),
+            update_resource=utils.get_from_manager(),
             timeout=CONF.benchmark.nova_server_migrate_timeout,
             check_interval=(
                 CONF.benchmark.nova_server_migrate_poll_interval)

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):

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):

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__)
 

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__)
 

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):

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,

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):

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):

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):

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,
+            is_ready=utils.resource_is(ICMP_UP_STATUS,
-                                             self._ping_ip_address),
+                                       self._ping_ip_address),
             timeout=120
         )
 

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,

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):

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):

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))
 

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__)
 

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__)

rally/task/processing/plot.py

@@ -18,8 +18,8 @@ import json
 
 import six
 
-from rally.benchmark.processing.charts import histogram as histo
+from rally.task.processing.charts import histogram as histo
-from rally.benchmark.processing import utils
+from rally.task.processing import utils
 from rally.ui import utils as ui_utils