openstack/cinder
Code Issues Proposed changes

Merge "[DOC BLD FIX] Fix code block issues"

Browse Source
This commit is contained in:
Jenkins 2017-07-23 01:12:19 +00:00 committed by Gerrit Code Review
commit 212b045a02
16 changed files with 100 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/api/common.py
View File

@ -433,7 +433,7 @@ def get_enabled_resource_filters(resource=None):
.. code-block:: json .. code-block:: json
{ {
"resource": ['filter1', 'filter2', 'filter3'] "resource": ["filter1", "filter2", "filter3"]
} }
if resource is not specified, all of the configuration will be returned, if resource is not specified, all of the configuration will be returned,

5
cinder/api/contrib/snapshot_manage.py
View File

@ -60,8 +60,9 @@ class SnapshotManageController(wsgi.Controller):
{ {
"snapshot": "snapshot":
{ {
"volume_id": <Cinder volume already exists in volume backend>, "volume_id": "<Cinder volume already exists in volume backend>",
"ref": <Driver-specific reference to the existing storage object> "ref":
"<Driver-specific reference to the existing storage object>"
} }
} }

9
cinder/api/contrib/volume_manage.py
View File

@ -62,11 +62,10 @@ class VolumeManageController(wsgi.Controller):
.. code-block:: json .. code-block:: json
{ {
'volume': "volume": {
{ "host": "<Cinder host on which the existing storage resides>",
'host': <Cinder host on which the existing storage resides>, "cluster": "<Cinder cluster on which the storage resides>",
'cluster': <Cinder cluster on which the storage resides>, "ref": "<Driver-specific reference to existing storage object>"
'ref': <Driver-specific reference to existing storage object>,
} }
} }

94
cinder/api/openstack/rest_api_version_history.rst
View File

@ -81,16 +81,18 @@ user documentation.
.. code-block:: json .. code-block:: json
"cluster": { {
"created_at": ..., "cluster": {
"disabled_reason": null, "created_at": "",
"last_heartbeat": ..., "disabled_reason": null,
"name": "cluster_name", "last_heartbeat": "",
"num_down_hosts": 4, "name": "cluster_name",
"num_hosts": 2, "num_down_hosts": 4,
"state": "up", "num_hosts": 2,
"status": "enabled", "state": "up",
"updated_at": ... "status": "enabled",
"updated_at": ""
}
} }
Update endpoint allows enabling and disabling a cluster in a similar way to Update endpoint allows enabling and disabling a cluster in a similar way to
@ -100,11 +102,13 @@ user documentation.
.. code-block:: json .. code-block:: json
"cluster": { {
"name": "cluster_name", "cluster": {
"state": "up", "name": "cluster_name",
"status": "enabled" "state": "up",
"disabled_reason": null "status": "enabled",
"disabled_reason": null
}
} }
Index and detail accept filtering by `name`, `binary`, `disabled`, Index and detail accept filtering by `name`, `binary`, `disabled`,
@ -115,37 +119,35 @@ user documentation.
.. code-block:: json .. code-block:: json
"clusters": [ {
{ "clusters": [
"name": "cluster_name", {
"state": "up", "name": "cluster_name",
"status": "enabled" "state": "up",
}, "status": "enabled"
{ }
... ]
} }
]
Detail endpoint returns: Detail endpoint returns:
.. code-block:: json .. code-block:: json
"clusters": [ {
{ "clusters": [
"created_at": ..., {
"disabled_reason": null, "created_at": "",
"last_heartbeat": ..., "disabled_reason": null,
"name": "cluster_name", "last_heartbeat": "",
"num_down_hosts": 4, "name": "cluster_name",
"num_hosts": 2, "num_down_hosts": 4,
"state": "up", "num_hosts": 2,
"status": "enabled", "state": "up",
"updated_at": ... "status": "enabled",
}, "updated_at": ""
{ }
... ]
} }
]
3.8 3.8
--- ---
@ -160,10 +162,12 @@ user documentation.
.. code-block:: json .. code-block:: json
"backup": { {
"id": "backup_id", "backup": {
"name": "backup_name", "id": "backup_id",
"links": "backup_link", "name": "backup_name",
"links": "backup_link"
}
} }
3.10 3.10

6
cinder/api/v3/attachments.py
View File

