Skip to content

Commit 2174666

Browse files
authored
Fixed doc build warnings (#2132)
Signed-off-by: Andreas Maier <maiera@de.ibm.com>
1 parent 23b5909 commit 2174666

5 files changed

Lines changed: 68 additions & 69 deletions

File tree

docs/appendix.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,11 @@ Resources scoped to the HMC
400400
MFA Server Definition
401401
The information in an HMC about an MFA server that may be used for
402402
HMC user authorization purposes.
403-
403+
404404
SSO Server Definition
405405
The information in an HMC about an SSO server that may be used for
406406
HMC user authorization purposes.
407-
407+
408408
Password Rule
409409
A rule which HMC users need to follow when creating a HMC logon password.
410410

@@ -539,13 +539,13 @@ Resources scoped to CPCs in DPM mode
539539

540540
Storage Volume Template
541541
A template for :term:`Storage Volumes <Storage Volume>`.
542-
543-
Tape library
542+
543+
Tape library
544544
A Tape Library represents one physical tape storage unit connected to
545545
a CPC.Tape libraries are automatically discovered,but discovery requires
546546
preprocessing,A single Worldwide Port Name (WWPN) must be zoned so the CPC
547547
can see the tape library.
548-
For details, see section :ref:`Tape Library`.
548+
For details, see section :ref:`Tape Libraries`.
549549

550550
vHBA
551551
Synonym for :term:`HBA`. In this resource model, HBAs are always

docs/resources.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ Storage Volumes
341341
.. _`Tape Libraries`:
342342

343343
Tape Libraries
344-
-----------------
344+
--------------
345345

346346
.. automodule:: zhmcclient._tape_library
347347

@@ -596,7 +596,7 @@ LDAP Server Definition
596596
:autosummary:
597597
:autosummary-inherited-members:
598598
:special-members: __str__
599-
599+
600600

601601
.. _`SSO Server Definition`:
602602

zhmcclient/_console.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,7 @@ def storage_group_templates(self):
255255
def tape_library(self):
256256
"""
257257
:class:`~zhmcclient.TapeLibraryManager`: Access to the
258-
:term:`TapeLibrary <TapeLibrary>` in this
259-
Console.
258+
:term:`tape libraries <tape library>` of this Console.
260259
"""
261260
# We do here some lazy loading.
262261
if not self._tape_library:

zhmcclient/_tape_library.py

Lines changed: 56 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646

4747
class TapeLibraryManager(BaseManager):
4848
"""
49-
Manager providing access to the
50-
:term:`tape libraries <tape libraries>` of the HMC.
49+
Manager providing access to the
50+
:term:`tape libraries <tape library>` of the HMC.
5151
5252
Derived from :class:`~zhmcclient.BaseManager`; see there for common methods
5353
and attributes.
@@ -133,19 +133,19 @@ def list(self, full_properties=False, filter_args=None):
133133
The listing of resources is handled in an optimized way:
134134
135135
* If this manager is enabled for :ref:`auto-updating`, a locally
136-
maintained resource list is used (which is automatically updated via
137-
inventory notifications from the HMC) and the provided filter
138-
arguments are applied.
136+
maintained resource list is used (which is automatically updated via
137+
inventory notifications from the HMC) and the provided filter
138+
arguments are applied.
139139
140140
* Otherwise, if the filter arguments specify the resource name as a
141-
single filter argument with a straight match string (i.e. without
142-
regular expressions), an optimized lookup is performed based on a
143-
locally maintained name-URI cache.
141+
single filter argument with a straight match string (i.e. without
142+
regular expressions), an optimized lookup is performed based on a
143+
locally maintained name-URI cache.
144144
145145
* Otherwise, the HMC List operation is performed with the subset of the
146-
provided filter arguments that can be handled on the HMC side and the
147-
remaining filter arguments are applied on the client side on the list
148-
result.
146+
provided filter arguments that can be handled on the HMC side and the
147+
remaining filter arguments are applied on the client side on the list
148+
result.
149149
150150
HMC/SE version requirements:
151151
@@ -154,16 +154,16 @@ def list(self, full_properties=False, filter_args=None):
154154
Authorization requirements:
155155
156156
* Object-access permission to any tape libraries to be included in the
157-
result.
157+
result.
158158
159159
Parameters:
160160
161-
full_properties (bool):
161+
full_properties (bool):
162162
Controls that the full set of resource properties for each returned
163163
tape library is being retrieved, vs. only the following short
164164
set: "object-uri", "cpc-uri", "name", and "state".
165165
166-
filter_args (dict):
166+
filter_args (dict):
167167
Filter arguments that narrow the list of returned resources to
168168
those that match the specified filter arguments. For details, see
169169
:ref:`Filtering`.
@@ -172,15 +172,15 @@ def list(self, full_properties=False, filter_args=None):
172172
173173
Returns:
174174
175-
: A list of :class:`~zhmcclient.TapeLibrary` objects.
175+
: A list of :class:`~zhmcclient.TapeLibrary` objects.
176176
177177
Raises:
178178
179-
:exc:`~zhmcclient.HTTPError`
180-
:exc:`~zhmcclient.ParseError`
181-
:exc:`~zhmcclient.AuthError`
182-
:exc:`~zhmcclient.ConnectionError`
183-
:exc:`~zhmcclient.FilterConversionError`
179+
:exc:`~zhmcclient.HTTPError`
180+
:exc:`~zhmcclient.ParseError`
181+
:exc:`~zhmcclient.AuthError`
182+
:exc:`~zhmcclient.ConnectionError`
183+
:exc:`~zhmcclient.FilterConversionError`
184184
"""
185185

186186
result_prop = "tape-libraries"
@@ -190,9 +190,7 @@ def list(self, full_properties=False, filter_args=None):
190190
)
191191

