openstack
/
python-magnumclient
Code Issues Proposed changes

Now cluster-template-update works for "labels" 

Now we are handling the label values converting them as a dictionary.
But as magnum-api only accepts the input as string. We are converting
the dictionary into string and passing to magnum-api. It is parsing
the string to dictionary and storing the label value a dictionary.

Change-Id: I2cec19e24c6dd32e209ca65a26a2f1999d8289e0
Depends-on: I4d64da78dc4ed4d5599533b54861b65bce609c28
Closes-Bug: #1659189
This commit is contained in:
M V P Nitesh 2017-08-22 13:00:57 +05:30 committed by Spyros Trigazis (strigazi)
parent 2d5efb2e4d
commit c165071ff8
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
magnumclient/common/utils.py
View File

@ -78,7 +78,13 @@ def args_array_to_patch(op, attributes):
attr = '/' + attr
if op in ['add', 'replace']:
path, value = split_and_deserialize(attr)
patch.append({'op': op, 'path': path, 'value': value})
if path == "/labels":
a = []
a.append(value)
value = str(handle_labels(a))
patch.append({'op': op, 'path': path, 'value': value})
else:
patch.append({'op': op, 'path': path, 'value': value})
elif op == "remove":
# For remove only the key is needed

9
magnumclient/tests/v1/test_clustertemplates_shell.py
View File

@ -679,6 +679,15 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
{'op': 'add', 'path': '/test1', 'value': 'test1'}]
mock_update.assert_called_once_with('test', patch)
@mock.patch(
'magnumclient.v1.cluster_templates.ClusterTemplateManager.update')
def test_cluster_template_update_label(self, mock_update):
self._test_arg_success('cluster-template-update test '
'replace labels=key1=val1')
patch = [{'op': 'replace', 'path': '/labels',
'value': "{'key1': 'val1'}"}]
mock_update.assert_called_once_with('test', patch)
@mock.patch(
'magnumclient.v1.cluster_templates.ClusterTemplateManager.update')
def test_cluster_template_update_failure_wrong_op(self, mock_update):