Skip to content

Commit e7b2e27

Browse files
committed
update/fix links, minor editorial changes to filter doc
Signed-off-by: Vera <[email protected]>
1 parent 0838418 commit e7b2e27

File tree

8 files changed

+68
-56
lines changed

8 files changed

+68
-56
lines changed

docs/source/community_guides.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For a developer guide on how to develop and run test cases for IBM® z/OS® CICS
2020
.. _git issues:
2121
https://github.com/ansible-collections/ibm_zos_cics/issues
2222
.. _Developer guide:
23-
https://github.com/ansible-collections/ibm_zos_cics/tree/master/CONTRIBUTING.md
23+
https://github.com/ansible-collections/ibm_zos_cics/blob/main/devguide.md
2424

2525

2626

docs/source/modules/cmci_action.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ resources
189189

190190
Filters can be nested. At most four nesting layers are allowed.
191191

192-
When supplying the ``attribute`` option, you must also supply a ``value`` for the filter. You can also override the default operator of ``=`` with the ``operator`` option.
192+
When supplying the ``attribute`` option, you must also supply a ``value`` for the filter. You can also override the default operator of ``=`` with the ``operator`` option.
193193

194-
For examples, see :ref:`cmci_get <cmci_get_module>`
194+
For examples, see "Examples" in :ref:`cmci_get <cmci_get_module>`.
195195

196196

197197
| **required**: False
@@ -202,7 +202,7 @@ resources
202202
and
203203
A list of filter expressions to be combined with an ``and`` operation.
204204

205-
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
205+
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
206206

207207

208208
| **required**: False
@@ -222,20 +222,21 @@ resources
222222

223223

224224
operator
225-
These operators are accepted: ``<`` or ``LT`` (less than), ``<=`` or ``LE`` (less than or equal to), ``=`` or ``EQ`` (equal to), ``>`` or ``GT`` (greater than), ``>=`` or ``GE`` (greater than or equal to), ``==`` or ``IS`` (is), ``¬=``, ``!=``, or ``NE`` (not equal to). If not supplied when 'attribute' is used, ``EQ`` will be assumed.
225+
These operators are accepted: ``<`` or ``LT`` (less than), ``<=`` or ``LE`` (less than or equal to), ``=`` or ``EQ`` (equal to), ``>`` or ``GT`` (greater than), ``>=`` or ``GE`` (greater than or equal to), ``==`` or ``IS`` (is), ``¬=``, ``!=``, or ``NE`` (not equal to). If not supplied when ``attribute`` is used, ``EQ`` is assumed.
226226

227227

228228

229229
| **required**: False
230230
| **type**: str
231+
| **default**: EQ
231232
| **choices**: <, >, <=, >=, =, ==, !=, ¬=, EQ, GT, GE, LT, LE, NE, IS
232233
233234

234235

235236
or
236237
A list of filter expressions to be combined with an ``or`` operation.
237238

238-
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
239+
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
239240

240241

241242
| **required**: False
@@ -258,17 +259,17 @@ resources
258259
filter
259260
A dictionary with attribute names as keys, and target values, to be used as criteria to filter the set of resources returned from CICSPlex SM.
260261

261-
Filters implicitly use the ``=`` operator
262+
Filters implicitly use the ``=`` operator.
262263

263-
Filters for ``string`` type attributes can use the ``*`` and ``+`` wildcard operators
264+
Filters for ``string`` type attributes can use the ``*`` and ``+`` wildcard operators.
264265

265-
``*`` is a wildcard representing an unknown number of characters, and must appear at the end of the value
266+
``*`` is a wildcard representing an unknown number of characters, and must appear at the end of the value.
266267

267268
``+`` is a wildcard representing a single character, and can appear in any place in the value, potentially multiple times.
268269

269270
To use more complicated filter expressions, including a range of different filter operators, and the ability to compose filters with ``and`` and ``or`` operators, see the ``complex_filter`` parameter.
270271

271-
For examples, see :ref:`cmci_get <cmci_get_module>`
272+
For examples, see "Examples" in :ref:`cmci_get <cmci_get_module>`.
272273

273274
For more details, see `How to build a filter expression <https://www.ibm.com/support/knowledgecenter/SSGMCP_5.6.0/system-programming/cpsm/eyup1a0.html>`_.
274275

docs/source/modules/cmci_delete.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ resources
149149

150150
Filters can be nested. At most four nesting layers are allowed.
151151

