Merge "Use the new loop backstore type for fileio"
This commit is contained in:
commit
9b518d8c99
|
@ -98,7 +98,7 @@ class TestFileIOVolumeAdapter(test_vol.TestVolumeAdapter):
|
||||||
# Validate
|
# Validate
|
||||||
mock_file_bld.assert_called_once_with(
|
mock_file_bld.assert_called_once_with(
|
||||||
self.adpt, 'fake_path',
|
self.adpt, 'fake_path',
|
||||||
backstore_type=pvm_stg.BackStoreType.FILE_IO, tag='a_vol_id')
|
backstore_type=pvm_stg.BackStoreType.LOOP, tag='a_vol_id')
|
||||||
self.assertEqual(1, mock_build_map.call_count)
|
self.assertEqual(1, mock_build_map.call_count)
|
||||||
self.assertEqual(1, mock_udid_to_map.call_count)
|
self.assertEqual(1, mock_udid_to_map.call_count)
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ class TestFileIOVolumeAdapter(test_vol.TestVolumeAdapter):
|
||||||
# Validate
|
# Validate
|
||||||
mock_file_bld.assert_called_once_with(
|
mock_file_bld.assert_called_once_with(
|
||||||
self.adpt, 'fake_path',
|
self.adpt, 'fake_path',
|
||||||
backstore_type=pvm_stg.BackStoreType.FILE_IO, tag='a_vol_id')
|
backstore_type=pvm_stg.BackStoreType.LOOP, tag='a_vol_id')
|
||||||
self.assertEqual(0, mock_build_map.call_count)
|
self.assertEqual(0, mock_build_map.call_count)
|
||||||
|
|
||||||
@mock.patch('pypowervm.tasks.partition.get_mgmt_partition', autospec=True)
|
@mock.patch('pypowervm.tasks.partition.get_mgmt_partition', autospec=True)
|
||||||
|
|
|
@ -97,7 +97,7 @@ class FileIOVolumeAdapter(v_driver.PowerVMVolumeAdapter):
|
||||||
volid = self.connection_info['data']['volume_id']
|
volid = self.connection_info['data']['volume_id']
|
||||||
fio = pvm_stg.FileIO.bld(
|
fio = pvm_stg.FileIO.bld(
|
||||||
self.adapter, path,
|
self.adapter, path,
|
||||||
backstore_type=pvm_stg.BackStoreType.FILE_IO, tag=volid)
|
backstore_type=pvm_stg.BackStoreType.LOOP, tag=volid)
|
||||||
|
|
||||||
def add_func(vios_w):
|
def add_func(vios_w):
|
||||||
# If the vios doesn't match, just return
|
# If the vios doesn't match, just return
|
||||||
|
|
Loading…
Reference in New Issue