diff --git a/rally-scenarios/plugins/context_plugin_ec2_creds.py b/rally-scenarios/plugins/context_plugin_ec2_creds.py index a1b08c08..67a1aa57 100644 --- a/rally-scenarios/plugins/context_plugin_ec2_creds.py +++ b/rally-scenarios/plugins/context_plugin_ec2_creds.py @@ -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: diff --git a/rally-scenarios/plugins/context_plugin_ec2_objects.py b/rally-scenarios/plugins/context_plugin_ec2_objects.py index a22945b9..ad6ef060 100644 --- a/rally-scenarios/plugins/context_plugin_ec2_objects.py +++ b/rally-scenarios/plugins/context_plugin_ec2_objects.py @@ -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"]): diff --git a/rally-scenarios/plugins/context_plugin_images.py b/rally-scenarios/plugins/context_plugin_images.py index d2338081..301df175 100644 --- a/rally-scenarios/plugins/context_plugin_images.py +++ b/rally-scenarios/plugins/context_plugin_images.py @@ -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"]):