From 62529cadddd5600e931ddaa7148328d68fe11c72 Mon Sep 17 00:00:00 2001 From: Eric Larese Date: Tue, 26 Sep 2017 09:55:25 -0400 Subject: [PATCH] change kernel backstore to fileio The kernel fileio backstore supports SCSI persistent reserve, which is needed for some cluster applications. This change converts to use this fileio backstore. Change-Id: Ifc3745a52e08c78abdf727d36f32ca0c7b2f05da Closes-Bug: 1719634 (cherry picked from commit ead4bc95317564666c0c30b542405cb442389049) --- nova_powervm/tests/virt/powervm/volume/test_fileio.py | 4 ++-- nova_powervm/virt/powervm/volume/fileio.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova_powervm/tests/virt/powervm/volume/test_fileio.py b/nova_powervm/tests/virt/powervm/volume/test_fileio.py index c5dc4ddb..fa3d4ccb 100644 --- a/nova_powervm/tests/virt/powervm/volume/test_fileio.py +++ b/nova_powervm/tests/virt/powervm/volume/test_fileio.py @@ -95,7 +95,7 @@ class TestFileIOVolumeAdapter(test_vol.TestVolumeAdapter): # Validate mock_file_bld.assert_called_once_with( self.adpt, 'fake_path', - backstore_type=pvm_stg.BackStoreType.USER_QCOW) + backstore_type=pvm_stg.BackStoreType.FILE_IO) self.assertEqual(1, mock_build_map.call_count) self.assertEqual(1, mock_udid_to_map.call_count) @@ -127,7 +127,7 @@ class TestFileIOVolumeAdapter(test_vol.TestVolumeAdapter): # Validate mock_file_bld.assert_called_once_with( self.adpt, 'fake_path', - backstore_type=pvm_stg.BackStoreType.USER_QCOW) + backstore_type=pvm_stg.BackStoreType.FILE_IO) self.assertEqual(0, mock_build_map.call_count) @mock.patch('pypowervm.entities.Entry.uuid', diff --git a/nova_powervm/virt/powervm/volume/fileio.py b/nova_powervm/virt/powervm/volume/fileio.py index db214bf3..5cfa5145 100644 --- a/nova_powervm/virt/powervm/volume/fileio.py +++ b/nova_powervm/virt/powervm/volume/fileio.py @@ -96,7 +96,7 @@ class FileIOVolumeAdapter(v_driver.PowerVMVolumeAdapter): # Get the File Path fio = pvm_stg.FileIO.bld( self.adapter, path, - backstore_type=pvm_stg.BackStoreType.USER_QCOW) + backstore_type=pvm_stg.BackStoreType.FILE_IO) def add_func(vios_w): # If the vios doesn't match, just return