openstack/cinder
Code Issues Proposed changes

Use object.property instead of object.dump()['property']

Browse Source 
Less verbose and requires less work for the library.

Change-Id: Ied2196b548c91324fdfce39ec4f8801e59da4f6c
This commit is contained in:
Andy Grover 2014-10-09 16:08:13 -07:00 committed by Mike Perez
parent 06a2f58458
commit 13d524389e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/cinder-rtstool
View File

@ -42,7 +42,7 @@ def create(backing_device, name, userid, password, initiator_iqns=None):
# Look to see if BlockStorageObject already exists # Look to see if BlockStorageObject already exists
for x in rtsroot.storage_objects: for x in rtsroot.storage_objects:
if x.dump()['name'] == name: if x.name == name:
# Already exists, use this one # Already exists, use this one
return return
@ -90,7 +90,7 @@ def _lookup_target(target_iqn, initiator_iqn):
# Look for the target # Look for the target
for t in rtsroot.targets: for t in rtsroot.targets:
if t.dump()['wwn'] == target_iqn: if t.wwn == target_iqn:
return t return t
raise RtstoolError(_('Could not find target %s') % target_iqn) raise RtstoolError(_('Could not find target %s') % target_iqn)
@ -98,7 +98,7 @@ def _lookup_target(target_iqn, initiator_iqn):
def add_initiator(target_iqn, initiator_iqn, userid, password): def add_initiator(target_iqn, initiator_iqn, userid, password):
target = _lookup_target(target_iqn, initiator_iqn) target = _lookup_target(target_iqn, initiator_iqn)
tpg = target.tpgs.next() # get the first one tpg = target.tpgs.next() # get the first one
for acl in tpg.dump()['node_acls']: for acl in tpg.node_acls:
# See if this ACL configuration already exists # See if this ACL configuration already exists
if acl['node_wwn'] == initiator_iqn: if acl['node_wwn'] == initiator_iqn:
# No further action required # No further action required
@ -125,18 +125,18 @@ def delete_initiator(target_iqn, initiator_iqn):
def get_targets(): def get_targets():
rtsroot = rtslib.root.RTSRoot() rtsroot = rtslib.root.RTSRoot()
for x in rtsroot.targets: for x in rtsroot.targets:
print(x.dump()['wwn']) print(x.wwn)
def delete(iqn): def delete(iqn):
rtsroot = rtslib.root.RTSRoot() rtsroot = rtslib.root.RTSRoot()
for x in rtsroot.targets: for x in rtsroot.targets:
if x.dump()['wwn'] == iqn: if x.wwn == iqn:
x.delete() x.delete()
break break
for x in rtsroot.storage_objects: for x in rtsroot.storage_objects:
if x.dump()['name'] == iqn: if x.name == iqn:
x.delete() x.delete()
break break