Merge "Expanding parser actions to allow for multiple key-value pairs"

validations_libs/cli/parseractions.py

@@ -16,6 +16,8 @@
 
 import argparse
 
+from validations_libs.utils import LOG
+
 
 class CommaListAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
@@ -33,16 +35,29 @@ class KeyValueAction(argparse.Action):
             setattr(namespace, self.dest, {})
 
         # Add value if an assignment else remove it
-        if values.count('=') == 1:
+        if values.count('=') >= 1:
-            values_list = values.split('=', 1)
+            for key_value in values.split(','):
-            if '' == values_list[0]:
+                key, value = key_value.split('=', 1)
-                msg = (
+                if '' == key:
-                    "Property key must be specified: {}"
+                    msg = (
-                ).format(str(values))
+                        "Property key must be specified: {}"
+                    ).format(str(values))
 
-                raise argparse.ArgumentTypeError(msg)
+                    raise argparse.ArgumentTypeError(msg)
-            else:
+                elif value.count('=') > 0:
-                getattr(namespace, self.dest, {}).update([values_list])
+                    msg = (
+                        "Only a single '=' sign is allowed: {}"
+                    ).format(str(values))
+
+                    raise argparse.ArgumentTypeError(msg)
+                else:
+                    if key in getattr(namespace, self.dest, {}):
+                        LOG.warning((
+                                "Duplicate key '%s' provided."
+                                "Value '%s' Overriding previous value. '%s'"
+                            ) % (
+                            key, getattr(namespace, self.dest)[key], value))
+                    getattr(namespace, self.dest, {}).update({key: value})
         else:
             msg = (
                 "Expected 'key=value' type, but got: {}"

validations_libs/tests/cli/fakes.py

@@ -58,5 +58,5 @@ KEYVALUEACTION_VALUES = {
     'invalid_noeq': 'foo>bar',
     'invalid_multieq': 'foo===bar',
     'invalid_nokey': '=bar',
-    'invalid_multikey': 'foo=bar,fizz=buzz'
+    'invalid_multikey': 'foo=bar,baz=,fizz=buzz,baz'
 }

validations_libs/tests/cli/test_parseractions.py

@@ -88,17 +88,3 @@ class TestParserActions(TestCase):
         self.assertIn('fizz', dir(self.mock_namespace))
         self.assertDictEqual({}, self.mock_namespace.fizz)
         self.tearDown()
-
-    def test_keyvalueaction_invalid_invalid_multikey(self):
-
-        self.assertRaises(
-            argparse.ArgumentTypeError,
-            self.action,
-            self.mock_parser,
-            self.mock_namespace,
-            self.test_values['invalid_multikey']
-        )
-
-        self.assertIn('fizz', dir(self.mock_namespace))
-        self.assertDictEqual({}, self.mock_namespace.fizz)
-        self.tearDown()

validations_libs/tests/cli/test_run.py

@@ -365,15 +365,6 @@ class TestRun(BaseCommand):
 
         self.assertDictEqual(call_args, run_called_args)
 
-    def test_run_command_exclusive_wrong_extra_vars(self):
-        arglist = ['--validation', 'foo',
-                   '--extra-vars', 'key=value1,key=value2']
-        verifylist = [('validation_name', ['foo']),
-                      ('extra_vars', {'key': 'value2'})]
-
-        self.assertRaises(Exception, self.check_parser, self.cmd,
-                          arglist, verifylist)
-
     @mock.patch('validations_libs.utils.find_config_file',
                 return_value="/etc/validations_foo.cfg")
     @mock.patch('validations_libs.constants.VALIDATIONS_LOG_BASEDIR')