|
10 | 10 | from cinder.tests.unit import utils as test_utils
|
11 | 11 | from cinder.tests.unit.volume.drivers.netapp import fakes as na_fakes
|
12 | 12 | from cinder.volume.drivers.netapp.dataontap.nvme_library import NetAppNVMeStorageLibrary
|
| 13 | +from cinder.volume.drivers.netapp.dataontap.utils import loopingcalls |
13 | 14 |
|
14 | 15 | from cinder_understack import dynamic_netapp_driver
|
15 | 16 |
|
16 | 17 |
|
| 18 | +def _create_mock_svm_lib(svm_name: str): |
| 19 | + mock_lib = mock.create_autospec( |
| 20 | + dynamic_netapp_driver.NetAppMinimalLibrary, instance=True |
| 21 | + ) |
| 22 | + mock_lib.vserver = svm_name |
| 23 | + mock_lib.loopingcalls = loopingcalls.LoopingCalls() |
| 24 | + return mock_lib |
| 25 | + |
| 26 | + |
17 | 27 | class NetappDynamicDriverTestCase(test.TestCase):
|
18 | 28 | """Test case for NetappCinderDynamicDriver."""
|
19 | 29 |
|
@@ -152,21 +162,16 @@ def test_refresh_svm_libraries_adds_and_removes_svms(
|
152 | 162 | expected_svm = f"os-{self.project_id}"
|
153 | 163 |
|
154 | 164 | self.driver._libraries = {
|
155 |
| - "os-old-svm": mock.Mock(vserver="os-old-svm"), |
156 |
| - expected_svm: mock.Mock(vserver=expected_svm), |
| 165 | + "os-old-svm": _create_mock_svm_lib("os-old-svm"), |
| 166 | + expected_svm: _create_mock_svm_lib(expected_svm), |
157 | 167 | }
|
158 | 168 |
|
159 | 169 | self.driver._get_svms = mock_get_svms
|
160 | 170 | # Returned by _get_svms (after refresh)
|
161 | 171 | mock_get_svms.return_value = [expected_svm, "os-new-svm"]
|
162 | 172 |
|
163 | 173 | # make the created lib look like the real thing
|
164 |
| - mock_lib_instance = mock.create_autospec( |
165 |
| - dynamic_netapp_driver.NetAppMinimalLibrary, instance=True |
166 |
| - ) |
167 |
| - |
168 |
| - # Mock the new lib instance created |
169 |
| - mock_lib_instance.vserver = "os-new-svm" |
| 174 | + mock_lib_instance = _create_mock_svm_lib("os-new-svm") |
170 | 175 | mock_create_svm_lib.return_value = mock_lib_instance
|
171 | 176 |
|
172 | 177 | # Trigger refresh
|
|
0 commit comments