From fc59e5098185fb286fd381dff50f11bf20d93105 Mon Sep 17 00:00:00 2001 From: jonnary Date: Thu, 27 Oct 2016 20:48:14 +0800 Subject: [PATCH] Support xyz_update purging metadata xyz_update's metadata can be added and modified. But if one or multiple key:value was added to metadata, it can't be recovered. This patch support purging metadata. Closes-Bug: 1637177 Change-Id: Id541b209b2e0a67a5243ccc3099ed3f5a8d13460 --- senlinclient/common/utils.py | 2 +- senlinclient/tests/unit/test_utils.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/senlinclient/common/utils.py b/senlinclient/common/utils.py index 2e003c61..224a9185 100644 --- a/senlinclient/common/utils.py +++ b/senlinclient/common/utils.py @@ -197,7 +197,7 @@ def print_action_result(rid, res): def format_parameters(params, parse_semicolon=True): """Reformat parameters into dict of format expected by the API.""" - if not params: + if not params or params == ['{}']: return {} if parse_semicolon: diff --git a/senlinclient/tests/unit/test_utils.py b/senlinclient/tests/unit/test_utils.py index 89878b25..1efecafa 100644 --- a/senlinclient/tests/unit/test_utils.py +++ b/senlinclient/tests/unit/test_utils.py @@ -50,6 +50,10 @@ class shellTest(testtools.TestCase): self.assertEqual(format_params, utils.format_parameters(params)) + def test_format_parameter_none_dict(self): + params = ['{}'] + self.assertEqual({}, utils.format_parameters(params)) + def test_format_parameter_none(self): self.assertEqual({}, utils.format_parameters(None))