From e672a49953faa5ee05d3463d7022a957ed57256c Mon Sep 17 00:00:00 2001 From: Alessandro Pilotti Date: Wed, 14 Oct 2015 22:36:22 +0300 Subject: [PATCH] Port Windows drivers to Python 3 Minor changes for Python 3 compatibility in the Windows iSCSI and SMB3 drivers. Change-Id: I64ee3c929e4142357c076e5de91ff68c0cb3c399 Partial-Implements: blueprint cinder-python3 --- cinder/tests/unit/windows/test_windows_utils.py | 9 +++++++++ cinder/volume/drivers/windows/windows_utils.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cinder/tests/unit/windows/test_windows_utils.py b/cinder/tests/unit/windows/test_windows_utils.py index c1a65626c..aaf7b6833 100644 --- a/cinder/tests/unit/windows/test_windows_utils.py +++ b/cinder/tests/unit/windows/test_windows_utils.py @@ -29,6 +29,15 @@ class WindowsUtilsTestCase(test.TestCase): self.wutils._conn_wmi = mock.Mock() self.wutils._conn_cimv2 = mock.MagicMock() + @mock.patch.object(windows_utils.WindowsUtils, 'get_windows_version') + def test_check_min_windows_version(self, mock_get_win_version): + required_win_version = [6, 4] + actual_win_version = '6.3.0' + mock_get_win_version.return_value = actual_win_version + + self.assertFalse(self.wutils.check_min_windows_version( + *required_win_version)) + def _test_copy_vhd_disk(self, source_exists=True, copy_failed=False): fake_data_file_object = mock.MagicMock() fake_data_file_object.Copy.return_value = [int(copy_failed)] diff --git a/cinder/volume/drivers/windows/windows_utils.py b/cinder/volume/drivers/windows/windows_utils.py index c939993fe..33f696e6a 100644 --- a/cinder/volume/drivers/windows/windows_utils.py +++ b/cinder/volume/drivers/windows/windows_utils.py @@ -423,7 +423,7 @@ class WindowsUtils(object): def check_min_windows_version(self, major, minor, build=0): version_str = self.get_windows_version() - return map(int, version_str.split('.')) >= [major, minor, build] + return list(map(int, version_str.split('.'))) >= [major, minor, build] def get_windows_version(self): return self._conn_cimv2.Win32_OperatingSystem()[0].Version -- 2.45.2