openstack
/
deb-cinder
Code Issues Proposed changes

Merge "[DOC BLD FIX] Fix docstring errors for VMAX driver"

This commit is contained in:
Jenkins 2017-07-24 20:18:40 +00:00 committed by Gerrit Code Review
parent 212b045a02 80d427d9a3
commit 2b21db22c0
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/volume/drivers/dell_emc/vmax/masking.py
View File

@ -1498,7 +1498,7 @@ class VMAXMasking(object):
:param device_info_dict: the data dict
:param source_storage_group_list: list of storage groups associated
with the device
with the device
:param extra_specs: extra specifications
"""
array = device_info_dict['array']

10
cinder/volume/drivers/dell_emc/vmax/rest.py
View File

@ -1418,9 +1418,13 @@ class VMAXRest(object):
"""Check what replication features are licensed and enabled.
Example return value for this method:
{"symmetrixId": "000197800128",
"snapVxCapable": true,
"rdfCapable": true}
.. code:: python
{"symmetrixId": "000197800128",
"snapVxCapable": true,
"rdfCapable": true}
:param: array
:returns: capabilities dict for the given array
"""

29
cinder/volume/drivers/dell_emc/vmax/utils.py
View File

@ -305,19 +305,22 @@ class VMAXUtils(object):
Given a file, parse it to get array and pool(srp).
<EMC>
<RestServerIp>10.108.246.202</RestServerIp>
<RestServerPort>8443</RestServerPort>
<RestUserName>smc</RestUserName>
<RestPassword>smc</RestPassword>
<SSLCert>/path/client.cert</SSLCert>
<SSLVerify>/path/to/certfile.pem</SSLVerify>
<PortGroups>
<PortGroup>OS-PORTGROUP1-PG</PortGroup>
</PortGroups>
<Array>000198700439</Array>
<SRP>SRP_1</SRP>
</EMC>
.. code:: ini
<EMC>
<RestServerIp>10.108.246.202</RestServerIp>
<RestServerPort>8443</RestServerPort>
<RestUserName>smc</RestUserName>
<RestPassword>smc</RestPassword>
<SSLCert>/path/client.cert</SSLCert>
<SSLVerify>/path/to/certfile.pem</SSLVerify>
<PortGroups>
<PortGroup>OS-PORTGROUP1-PG</PortGroup>
</PortGroups>
<Array>000198700439</Array>
<SRP>SRP_1</SRP>
</EMC>
:param file_name: the configuration file
:returns: list
"""