@ -126,7 +126,7 @@ class AttachmentsController(wsgi.Controller):
{ {
"volume_uuid": "volume-uuid", "volume_uuid": "volume-uuid",
"instance_uuid": "nova-server-uuid", "instance_uuid": "nova-server-uuid",
"connector": None|<connector-object>, "connector": "null|<connector-object>"
} }
} }
@ -142,9 +142,9 @@ class AttachmentsController(wsgi.Controller):
"platform": "x86_64", "platform": "x86_64",
"host": "tempest-1", "host": "tempest-1",
"os_type": "linux2", "os_type": "linux2",
"multipath": False, "multipath": false,
"mountpoint": "/dev/vdb", "mountpoint": "/dev/vdb",
"mode": None|"rw"|"ro", "mode": "null|rw|ro"
} }
} }

4
cinder/api/v3/views/resource_filters.py
View File

@ -24,8 +24,8 @@ class ViewBuilder(object):
{ {
"resource_filters": [{ "resource_filters": [{
"resource": 'resource_1', "resource": "resource_1",
"filters": ['filter1', 'filter2', 'filter3'] "filters": ["filter1", "filter2", "filter3"]
}] }]
} }
""" """

20
cinder/volume/driver.py
View File

@ -2727,16 +2727,16 @@ class ISERDriver(ISCSIDriver):
The format of the driver data is defined in _get_iser_properties. The format of the driver data is defined in _get_iser_properties.
Example return value: Example return value:
.. code-block:: json .. code-block:: default
{ {
'driver_volume_type': 'iser' 'driver_volume_type': 'iser',
'data': { 'data': {
'target_discovered': True, 'target_discovered': True,
'target_iqn': 'target_iqn':
'iqn.2010-10.org.iser.openstack:volume-00000001', 'iqn.2010-10.org.iser.openstack:volume-00000001',
'target_portal': '127.0.0.0.1:3260', 'target_portal': '127.0.0.0.1:3260',
'volume_id': 1, 'volume_id': 1
} }
} }
@ -2775,27 +2775,29 @@ class FibreChannelDriver(VolumeDriver):
correspond to the list of remote wwn(s) that will export the volume. correspond to the list of remote wwn(s) that will export the volume.
Example return values: Example return values:
.. code-block:: json .. code-block:: default
{ {
'driver_volume_type': 'fibre_channel' 'driver_volume_type': 'fibre_channel',
'data': { 'data': {
'target_discovered': True, 'target_discovered': True,
'target_lun': 1, 'target_lun': 1,
'target_wwn': '1234567890123', 'target_wwn': '1234567890123',
'discard': False, 'discard': False
} }
} }
or or
.. code-block:: default
{ {
'driver_volume_type': 'fibre_channel' 'driver_volume_type': 'fibre_channel',
'data': { 'data': {
'target_discovered': True, 'target_discovered': True,
'target_lun': 1, 'target_lun': 1,
'target_wwn': ['1234567890123', '0987654321321'], 'target_wwn': ['1234567890123', '0987654321321'],
'discard': False, 'discard': False
} }
} }

16
cinder/volume/drivers/dell_emc/vmax/iscsi.py
View File

@ -201,26 +201,30 @@ class VMAXISCSIDriver(driver.ISCSIDriver):
the format of the driver data is defined in smis_get_iscsi_properties. the format of the driver data is defined in smis_get_iscsi_properties.
Example return value: Example return value:
.. code-block:: json .. code-block:: default
{ {
'driver_volume_type': 'iscsi' 'driver_volume_type': 'iscsi',
'data': { 'data': {
'target_discovered': True, 'target_discovered': True,
'target_iqn': 'iqn.2010-10.org.openstack:volume-00000001', 'target_iqn': 'iqn.2010-10.org.openstack:volume-00000001',
'target_portal': '127.0.0.0.1:3260', 'target_portal': '127.0.0.0.1:3260',
'volume_id': '12345678-1234-4321-1234-123456789012', 'volume_id': '12345678-1234-4321-1234-123456789012'
} }
} }
Example return value (multipath is enabled)::
Example return value (multipath is enabled):
.. code-block:: default
{ {
'driver_volume_type': 'iscsi' 'driver_volume_type': 'iscsi',
'data': { 'data': {
'target_discovered': True, 'target_discovered': True,
'target_iqns': ['iqn.2010-10.org.openstack:volume-00001', 'target_iqns': ['iqn.2010-10.org.openstack:volume-00001',
'iqn.2010-10.org.openstack:volume-00002'], 'iqn.2010-10.org.openstack:volume-00002'],
'target_portals': ['127.0.0.1:3260', '127.0.1.1:3260'], 'target_portals': ['127.0.0.1:3260', '127.0.1.1:3260'],
'target_luns': [1, 1], 'target_luns': [1, 1]
} }
} }
:param volume: the cinder volume object :param volume: the cinder volume object

