Refactors utils into specific folders

Groups specific utils into more specific folders, so it is more
clear and organised.

Folders:
compute
- livemigrationutils.py
- rdpconsoleutils.py
- rdpconsoleutilsv2.py
- vmutils.py
- vmutilsv2.py

io
- ioutils.py

network
- networkutils.py
- networkutilsv2.py

storage
- basevolumeutils.py
- vhdutils.py
- vhdutilsv2.py
- volumeutils.py
- volumeutilsv2.py

The rest of the utils modules remained where they were.
Moves the module unit tests to reflect the new folder structure.
Updates all the necessary imports.

Change-Id: Ib9e67c93e0de71583fb6477bcd56f39f82eeedec

os_win/tests/test_utilsfactory.py

@@ -22,11 +22,11 @@ from oslo_config import cfg
 from oslotest import base
 
 from os_win import exceptions
+from os_win.utils.compute import vmutils
+from os_win.utils.compute import vmutilsv2
 from os_win.utils import hostutils
-from os_win.utils import networkutils
-from os_win.utils import networkutilsv2
-from os_win.utils import vmutils
-from os_win.utils import vmutilsv2
+from os_win.utils.network import networkutils
+from os_win.utils.network import networkutilsv2
 from os_win import utilsfactory
 
 CONF = cfg.CONF

os_win/tests/utils/compute/test_livemigrationutils.py

@@ -17,7 +17,7 @@ import mock
 from oslotest import base
 
 from os_win import exceptions
-from os_win.utils import livemigrationutils
+from os_win.utils.compute import livemigrationutils
 
 
 class LiveMigrationUtilsTestCase(base.BaseTestCase):

os_win/tests/utils/compute/test_rdpconsoleutils.py

@@ -14,7 +14,7 @@
 
 from oslotest import base
 
-from os_win.utils import rdpconsoleutils
+from os_win.utils.compute import rdpconsoleutils
 
 
 class RDPConsoleUtilsTestCase(base.BaseTestCase):

os_win/tests/utils/compute/test_rdpconsoleutilsv2.py

@@ -15,7 +15,7 @@
 import mock
 from oslotest import base
 
-from os_win.utils import rdpconsoleutilsv2
+from os_win.utils.compute import rdpconsoleutilsv2
 
 
 class RDPConsoleUtilsV2TestCase(base.BaseTestCase):

os_win/tests/utils/compute/test_vmutils.py

@@ -19,8 +19,8 @@ from oslotest import base
 from six.moves import range
 
 from os_win import exceptions
+from os_win.utils.compute import vmutils
 from os_win.utils import constants
-from os_win.utils import vmutils
 
 
 class VMUtilsTestCase(base.BaseTestCase):
@@ -164,7 +164,7 @@ class VMUtilsTestCase(base.BaseTestCase):
         self._vmutils.soft_shutdown_vm(self._FAKE_VM_NAME)
         self.assertFalse(self._vmutils._jobutils.check_ret_val.called)
 
-    @mock.patch('os_win.utils.vmutils.VMUtils._get_vm_disks')
+    @mock.patch.object(vmutils.VMUtils, '_get_vm_disks')
     def test_get_vm_storage_paths(self, mock_get_vm_disks):
         self._lookup_vm()
         mock_rasds = self._create_mock_disks()
@@ -251,7 +251,7 @@ class VMUtilsTestCase(base.BaseTestCase):
         path = self._vmutils.get_vm_scsi_controller(self._FAKE_VM_NAME)
         self.assertEqual(self._FAKE_RES_PATH, path)
 
-    @mock.patch("os_win.utils.vmutils.VMUtils.get_attached_disks")
+    @mock.patch.object(vmutils.VMUtils, 'get_attached_disks')
     def test_get_free_controller_slot(self, mock_get_attached_disks):
         mock_disk = mock.MagicMock()
         mock_disk.AddressOnParent = 3
@@ -306,8 +306,8 @@ class VMUtilsTestCase(base.BaseTestCase):
         mock_rasds.ResourceSubType = mock_subtype
         return mock_rasds
 
