openstack
/
deb-cinder
Code Issues Proposed changes

Merge "[DOC BLD FIX] correct formatting errors in datera driver"

This commit is contained in:
Jenkins 2017-07-24 21:22:19 +00:00 committed by Gerrit Code Review
parent dc2eda8d6f 3d980009cf
commit 6331902122
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cinder/volume/drivers/datera/datera_iscsi.py
View File

@ -80,18 +80,18 @@ class DateraDriver(san.SanISCSIDriver, api2.DateraApi, api21.DateraApi):
"""The OpenStack Datera Driver """The OpenStack Datera Driver
Version history: Version history:
1.0 - Initial driver * 1.0 - Initial driver
1.1 - Look for lun-0 instead of lun-1. * 1.1 - Look for lun-0 instead of lun-1.
2.0 - Update For Datera API v2 * 2.0 - Update For Datera API v2
2.1 - Multipath, ACL and reorg * 2.1 - Multipath, ACL and reorg
2.2 - Capabilites List, Extended Volume-Type Support * 2.2 - Capabilites List, Extended Volume-Type Support
Naming convention change, Naming convention change,
Volume Manage/Unmanage support Volume Manage/Unmanage support
2.3 - Templates, Tenants, Snapshot Polling, * 2.3 - Templates, Tenants, Snapshot Polling,
2.1 Api Version Support, Restructure 2.1 Api Version Support, Restructure
2.3.1 - Scalability bugfixes * 2.3.1 - Scalability bugfixes
2.3.2 - Volume Placement, ACL multi-attach bugfix * 2.3.2 - Volume Placement, ACL multi-attach bugfix
2.4.0 - Fast Retype Support * 2.4.0 - Fast Retype Support
""" """
VERSION = '2.4.0' VERSION = '2.4.0'
@ -245,6 +245,7 @@ class DateraDriver(san.SanISCSIDriver, api2.DateraApi, api21.DateraApi):
"""Convert the volume to be of the new type. """Convert the volume to be of the new type.
Returns a boolean indicating whether the retype occurred. Returns a boolean indicating whether the retype occurred.
:param ctxt: Context :param ctxt: Context
:param volume: A dictionary describing the volume to migrate :param volume: A dictionary describing the volume to migrate
:param new_type: A dictionary describing the volume type to convert to :param new_type: A dictionary describing the volume type to convert to
@ -273,6 +274,7 @@ class DateraDriver(san.SanISCSIDriver, api2.DateraApi, api21.DateraApi):
(existing_ref['source-name'] == (existing_ref['source-name'] ==
tenant:app_inst_name:storage_inst_name:vol_name) tenant:app_inst_name:storage_inst_name:vol_name)
if using Datera 2.1 API if using Datera 2.1 API
or or
@ -323,8 +325,9 @@ class DateraDriver(san.SanISCSIDriver, api2.DateraApi, api21.DateraApi):
Returns a list of dictionaries, each specifying a volume in the host, Returns a list of dictionaries, each specifying a volume in the host,
with the following keys: with the following keys:
- reference (dictionary): The reference for a volume, which can be - reference (dictionary): The reference for a volume, which can be
passed to "manage_existing". passed to 'manage_existing'.
- size (int): The size of the volume according to the storage - size (int): The size of the volume according to the storage
backend, rounded up to the nearest GB. backend, rounded up to the nearest GB.
- safe_to_manage (boolean): Whether or not this volume is safe to - safe_to_manage (boolean): Whether or not this volume is safe to