openstack/cinder
Code Issues Proposed changes

Merge "CoprHD: Handle ScaleIO CI failing with version-3.5"

Browse Source
This commit is contained in:
Jenkins 2017-01-17 06:47:15 +00:00 committed by Gerrit Code Review
commit be92df726a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cinder/volume/drivers/coprhd/helpers/volume.py
View File

@ -327,14 +327,11 @@ class Volume(common.CoprHDResource):
# Filtering based on "replicaState" attribute value of Cloned volume.
# If "replicaState" value is "SYNCHRONIZED" then only Cloned volume
# would be in detachable state.
if(vol and 'protection' in vol and
'full_copies' in vol['protection'] and
'replicaState' in vol['protection']['full_copies']):
if(vol['protection']['full_copies']['replicaState'] ==
'SYNCHRONIZED'):
return True
try:
return vol['protection']['full_copies'][
'replicaState'] == 'SYNCHRONIZED'
except TypeError:
return False
return False
def volume_clone_detach(self, resource_uri, full_project_name,
name, sync, synctimeout=0):
@ -491,7 +488,7 @@ class Volume(common.CoprHDResource):
"""
namelist = []
if type(name) is list:
if isinstance(name, list):
namelist = name
else:
namelist.append(name)