-    @mock.patch("os_win.utils.vmutils.VMUtils.get_free_controller_slot")
-    @mock.patch("os_win.utils.vmutils.VMUtils._get_vm_scsi_controller")
+    @mock.patch.object(vmutils.VMUtils, 'get_free_controller_slot')
+    @mock.patch.object(vmutils.VMUtils, '_get_vm_scsi_controller')
     def test_attach_scsi_drive(self, mock_get_vm_scsi_controller,
                                mock_get_free_controller_slot):
         mock_vm = self._lookup_vm()
@@ -566,9 +566,9 @@ class VMUtilsTestCase(base.BaseTestCase):
         self._vmutils._jobutils.check_ret_val.assert_called_once_with(
             fake_ret_val, fake_job_path)
 
-    @mock.patch('os_win.utils.vmutils.VMUtils._get_wmi_obj')
-    @mock.patch('os_win.utils.vmutils.VMUtils._modify_virtual_system')
-    @mock.patch('os_win.utils.vmutils.VMUtils._get_vm_setting_data')
+    @mock.patch.object(vmutils.VMUtils, '_get_wmi_obj')
+    @mock.patch.object(vmutils.VMUtils, '_modify_virtual_system')
+    @mock.patch.object(vmutils.VMUtils, '_get_vm_setting_data')
     def test_create_vm_obj(self, mock_get_vm_setting_data,
                            mock_modify_virtual_system,
                            mock_get_wmi_obj):

os_win/tests/utils/compute/test_vmutilsv2.py

@@ -14,9 +14,9 @@
 
 import mock
 
-from os_win.tests.utils import test_vmutils
+from os_win.tests.utils.compute import test_vmutils
+from os_win.utils.compute import vmutilsv2
 from os_win.utils import constants
-from os_win.utils import vmutilsv2
 
 
 class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
@@ -74,7 +74,7 @@ class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
         self._vmutils._jobutils.check_ret_val.assert_called_once_with(
             self._FAKE_RET_VAL, self._FAKE_JOB_PATH)
 
-    @mock.patch('os_win.utils.vmutils.VMUtils._get_vm_disks')
+    @mock.patch.object(vmutilsv2.VMUtilsV2, '_get_vm_disks')
     def test_enable_vm_metrics_collection(self, mock_get_vm_disks):
         self._lookup_vm()
         mock_svc = self._vmutils._conn.Msvm_MetricService()[0]
@@ -130,7 +130,7 @@ class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
     def _get_fake_instance_notes(self):
         return [self._FAKE_VM_UUID]
 
-    @mock.patch('os_win.utils.vmutilsv2.VMUtilsV2._get_wmi_obj')
+    @mock.patch.object(vmutilsv2.VMUtilsV2, '_get_wmi_obj')
     def _test_create_vm_obj(self, mock_get_wmi_obj, vm_path,
                             dynamic_memory_ratio=1.0):
         mock_vs_man_svc = mock.MagicMock()

os_win/tests/utils/io/test_ioutils.py

@@ -18,7 +18,7 @@ from oslotest import base
 
 import os
 
-from os_win.utils import ioutils
+from os_win.utils.io import ioutils
 
 
 class IOThreadTestCase(base.BaseTestCase):

os_win/tests/utils/network/test_networkutils.py

@@ -17,7 +17,7 @@ from oslotest import base
 
 from os_win import exceptions
 from os_win.utils import constants
-from os_win.utils import networkutils
+from os_win.utils.network import networkutils
 
 
 class NetworkUtilsTestCase(base.BaseTestCase):

os_win/tests/utils/network/test_networkutilsv2.py

@@ -16,7 +16,7 @@ import mock
 from oslotest import base
 
 from os_win import exceptions
-from os_win.utils import networkutilsv2
+from os_win.utils.network import networkutilsv2
 
 
 class NetworkUtilsV2TestCase(base.BaseTestCase):

os_win/tests/utils/storage/test_basevolumeutils.py

@@ -17,7 +17,7 @@
 import mock
 from oslotest import base
 
-from os_win.utils import basevolumeutils
+from os_win.utils.storage import basevolumeutils
 
 
 def _exception_thrower():

