openstack
/
ec2-api
Code Issues Proposed changes

rally: fix logging due to changes in rally 

Change-Id: I3f4c6864a926c63f62173f9b633ee63e2f803a84
This commit is contained in:
Andrey Pavlov 2015-11-05 21:22:42 +03:00
parent 5b5acf150f
commit dfea99164b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ class PrepareEC2ClientContext(context.Context):
self.config)
self.net_wrapper.start_cidr = '10.0.0.0/16'
@rutils.log_task_wrapper(LOG.info, _("Enter context: `EC2 creds`"))
@logging.log_task_wrapper(LOG.info, _("Enter context: `EC2 creds`"))
def setup(self):
"""This method is called before the task start."""
try:
@ -75,7 +75,7 @@ class PrepareEC2ClientContext(context.Context):
else:
LOG.warning(msg)
@rutils.log_task_wrapper(LOG.info, _("Exit context: `EC2 creds`"))
@logging.log_task_wrapper(LOG.info, _("Exit context: `EC2 creds`"))
def cleanup(self):
try:
if self.net_wrapper.SERVICE_IMPL == consts.Service.NEUTRON:

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

@ -250,7 +250,7 @@ class FakeNetworkGenerator(EC2Objects):
"nis_per_subnet": 5,
}
@rutils.log_task_wrapper(LOG.info, _("Enter context: `EC2 Networks`"))
@logging.log_task_wrapper(LOG.info, _("Enter context: `EC2 Networks`"))
def setup(self):
for user, tenant_id in rutils.iterate_per_tenants(
self.context["users"]):
@ -267,7 +267,7 @@ class FakeNetworkGenerator(EC2Objects):
for dummy in xrange(0, subnets_count):
self.prepare_network(tenant_id, client, nis_count)
@rutils.log_task_wrapper(LOG.info, _("Exit context: `EC2 Networks`"))
@logging.log_task_wrapper(LOG.info, _("Exit context: `EC2 Networks`"))
def cleanup(self):
for user, tenant_id in rutils.iterate_per_tenants(
self.context["users"]):
@ -323,7 +323,7 @@ class FakeServerGenerator(EC2Objects):
"servers_per_run": 10
}
@rutils.log_task_wrapper(LOG.info, _("Enter context: `EC2 Servers`"))
@logging.log_task_wrapper(LOG.info, _("Enter context: `EC2 Servers`"))
def setup(self):
image = self.config["image"]
image_id = None
@ -349,7 +349,7 @@ class FakeServerGenerator(EC2Objects):
self.wait_for_instances(tenant_id, client)
self.assign_floating_ips(tenant_id, client)
@rutils.log_task_wrapper(LOG.info, _("Exit context: `EC2 Servers`"))
@logging.log_task_wrapper(LOG.info, _("Exit context: `EC2 Servers`"))
def cleanup(self):
for user, tenant_id in rutils.iterate_per_tenants(
self.context["users"]):

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

@ -47,7 +47,7 @@ class FakeImageGenerator(context.Context):
"additionalProperties": False
}
@rutils.log_task_wrapper(LOG.info, _("Enter context: `Images`"))
@logging.log_task_wrapper(LOG.info, _("Enter context: `Images`"))
def setup(self):
disk_format = self.config["disk_format"]
container_format = self.config["container_format"]
@ -69,7 +69,7 @@ class FakeImageGenerator(context.Context):
self.context["tenants"][tenant_id]["images"] = current_images
@rutils.log_task_wrapper(LOG.info, _("Exit context: `Images`"))
@logging.log_task_wrapper(LOG.info, _("Exit context: `Images`"))
def cleanup(self):
for user, tenant_id in rutils.iterate_per_tenants(
self.context["users"]):