Merge "Include "nqn." in subsystem name"
This commit is contained in:
commit
70dd6f63f0
|
@ -94,7 +94,7 @@ class NVMeConnector(base.BaseLinuxConnector):
|
||||||
current_nvme_devices = self._get_nvme_devices()
|
current_nvme_devices = self._get_nvme_devices()
|
||||||
|
|
||||||
device_info = {'type': 'block'}
|
device_info = {'type': 'block'}
|
||||||
conn_nqn = connection_properties['nqn'].split('.', 1)[1]
|
conn_nqn = connection_properties['nqn']
|
||||||
target_portal = connection_properties['target_portal']
|
target_portal = connection_properties['target_portal']
|
||||||
port = connection_properties['target_port']
|
port = connection_properties['target_port']
|
||||||
nvme_transport_type = connection_properties['transport_type']
|
nvme_transport_type = connection_properties['transport_type']
|
||||||
|
|
|
@ -76,7 +76,7 @@ class NVMeConnectorTestCase(test_connector.ConnectorTestCase):
|
||||||
mock_execute.assert_called_once_with(
|
mock_execute.assert_called_once_with(
|
||||||
'nvme', 'connect', '-t',
|
'nvme', 'connect', '-t',
|
||||||
connection_properties['transport_type'], '-n',
|
connection_properties['transport_type'], '-n',
|
||||||
'volume_123',
|
'nqn.volume_123',
|
||||||
'-a', connection_properties['target_portal'],
|
'-a', connection_properties['target_portal'],
|
||||||
'-s', connection_properties['target_port'],
|
'-s', connection_properties['target_port'],
|
||||||
root_helper=None,
|
root_helper=None,
|
||||||
|
|
Loading…
Reference in New Issue