From 2f77c3095e6473f70cc331b4d463997ce925d8c6 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Thu, 5 Dec 2019 00:59:19 +0100 Subject: [PATCH] Follow up of stop using six library Change-Id: I5fcd5babbadfb075cbc85bf4f9e18fdeddbce44a Follow-Up: https://review.opendev.org/697059 --- ironic_staging_drivers/intel_nm/nm_commands.py | 2 +- ironic_staging_drivers/intel_nm/nm_vendor.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ironic_staging_drivers/intel_nm/nm_commands.py b/ironic_staging_drivers/intel_nm/nm_commands.py index c06e7cd..9c321bd 100644 --- a/ironic_staging_drivers/intel_nm/nm_commands.py +++ b/ironic_staging_drivers/intel_nm/nm_commands.py @@ -504,7 +504,7 @@ def parse_statistics(raw_data): # there is not "bad time" in standard, reset to start the epoch statistics['timestamp'] = _INVALID_TIME LOG.warning('Invalid timestamp in Node Nanager statistics ' - 'data: %s', str(e)) + 'data: %s', e) else: statistics['timestamp'] = isotime diff --git a/ironic_staging_drivers/intel_nm/nm_vendor.py b/ironic_staging_drivers/intel_nm/nm_vendor.py index dc6c4b1..a2ccd10 100644 --- a/ironic_staging_drivers/intel_nm/nm_vendor.py +++ b/ironic_staging_drivers/intel_nm/nm_vendor.py @@ -114,7 +114,7 @@ def _execute_nm_command(task, data, command_func, parse_func=None): with excutils.save_and_reraise_exception(): LOG.exception('Can not obtain Intel Node Manager address for ' 'node %(node)s: %(err)s', - {'node': task.node.uuid, 'err': str(e)}) + {'node': task.node.uuid, 'err': e}) driver_info = task.node.driver_info driver_info['ipmi_bridging'] = 'single' driver_info['ipmi_target_channel'] = channel @@ -128,7 +128,7 @@ def _execute_nm_command(task, data, command_func, parse_func=None): with excutils.save_and_reraise_exception(): LOG.exception('Error in returned data for node %(node)s: ' '%(err)s', {'node': task.node.uuid, - 'err': str(e)}) + 'err': e}) class IntelNMVendorPassthru(base.VendorInterface):