192192
@logged_api_call
193-
def request_zoning(
194-
self, email_to_addresses=None, email_cc_addresses=None
195-
):
193+
def request_zoning(self, email_to_addresses=None, email_cc_addresses=None):
196194
"""
197195
Request tape library zoning configuration by sending email notifications
198196
to storage administrators.
@@ -212,26 +210,26 @@ def request_zoning(
212210
213211
Parameters:
214212
215-
email_to_addresses (:term:`iterable` of :term:`string`): Email
213+
email_to_addresses (:term:`iterable` of :term:`string`): Email
216214
addresses of one or more storage administrators to be notified.
217215
If `None` or empty, no email will be sent.
218216
219-
email_cc_addresses (:term:`iterable` of :term:`string`): Email
217+
email_cc_addresses (:term:`iterable` of :term:`string`): Email
220218
addresses of one or more storage administrators to be copied
221219
on the notification email.
222220
If `None` or empty, nobody will be copied on the email.
223221
224222
Returns:
225223
226-
dict: A dictionary with the operation results.
224+
dict: A dictionary with the operation results.
227225
228226
Raises:
229227
230-
:exc:`~zhmcclient.HTTPError`: HTTP status 409, reason 487 if no FCP
231-
adapters are available on the CPC.
232-
:exc:`~zhmcclient.ParseError`
233-
:exc:`~zhmcclient.AuthError`
234-
:exc:`~zhmcclient.ConnectionError`
228+
:exc:`~zhmcclient.HTTPError`: HTTP status 409, reason 487 if no FCP
229+
adapters are available on the CPC.
230+
:exc:`~zhmcclient.ParseError`
231+
:exc:`~zhmcclient.AuthError`
232+
:exc:`~zhmcclient.ConnectionError`
235233
"""
236234

