openstack/zun
Code Issues Proposed changes

Merge "Use 'find' to replace the list method when search volume."

Browse Source
This commit is contained in:
Zuul 2017-11-27 09:39:59 +00:00 committed by Gerrit Code Review
commit 43bb9825fb
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zun/volume/cinder_api.py
View File

@ -43,18 +43,16 @@ class CinderAPI(object):
def search_volume(self, volume):
if uuidutils.is_uuid_like(volume):
volume = self.cinder.volumes.get(volume)
volumes = [volume]
else:
volumes = self.cinder.volumes.list(search_opts={'name': volume})
try:
volume = self.cinder.volumes.find(name=volume)
except cinder_exception.NotFound:
raise exception.VolumeNotFound(volume=volume)
except cinder_exception.NoUniqueMatch:
raise exception.Conflict(_(
'Multiple cinder volumes exist with same name. '
'Please use the uuid instead.'))
if len(volumes) == 0:
raise exception.VolumeNotFound(volume=volume)
elif len(volumes) > 1:
raise exception.Conflict(_(
'Multiple cinder volumes exist with same name. '
'Please use the uuid instead.'))
volume = volumes[0]
return volume
def ensure_volume_usable(self, volume):