os_win/tests/utils/storage/test_vhdutils.py

@@ -18,7 +18,7 @@ from oslotest import base
 
 from os_win import exceptions
 from os_win.utils import constants
-from os_win.utils import vhdutils
+from os_win.utils.storage import vhdutils
 
 
 class VHDUtilsBaseTestCase(base.BaseTestCase):
@@ -233,18 +233,20 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
         self.assertEqual(expected_vhd_size, real_size)
 
     def test_get_vhd_format_vhdx(self):
-        with mock.patch('os_win.utils.vhdutils.open',
-                        mock.mock_open(read_data=vhdutils.VHDX_SIGNATURE),
-                        create=True):
+        with mock.patch.object(
+                vhdutils, 'open',
+                mock.mock_open(read_data=vhdutils.VHDX_SIGNATURE),
+                create=True):
 
             format = self._vhdutils.get_vhd_format(self._FAKE_VHD_PATH)
 
             self.assertEqual(constants.DISK_FORMAT_VHDX, format)
 
     def test_get_vhd_format_vhd(self):
-        with mock.patch('os_win.utils.vhdutils.open',
-                        mock.mock_open(),
-                        create=True) as mock_open:
+        with mock.patch.object(
+                vhdutils, 'open',
+                mock.mock_open(read_data=vhdutils.VHD_SIGNATURE),
+                create=True) as mock_open:
             f = mock_open.return_value
             f.tell.return_value = 1024
             readdata = ['notthesig', vhdutils.VHD_SIGNATURE]
@@ -260,9 +262,9 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
             self.assertEqual(constants.DISK_FORMAT_VHD, format)
 
     def test_get_vhd_format_invalid_format(self):
-        with mock.patch('os_win.utils.vhdutils.open',
-                        mock.mock_open(read_data='invalid'),
-                        create=True) as mock_open:
+        with mock.patch.object(vhdutils, 'open',
+                               mock.mock_open(read_data='invalid'),
+                               create=True) as mock_open:
             f = mock_open.return_value
             f.tell.return_value = 1024
 
@@ -271,9 +273,9 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
                               self._FAKE_VHD_PATH)
 
     def test_get_vhd_format_zero_length_file(self):
-        with mock.patch('os_win.utils.vhdutils.open',
-                        mock.mock_open(read_data=''),
-                        create=True) as mock_open:
+        with mock.patch.object(vhdutils, 'open',
+                               mock.mock_open(read_data=''),
+                               create=True) as mock_open:
             f = mock_open.return_value
             f.tell.return_value = 0
 

os_win/tests/utils/storage/test_vhdutilsv2.py

@@ -15,9 +15,9 @@
 import mock
 
 from os_win import exceptions
-from os_win.tests.utils import test_vhdutils
+from os_win.tests.utils.storage import test_vhdutils
 from os_win.utils import constants
-from os_win.utils import vhdutilsv2
+from os_win.utils.storage import vhdutilsv2
 
 
 class VHDUtilsV2TestCase(test_vhdutils.VHDUtilsBaseTestCase):
@@ -168,7 +168,7 @@ class VHDUtilsV2TestCase(test_vhdutils.VHDUtilsBaseTestCase):
         else:
             self._vhdutils.get_vhd_info.return_value = self._fake_vhd_info
 
-    @mock.patch('os_win.utils.vhdutils.VHDUtils.get_vhd_format')
+    @mock.patch.object(vhdutilsv2.VHDUtilsV2, 'get_vhd_format')
     def test_get_vhdx_internal_size(self, mock_get_vhd_format):
         mock_get_vhd_format.return_value = constants.DISK_FORMAT_VHDX
         self._mock_get_vhd_info()

os_win/tests/utils/storage/test_volumeutils.py

@@ -17,8 +17,8 @@
 import mock
 
 from os_win import exceptions
-from os_win.tests.utils import test_basevolumeutils
-from os_win.utils import volumeutils
+from os_win.tests.utils.storage import test_basevolumeutils
+from os_win.utils.storage import volumeutils
 
 
 class VolumeUtilsTestCase(test_basevolumeutils.BaseVolumeUtilsTestCase):

