From e95cd8cc5e97e3ca8a688e6526bf93c5cb0775dc Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Wed, 13 Jun 2018 08:55:10 +0300 Subject: [PATCH] Port rally plugins to use proper modules Sometime ago, all OpenStack related stuff moved from the main repository to the separate one - https://github.com/openstack/rally-openstack . All further development and maintance will be done only in a new repository. As for first major release, the structure is not changed, so only imports should be changed. Depends-On: I3446ccd5a36cb686282e85a9ea210d1723da1fef Change-Id: Ied6b0693ba2e050b0d5f5bae91fed25891ae9882 --- rally-scenarios/plugins/context_plugin_ec2_creds.py | 6 +++--- rally-scenarios/plugins/context_plugin_images.py | 4 ++-- rally-scenarios/plugins/ec2api_plugin.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rally-scenarios/plugins/context_plugin_ec2_creds.py b/rally-scenarios/plugins/context_plugin_ec2_creds.py index d56bdeae..477f1bb8 100644 --- a/rally-scenarios/plugins/context_plugin_ec2_creds.py +++ b/rally-scenarios/plugins/context_plugin_ec2_creds.py @@ -16,10 +16,10 @@ from rally.common.i18n import _ from rally.common import logging from rally.common import utils as rutils -from rally import consts -from rally import osclients -from rally.plugins.openstack.wrappers import network as network_wrapper from rally.task import context +from rally_openstack import consts +from rally_openstack import osclients +from rally_openstack.wrappers import network as network_wrapper LOG = logging.getLogger(__name__) diff --git a/rally-scenarios/plugins/context_plugin_images.py b/rally-scenarios/plugins/context_plugin_images.py index 468b9e44..7c7ae9e6 100644 --- a/rally-scenarios/plugins/context_plugin_images.py +++ b/rally-scenarios/plugins/context_plugin_images.py @@ -15,9 +15,9 @@ from rally.common.i18n import _ from rally.common import logging from rally.common import utils as rutils -from rally import consts -from rally import osclients from rally.task import context +from rally_openstack import consts +from rally_openstack import osclients from ec2api.tests import botocoreclient diff --git a/rally-scenarios/plugins/ec2api_plugin.py b/rally-scenarios/plugins/ec2api_plugin.py index 258a36c4..9c266ffa 100644 --- a/rally-scenarios/plugins/ec2api_plugin.py +++ b/rally-scenarios/plugins/ec2api_plugin.py @@ -11,9 +11,9 @@ # under the License. from rally.common import logging -from rally import osclients -from rally.plugins.openstack import scenario from rally.task import atomic +from rally_openstack import osclients +from rally_openstack import scenario from ec2api.tests import botocoreclient