152-
When supplying the ``attribute`` option, you must also supply a ``value`` for the filter. You can also override the default operator of ``=`` with the ``operator`` option.
152+
When supplying the ``attribute`` option, you must also supply a ``value`` for the filter. You can also override the default operator of ``=`` with the ``operator`` option.
153153

154-
For examples, see :ref:`cmci_get <cmci_get_module>`
154+
For examples, see "Examples" in :ref:`cmci_get <cmci_get_module>`.
155155

156156

157157
| **required**: False
@@ -162,7 +162,7 @@ resources
162162
and
163163
A list of filter expressions to be combined with an ``and`` operation.
164164

165-
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
165+
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
166166

167167

168168
| **required**: False
@@ -182,20 +182,21 @@ resources
182182

183183

184184
operator
185-
These operators are accepted: ``<`` or ``LT`` (less than), ``<=`` or ``LE`` (less than or equal to), ``=`` or ``EQ`` (equal to), ``>`` or ``GT`` (greater than), ``>=`` or ``GE`` (greater than or equal to), ``==`` or ``IS`` (is), ``¬=``, ``!=``, or ``NE`` (not equal to). If not supplied when 'attribute' is used, ``EQ`` will be assumed.
185+
These operators are accepted: ``<`` or ``LT`` (less than), ``<=`` or ``LE`` (less than or equal to), ``=`` or ``EQ`` (equal to), ``>`` or ``GT`` (greater than), ``>=`` or ``GE`` (greater than or equal to), ``==`` or ``IS`` (is), ``¬=``, ``!=``, or ``NE`` (not equal to). If not supplied when ``attribute`` is used, ``EQ`` is assumed.
186186

187187

188188

189189
| **required**: False
190190
| **type**: str
191+
| **default**: EQ
191192
| **choices**: <, >, <=, >=, =, ==, !=, ¬=, EQ, GT, GE, LT, LE, NE, IS
192193
193194

194195

195196
or
196197
A list of filter expressions to be combined with an ``or`` operation.
197198

198-
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
199+
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
199200

200201

201202
| **required**: False
@@ -218,17 +219,17 @@ resources
218219
filter
219220
A dictionary with attribute names as keys, and target values, to be used as criteria to filter the set of resources returned from CICSPlex SM.
220221

221-
Filters implicitly use the ``=`` operator
222+
Filters implicitly use the ``=`` operator.
222223

223-
Filters for ``string`` type attributes can use the ``*`` and ``+`` wildcard operators
224+
Filters for ``string`` type attributes can use the ``*`` and ``+`` wildcard operators.
224225

225-
``*`` is a wildcard representing an unknown number of characters, and must appear at the end of the value
226+
``*`` is a wildcard representing an unknown number of characters, and must appear at the end of the value.
226227

227228
``+`` is a wildcard representing a single character, and can appear in any place in the value, potentially multiple times.
228229

229230
To use more complicated filter expressions, including a range of different filter operators, and the ability to compose filters with ``and`` and ``or`` operators, see the ``complex_filter`` parameter.
230231

231-
For examples, see :ref:`cmci_get <cmci_get_module>`
232+
For examples, see "Examples" in :ref:`cmci_get <cmci_get_module>`.
232233

233234
For more details, see `How to build a filter expression <https://www.ibm.com/support/knowledgecenter/SSGMCP_5.6.0/system-programming/cpsm/eyup1a0.html>`_.
234235

docs/source/modules/cmci_get.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ resources
162162

163163
Filters can be nested. At most four nesting layers are allowed.
164164

165-
When supplying the ``attribute`` option, you must also supply a ``value`` for the filter. You can also override the default operator of ``=`` with the ``operator`` option.
165+
When supplying the ``attribute`` option, you must also supply a ``value`` for the filter. You can also override the default operator of ``=`` with the ``operator`` option.
166166

167-
For examples, see :ref:`cmci_get <cmci_get_module>`
167+
For examples, see "Examples" in :ref:`cmci_get <cmci_get_module>`.
168168

169169

170170
| **required**: False
@@ -175,7 +175,7 @@ resources
175175
and
176176
A list of filter expressions to be combined with an ``and`` operation.
177177

178-
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
178+
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
179179

180180

181181
| **required**: False
@@ -195,20 +195,21 @@ resources
195195

196196

