openstack
/
cinder
Code Issues Proposed changes

cinder-rtstool: should use acl.node_wwn 

In newer version of rtslib module, NodeACL is now an object, not a
dict. Thus, acl.node_wwn must be used instead of acl['node_wwn'],
otherwise it will fail with exception.

Change-Id: I0fb53596a2a99609aa4d573f1254b3afa7d9fd91
Closes-Bug: #1408443
This commit is contained in:
Tomoki Sekiyama 2015-01-07 17:33:51 -05:00
parent 00b03b90cc
commit 65d9c20b45
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/cmd/rtstool.py
View File

@ -100,7 +100,7 @@ def add_initiator(target_iqn, initiator_iqn, userid, password):
tpg = target.tpgs.next() # get the first one
for acl in tpg.node_acls:
# See if this ACL configuration already exists
if acl['node_wwn'] == initiator_iqn:
if acl.node_wwn == initiator_iqn:
# No further action required
return

2
cinder/tests/test_cmd.py
View File

@ -844,7 +844,7 @@ class TestCinderRtstoolCmd(test.TestCase):
target_iqn = mock.MagicMock()
target_iqn.tpgs.return_value = \
[{'node_acls': mock.sentinel.initiator_iqn}]
acl = {'node_wwn': mock.sentinel.initiator_iqn}
acl = mock.MagicMock(node_wwn=mock.sentinel.initiator_iqn)
tpg = mock.MagicMock(node_acls=[acl])
tpgs = mock.MagicMock()
tpgs.next.return_value = tpg