openstack
/
ec2-api
Code Issues Proposed changes

fix rally scenarios because of rally changes 

Change-Id: If4bae9be1becbcce138ea955e8640a32efb6f91e
This commit is contained in:
Andrey Pavlov 2015-07-02 20:49:49 +03:00
parent 1482c50bc0
commit f29e66a6a9
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rally-scenarios/plugins/context_plugin_ec2_creds.py
View File

@ -19,11 +19,8 @@ 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
try:
from rally.benchmark.context import base as context
except ImportError:
from rally.benchmark import context
LOG = logging.getLogger(__name__)

6
rally-scenarios/plugins/context_plugin_ec2_objects.py
View File

@ -18,14 +18,10 @@ from rally.common.i18n import _
from rally.common import log as logging
from rally.common import utils as rutils
from rally import consts
from rally.task import context
from ec2api.tests.functional import botocoreclient
try:
from rally.benchmark.context import base as context
except ImportError:
from rally.benchmark import context
LOG = logging.getLogger(__name__)

8
rally-scenarios/plugins/context_plugin_images.py
View File

@ -12,17 +12,13 @@
# License for the specific language governing permissions and limitations
# under the License.
from rally.benchmark.scenarios import base as scenario_base
from rally.common.i18n import _
from rally.common import log as logging
from rally.common import utils as rutils
from rally import consts
from rally import osclients
try:
from rally.benchmark.context import base as context
except ImportError:
from rally.benchmark import context
from rally.task import context
from rally.task.scenarios import base as scenario_base
LOG = logging.getLogger(__name__)

2
rally-scenarios/plugins/ec2api_plugin.py
View File

@ -12,8 +12,8 @@
import functools
from rally.benchmark.scenarios import base
from rally.common import log as logging
from rally.task.scenarios import base
from ec2api.tests.functional import botocoreclient