os_win/tests/utils/storage/test_volumeutilsv2.py

@@ -16,7 +16,7 @@ import mock
 from oslotest import base
 
 from os_win import exceptions
-from os_win.utils import volumeutilsv2
+from os_win.utils.storage import volumeutilsv2
 
 
 class VolumeUtilsV2TestCase(base.BaseTestCase):

os_win/utils/compute/livemigrationutils.py

@@ -22,8 +22,8 @@ from oslo_log import log as logging
 
 from os_win._i18n import _, _LE
 from os_win import exceptions
-from os_win.utils import vmutilsv2
-from os_win.utils import volumeutilsv2
+from os_win.utils.compute import vmutilsv2
+from os_win.utils.storage import volumeutilsv2
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/compute/rdpconsoleutilsv2.py

@@ -15,7 +15,7 @@
 
 import sys
 
-from os_win.utils import rdpconsoleutils
+from os_win.utils.compute import rdpconsoleutils
 
 if sys.platform == 'win32':
     import wmi

os_win/utils/compute/vmutilsv2.py

@@ -27,10 +27,10 @@ if sys.platform == 'win32':
 from oslo_config import cfg
 from oslo_log import log as logging
 
+from os_win.utils.compute import vmutils
 from os_win.utils import constants
 from os_win.utils import hostutils
 from os_win.utils import jobutils
-from os_win.utils import vmutils
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

os_win/utils/network/networkutilsv2.py

@@ -28,7 +28,7 @@ if sys.platform == 'win32':
 from os_win._i18n import _
 from os_win import exceptions
 from os_win.utils import jobutils
-from os_win.utils import networkutils
+from os_win.utils.network import networkutils
 
 
 class NetworkUtilsV2(networkutils.NetworkUtils):

os_win/utils/storage/vhdutilsv2.py

@@ -32,7 +32,7 @@ from os_win._i18n import _
 from os_win import exceptions
 from os_win.utils import constants
 from os_win.utils import jobutils
-from os_win.utils import vhdutils
+from os_win.utils.storage import vhdutils
 
 
 VHDX_BAT_ENTRY_SIZE = 8

os_win/utils/storage/volumeutils.py

@@ -33,7 +33,7 @@ from six.moves import range
 from os_win._i18n import _
 from os_win import _utils
 from os_win import exceptions
-from os_win.utils import basevolumeutils
+from os_win.utils.storage import basevolumeutils
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/storage/volumeutilsv2.py

@@ -31,7 +31,7 @@ from six.moves import range
 from os_win._i18n import _
 from os_win import _utils
 from os_win import exceptions
-from os_win.utils import basevolumeutils
+from os_win.utils.storage import basevolumeutils
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

os_win/utilsfactory.py

@@ -18,20 +18,20 @@ from oslo_log import log as logging
 
 from os_win._i18n import _, _LW  # noqa
 from os_win import exceptions
+from os_win.utils.compute import livemigrationutils
+from os_win.utils.compute import rdpconsoleutils
+from os_win.utils.compute import rdpconsoleutilsv2
+from os_win.utils.compute import vmutils
+from os_win.utils.compute import vmutilsv2
 from os_win.utils import hostutils
 from os_win.utils import hostutilsv2
-from os_win.utils import livemigrationutils
-from os_win.utils import networkutils
-from os_win.utils import networkutilsv2
+from os_win.utils.network import networkutils
+from os_win.utils.network import networkutilsv2
 from os_win.utils import pathutils
-from os_win.utils import rdpconsoleutils
-from os_win.utils import rdpconsoleutilsv2
-from os_win.utils import vhdutils
-from os_win.utils import vhdutilsv2
-from os_win.utils import vmutils
-from os_win.utils import vmutilsv2
-from os_win.utils import volumeutils
-from os_win.utils import volumeutilsv2
+from os_win.utils.storage import vhdutils
+from os_win.utils.storage import vhdutilsv2
+from os_win.utils.storage import volumeutils
+from os_win.utils.storage import volumeutilsv2
 
 hyper_opts = [
     cfg.BoolOpt('force_hyperv_utils_v1',