Change structure and imports

rally.plugins.openstack -> rally_openstack
- rally_openstack.context -> rally_openstack.contexts
rally.plugins.workloads -> rally_openstack/workloads
rally.consts -> rally_openstack.consts

TODO: fix pep8

README.rst

@@ -1,92 +1,8 @@
 =====
-Rally
+rally-openstack
 =====
 
-Team and repository tags
-========================
-
-.. image:: https://governance.openstack.org/badges/rally.svg
-    :target: https://governance.openstack.org/reference/tags/index.html
-
-.. image:: https://img.shields.io/pypi/v/rally.svg
-    :target: https://pypi.python.org/pypi/rally/
-    :alt: Latest Version
-
-.. image:: https://img.shields.io/badge/gitter-join_chat-ff69b4.svg
-    :target: https://gitter.im/rally-dev/Lobby
-    :alt: Gitter Chat
-
-.. image:: https://img.shields.io/badge/tasks-trello_board-blue.svg
-    :target: https://trello.com/b/DoD8aeZy/rally
-    :alt: Trello Board
-
-.. image:: https://img.shields.io/github/license/openstack/rally.svg
-    :target: https://www.apache.org/licenses/LICENSE-2.0
-    :alt: Apache License, Version 2.0
-
-
-What is Rally
-=============
-
-Rally is a Benchmark-as-a-Service project for OpenStack.
-
-Rally is intended to provide the community with a benchmarking tool that is capable of performing **specific**, **complicated** and **reproducible** test cases on **real deployment** scenarios.
-
-If you are here, you are probably familiar with OpenStack and you also know that it's a really huge ecosystem of cooperative services. When something fails, performs slowly or doesn't scale, it's really hard to answer different questions on "what", "why" and "where" has happened. Another reason why you could be here is that you would like to build an OpenStack CI/CD system that will allow you to improve SLA, performance and stability of OpenStack continuously.
-
-The OpenStack QA team mostly works on CI/CD that ensures that new patches don't break some specific single node installation of OpenStack. On the other hand it's clear that such CI/CD is only an indication and does not cover all cases (e.g. if a cloud works well on a single node installation it doesn't mean that it will continue to do so on a 1k servers installation under high load as well). Rally aims to fix this and help us to answer the question "How does OpenStack work at scale?". To make it possible, we are going to automate and unify all steps that are required for benchmarking OpenStack at scale: multi-node OS deployment, verification, benchmarking & profiling.
-
-
-**Rally** workflow can be visualized by the following diagram:
-
-.. image:: doc/source/images/Rally-Actions.png
-   :alt: Rally Architecture
-
-
-Who Is Using Rally
-==================
-
-.. image:: doc/source/images/Rally_who_is_using.png
-   :alt: Who is Using Rally
-
-
-Documentation
-=============
-
-`Rally documentation on ReadTheDocs <https://rally.readthedocs.org/en/latest/>`_ is a perfect place to start learning about Rally. It provides you with an **easy** and **illustrative** guidance through this benchmarking tool. For example, check out the `Rally step-by-step tutorial <https://rally.readthedocs.io/en/latest/quick_start/tutorial.html>`_ that explains, in a series of lessons, how to explore the power of Rally in benchmarking your OpenStack clouds.
-
-
-Architecture
-------------
-
-In terms of software architecture, Rally is built of 4 main components:
-
-1. **Server Providers** - provide servers (virtual servers), with ssh access, in one L3 network.
-2. **Deploy Engines** - deploy OpenStack cloud on servers that are presented by **Server Providers**
-3. **Verification** - component that runs tempest (or another specific set of tests) against a deployed cloud, collects results & presents them in human readable form.
-4. **Benchmark engine** - allows to write parameterized benchmark scenarios & run them against the cloud.
-
-Use Cases
----------
-
-There are 3 major high level Rally Use Cases:
-
-.. image:: doc/source/images/Rally-UseCases.png
-   :alt: Rally Use Cases
-
-
-Typical cases where Rally aims to help are:
-
-- Automate measuring & profiling focused on how new code changes affect the OS performance;
-- Using Rally profiler to detect scaling & performance issues;
-- Investigate how different deployments affect the OS performance:
-	- Find the set of suitable OpenStack deployment architectures;
-	- Create deployment specifications for different loads (amount of controllers, swift nodes, etc.);
-- Automate the search for hardware best suited for particular OpenStack cloud;
-- Automate the production cloud specification generation:
-	- Determine terminal loads for basic cloud operations: VM start & stop, Block Device create/destroy & various OpenStack API methods;
-	- Check performance of basic cloud operations in case of different loads.
-
+Rally plugins for `OpenStack platform <https://openstack.org>`_
 
 Links
 ----------------------
@@ -96,7 +12,6 @@ Links
 * Source: https://git.openstack.org/cgit/openstack/rally
 * Bugs: https://bugs.launchpad.net/rally
 * Step-by-step tutorial: https://rally.readthedocs.io/en/latest/quick_start/tutorial.html
-* RoadMap: https://docs.google.com/a/mirantis.com/spreadsheets/d/16DXpfbqvlzMFaqaXAcJsBzzpowb_XpymaK2aFY2gA2g
 * Launchpad page: https://launchpad.net/rally
 * Gitter chat: https://gitter.im/rally-dev/Lobby
 * Trello board: https://trello.com/b/DoD8aeZy/rally

rally/plugins/__init__.py

@@ -1,55 +0,0 @@
-# Copyright 2015: Mirantis Inc.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import os
-
-import decorator
-
-from rally.common.plugin import discover
-
-
-PLUGINS_LOADED = False
-
-
-def load():
-    global PLUGINS_LOADED
-
-    if not PLUGINS_LOADED:
-        from rally.common import opts
-
-        opts.register()
-
-        discover.import_modules_from_package("rally.deployment.engines")
-        discover.import_modules_from_package("rally.deployment.serverprovider")
-        discover.import_modules_from_package("rally.plugins.common")
-        try:
-            import rally_openstack  # noqa
-        except ImportError:
-            # print warnings when rally_openstack will be released
-            discover.import_modules_from_package("rally.plugins.openstack")
-            discover.import_modules_from_package("rally.plugins.workload")
-
-        discover.import_modules_by_entry_point()
-
-        discover.load_plugins("/opt/rally/plugins/")
-        discover.load_plugins(os.path.expanduser("~/.rally/plugins/"))
-
-    PLUGINS_LOADED = True
-
-
-@decorator.decorator
-def ensure_plugins_are_loaded(f, *args, **kwargs):
-    load()
-    return f(*args, **kwargs)

rally_openstack/cfg/opts.py

@@ -13,31 +13,31 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from rally.plugins.openstack.cfg import cinder
-from rally.plugins.openstack.cfg import ec2
-from rally.plugins.openstack.cfg import glance
-from rally.plugins.openstack.cfg import heat
-from rally.plugins.openstack.cfg import ironic
-from rally.plugins.openstack.cfg import magnum
-from rally.plugins.openstack.cfg import manila
-from rally.plugins.openstack.cfg import mistral
-from rally.plugins.openstack.cfg import monasca
-from rally.plugins.openstack.cfg import murano
-from rally.plugins.openstack.cfg import neutron
-from rally.plugins.openstack.cfg import nova
-from rally.plugins.openstack.cfg import osclients
-from rally.plugins.openstack.cfg import profiler
-from rally.plugins.openstack.cfg import sahara
-from rally.plugins.openstack.cfg import senlin
-from rally.plugins.openstack.cfg import vm
-from rally.plugins.openstack.cfg import watcher
+from rally_openstack.cfg import cinder
+from rally_openstack.cfg import ec2
+from rally_openstack.cfg import glance
+from rally_openstack.cfg import heat
+from rally_openstack.cfg import ironic
+from rally_openstack.cfg import magnum
+from rally_openstack.cfg import manila
+from rally_openstack.cfg import mistral
+from rally_openstack.cfg import monasca
+from rally_openstack.cfg import murano
+from rally_openstack.cfg import neutron
+from rally_openstack.cfg import nova
+from rally_openstack.cfg import osclients
+from rally_openstack.cfg import profiler
+from rally_openstack.cfg import sahara
+from rally_openstack.cfg import senlin
+from rally_openstack.cfg import vm
+from rally_openstack.cfg import watcher
 
-from rally.plugins.openstack.cfg import tempest
+from rally_openstack.cfg import tempest
 
-from rally.plugins.openstack.cfg import keystone_roles
-from rally.plugins.openstack.cfg import keystone_users
+from rally_openstack.cfg import keystone_roles
+from rally_openstack.cfg import keystone_users
 
-from rally.plugins.openstack.cfg import cleanup
+from rally_openstack.cfg import cleanup
 
 
 def list_opts():

rally_openstack/cleanup/manager.py

@@ -20,7 +20,7 @@ from rally.common import logging
 from rally.common.plugin import discover
 from rally.common.plugin import plugin
 from rally.common import utils as rutils
-from rally.plugins.openstack.cleanup import base
+from rally_openstack.cleanup import base
 
 
 LOG = logging.getLogger(__name__)

rally_openstack/cleanup/resources.py

@@ -20,10 +20,10 @@ from saharaclient.api import base as saharaclient_base
 
 from rally.common import cfg
 from rally.common import logging
-from rally.plugins.openstack.cleanup import base
-from rally.plugins.openstack.services.identity import identity
-from rally.plugins.openstack.services.image import glance_v2
-from rally.plugins.openstack.services.image import image
+from rally_openstack.cleanup import base
+from rally_openstack.services.identity import identity
+from rally_openstack.services.image import glance_v2
+from rally_openstack.services.image import image
 from rally.task import utils as task_utils
 
 CONF = cfg.CONF

rally_openstack/contexts/api_versions.py

@@ -15,7 +15,7 @@ import random
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack import osclients
+from rally_openstack import osclients
 from rally.task import context
 
 

rally_openstack/contexts/ceilometer/samples.py

@@ -21,7 +21,7 @@ from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack.scenarios.ceilometer import utils as ceilo_utils
+from rally_openstack.scenarios.ceilometer import utils as ceilo_utils
 from rally.task import context
 
 

rally_openstack/contexts/cinder/volume_types.py

@@ -16,9 +16,9 @@ from rally.common import logging
 from rally.common import utils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.services.storage import block
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.services.storage import block
 from rally.task import context
 
 

rally_openstack/contexts/cinder/volumes.py

@@ -14,9 +14,9 @@
 
 from rally.common import utils as rutils
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.services.storage import block
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.services.storage import block
 from rally.task import context
 
 

rally_openstack/contexts/cleanup/admin.py

@@ -16,9 +16,9 @@
 import sys
 
 from rally.common import validation
-from rally.plugins.openstack.cleanup import manager
-from rally.plugins.openstack.context.cleanup import base
-from rally.plugins.openstack import scenario
+from rally_openstack.cleanup import manager
+from rally_openstack.contexts.cleanup import base
+from rally_openstack import scenario
 from rally.task import context
 
 

rally_openstack/contexts/cleanup/base.py

@@ -15,7 +15,7 @@
 
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager
+from rally_openstack.cleanup import manager
 
 
 @validation.configure("check_cleanup_resources")

rally_openstack/contexts/cleanup/user.py

@@ -16,9 +16,9 @@
 import sys
 
 from rally.common import validation
-from rally.plugins.openstack.cleanup import manager
-from rally.plugins.openstack.context.cleanup import base
-from rally.plugins.openstack import scenario
+from rally_openstack.cleanup import manager
+from rally_openstack.contexts.cleanup import base
+from rally_openstack import scenario
 from rally.task import context
 
 

rally_openstack/contexts/dataplane/heat.py

@@ -19,9 +19,9 @@ from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.scenarios.heat import utils as heat_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.scenarios.heat import utils as heat_utils
 from rally.task import context
 
 

rally_openstack/contexts/designate/zones.py

@@ -15,8 +15,8 @@
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.scenarios.designate import utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.scenarios.designate import utils
 from rally.task import context
 
 

rally_openstack/contexts/ec2/servers.py

@@ -15,10 +15,10 @@
 from rally.common import logging
 from rally.common import utils as rutils
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.scenarios.ec2 import utils as ec2_utils
-from rally.plugins.openstack import types
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.scenarios.ec2 import utils as ec2_utils
+from rally_openstack import types
 from rally.task import context
 
 

rally_openstack/contexts/glance/images.py

@@ -17,9 +17,9 @@ from rally.common import logging
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.services.image import image
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.services.image import image
 from rally.task import context
 
 CONF = cfg.CONF

rally_openstack/contexts/heat/stacks.py

@@ -16,8 +16,8 @@
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.scenarios.heat import utils as heat_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.scenarios.heat import utils as heat_utils
 from rally.task import context
 
 

rally_openstack/contexts/keystone/roles.py

@@ -19,8 +19,8 @@ from rally.common import logging
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.services.identity import identity
+from rally_openstack import osclients
+from rally_openstack.services.identity import identity
 from rally.task import context
 
 

rally_openstack/contexts/keystone/users.py

@@ -23,10 +23,10 @@ from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack import credential
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.services.identity import identity
-from rally.plugins.openstack.wrappers import network
+from rally_openstack import credential
+from rally_openstack import osclients
+from rally_openstack.services.identity import identity
+from rally_openstack.wrappers import network
 from rally.task import context
 
 

rally_openstack/contexts/magnum/ca_certs.py

@@ -24,7 +24,7 @@ from cryptography.x509 import oid
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.scenarios.magnum import utils as magnum_utils
+from rally_openstack.scenarios.magnum import utils as magnum_utils
 from rally.task import context
 
 

rally_openstack/contexts/magnum/cluster_templates.py

@@ -15,8 +15,8 @@
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.scenarios.magnum import utils as magnum_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.scenarios.magnum import utils as magnum_utils
 from rally.task import context
 
 

rally_openstack/contexts/magnum/clusters.py

@@ -15,9 +15,9 @@
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.scenarios.magnum import utils as magnum_utils
-from rally.plugins.openstack.scenarios.nova import utils as nova_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.scenarios.magnum import utils as magnum_utils
+from rally_openstack.scenarios.nova import utils as nova_utils
 from rally.task import context
 
 

rally_openstack/contexts/manila/manila_security_services.py

@@ -17,9 +17,9 @@ from rally.common import cfg
 from rally.common import utils
 from rally.common import validation
 from rally import consts as rally_consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.context.manila import consts
-from rally.plugins.openstack.scenarios.manila import utils as manila_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.contexts.manila import consts
+from rally_openstack.scenarios.manila import utils as manila_utils
 from rally.task import context
 
 CONF = cfg.CONF

rally_openstack/contexts/manila/manila_share_networks.py

@@ -19,9 +19,9 @@ from rally.common import utils
 from rally.common import validation
 from rally import consts as rally_consts
 from rally import exceptions
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.context.manila import consts
-from rally.plugins.openstack.scenarios.manila import utils as manila_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.contexts.manila import consts
+from rally_openstack.scenarios.manila import utils as manila_utils
 from rally.task import context
 
 CONF = cfg.CONF

rally_openstack/contexts/manila/manila_shares.py

@@ -17,9 +17,9 @@ from rally.common import cfg
 from rally.common import utils
 from rally.common import validation
 from rally import consts as rally_consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.context.manila import consts
-from rally.plugins.openstack.scenarios.manila import utils as manila_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.contexts.manila import consts
+from rally_openstack.scenarios.manila import utils as manila_utils
 from rally.task import context
 
 CONF = cfg.CONF

rally_openstack/contexts/monasca/metrics.py

@@ -17,7 +17,7 @@ from six import moves
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.scenarios.monasca import utils as monasca_utils
+from rally_openstack.scenarios.monasca import utils as monasca_utils
 from rally.task import context
 
 

rally_openstack/contexts/murano/murano_environments.py

@@ -16,8 +16,8 @@
 from rally.common import utils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.scenarios.murano import utils as murano_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.scenarios.murano import utils as murano_utils
 from rally.task import context
 
 

rally_openstack/contexts/murano/murano_packages.py

@@ -21,8 +21,8 @@ from rally.common import utils
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
 from rally.task import context
 
 

rally_openstack/contexts/network/allow_ssh.py

@@ -16,8 +16,8 @@
 from rally.common import logging
 from rally.common import utils
 from rally.common import validation
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.wrappers import network
+from rally_openstack import osclients
+from rally_openstack.wrappers import network
 from rally.task import context
 
 

rally_openstack/contexts/network/existing_network.py

@@ -15,8 +15,8 @@
 from rally.common import utils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.wrappers import network as network_wrapper
+from rally_openstack import osclients
+from rally_openstack.wrappers import network as network_wrapper
 from rally.task import context
 
 

rally_openstack/contexts/network/networks.py

@@ -17,8 +17,8 @@ from rally.common import logging
 from rally.common import utils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.wrappers import network as network_wrapper
+from rally_openstack import osclients
+from rally_openstack.wrappers import network as network_wrapper
 from rally.task import context
 
 

rally_openstack/contexts/network/routers.py

@@ -16,8 +16,8 @@
 from rally.common import utils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.scenarios.neutron import utils as neutron_utils
 from rally.task import context
 
 

rally_openstack/contexts/neutron/lbaas.py

@@ -14,8 +14,8 @@ from rally.common import logging
 from rally.common import utils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.wrappers import network as network_wrapper
+from rally_openstack import osclients
+from rally_openstack.wrappers import network as network_wrapper
 from rally.task import context
 
 

rally_openstack/contexts/nova/flavors.py

@@ -17,8 +17,8 @@ from rally.common import logging
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
 from rally.task import context
 
 LOG = logging.getLogger(__name__)

rally_openstack/contexts/nova/keypairs.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from rally.common import validation
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
 from rally.task import context
 
 

rally_openstack/contexts/nova/servers.py

@@ -15,10 +15,10 @@
 from rally.common import logging
 from rally.common import utils as rutils
 from rally.common import validation
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.scenarios.nova import utils as nova_utils
-from rally.plugins.openstack import types
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.scenarios.nova import utils as nova_utils
+from rally_openstack import types
 from rally.task import context
 
 

rally_openstack/contexts/quotas/quotas.py

@@ -16,12 +16,12 @@
 from rally.common import logging
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.context.quotas import cinder_quotas
-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.plugins.openstack import osclients
+from rally_openstack.contexts.quotas import cinder_quotas
+from rally_openstack.contexts.quotas import designate_quotas
+from rally_openstack.contexts.quotas import manila_quotas
+from rally_openstack.contexts.quotas import neutron_quotas
+from rally_openstack.contexts.quotas import nova_quotas
+from rally_openstack import osclients
 from rally.task import context
 
 

rally_openstack/contexts/sahara/sahara_cluster.py

@@ -18,8 +18,8 @@ from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack.scenarios.sahara import utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack.scenarios.sahara import utils
 from rally.task import context
 from rally.task import utils as bench_utils
 

rally_openstack/contexts/sahara/sahara_image.py

@@ -16,10 +16,10 @@ from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.scenarios.sahara import utils
-from rally.plugins.openstack.services.image import image as image_services
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.scenarios.sahara import utils
+from rally_openstack.services.image import image as image_services
 from rally.task import context
 
 

rally_openstack/contexts/sahara/sahara_input_data_sources.py

@@ -19,10 +19,10 @@ from six.moves.urllib import parse
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.scenarios.sahara import utils
-from rally.plugins.openstack.scenarios.swift import utils as swift_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.scenarios.sahara import utils
+from rally_openstack.scenarios.swift import utils as swift_utils
 from rally.task import context
 
 

rally_openstack/contexts/sahara/sahara_job_binaries.py

@@ -19,9 +19,9 @@ from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.scenarios.sahara import utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.scenarios.sahara import utils
 from rally.task import context
 
 

rally_openstack/contexts/sahara/sahara_output_data_sources.py

@@ -16,10 +16,10 @@
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.cleanup import manager as resource_manager
-from rally.plugins.openstack import osclients
-from rally.plugins.openstack.scenarios.sahara import utils
-from rally.plugins.openstack.scenarios.swift import utils as swift_utils
+from rally_openstack.cleanup import manager as resource_manager
+from rally_openstack import osclients
+from rally_openstack.scenarios.sahara import utils
+from rally_openstack.scenarios.swift import utils as swift_utils
 from rally.task import context
 
 

rally_openstack/contexts/senlin/profiles.py

@@ -13,7 +13,7 @@
 from rally.common import utils as rutils
 from rally.common import validation
 from rally import consts
-from rally.plugins.openstack.scenarios.senlin import utils as senlin_utils
+from rally_openstack.scenarios.senlin import utils as senlin_utils
 from rally.task import context
 
 

rally_openstack/contexts/swift/objects.py

@@ -17,7 +17,7 @@ from rally.common import logging
 from rally.common import validation
 from rally import consts
 from rally import exceptions
-from rally.plugins.openstack.context.swift import utils as swift_utils
+from rally_openstack.contexts.swift import utils as swift_utils
 from rally.task import context
 
 LOG = logging.getLogger(__name__)

rally_openstack/contexts/swift/utils.py

@@ -17,7 +17,7 @@ import tempfile
 
 from rally.common import broker
 from rally.common import utils as rutils
-from rally.plugins.openstack.scenarios.swift import utils as swift_utils
+from rally_openstack.scenarios.swift import utils as swift_utils
 
 
 class SwiftObjectMixin(object):