openstack/python-cinderclient
Code Issues Proposed changes

Merge "refactor the getid method base.py"

Browse Source
This commit is contained in:
Zuul
2018-10-03 15:51:25 +00:00
committed by Gerrit Code Review
parent e9658c6ef6 42b598d109
commit c73844df2d
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cinderclient/apiclient/base.py
View File

@@ -41,15 +41,10 @@ def getid(obj):
Abstracts the common pattern of allowing both an object or an object's ID Abstracts the common pattern of allowing both an object or an object's ID
(UUID) as a parameter when dealing with relationships. (UUID) as a parameter when dealing with relationships.
""" """
try: if getattr(obj, 'uuid', None):
if obj.uuid: return obj.uuid
return obj.uuid else:
except AttributeError: return getattr(obj, 'id', obj)
pass
try:
return obj.id
except AttributeError:
return obj
# TODO(aababilov): call run_hooks() in HookableMixin's child classes # TODO(aababilov): call run_hooks() in HookableMixin's child classes

5
cinderclient/base.py
View File

@@ -53,10 +53,7 @@ def getid(obj):
Abstracts the common pattern of allowing both an object or an object's ID Abstracts the common pattern of allowing both an object or an object's ID
as a parameter when dealing with relationships. as a parameter when dealing with relationships.
""" """
try: return getattr(obj, 'id', obj)
return obj.id
except AttributeError:
return obj
class Manager(common_base.HookableMixin): class Manager(common_base.HookableMixin):