From a9fd604aaad21f5b256342f2b4fedc504a415b2e Mon Sep 17 00:00:00 2001 From: Ruby Loo Date: Thu, 1 Sep 2016 13:15:49 -0400 Subject: [PATCH] use utils.key_value_pairs_to_dict() utils.key_value_pairs_to_dict() was recently added to the code base; utils.args_array_to_dict() calls utils.key_value_pairs_to_dict(). This replaces calls to utils.args_array_to_dict() with calls to utils.key_value_pairs_to_dict() when the latter is really the goal. Doing this avoids creating a temporary dictionary. Change-Id: I6295c9442e4ce4b4ad0ac2930eb2797f30683793 --- ironicclient/osc/v1/baremetal_driver.py | 6 +----- ironicclient/osc/v1/baremetal_node.py | 9 +-------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ironicclient/osc/v1/baremetal_driver.py b/ironicclient/osc/v1/baremetal_driver.py index 07cb72ba1..d7aafdbe7 100644 --- a/ironicclient/osc/v1/baremetal_driver.py +++ b/ironicclient/osc/v1/baremetal_driver.py @@ -89,11 +89,7 @@ class PassthruCallBaremetalDriver(command.ShowOne): self.log.debug("take_action(%s)", parsed_args) baremetal_client = self.app.client_manager.baremetal - arguments = utils.args_array_to_dict( - {'args': parsed_args.arg}, 'args')['args'] - if not arguments: - arguments = {} - + arguments = utils.key_value_pairs_to_dict(parsed_args.arg) response = (baremetal_client.driver. vendor_passthru(parsed_args.driver, parsed_args.method, diff --git a/ironicclient/osc/v1/baremetal_node.py b/ironicclient/osc/v1/baremetal_node.py index 13ab2e01a..0037ccfca 100644 --- a/ironicclient/osc/v1/baremetal_node.py +++ b/ironicclient/osc/v1/baremetal_node.py @@ -662,14 +662,7 @@ class PassthruCallBaremetalNode(command.Command): baremetal_client = self.app.client_manager.baremetal - arguments = utils.args_array_to_dict( - {'args': parsed_args.arg}, 'args')['args'] - - # If there were no arguments for the method, arguments will still - # be an empty list. So make it an empty dict. - if not arguments: - arguments = {} - + arguments = utils.key_value_pairs_to_dict(parsed_args.arg) resp = baremetal_client.node.vendor_passthru( parsed_args.node, parsed_args.method,