Fix consts imports

Also, made some minor changes to imports orders to fit PEP8

Change-Id: I1596989cac61602a3f417c9d60774354f5650424

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

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

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

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)

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
 
 

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
 
 

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
 

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
 

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

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
 

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
 
 

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

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
 

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
 
 

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
 

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

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
 
 

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
 
 

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
 

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
 

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
 

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
 

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
 
 

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
 
 

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
 
 

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
 

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
 

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
 
 

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
 

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
 
 

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

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
 
 

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

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

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
 

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

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
 
 

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

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

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

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

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

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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

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

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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
 

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

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