Merge pull request #64 from stewartfrancis/filter-spec

Custom validation and test for complex_filter dsl

Author: sophiegreen

build.sh

@@ -59,7 +59,7 @@ pip install -r requirements.txt
 echo "/* -------------------------------------------------------------------------- */"
 echo "/*                          Integration tests Python 2.7                      */"
 echo "/* -------------------------------------------------------------------------- */"
-(set -x; ansible-test integration --python 2.7)
+(set -x; ansible-test integration cics_cmci --python 2.7)
 deactivate
 
 source "$CMCI_PYTHON_38/bin/activate"

plugins/doc_fragments/cmci.py

@@ -163,7 +163,7 @@ class ModuleDocFragment(object):
           - Filters can be nested. At most four nesting layers are allowed.
           - When supplying the C(attribute) option, you must also supply a
             C(value) for the filter.  You can also override the default operator
-            with the C(=) option.
+            of C(=) with the C(operator) option.
           - For examples, see M(cmci_get)
         type: dict
         required: false
@@ -176,6 +176,7 @@ class ModuleDocFragment(object):
                 nested filter expression can be either an C(attribute), C(and)
                 or C(or) complex filter expression.
             type: list
+            elements: dict
             required: false
           or:
             description:
@@ -185,6 +186,7 @@ class ModuleDocFragment(object):
                 nested filter expression can be either an C(attribute), C(and)
                 or C(or) complex filter expression.
             type: list
+            elements: dict
             required: false
           attribute:
             description:
@@ -200,7 +202,8 @@ class ModuleDocFragment(object):
               These operators are accepted: C(<) or C(LT) (less than), C(<=) or
               C(LE) (less than or equal to), C(=) or C(EQ) (equal to), C(>) or
               C(GT) (greater than), C(>=) or C(GE) (greater than or equal to),
-              C(==) or C(IS) (is), C(¬=), C(!=), or C(NE) (not equal to).
+              C(==) or C(IS) (is), C(¬=), C(!=), or C(NE) (not equal to).  If
+              not supplied when 'attribute' is used, C(EQ) will be assumed.
             type: str
             required: false
             choices:
@@ -219,14 +222,14 @@ class ModuleDocFragment(object):
               - LE
               - NE
               - IS
-            default: EQ
           value:
             description:
               - The value by which you are to filter the resource attributes.
               - The value must be a valid one for the resource table attribute
                 as documented in the resource table reference, for example,
                 L(PROGDEF resource table reference,
                 https://www.ibm.com/support/knowledgecenter/en/SSGMCP_5.6.0/reference-cpsm-restables/cpsm-restables/PROGDEFtab.html).
+            type: str
             required: false
       get_parameters:
         description: >
@@ -239,6 +242,7 @@ class ModuleDocFragment(object):
           as found in the L(PROGDEF resource table reference,
           https://www.ibm.com/support/knowledgecenter/en/SSGMCP_5.6.0/reference-cpsm-restables/cpsm-restables/PROGDEFtab.html).
         type: list
+        elements: dict
         suboptions:
           name:
             description: Parameter name available for the GET operation.