openstack
/
tripleo-operator-ansible
Code Issues Proposed changes

Merge "Modified shell_args plugin for nested lists."

This commit is contained in:
Zuul 2021-11-09 00:43:54 +00:00 committed by Gerrit Code Review
parent f3f20e0ae6 fae3c7d813
commit e7f4f5aa9f
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/filter/shell_args.py
View File

@ -26,6 +26,13 @@ class FilterModule(object):
'shell_arg_list': self.shell_arg_list
}
def _add_to_list(self, list_item, arg, parameter):
val = quote(arg)
if parameter:
list_item.append("{} {}".format(parameter, val))
else:
list_item.append(val)
def shell_arg_list(self, arg, parameter=None):
# Nothing was passed into this, just return an empty string
if not arg:
@ -34,10 +41,11 @@ class FilterModule(object):
arg = [arg]
return_value = []
for a in arg:
if a:
val = quote(a)
if parameter:
return_value.append("{} {}".format(parameter, val))
else:
return_value.append(val)
if isinstance(a, str) and a.strip():
self._add_to_list(return_value, a, parameter)
elif isinstance(a, (list, tuple)):
# Deal with nested list items.
for item in a:
if item.strip():
self._add_to_list(return_value, item, parameter)
return ' '.join(return_value)

12
tests/plugins/filter/test_shell_args.py
View File

@ -59,3 +59,15 @@ class TestShellArgsFilters(tests_base.TestCase):
expected = '-p a'
self.assertEqual(expected,
self.filter.shell_arg_list(arg, parameter='-p'))
def test_shell_arg_nested_list(self):
arg = ['a', ['b', 'c'], 'd']
expected = '-p a -p b -p c -p d'
self.assertEqual(expected,
self.filter.shell_arg_list(arg, parameter='-p'))
def test_shell_args_empty_item(self):
arg = ['a', ['b', 'c', ''], 'd', '']
expected = '-p a -p b -p c -p d'
self.assertEqual(expected,
self.filter.shell_arg_list(arg, parameter='-p'))