Validate value but not attribute and attribute but not value

Signed-off-by: Stew Francis <[email protected]>

Author: stewartfrancis

plugins/module_utils/cmci.py

@@ -75,7 +75,6 @@ def parameters_argument(name):  # type: (str) -> Dict[str, Any]
 AND = 'and'
 OR = 'or'
 OPERATOR = 'operator'
-VALUE = 'value'
 
 RESOURCES_ARGUMENT = {
     RESOURCES: {
@@ -634,6 +633,15 @@ def _get_filter(self, list_of_filters, complex_filter_string, joiner, path):
                     % (OPERATOR, ATTRIBUTE)
                 )
 
+            value = i.get(VALUE)
+
+            if (value and not attribute) or (attribute and not value):
+                self._fail(
+                    'parameters are required together: %s, %s found in '
+                    'resources -> complex_filter%s'
+                    % (ATTRIBUTE, VALUE, path)
+                )
+
             # Validate mutually exclusive parameters
             if (and_item and or_item) or (and_item and attribute) or \
                     (or_item and attribute):
@@ -675,15 +683,6 @@ def _get_filter(self, list_of_filters, complex_filter_string, joiner, path):
                         % (ATTRIBUTE, type(attribute), path)
                     )
 
-                value = i.get(VALUE)
-
-                if value is None:
-                    self._fail(
-                        'parameters are required together: %s, %s found in '
-                        'resources -> complex_filter%s'
-                        % (ATTRIBUTE, VALUE, path)
-                    )
-
                 # Validate value type
                 if not isinstance(value, str):
                     self._fail(

tests/unit/modules/test_cmci_filters.py

@@ -1121,7 +1121,88 @@ def test_value_type_or(cmci_module):
     })
 
 
-# value type
+def test_value_no_attribute_root(cmci_module):
+    # type: (CMCITestHelper) -> None
+    cmci_module.expect({
+        'msg': "parameters are required together: attribute, value found in "
+               "resources -> complex_filter",
+        'failed': True
+    })
+
+    cmci_module.run(cmci_get, {
+        'cmci_host': HOST,
+        'cmci_port': PORT,
+        'context': CONTEXT,
+        'scope': 'IYCWEMW2',
+        'type': 'cicslocalfile',
+        'resources': {
+            'complex_filter': {
+                'value': '456a',
+                'and': [{
+                    'attribute': '123',
+                    'value': '678a'
+                }]
+            }
+        }
+    })
+
+
+def test_value_no_attribute_and(cmci_module):
+    # type: (CMCITestHelper) -> None
+    cmci_module.expect({
+        'msg': "parameters are required together: attribute, value found in "
+               "resources -> complex_filter -> and",
+        'failed': True,
+        'changed': False
+    })
+
+    cmci_module.run(cmci_get, {
+        'cmci_host': HOST,
+        'cmci_port': PORT,
+        'context': CONTEXT,
+        'scope': 'IYCWEMW2',
+        'type': 'cicslocalfile',
+        'resources': {
+            'complex_filter': {
+                'and': [{
+                    'value': '456',
+                    'and': [{
+                        'attribute': '123',
+                        'value': '678'
+                    }]
+                }]
+            }
+        }
+    })
+
+
+def test_value_no_attribute_or(cmci_module):
+    # type: (CMCITestHelper) -> None
+    cmci_module.expect({
+        'msg': "parameters are required together: attribute, value found in "
+               "resources -> complex_filter -> or",
+        'failed': True,
+        'changed': False
+    })
+
+    cmci_module.run(cmci_get, {
+        'cmci_host': HOST,
+        'cmci_port': PORT,
+        'context': CONTEXT,
+        'scope': 'IYCWEMW2',
+        'type': 'cicslocalfile',
+        'resources': {
+            'complex_filter': {
+                'or': [{
+                    'value': '456',
+                    'or': [{
+                        'attribute': '123',
+                        'value': '678'
+                    }]
+                }]
+            }
+        }
+    })
 
 
 def result(url, records, http_status='OK', http_status_code=200):