openstack
/
os-brick
Code Issues Proposed changes

Merge "rbd: Correct local_attach disconnect test and showmapped arguments" into stable/stein

This commit is contained in:
Zuul 2020-07-29 16:37:17 +00:00 committed by Gerrit Code Review
parent 01e93a3672 4f25b9c92a
commit 19f30299bb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os_brick/initiator/connectors/rbd.py
View File

@ -217,6 +217,7 @@ class RBDConnector(base.BaseLinuxConnector):
"""
__, volume = connection_properties['name'].split('/')
cmd = ['rbd', 'showmapped', '--format=json']
cmd += self._get_rbd_args(connection_properties)
(out, err) = self._execute(*cmd, root_helper=self._root_helper,
run_as_root=True)
for index, mapping in jsonutils.loads(out).items():

6
os_brick/tests/initiator/connectors/test_rbd.py
View File

@ -258,8 +258,8 @@ class RBDConnectorTestCase(test_connector.ConnectorTestCase):
'hosts': ['192.168.10.2'],
'ports': ['6789']}
mock_execute.side_effect = [("""
{"0":{"pool":"pool","device":"/dev/rbd0","name":"pool-image"},
"1":{"pool":"pool","device":"/dev/rdb1","name":"pool-image_2"}}""", None),
{"0":{"pool":"pool","device":"/dev/rbd0","name":"image"},
"1":{"pool":"pool","device":"/dev/rdb1","name":"image_2"}}""", None),
(None, None)]
show_cmd = ['rbd', 'showmapped', '--format=json', '--id', 'fake_user',
'--mon_host', '192.168.10.2:6789']
@ -269,7 +269,7 @@ class RBDConnectorTestCase(test_connector.ConnectorTestCase):
rbd_connector.disconnect_volume(conn, None)
# Assert that showmapped is used before we unmap the root device
mock_execute.has_calls([
mock_execute.assert_has_calls([
mock.call(*show_cmd, root_helper=None, run_as_root=True),
mock.call(*unmap_cmd, root_helper=None, run_as_root=True)])