237235
body = {}
@@ -273,21 +271,21 @@ def discover(
273271
274272
* Object-access permission to the CPC.
275273
* Task permission to the "Configure Storage - System Programmer" task
276-
or to the "Configure Storage - Storage Administrator" task.
274+
or to the "Configure Storage - Storage Administrator" task.
277275
278276
Parameters:
279277
280-
force_restart (bool):
278+
force_restart (bool):
281279
Indicates if there is an in-progress discovery operation for the
282280
CPC, it should be terminated and started again.
283281
If `False` or there is no in-progress discovery operation,
284282
a new one is started.
285283
286-
wait_for_completion (bool):
284+
wait_for_completion (bool):
287285
Boolean controlling whether this method should wait for completion
288286
of the asynchronous job performing the discovery.
289287
290-
operation_timeout (:term:`number`):
288+
operation_timeout (:term:`number`):
291289
Timeout in seconds, for waiting for completion of the asynchronous
292290
job performing the discovery. The special value 0 means that no
293291
timeout is set. `None` means that the default async operation
@@ -297,24 +295,22 @@ def discover(
297295
298296
Returns:
299297
300-
`None` or :class:`~zhmcclient.Job`:
301-
302-
If `wait_for_completion` is `True`, returns nothing.
303-
304-
If `wait_for_completion` is `False`, returns a
305-
:class:`~zhmcclient.Job` object representing the asynchronously
306-
executing job on the HMC.
307-
This job does not support cancellation.
298+
`None` or :class:`~zhmcclient.Job`:
299+
If `wait_for_completion` is `True`, returns nothing.
300+
If `wait_for_completion` is `False`, returns a
301+
:class:`~zhmcclient.Job` object representing the asynchronously
302+
executing job on the HMC.
303+
This job does not support cancellation.
308304
309305
Raises:
310306
311-
:exc:`~zhmcclient.HTTPError`: HTTP status 409, reason 501 if the CPC
312-
does not have a management-world-wide-port-name configured.
313-
:exc:`~zhmcclient.ParseError`
314-
:exc:`~zhmcclient.AuthError`
315-
:exc:`~zhmcclient.ConnectionError`
316-
:exc:`~zhmcclient.OperationTimeout`: The timeout expired while
317-
waiting for completion of the operation.
307+
:exc:`~zhmcclient.HTTPError`: HTTP status 409, reason 501 if the CPC
308+
does not have a management-world-wide-port-name configured.
309+
:exc:`~zhmcclient.ParseError`
310+
:exc:`~zhmcclient.AuthError`
311+
:exc:`~zhmcclient.ConnectionError`
312+
:exc:`~zhmcclient.OperationTimeout`: The timeout expired while
313+
waiting for completion of the operation.
318314
"""
319315

320316
body = {}
@@ -383,14 +379,14 @@ def undefine(self):
383379
384380
* Object-access permission to this tape library.
385381
* Task permissions are: "Configure Storage – System Programmer" or
386-
"Configure Storage – Storage Administrator"
382+
"Configure Storage – Storage Administrator"
387383
388384
Raises:
389385
390-
:exc:`~zhmcclient.HTTPError`
391-
:exc:`~zhmcclient.ParseError`
392-
:exc:`~zhmcclient.AuthError`
393-
:exc:`~zhmcclient.ConnectionError`
386+
:exc:`~zhmcclient.HTTPError`
387+
:exc:`~zhmcclient.ParseError`
388+
:exc:`~zhmcclient.AuthError`
389+
:exc:`~zhmcclient.ConnectionError`
394390
"""
395391
self.manager.session.post(uri=self.uri + "/operations/undefine",
396392
resource=self)
@@ -419,17 +415,17 @@ def update_properties(self, properties):
419415
420416
Parameters:
421417
422-
properties (dict): New values for the properties to be updated.
418+
properties (dict): New values for the properties to be updated.
423419
Properties not to be updated are omitted.
424420
Allowable properties are the writeable properties defined for
425421
the tape library resource in the :term:`HMC API` book.
426422
427423
Raises:
428424
429-
:exc:`~zhmcclient.HTTPError`
430-
:exc:`~zhmcclient.ParseError`
431-
:exc:`~zhmcclient.AuthError`
432-
:exc:`~zhmcclient.ConnectionError`
425+
:exc:`~zhmcclient.HTTPError`
426+
:exc:`~zhmcclient.ParseError`
427+
:exc:`~zhmcclient.AuthError`
428+
:exc:`~zhmcclient.ConnectionError`
433429
"""
434430
result = self.manager.session.post(self.uri,
435431
resource=self, body=properties)

zhmcclient/mock/_hmc.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,9 @@ def add(self, properties):
18301830
# pylint: disable=useless-super-delegation
18311831
"""
18321832
Add a faked SSO Server Definition resource.
1833+
18331834
Parameters:
1835+
18341836
properties (dict):
18351837
Resource properties.
18361838
Special handling and requirements for certain properties:
@@ -1842,7 +1844,9 @@ def add(self, properties):
18421844
if not specified.
18431845
* All of the other class-soecific resource properties will be set
18441846
to a default value consistent with the HMC data model.
1847+
18451848
Returns:
1849+
18461850
:class:`~zhmcclient.mock.FakedSSOServerDefinition`: The faked
18471851
SSOServerDefinition resource.
18481852
"""

0 commit comments

Comments
 (0)