197197
operator
198-
These operators are accepted: ``<`` or ``LT`` (less than), ``<=`` or ``LE`` (less than or equal to), ``=`` or ``EQ`` (equal to), ``>`` or ``GT`` (greater than), ``>=`` or ``GE`` (greater than or equal to), ``==`` or ``IS`` (is), ``¬=``, ``!=``, or ``NE`` (not equal to). If not supplied when 'attribute' is used, ``EQ`` will be assumed.
198+
These operators are accepted: ``<`` or ``LT`` (less than), ``<=`` or ``LE`` (less than or equal to), ``=`` or ``EQ`` (equal to), ``>`` or ``GT`` (greater than), ``>=`` or ``GE`` (greater than or equal to), ``==`` or ``IS`` (is), ``¬=``, ``!=``, or ``NE`` (not equal to). If not supplied when ``attribute`` is used, ``EQ`` is assumed.
199199

200200

201201

202202
| **required**: False
203203
| **type**: str
204+
| **default**: EQ
204205
| **choices**: <, >, <=, >=, =, ==, !=, ¬=, EQ, GT, GE, LT, LE, NE, IS
205206
206207

207208

208209
or
209210
A list of filter expressions to be combined with an ``or`` operation.
210211

211-
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
212+
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
212213

213214

214215
| **required**: False
@@ -231,17 +232,17 @@ resources
231232
filter
232233
A dictionary with attribute names as keys, and target values, to be used as criteria to filter the set of resources returned from CICSPlex SM.
233234

234-
Filters implicitly use the ``=`` operator
235+
Filters implicitly use the ``=`` operator.
235236

236-
Filters for ``string`` type attributes can use the ``*`` and ``+`` wildcard operators
237+
Filters for ``string`` type attributes can use the ``*`` and ``+`` wildcard operators.
237238

238-
``*`` is a wildcard representing an unknown number of characters, and must appear at the end of the value
239+
``*`` is a wildcard representing an unknown number of characters, and must appear at the end of the value.
239240

240241
``+`` is a wildcard representing a single character, and can appear in any place in the value, potentially multiple times.
241242

242243
To use more complicated filter expressions, including a range of different filter operators, and the ability to compose filters with ``and`` and ``or`` operators, see the ``complex_filter`` parameter.
243244

244-
For examples, see :ref:`cmci_get <cmci_get_module>`
245+
For examples, see "Examples" in :ref:`cmci_get <cmci_get_module>`.
245246

246247
For more details, see `How to build a filter expression <https://www.ibm.com/support/knowledgecenter/SSGMCP_5.6.0/system-programming/cpsm/eyup1a0.html>`_.
247248

docs/source/modules/cmci_update.rst

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ resources
158158

159159
Filters can be nested. At most four nesting layers are allowed.
160160

161-
When supplying the ``attribute`` option, you must also supply a ``value`` for the filter. You can also override the default operator of ``=`` with the ``operator`` option.
161+
When supplying the ``attribute`` option, you must also supply a ``value`` for the filter. You can also override the default operator of ``=`` with the ``operator`` option.
162162

163-
For examples, see :ref:`cmci_get <cmci_get_module>`
163+
For examples, see "Examples" in :ref:`cmci_get <cmci_get_module>`.
164164

165165

166166
| **required**: False
@@ -171,7 +171,7 @@ resources
171171
and
172172
A list of filter expressions to be combined with an ``and`` operation.
173173

174-
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
174+
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
175175

176176

177177
| **required**: False
@@ -191,20 +191,21 @@ resources
191191

192192

193193
operator
194-
These operators are accepted: ``<`` or ``LT`` (less than), ``<=`` or ``LE`` (less than or equal to), ``=`` or ``EQ`` (equal to), ``>`` or ``GT`` (greater than), ``>=`` or ``GE`` (greater than or equal to), ``==`` or ``IS`` (is), ``¬=``, ``!=``, or ``NE`` (not equal to). If not supplied when 'attribute' is used, ``EQ`` will be assumed.
194+
These operators are accepted: ``<`` or ``LT`` (less than), ``<=`` or ``LE`` (less than or equal to), ``=`` or ``EQ`` (equal to), ``>`` or ``GT`` (greater than), ``>=`` or ``GE`` (greater than or equal to), ``==`` or ``IS`` (is), ``¬=``, ``!=``, or ``NE`` (not equal to). If not supplied when ``attribute`` is used, ``EQ`` is assumed.
195195

196196

197197