4
cinder/volume/drivers/hitachi/hbsd_common.py
View File

@ -750,7 +750,7 @@ class HBSDCommon(object):
For HUS 100 Family: For HUS 100 Family:
.. code-block:: json .. code-block:: default
{ {
'ldev': <logical device number on storage>, 'ldev': <logical device number on storage>,
@ -759,7 +759,7 @@ class HBSDCommon(object):
For VSP G1000/VSP/HUS VM: For VSP G1000/VSP/HUS VM:
.. code-block:: json .. code-block:: default
{ {
'ldev': <logical device number on storage>, 'ldev': <logical device number on storage>,

4
cinder/volume/drivers/hpe/hpe_3par_iscsi.py
View File

@ -331,10 +331,10 @@ class HPE3PARISCSIDriver(driver.ManageableVD,
The format of the driver data is defined in _get_iscsi_properties. The format of the driver data is defined in _get_iscsi_properties.
Example return value: Example return value:
.. code-block:: json .. code-block:: default
{ {
'driver_volume_type': 'iscsi' 'driver_volume_type': 'iscsi',
'data': { 'data': {
'encrypted': False, 'encrypted': False,
'target_discovered': True, 'target_discovered': True,

2
cinder/volume/drivers/infortrend/infortrend_fc_cli.py
View File

@ -221,7 +221,7 @@ class InfortrendCLIFCDriver(driver.FibreChannelDriver):
volume['name'] which is how drivers traditionally map between a volume['name'] which is how drivers traditionally map between a
cinder volume and the associated backend storage object. cinder volume and the associated backend storage object.
.. code-block:: json .. code-block:: default
existing_ref:{ existing_ref:{
'id':lun_id 'id':lun_id

2
cinder/volume/drivers/infortrend/infortrend_iscsi_cli.py
View File

@ -194,7 +194,7 @@ class InfortrendCLIISCSIDriver(driver.ISCSIDriver):
volume['name'] which is how drivers traditionally map between a volume['name'] which is how drivers traditionally map between a
cinder volume and the associated backend storage object. cinder volume and the associated backend storage object.
.. code-block:: json .. code-block:: default
existing_ref:{ existing_ref:{
'id':lun_id 'id':lun_id

10
cinder/volume/drivers/netapp/dataontap/block_base.py
View File

@ -891,10 +891,10 @@ class NetAppBlockStorageLibrary(object):
correspond to the list of remote wwn(s) that will export the volume. correspond to the list of remote wwn(s) that will export the volume.
Example return values: Example return values:
.. code-block:: json .. code-block:: default
{ {
'driver_volume_type': 'fibre_channel' 'driver_volume_type': 'fibre_channel',
'data': { 'data': {
'target_discovered': True, 'target_discovered': True,
'target_lun': 1, 'target_lun': 1,
@ -906,10 +906,12 @@ class NetAppBlockStorageLibrary(object):
} }
} }
or Or
.. code-block:: default
{ {
'driver_volume_type': 'fibre_channel' 'driver_volume_type': 'fibre_channel',
'data': { 'data': {
'target_discovered': True, 'target_discovered': True,
'target_lun': 1, 'target_lun': 1,

6
cinder/volume/drivers/vmware/vmdk.py
View File

@ -605,11 +605,11 @@ class VMwareVcVmdkDriver(driver.VolumeDriver):
The implementation returns the following information: The implementation returns the following information:
.. code-block:: json .. code-block:: default
{ {
'driver_volume_type': 'vmdk' 'driver_volume_type': 'vmdk',
'data': {'volume': $VOLUME_MOREF_VALUE 'data': {'volume': $VOLUME_MOREF_VALUE,
'volume_id': $VOLUME_ID 'volume_id': $VOLUME_ID
} }
} }

2
cinder/volume/volume_types.py
View File

@ -275,7 +275,7 @@ def volume_types_diff(context, vol_type_id1, vol_type_id2):
whether there is any difference, and 'diff' is a dictionary with the whether there is any difference, and 'diff' is a dictionary with the
following format: following format:
.. code-block:: json .. code-block:: default
{ {
'extra_specs': {'key1': (value_in_1st_vol_type, 'extra_specs': {'key1': (value_in_1st_vol_type,

2
cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py
View File

@ -69,7 +69,7 @@ class BrcdFCSanLookupService(fc_service.FCSanLookupService):
:param target_wwn_list: List of target port WWN :param target_wwn_list: List of target port WWN
:returns: List -- device wwn map in following format :returns: List -- device wwn map in following format
.. code-block:: json .. code-block:: default
{ {
<San name>: { <San name>: {