diff --git a/doc/source/plugins/implementation/context_plugin.rst b/doc/source/plugins/implementation/context_plugin.rst index 0c80cc8d..5b45a771 100644 --- a/doc/source/plugins/implementation/context_plugin.rst +++ b/doc/source/plugins/implementation/context_plugin.rst @@ -39,9 +39,10 @@ implement the Context API: the *setup()* method that creates a flavor and the from rally.task import context from rally.common import logging - from rally import consts from rally.plugins.openstack import osclients + from rally_openstack import consts + LOG = logging.getLogger(__name__) diff --git a/doc/source/plugins/implementation/hook_and_trigger_plugins.rst b/doc/source/plugins/implementation/hook_and_trigger_plugins.rst index 713bab9c..a5208cca 100644 --- a/doc/source/plugins/implementation/hook_and_trigger_plugins.rst +++ b/doc/source/plugins/implementation/hook_and_trigger_plugins.rst @@ -213,9 +213,9 @@ method: import shlex import subprocess - from rally import consts from rally.task import hook + from rally_openstack import consts @hook.configure(name="simple_sys_call") class SimpleSysCallHook(hook.Hook): @@ -318,9 +318,9 @@ This example shows the code of the existing Event trigger: .. code-block:: python - from rally import consts from rally.task import trigger + from rally_openstack import consts @trigger.configure(name="event") class EventTrigger(trigger.Trigger): diff --git a/doc/source/plugins/implementation/runner_plugin.rst b/doc/source/plugins/implementation/runner_plugin.rst index 6c019adf..f07fc804 100644 --- a/doc/source/plugins/implementation/runner_plugin.rst +++ b/doc/source/plugins/implementation/runner_plugin.rst @@ -32,7 +32,8 @@ and implement its API (the *_run_scenario()* method): import random from rally.task import runner - from rally import consts + + from rally_openstack import consts @runner.configure(name="random_times") diff --git a/doc/source/plugins/implementation/scenario_plugin.rst b/doc/source/plugins/implementation/scenario_plugin.rst index 984f97ba..0d4e9dd1 100644 --- a/doc/source/plugins/implementation/scenario_plugin.rst +++ b/doc/source/plugins/implementation/scenario_plugin.rst @@ -31,11 +31,12 @@ clients: .. code-block:: python - from rally import consts from rally.plugins.openstack import scenario from rally.task import atomic from rally.task import validation + from rally_openstack import consts + @validation.add("required_services", services=[consts.Service.NOVA]) @validation.add("required_platform", platform="openstack", users=True) diff --git a/rally_openstack/contexts/api_versions.py b/rally_openstack/contexts/api_versions.py index 601fe802..f1e7b935 100644 --- a/rally_openstack/contexts/api_versions.py +++ b/rally_openstack/contexts/api_versions.py @@ -13,10 +13,10 @@ import random from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context +from rally_openstack import consts from rally_openstack import osclients diff --git a/rally_openstack/contexts/ceilometer/samples.py b/rally_openstack/contexts/ceilometer/samples.py index be423337..884fbb65 100644 --- a/rally_openstack/contexts/ceilometer/samples.py +++ b/rally_openstack/contexts/ceilometer/samples.py @@ -17,11 +17,11 @@ import time from rally.common import logging from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context from six import moves +from rally_openstack import consts from rally_openstack.scenarios.ceilometer import utils as ceilo_utils diff --git a/rally_openstack/contexts/cinder/volume_types.py b/rally_openstack/contexts/cinder/volume_types.py index af209aad..30de2a97 100644 --- a/rally_openstack/contexts/cinder/volume_types.py +++ b/rally_openstack/contexts/cinder/volume_types.py @@ -15,10 +15,10 @@ from rally.common import logging from rally.common import utils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.services.storage import block diff --git a/rally_openstack/contexts/cinder/volumes.py b/rally_openstack/contexts/cinder/volumes.py index 88a4fce3..c8f143ea 100644 --- a/rally_openstack/contexts/cinder/volumes.py +++ b/rally_openstack/contexts/cinder/volumes.py @@ -13,10 +13,10 @@ # under the License. from rally.common import utils as rutils -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.services.storage import block diff --git a/rally_openstack/contexts/cleanup/base.py b/rally_openstack/contexts/cleanup/base.py index d5e97d61..fdd72785 100644 --- a/rally_openstack/contexts/cleanup/base.py +++ b/rally_openstack/contexts/cleanup/base.py @@ -14,9 +14,9 @@ # under the License. from rally.common import validation -from rally import consts from rally_openstack.cleanup import manager +from rally_openstack import consts @validation.configure("check_cleanup_resources") diff --git a/rally_openstack/contexts/dataplane/heat.py b/rally_openstack/contexts/dataplane/heat.py index 4442d401..db5bdff3 100644 --- a/rally_openstack/contexts/dataplane/heat.py +++ b/rally_openstack/contexts/dataplane/heat.py @@ -17,11 +17,11 @@ import pkgutil from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.scenarios.heat import utils as heat_utils diff --git a/rally_openstack/contexts/designate/zones.py b/rally_openstack/contexts/designate/zones.py index 9e03a379..31308932 100644 --- a/rally_openstack/contexts/designate/zones.py +++ b/rally_openstack/contexts/designate/zones.py @@ -14,10 +14,10 @@ from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack.scenarios.designate import utils diff --git a/rally_openstack/contexts/ec2/servers.py b/rally_openstack/contexts/ec2/servers.py index 31336b14..0354fa29 100644 --- a/rally_openstack/contexts/ec2/servers.py +++ b/rally_openstack/contexts/ec2/servers.py @@ -14,10 +14,10 @@ from rally.common import logging from rally.common import utils as rutils -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.scenarios.ec2 import utils as ec2_utils from rally_openstack import types diff --git a/rally_openstack/contexts/glance/images.py b/rally_openstack/contexts/glance/images.py index 93cf40c1..a9ddaaf1 100644 --- a/rally_openstack/contexts/glance/images.py +++ b/rally_openstack/contexts/glance/images.py @@ -16,10 +16,10 @@ from rally.common import cfg from rally.common import logging from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.services.image import image diff --git a/rally_openstack/contexts/heat/stacks.py b/rally_openstack/contexts/heat/stacks.py index 5ebd15e9..aa870fba 100644 --- a/rally_openstack/contexts/heat/stacks.py +++ b/rally_openstack/contexts/heat/stacks.py @@ -15,10 +15,10 @@ from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack.scenarios.heat import utils as heat_utils diff --git a/rally_openstack/contexts/keystone/roles.py b/rally_openstack/contexts/keystone/roles.py index 8c637966..b7b4fd30 100644 --- a/rally_openstack/contexts/keystone/roles.py +++ b/rally_openstack/contexts/keystone/roles.py @@ -17,10 +17,10 @@ from rally.common import broker from rally.common import cfg from rally.common import logging from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.services.identity import identity diff --git a/rally_openstack/contexts/keystone/users.py b/rally_openstack/contexts/keystone/users.py index 7394a9af..6ff7bd41 100644 --- a/rally_openstack/contexts/keystone/users.py +++ b/rally_openstack/contexts/keystone/users.py @@ -21,10 +21,10 @@ from rally.common import cfg from rally.common import logging from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context +from rally_openstack import consts from rally_openstack import credential from rally_openstack import osclients from rally_openstack.services.identity import identity diff --git a/rally_openstack/contexts/magnum/ca_certs.py b/rally_openstack/contexts/magnum/ca_certs.py index 59eda5ce..e100f437 100644 --- a/rally_openstack/contexts/magnum/ca_certs.py +++ b/rally_openstack/contexts/magnum/ca_certs.py @@ -23,9 +23,9 @@ from cryptography.x509 import oid from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context +from rally_openstack import consts from rally_openstack.scenarios.magnum import utils as magnum_utils diff --git a/rally_openstack/contexts/magnum/cluster_templates.py b/rally_openstack/contexts/magnum/cluster_templates.py index 0723c2e6..c82d5bd5 100644 --- a/rally_openstack/contexts/magnum/cluster_templates.py +++ b/rally_openstack/contexts/magnum/cluster_templates.py @@ -14,10 +14,10 @@ from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack.scenarios.magnum import utils as magnum_utils diff --git a/rally_openstack/contexts/magnum/clusters.py b/rally_openstack/contexts/magnum/clusters.py index 6de2e041..a45ed55d 100644 --- a/rally_openstack/contexts/magnum/clusters.py +++ b/rally_openstack/contexts/magnum/clusters.py @@ -14,10 +14,10 @@ from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack.scenarios.magnum import utils as magnum_utils from rally_openstack.scenarios.nova import utils as nova_utils diff --git a/rally_openstack/contexts/manila/manila_security_services.py b/rally_openstack/contexts/manila/manila_security_services.py index c7c86c8e..6d33d1c7 100644 --- a/rally_openstack/contexts/manila/manila_security_services.py +++ b/rally_openstack/contexts/manila/manila_security_services.py @@ -16,10 +16,10 @@ from rally.common import cfg from rally.common import utils from rally.common import validation -from rally import consts as rally_consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts as rally_consts from rally_openstack.contexts.manila import consts from rally_openstack.scenarios.manila import utils as manila_utils diff --git a/rally_openstack/contexts/manila/manila_share_networks.py b/rally_openstack/contexts/manila/manila_share_networks.py index f036e046..47a1517a 100644 --- a/rally_openstack/contexts/manila/manila_share_networks.py +++ b/rally_openstack/contexts/manila/manila_share_networks.py @@ -17,11 +17,11 @@ from rally.common import cfg from rally.common import logging from rally.common import utils from rally.common import validation -from rally import consts as rally_consts from rally import exceptions from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts as rally_consts from rally_openstack.contexts.manila import consts from rally_openstack.scenarios.manila import utils as manila_utils diff --git a/rally_openstack/contexts/manila/manila_shares.py b/rally_openstack/contexts/manila/manila_shares.py index 3f0b6613..de44e3b4 100644 --- a/rally_openstack/contexts/manila/manila_shares.py +++ b/rally_openstack/contexts/manila/manila_shares.py @@ -16,10 +16,10 @@ from rally.common import cfg from rally.common import utils from rally.common import validation -from rally import consts as rally_consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts as rally_consts from rally_openstack.contexts.manila import consts from rally_openstack.scenarios.manila import utils as manila_utils diff --git a/rally_openstack/contexts/monasca/metrics.py b/rally_openstack/contexts/monasca/metrics.py index 4a190811..56a0684c 100644 --- a/rally_openstack/contexts/monasca/metrics.py +++ b/rally_openstack/contexts/monasca/metrics.py @@ -16,9 +16,9 @@ from six import moves from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context +from rally_openstack import consts from rally_openstack.scenarios.monasca import utils as monasca_utils diff --git a/rally_openstack/contexts/murano/murano_environments.py b/rally_openstack/contexts/murano/murano_environments.py index 51c18fd6..34f64b33 100644 --- a/rally_openstack/contexts/murano/murano_environments.py +++ b/rally_openstack/contexts/murano/murano_environments.py @@ -15,10 +15,10 @@ from rally.common import utils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack.scenarios.murano import utils as murano_utils diff --git a/rally_openstack/contexts/murano/murano_packages.py b/rally_openstack/contexts/murano/murano_packages.py index 409119a7..2d8cf27f 100644 --- a/rally_openstack/contexts/murano/murano_packages.py +++ b/rally_openstack/contexts/murano/murano_packages.py @@ -19,11 +19,11 @@ import zipfile from rally.common import fileutils from rally.common import utils from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients diff --git a/rally_openstack/contexts/network/existing_network.py b/rally_openstack/contexts/network/existing_network.py index b3f59f3d..45c81dfc 100644 --- a/rally_openstack/contexts/network/existing_network.py +++ b/rally_openstack/contexts/network/existing_network.py @@ -14,9 +14,9 @@ from rally.common import utils from rally.common import validation -from rally import consts from rally.task import context +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.wrappers import network as network_wrapper diff --git a/rally_openstack/contexts/network/networks.py b/rally_openstack/contexts/network/networks.py index 5da8fbce..e7d201a6 100644 --- a/rally_openstack/contexts/network/networks.py +++ b/rally_openstack/contexts/network/networks.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.task import context +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.wrappers import network as network_wrapper diff --git a/rally_openstack/contexts/network/routers.py b/rally_openstack/contexts/network/routers.py index 6b851f21..861d3424 100644 --- a/rally_openstack/contexts/network/routers.py +++ b/rally_openstack/contexts/network/routers.py @@ -15,10 +15,10 @@ from rally.common import utils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack.scenarios.neutron import utils as neutron_utils diff --git a/rally_openstack/contexts/neutron/lbaas.py b/rally_openstack/contexts/neutron/lbaas.py index 868828db..37ad6216 100644 --- a/rally_openstack/contexts/neutron/lbaas.py +++ b/rally_openstack/contexts/neutron/lbaas.py @@ -12,10 +12,11 @@ from rally.common import logging from rally.common import utils + from rally.common import validation -from rally import consts from rally.task import context +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.wrappers import network as network_wrapper diff --git a/rally_openstack/contexts/nova/flavors.py b/rally_openstack/contexts/nova/flavors.py index 6dd67245..90aecbc5 100644 --- a/rally_openstack/contexts/nova/flavors.py +++ b/rally_openstack/contexts/nova/flavors.py @@ -16,10 +16,10 @@ from rally.common import logging from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients diff --git a/rally_openstack/contexts/quotas/quotas.py b/rally_openstack/contexts/quotas/quotas.py index c184c907..8ce7fb30 100644 --- a/rally_openstack/contexts/quotas/quotas.py +++ b/rally_openstack/contexts/quotas/quotas.py @@ -15,9 +15,9 @@ from rally.common import logging from rally.common import validation -from rally import consts from rally.task import context +from rally_openstack import consts from rally_openstack.contexts.quotas import cinder_quotas from rally_openstack.contexts.quotas import designate_quotas from rally_openstack.contexts.quotas import manila_quotas diff --git a/rally_openstack/contexts/sahara/sahara_cluster.py b/rally_openstack/contexts/sahara/sahara_cluster.py index b1cf206c..006ae5cc 100644 --- a/rally_openstack/contexts/sahara/sahara_cluster.py +++ b/rally_openstack/contexts/sahara/sahara_cluster.py @@ -16,12 +16,12 @@ from rally.common import cfg from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context from rally.task import utils as bench_utils from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack.scenarios.sahara import utils diff --git a/rally_openstack/contexts/sahara/sahara_image.py b/rally_openstack/contexts/sahara/sahara_image.py index 9cffed61..2fcdad50 100644 --- a/rally_openstack/contexts/sahara/sahara_image.py +++ b/rally_openstack/contexts/sahara/sahara_image.py @@ -14,11 +14,11 @@ from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.scenarios.sahara import utils from rally_openstack.services.image import image as image_services diff --git a/rally_openstack/contexts/sahara/sahara_input_data_sources.py b/rally_openstack/contexts/sahara/sahara_input_data_sources.py index f6c94571..52f014c1 100644 --- a/rally_openstack/contexts/sahara/sahara_input_data_sources.py +++ b/rally_openstack/contexts/sahara/sahara_input_data_sources.py @@ -18,10 +18,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.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.scenarios.sahara import utils from rally_openstack.scenarios.swift import utils as swift_utils diff --git a/rally_openstack/contexts/sahara/sahara_job_binaries.py b/rally_openstack/contexts/sahara/sahara_job_binaries.py index c367b2ec..3e2970af 100644 --- a/rally_openstack/contexts/sahara/sahara_job_binaries.py +++ b/rally_openstack/contexts/sahara/sahara_job_binaries.py @@ -17,11 +17,11 @@ import requests from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.scenarios.sahara import utils diff --git a/rally_openstack/contexts/sahara/sahara_output_data_sources.py b/rally_openstack/contexts/sahara/sahara_output_data_sources.py index ecb30bfe..4a5dbcac 100644 --- a/rally_openstack/contexts/sahara/sahara_output_data_sources.py +++ b/rally_openstack/contexts/sahara/sahara_output_data_sources.py @@ -15,10 +15,10 @@ from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.scenarios.sahara import utils from rally_openstack.scenarios.swift import utils as swift_utils diff --git a/rally_openstack/contexts/senlin/profiles.py b/rally_openstack/contexts/senlin/profiles.py index 88504435..a1a73a9b 100644 --- a/rally_openstack/contexts/senlin/profiles.py +++ b/rally_openstack/contexts/senlin/profiles.py @@ -12,9 +12,9 @@ from rally.common import utils as rutils from rally.common import validation -from rally import consts from rally.task import context +from rally_openstack import consts from rally_openstack.scenarios.senlin import utils as senlin_utils diff --git a/rally_openstack/contexts/swift/objects.py b/rally_openstack/contexts/swift/objects.py index 8079c0e1..07f04f31 100644 --- a/rally_openstack/contexts/swift/objects.py +++ b/rally_openstack/contexts/swift/objects.py @@ -15,10 +15,10 @@ from rally.common import logging from rally.common import validation -from rally import consts from rally import exceptions from rally.task import context +from rally_openstack import consts from rally_openstack.contexts.swift import utils as swift_utils LOG = logging.getLogger(__name__) diff --git a/rally_openstack/contexts/vm/custom_image.py b/rally_openstack/contexts/vm/custom_image.py index db7c217a..dcf2a52b 100644 --- a/rally_openstack/contexts/vm/custom_image.py +++ b/rally_openstack/contexts/vm/custom_image.py @@ -20,9 +20,9 @@ import six from rally.common import broker from rally.common import logging from rally.common import utils -from rally import consts from rally.task import context +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.scenarios.vm import vmtasks from rally_openstack.services.image import image diff --git a/rally_openstack/contexts/watcher/audit_templates.py b/rally_openstack/contexts/watcher/audit_templates.py index fa33162d..17cb08bd 100644 --- a/rally_openstack/contexts/watcher/audit_templates.py +++ b/rally_openstack/contexts/watcher/audit_templates.py @@ -17,10 +17,10 @@ import random import six from rally.common import validation -from rally import consts from rally.task import context from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import consts from rally_openstack import osclients from rally_openstack.scenarios.watcher import utils as watcher_utils from rally_openstack import types diff --git a/rally_openstack/hook/fault_injection.py b/rally_openstack/hook/fault_injection.py index 1cc0338a..35c0aa67 100644 --- a/rally_openstack/hook/fault_injection.py +++ b/rally_openstack/hook/fault_injection.py @@ -15,9 +15,10 @@ from rally.common import logging from rally.common import objects -from rally import consts from rally.task import hook +from rally_openstack import consts + LOG = logging.getLogger(__name__) diff --git a/rally_openstack/osclients.py b/rally_openstack/osclients.py index 028793d7..503e79a3 100644 --- a/rally_openstack/osclients.py +++ b/rally_openstack/osclients.py @@ -16,15 +16,15 @@ import abc import os -from six.moves.urllib import parse - from rally.cli import envutils from rally.common import cfg from rally.common import logging from rally.common.plugin import plugin from rally.common import utils -from rally import consts from rally import exceptions +from six.moves.urllib import parse + +from rally_openstack import consts LOG = logging.getLogger(__name__) diff --git a/rally_openstack/scenarios/authenticate/authenticate.py b/rally_openstack/scenarios/authenticate/authenticate.py index d68ef8fa..1919335a 100644 --- a/rally_openstack/scenarios/authenticate/authenticate.py +++ b/rally_openstack/scenarios/authenticate/authenticate.py @@ -12,7 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts +from rally_openstack import consts + from rally.task import atomic from rally.task import validation diff --git a/rally_openstack/scenarios/ceilometer/alarms.py b/rally_openstack/scenarios/ceilometer/alarms.py index f8984245..62601d28 100644 --- a/rally_openstack/scenarios/ceilometer/alarms.py +++ b/rally_openstack/scenarios/ceilometer/alarms.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ceilometer import utils as ceiloutils diff --git a/rally_openstack/scenarios/ceilometer/events.py b/rally_openstack/scenarios/ceilometer/events.py index 876d9caf..355bdb7d 100644 --- a/rally_openstack/scenarios/ceilometer/events.py +++ b/rally_openstack/scenarios/ceilometer/events.py @@ -16,9 +16,9 @@ Scenarios for Ceilometer Events API. """ -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ceilometer import utils as cutils from rally_openstack.scenarios.keystone import basic as kbasic diff --git a/rally_openstack/scenarios/ceilometer/meters.py b/rally_openstack/scenarios/ceilometer/meters.py index 0b44dbab..659616f2 100644 --- a/rally_openstack/scenarios/ceilometer/meters.py +++ b/rally_openstack/scenarios/ceilometer/meters.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ceilometer import utils as ceiloutils diff --git a/rally_openstack/scenarios/ceilometer/queries.py b/rally_openstack/scenarios/ceilometer/queries.py index 6702bc99..211eab27 100644 --- a/rally_openstack/scenarios/ceilometer/queries.py +++ b/rally_openstack/scenarios/ceilometer/queries.py @@ -14,9 +14,9 @@ import json -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ceilometer import utils as ceiloutils diff --git a/rally_openstack/scenarios/ceilometer/resources.py b/rally_openstack/scenarios/ceilometer/resources.py index c08f5846..30dda687 100644 --- a/rally_openstack/scenarios/ceilometer/resources.py +++ b/rally_openstack/scenarios/ceilometer/resources.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ceilometer import utils as ceiloutils diff --git a/rally_openstack/scenarios/ceilometer/samples.py b/rally_openstack/scenarios/ceilometer/samples.py index 416d1ca2..eb9d655b 100644 --- a/rally_openstack/scenarios/ceilometer/samples.py +++ b/rally_openstack/scenarios/ceilometer/samples.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ceilometer import utils as ceiloutils diff --git a/rally_openstack/scenarios/ceilometer/stats.py b/rally_openstack/scenarios/ceilometer/stats.py index 1ba86a93..fba9a4d1 100644 --- a/rally_openstack/scenarios/ceilometer/stats.py +++ b/rally_openstack/scenarios/ceilometer/stats.py @@ -13,9 +13,9 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ceilometer import utils diff --git a/rally_openstack/scenarios/ceilometer/traits.py b/rally_openstack/scenarios/ceilometer/traits.py index ccc8be97..a673f7d0 100644 --- a/rally_openstack/scenarios/ceilometer/traits.py +++ b/rally_openstack/scenarios/ceilometer/traits.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ceilometer import utils as cutils from rally_openstack.scenarios.keystone import basic as kbasic diff --git a/rally_openstack/scenarios/cinder/qos_specs.py b/rally_openstack/scenarios/cinder/qos_specs.py index 3150594b..cffab322 100644 --- a/rally_openstack/scenarios/cinder/qos_specs.py +++ b/rally_openstack/scenarios/cinder/qos_specs.py @@ -11,10 +11,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.cinder import utils as cinder_utils diff --git a/rally_openstack/scenarios/cinder/volume_backups.py b/rally_openstack/scenarios/cinder/volume_backups.py index 00c06bdf..aed94622 100644 --- a/rally_openstack/scenarios/cinder/volume_backups.py +++ b/rally_openstack/scenarios/cinder/volume_backups.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.cinder import utils as cinder_utils diff --git a/rally_openstack/scenarios/cinder/volume_types.py b/rally_openstack/scenarios/cinder/volume_types.py index 421246e9..45dec8f5 100644 --- a/rally_openstack/scenarios/cinder/volume_types.py +++ b/rally_openstack/scenarios/cinder/volume_types.py @@ -13,9 +13,9 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.cinder import utils as cinder_utils from rally_openstack.services.storage import cinder_v2 diff --git a/rally_openstack/scenarios/cinder/volumes.py b/rally_openstack/scenarios/cinder/volumes.py index 621fdb4f..9081271d 100644 --- a/rally_openstack/scenarios/cinder/volumes.py +++ b/rally_openstack/scenarios/cinder/volumes.py @@ -16,12 +16,12 @@ import random from rally.common import logging -from rally import consts from rally import exceptions from rally.task import atomic from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.cinder import utils as cinder_utils from rally_openstack.scenarios.glance import images diff --git a/rally_openstack/scenarios/designate/basic.py b/rally_openstack/scenarios/designate/basic.py index 4a1c2989..84436532 100644 --- a/rally_openstack/scenarios/designate/basic.py +++ b/rally_openstack/scenarios/designate/basic.py @@ -16,9 +16,9 @@ import random -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.designate import utils diff --git a/rally_openstack/scenarios/ec2/servers.py b/rally_openstack/scenarios/ec2/servers.py index 51259959..65e15df5 100644 --- a/rally_openstack/scenarios/ec2/servers.py +++ b/rally_openstack/scenarios/ec2/servers.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ec2 import utils diff --git a/rally_openstack/scenarios/glance/images.py b/rally_openstack/scenarios/glance/images.py index 71df7236..37337c39 100644 --- a/rally_openstack/scenarios/glance/images.py +++ b/rally_openstack/scenarios/glance/images.py @@ -14,10 +14,10 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils as nova_utils from rally_openstack.services.image import glance_v2 diff --git a/rally_openstack/scenarios/gnocchi/archive_policy.py b/rally_openstack/scenarios/gnocchi/archive_policy.py index a363e96c..f72076a7 100644 --- a/rally_openstack/scenarios/gnocchi/archive_policy.py +++ b/rally_openstack/scenarios/gnocchi/archive_policy.py @@ -13,9 +13,9 @@ # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.gnocchi import utils as gnocchiutils diff --git a/rally_openstack/scenarios/gnocchi/archive_policy_rule.py b/rally_openstack/scenarios/gnocchi/archive_policy_rule.py index 84091542..7b7711bc 100644 --- a/rally_openstack/scenarios/gnocchi/archive_policy_rule.py +++ b/rally_openstack/scenarios/gnocchi/archive_policy_rule.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.gnocchi import utils as gnocchiutils diff --git a/rally_openstack/scenarios/gnocchi/capabilities.py b/rally_openstack/scenarios/gnocchi/capabilities.py index db67d74f..5eddf311 100644 --- a/rally_openstack/scenarios/gnocchi/capabilities.py +++ b/rally_openstack/scenarios/gnocchi/capabilities.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.gnocchi import utils as gnocchiutils diff --git a/rally_openstack/scenarios/gnocchi/resource_type.py b/rally_openstack/scenarios/gnocchi/resource_type.py index e0c240ad..a00c48ff 100644 --- a/rally_openstack/scenarios/gnocchi/resource_type.py +++ b/rally_openstack/scenarios/gnocchi/resource_type.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.gnocchi import utils as gnocchiutils diff --git a/rally_openstack/scenarios/gnocchi/status.py b/rally_openstack/scenarios/gnocchi/status.py index a20c53a6..3edc02e4 100644 --- a/rally_openstack/scenarios/gnocchi/status.py +++ b/rally_openstack/scenarios/gnocchi/status.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.gnocchi import utils as gnocchiutils diff --git a/rally_openstack/scenarios/heat/stacks.py b/rally_openstack/scenarios/heat/stacks.py index 47086ded..a1b16765 100644 --- a/rally_openstack/scenarios/heat/stacks.py +++ b/rally_openstack/scenarios/heat/stacks.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import atomic from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.heat import utils diff --git a/rally_openstack/scenarios/ironic/nodes.py b/rally_openstack/scenarios/ironic/nodes.py index 77cfcba3..971985a2 100644 --- a/rally_openstack/scenarios/ironic/nodes.py +++ b/rally_openstack/scenarios/ironic/nodes.py @@ -14,9 +14,9 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.ironic import utils diff --git a/rally_openstack/scenarios/magnum/cluster_templates.py b/rally_openstack/scenarios/magnum/cluster_templates.py index 27616416..e29ca7b8 100644 --- a/rally_openstack/scenarios/magnum/cluster_templates.py +++ b/rally_openstack/scenarios/magnum/cluster_templates.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.magnum import utils diff --git a/rally_openstack/scenarios/magnum/clusters.py b/rally_openstack/scenarios/magnum/clusters.py index 94111a33..1491ba33 100644 --- a/rally_openstack/scenarios/magnum/clusters.py +++ b/rally_openstack/scenarios/magnum/clusters.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.magnum import utils from rally_openstack.scenarios.nova import utils as nova_utils diff --git a/rally_openstack/scenarios/magnum/k8s_pods.py b/rally_openstack/scenarios/magnum/k8s_pods.py index d750138f..96ecac7e 100644 --- a/rally_openstack/scenarios/magnum/k8s_pods.py +++ b/rally_openstack/scenarios/magnum/k8s_pods.py @@ -12,10 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation import yaml +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.magnum import utils diff --git a/rally_openstack/scenarios/manila/shares.py b/rally_openstack/scenarios/manila/shares.py index a20bfa74..1b374ca7 100644 --- a/rally_openstack/scenarios/manila/shares.py +++ b/rally_openstack/scenarios/manila/shares.py @@ -14,9 +14,9 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack.contexts.manila import consts as manila_consts from rally_openstack import scenario from rally_openstack.scenarios.manila import utils diff --git a/rally_openstack/scenarios/mistral/executions.py b/rally_openstack/scenarios/mistral/executions.py index c39c4426..c0440d42 100644 --- a/rally_openstack/scenarios/mistral/executions.py +++ b/rally_openstack/scenarios/mistral/executions.py @@ -14,12 +14,12 @@ import json -from rally import consts from rally.task import types from rally.task import validation import six import yaml +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.mistral import utils diff --git a/rally_openstack/scenarios/mistral/workbooks.py b/rally_openstack/scenarios/mistral/workbooks.py index 8532c853..0e55492a 100644 --- a/rally_openstack/scenarios/mistral/workbooks.py +++ b/rally_openstack/scenarios/mistral/workbooks.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.mistral import utils diff --git a/rally_openstack/scenarios/monasca/metrics.py b/rally_openstack/scenarios/monasca/metrics.py index deb388b3..48571610 100644 --- a/rally_openstack/scenarios/monasca/metrics.py +++ b/rally_openstack/scenarios/monasca/metrics.py @@ -12,9 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.monasca import utils as monascautils diff --git a/rally_openstack/scenarios/murano/environments.py b/rally_openstack/scenarios/murano/environments.py index a97ecb95..42d13521 100644 --- a/rally_openstack/scenarios/murano/environments.py +++ b/rally_openstack/scenarios/murano/environments.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.murano import utils diff --git a/rally_openstack/scenarios/murano/packages.py b/rally_openstack/scenarios/murano/packages.py index b413e55f..bfc5dfc2 100644 --- a/rally_openstack/scenarios/murano/packages.py +++ b/rally_openstack/scenarios/murano/packages.py @@ -16,10 +16,10 @@ import os -from rally import consts from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.murano import utils diff --git a/rally_openstack/scenarios/neutron/bgpvpn.py b/rally_openstack/scenarios/neutron/bgpvpn.py index 516549d5..380434f3 100644 --- a/rally_openstack/scenarios/neutron/bgpvpn.py +++ b/rally_openstack/scenarios/neutron/bgpvpn.py @@ -12,9 +12,9 @@ import random -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.neutron import utils diff --git a/rally_openstack/scenarios/neutron/loadbalancer_v1.py b/rally_openstack/scenarios/neutron/loadbalancer_v1.py index 60b6e30c..f7cdb180 100644 --- a/rally_openstack/scenarios/neutron/loadbalancer_v1.py +++ b/rally_openstack/scenarios/neutron/loadbalancer_v1.py @@ -12,9 +12,9 @@ import random -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.neutron import utils diff --git a/rally_openstack/scenarios/neutron/loadbalancer_v2.py b/rally_openstack/scenarios/neutron/loadbalancer_v2.py index 08703c0e..20381f25 100755 --- a/rally_openstack/scenarios/neutron/loadbalancer_v2.py +++ b/rally_openstack/scenarios/neutron/loadbalancer_v2.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.neutron import utils diff --git a/rally_openstack/scenarios/neutron/network.py b/rally_openstack/scenarios/neutron/network.py index e9a6cf7c..7ec89b9b 100644 --- a/rally_openstack/scenarios/neutron/network.py +++ b/rally_openstack/scenarios/neutron/network.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.neutron import utils diff --git a/rally_openstack/scenarios/neutron/security_groups.py b/rally_openstack/scenarios/neutron/security_groups.py index d21cae51..b4fdf14b 100644 --- a/rally_openstack/scenarios/neutron/security_groups.py +++ b/rally_openstack/scenarios/neutron/security_groups.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.neutron import utils diff --git a/rally_openstack/scenarios/nova/agents.py b/rally_openstack/scenarios/nova/agents.py index d0af5a91..5aab91c5 100644 --- a/rally_openstack/scenarios/nova/agents.py +++ b/rally_openstack/scenarios/nova/agents.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/nova/aggregates.py b/rally_openstack/scenarios/nova/aggregates.py index 12534d9a..828320b1 100644 --- a/rally_openstack/scenarios/nova/aggregates.py +++ b/rally_openstack/scenarios/nova/aggregates.py @@ -13,11 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally import exceptions from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/nova/availability_zones.py b/rally_openstack/scenarios/nova/availability_zones.py index 4843fa44..57c4c60f 100644 --- a/rally_openstack/scenarios/nova/availability_zones.py +++ b/rally_openstack/scenarios/nova/availability_zones.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/nova/flavors.py b/rally_openstack/scenarios/nova/flavors.py index ec6a1932..b0d3d2b9 100644 --- a/rally_openstack/scenarios/nova/flavors.py +++ b/rally_openstack/scenarios/nova/flavors.py @@ -14,9 +14,9 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/nova/hypervisors.py b/rally_openstack/scenarios/nova/hypervisors.py index 46202bdd..9c03879b 100644 --- a/rally_openstack/scenarios/nova/hypervisors.py +++ b/rally_openstack/scenarios/nova/hypervisors.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/nova/images.py b/rally_openstack/scenarios/nova/images.py index d57e4e5e..ff77cb51 100644 --- a/rally_openstack/scenarios/nova/images.py +++ b/rally_openstack/scenarios/nova/images.py @@ -14,9 +14,9 @@ # under the License. from rally.common.plugin import plugin -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/nova/keypairs.py b/rally_openstack/scenarios/nova/keypairs.py index 1a29c310..e8c8ec7a 100644 --- a/rally_openstack/scenarios/nova/keypairs.py +++ b/rally_openstack/scenarios/nova/keypairs.py @@ -14,10 +14,10 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/nova/server_groups.py b/rally_openstack/scenarios/nova/server_groups.py index 36a8bc28..2e75dd07 100755 --- a/rally_openstack/scenarios/nova/server_groups.py +++ b/rally_openstack/scenarios/nova/server_groups.py @@ -14,9 +14,9 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/nova/servers.py b/rally_openstack/scenarios/nova/servers.py index c313d538..4c21617a 100644 --- a/rally_openstack/scenarios/nova/servers.py +++ b/rally_openstack/scenarios/nova/servers.py @@ -15,11 +15,11 @@ import jsonschema from rally.common import logging -from rally import consts from rally import exceptions as rally_exceptions from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.cinder import utils as cinder_utils from rally_openstack.scenarios.neutron import utils as neutron_utils diff --git a/rally_openstack/scenarios/nova/services.py b/rally_openstack/scenarios/nova/services.py index 6a568216..beb90564 100644 --- a/rally_openstack/scenarios/nova/services.py +++ b/rally_openstack/scenarios/nova/services.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.nova import utils diff --git a/rally_openstack/scenarios/quotas/quotas.py b/rally_openstack/scenarios/quotas/quotas.py index bd87d82f..844deb35 100644 --- a/rally_openstack/scenarios/quotas/quotas.py +++ b/rally_openstack/scenarios/quotas/quotas.py @@ -13,9 +13,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.quotas import utils diff --git a/rally_openstack/scenarios/sahara/clusters.py b/rally_openstack/scenarios/sahara/clusters.py index ddbc16d3..1f01418a 100644 --- a/rally_openstack/scenarios/sahara/clusters.py +++ b/rally_openstack/scenarios/sahara/clusters.py @@ -14,10 +14,10 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.sahara import utils diff --git a/rally_openstack/scenarios/sahara/jobs.py b/rally_openstack/scenarios/sahara/jobs.py index c6bec750..4f52a6ec 100644 --- a/rally_openstack/scenarios/sahara/jobs.py +++ b/rally_openstack/scenarios/sahara/jobs.py @@ -14,9 +14,9 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.sahara import utils diff --git a/rally_openstack/scenarios/sahara/node_group_templates.py b/rally_openstack/scenarios/sahara/node_group_templates.py index a783db99..ccfc76f1 100644 --- a/rally_openstack/scenarios/sahara/node_group_templates.py +++ b/rally_openstack/scenarios/sahara/node_group_templates.py @@ -13,10 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.sahara import utils diff --git a/rally_openstack/scenarios/sahara/utils.py b/rally_openstack/scenarios/sahara/utils.py index 178be32a..63b3d058 100644 --- a/rally_openstack/scenarios/sahara/utils.py +++ b/rally_openstack/scenarios/sahara/utils.py @@ -19,11 +19,11 @@ from oslo_utils import uuidutils from rally.common import cfg from rally.common import logging from rally.common import utils as rutils -from rally import consts from rally import exceptions from rally.task import atomic from rally.task import utils +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.sahara import consts as sahara_consts diff --git a/rally_openstack/scenarios/senlin/clusters.py b/rally_openstack/scenarios/senlin/clusters.py index 21908bdd..25ea2484 100644 --- a/rally_openstack/scenarios/senlin/clusters.py +++ b/rally_openstack/scenarios/senlin/clusters.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.senlin import utils diff --git a/rally_openstack/scenarios/swift/objects.py b/rally_openstack/scenarios/swift/objects.py index 2b9d39b2..b683ebf6 100644 --- a/rally_openstack/scenarios/swift/objects.py +++ b/rally_openstack/scenarios/swift/objects.py @@ -15,9 +15,9 @@ import tempfile -from rally import consts from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.swift import utils diff --git a/rally_openstack/scenarios/vm/vmtasks.py b/rally_openstack/scenarios/vm/vmtasks.py index ee80307e..f18b4bc4 100644 --- a/rally_openstack/scenarios/vm/vmtasks.py +++ b/rally_openstack/scenarios/vm/vmtasks.py @@ -20,12 +20,12 @@ import pkgutil from rally.common import logging from rally.common import sshutils from rally.common import validation -from rally import consts from rally import exceptions from rally.plugins.common import validators from rally.task import atomic from rally.task import types +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.cinder import utils as cinder_utils from rally_openstack.scenarios.vm import utils as vm_utils diff --git a/rally_openstack/scenarios/watcher/basic.py b/rally_openstack/scenarios/watcher/basic.py index 275b9a59..b50e305d 100644 --- a/rally_openstack/scenarios/watcher/basic.py +++ b/rally_openstack/scenarios/watcher/basic.py @@ -11,10 +11,10 @@ # under the License. from rally.common import logging -from rally import consts from rally.task import types from rally.task import validation +from rally_openstack import consts from rally_openstack import scenario from rally_openstack.scenarios.watcher import utils diff --git a/rally_openstack/validators.py b/rally_openstack/validators.py index b0c50464..9e9029f4 100644 --- a/rally_openstack/validators.py +++ b/rally_openstack/validators.py @@ -20,18 +20,19 @@ import six from glanceclient import exc as glance_exc from novaclient import exceptions as nova_exc -from rally.task import types - from rally.common import logging from rally.common import validation from rally.common import yamlutils as yaml -from rally import consts from rally import exceptions from rally.plugins.common import validators +from rally.task import types + +from rally_openstack import consts from rally_openstack.contexts.keystone import roles from rally_openstack.contexts.nova import flavors as flavors_ctx from rally_openstack import types as openstack_types + LOG = logging.getLogger(__name__) diff --git a/rally_openstack/wrappers/network.py b/rally_openstack/wrappers/network.py index 8fc62df0..fb252cf0 100644 --- a/rally_openstack/wrappers/network.py +++ b/rally_openstack/wrappers/network.py @@ -15,17 +15,16 @@ import abc import itertools - import netaddr import six +from neutronclient.common import exceptions as neutron_exceptions from rally.common import cfg from rally.common import logging from rally.common import utils -from rally import consts from rally import exceptions -from neutronclient.common import exceptions as neutron_exceptions +from rally_openstack import consts LOG = logging.getLogger(__name__) diff --git a/tests/unit/contexts/keystone/test_users.py b/tests/unit/contexts/keystone/test_users.py index fcbe1c8f..50d26986 100644 --- a/tests/unit/contexts/keystone/test_users.py +++ b/tests/unit/contexts/keystone/test_users.py @@ -15,12 +15,13 @@ import mock -from rally import consts from rally import exceptions from rally_openstack.contexts.keystone import users from rally_openstack import credential as oscredential from tests.unit import test +from rally_openstack import consts + CTX = "rally_openstack.contexts.keystone.users" diff --git a/tests/unit/contexts/manila/test_manila_shares.py b/tests/unit/contexts/manila/test_manila_shares.py index dc834e04..c7602068 100644 --- a/tests/unit/contexts/manila/test_manila_shares.py +++ b/tests/unit/contexts/manila/test_manila_shares.py @@ -19,7 +19,7 @@ import ddt import mock import six -from rally import consts as rally_consts +from rally_openstack import consts as rally_consts from rally_openstack.contexts.manila import consts from rally_openstack.contexts.manila import manila_shares from rally_openstack.scenarios.manila import utils as manila_utils diff --git a/tests/unit/fakes.py b/tests/unit/fakes.py index ecb38d82..fe88adf8 100644 --- a/tests/unit/fakes.py +++ b/tests/unit/fakes.py @@ -25,14 +25,14 @@ from glanceclient import exc import mock from neutronclient.common import exceptions as neutron_exceptions from novaclient import exceptions as nova_exceptions +from rally import api +from rally.common import utils as rally_utils +from rally.task import context +from rally.task import scenario import six from swiftclient import exceptions as swift_exceptions -from rally import api -from rally.common import utils as rally_utils -from rally import consts -from rally.task import context -from rally.task import scenario +from rally_openstack import consts def generate_uuid(): diff --git a/tests/unit/hook/test_fault_injection.py b/tests/unit/hook/test_fault_injection.py index 2be9b8d5..378c19ce 100644 --- a/tests/unit/hook/test_fault_injection.py +++ b/tests/unit/hook/test_fault_injection.py @@ -18,9 +18,9 @@ import ddt import mock import os_faults from os_faults.api import error -from rally import consts from rally.task import hook +from rally_openstack import consts from rally_openstack.hook import fault_injection from tests.unit import fakes from tests.unit import test diff --git a/tests/unit/scenarios/sahara/test_utils.py b/tests/unit/scenarios/sahara/test_utils.py index b3ad6beb..fd9c1984 100644 --- a/tests/unit/scenarios/sahara/test_utils.py +++ b/tests/unit/scenarios/sahara/test_utils.py @@ -18,11 +18,12 @@ from oslo_utils import uuidutils from saharaclient.api import base as sahara_base from rally.common import cfg -from rally import consts from rally import exceptions from rally_openstack.scenarios.sahara import utils from tests.unit import test +from rally_openstack import consts + CONF = cfg.CONF SAHARA_UTILS = "rally_openstack.scenarios.sahara.utils" diff --git a/tests/unit/test_osclients.py b/tests/unit/test_osclients.py index 7c2e51cf..c2de971d 100644 --- a/tests/unit/test_osclients.py +++ b/tests/unit/test_osclients.py @@ -17,15 +17,15 @@ import ddt import mock from rally.common import cfg -from rally import consts from rally import exceptions from rally import osclients as deprecated_osclients # noqa + +from rally_openstack import consts from rally_openstack import credential as oscredential from rally_openstack import osclients from tests.unit import fakes from tests.unit import test - PATH = "rally_openstack.osclients" diff --git a/tests/unit/test_validators.py b/tests/unit/test_validators.py index 090160ac..50515257 100644 --- a/tests/unit/test_validators.py +++ b/tests/unit/test_validators.py @@ -19,9 +19,9 @@ import mock from glanceclient import exc as glance_exc from novaclient import exceptions as nova_exc - -from rally import consts from rally import exceptions + +from rally_openstack import consts from rally_openstack import validators from tests.unit import test diff --git a/tests/unit/wrappers/test_network.py b/tests/unit/wrappers/test_network.py index 73f4a1f2..14a05df9 100644 --- a/tests/unit/wrappers/test_network.py +++ b/tests/unit/wrappers/test_network.py @@ -16,12 +16,13 @@ import ddt import mock +from neutronclient.common import exceptions as neutron_exceptions from rally.common import utils -from rally import consts + +from rally_openstack import consts from rally_openstack.wrappers import network from tests.unit import test -from neutronclient.common import exceptions as neutron_exceptions SVC = "rally_openstack.wrappers.network."