198198
| **required**: False
199199
| **type**: str
200+
| **default**: EQ
200201
| **choices**: <, >, <=, >=, =, ==, !=, ¬=, EQ, GT, GE, LT, LE, NE, IS
201202
202203

203204

204205
or
205206
A list of filter expressions to be combined with an ``or`` operation.
206207

207-
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
208+
Filter expressions are nested ``complex_filter`` elements. Each nested filter expression can be either an ``attribute``, ``and`` or ``or`` complex filter expression.
208209

209210

210211
| **required**: False
@@ -227,17 +228,17 @@ resources
227228
filter
228229
A dictionary with attribute names as keys, and target values, to be used as criteria to filter the set of resources returned from CICSPlex SM.
229230

230-
Filters implicitly use the ``=`` operator
231+
Filters implicitly use the ``=`` operator.
231232

232-
Filters for ``string`` type attributes can use the ``*`` and ``+`` wildcard operators
233+
Filters for ``string`` type attributes can use the ``*`` and ``+`` wildcard operators.
233234

234-
``*`` is a wildcard representing an unknown number of characters, and must appear at the end of the value
235+
``*`` is a wildcard representing an unknown number of characters, and must appear at the end of the value.
235236

236237
``+`` is a wildcard representing a single character, and can appear in any place in the value, potentially multiple times.
237238

238239
To use more complicated filter expressions, including a range of different filter operators, and the ability to compose filters with ``and`` and ``or`` operators, see the ``complex_filter`` parameter.
239240

240-
For examples, see :ref:`cmci_get <cmci_get_module>`
241+
For examples, see "Examples" in :ref:`cmci_get <cmci_get_module>`.
241242

242243
For more details, see `How to build a filter expression <https://www.ibm.com/support/knowledgecenter/SSGMCP_5.6.0/system-programming/cpsm/eyup1a0.html>`_.
243244

docs/source/release_notes.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ This collection can manage CICS and CICSPlex® SM resources and definitions by c
3737
* Sample playbooks are available at the `samples repository`_. Each playbook contains a README that explains what configurations must be made to run a sample playbook.
3838

3939
.. _samples repository:
40-
https://github.com/IBM/z_ansible_collections_samples/blob/master/README.md
40+
https://github.com/IBM/z_ansible_collections_samples/tree/master/cics/cmci
4141

4242
.. _CMCI REST API:
4343
https://www.ibm.com/support/knowledgecenter/SSGMCP_5.6.0/fundamentals/cpsm/cpsm-cmci-restfulapi-overview.html
4444

4545
.. _the documentation site:
46-
https://ansible-collections.github.io/ibm_zos_cics/
46+
https://ibm.github.io/z_ansible_collections_doc/ibm_zos_cics/docs/ansible_content.html
4747

4848
Availability
4949
------------

docs/source/requirements_managed.rst

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,29 @@ The requirements of the managed node are as follows:
2323
* `xmltodict`_
2424

2525
If you delegate the tasks to run on your localhost, the Python module dependencies
26-
need to be installed on your localhost instead. You can install them from CLI:
26+
need to be installed on your localhost instead.
27+
28+
You can install them from CLI:
2729

2830
.. code-block:: sh
2931
3032
pip install requests xmltodict
3133
32-
You can also install them using the playbook. See this sample (link to be added) for an example.
34+
You can also install them using the playbook. For example, this `CICS
35+
sample playbook`_ shows how you can ensure the pre-requisites are installed before the module is executed.
3336

3437
.. _requests:
3538
https://pypi.org/project/requests/
3639

3740
.. _xmltodict:
3841
https://pypi.org/project/xmltodict/
3942

43+
.. _CICS sample playbook:
44+
https://github.com/IBM/z_ansible_collections_samples/tree/master/cics/cmci/reporting
45+
4046

41-
If you use the CICS collection in conjunction with other IBM z/OS collections, you won't be able to delegate all tasks to your localhost. In that case, your managed node must also follow the requirements of those collections, for example, `IBM z/OS core managed node requirements`_.
47+
If you use the CICS collection in conjunction with other IBM z/OS collections,
48+
your managed node must also follow the requirements of those collections, for example, `IBM z/OS core managed node requirements`_.
4249

4350
If you use the CICS collection alone but don't delegate the CICS tasks to your localhost, your managed node must also follow the `IBM z/OS core managed node requirements`_ except that IBM Z Open Automation Utilities (ZOAU) is not required.
4451

0 commit comments

Comments
 (0)