Refactoring for Windows related utilities location

Moves all Windows related utilities in utils/windows

cloudbaseinit/metadata/services/baseopenstackservice.py

@@ -22,7 +22,7 @@ from oslo.config import cfg
 from cloudbaseinit.metadata.services import base
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
-from cloudbaseinit.plugins.windows import x509
+from cloudbaseinit.utils.windows import x509
 
 opts = [
     cfg.StrOpt('metadata_base_url', default='http://169.254.169.254/',

cloudbaseinit/metadata/services/configdrive/manager.py

@@ -25,12 +25,9 @@ import wmi
 from ctypes import wintypes
 
 from cloudbaseinit.openstack.common import log as logging
-
-from cloudbaseinit.metadata.services.configdrive.windows.disk \
-    import physical_disk
-from cloudbaseinit.metadata.services.configdrive.windows.disk \
-    import virtual_disk
 from cloudbaseinit.osutils import factory as osutils_factory
+from cloudbaseinit.utils.windows import physical_disk
+from cloudbaseinit.utils.windows import virtual_disk
 
 LOG = logging.getLogger(__name__)
 

cloudbaseinit/metadata/services/maasservice.py

@@ -21,7 +21,7 @@ from oslo.config import cfg
 
 from cloudbaseinit.metadata.services import base
 from cloudbaseinit.openstack.common import log as logging
-from cloudbaseinit.plugins.windows import x509
+from cloudbaseinit.utils.windows import x509
 
 opts = [
     cfg.StrOpt('maas_metadata_url', default=None,

cloudbaseinit/plugins/windows/extendvolumes.py

@@ -21,7 +21,7 @@ from oslo.config import cfg
 
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.plugins import base
-from cloudbaseinit.plugins.windows import vds
+from cloudbaseinit.utils.windows import vds
 
 ole32 = ctypes.windll.ole32
 ole32.CoTaskMemFree.restype = None

cloudbaseinit/plugins/windows/winrmcertificateauth.py

@@ -17,8 +17,8 @@
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.plugins import base
 from cloudbaseinit.plugins import constants
-from cloudbaseinit.plugins.windows import x509
 from cloudbaseinit.plugins.windows import winrmconfig
+from cloudbaseinit.utils.windows import x509
 
 LOG = logging.getLogger(__name__)
 

cloudbaseinit/plugins/windows/winrmlistener.py

@@ -19,8 +19,8 @@ from oslo.config import cfg
 from cloudbaseinit.openstack.common import log as logging
 from cloudbaseinit.osutils import factory as osutils_factory
 from cloudbaseinit.plugins import base
-from cloudbaseinit.plugins.windows import x509
 from cloudbaseinit.plugins.windows import winrmconfig
+from cloudbaseinit.utils.windows import x509
 
 LOG = logging.getLogger(__name__)
 

cloudbaseinit/utils/windows/x509.py

@@ -20,7 +20,7 @@ import uuid
 
 from ctypes import wintypes
 
-from cloudbaseinit.plugins.windows import cryptoapi
+from cloudbaseinit.utils.windows import cryptoapi
 
 malloc = ctypes.cdll.msvcrt.malloc
 malloc.restype = ctypes.c_void_p