From e34f375375bf828d72e05cf1e32fcd6376ef8efe Mon Sep 17 00:00:00 2001 From: Alessandro Pilotti Date: Wed, 19 Feb 2014 15:19:31 +0200 Subject: [PATCH] Refactoring for Windows related utilities location Moves all Windows related utilities in utils/windows --- cloudbaseinit/metadata/services/baseopenstackservice.py | 2 +- cloudbaseinit/metadata/services/configdrive/manager.py | 7 ++----- .../metadata/services/configdrive/windows/disk/__init__.py | 0 cloudbaseinit/metadata/services/maasservice.py | 2 +- cloudbaseinit/plugins/windows/extendvolumes.py | 2 +- cloudbaseinit/plugins/windows/winrmcertificateauth.py | 2 +- cloudbaseinit/plugins/windows/winrmlistener.py | 2 +- .../services/configdrive => utils}/windows/__init__.py | 0 cloudbaseinit/{plugins => utils}/windows/cryptoapi.py | 0 .../windows/disk => utils/windows}/physical_disk.py | 0 cloudbaseinit/{plugins => utils}/windows/vds.py | 0 .../windows/disk => utils/windows}/virtual_disk.py | 0 cloudbaseinit/{plugins => utils}/windows/x509.py | 2 +- 13 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 cloudbaseinit/metadata/services/configdrive/windows/disk/__init__.py rename cloudbaseinit/{metadata/services/configdrive => utils}/windows/__init__.py (100%) rename cloudbaseinit/{plugins => utils}/windows/cryptoapi.py (100%) rename cloudbaseinit/{metadata/services/configdrive/windows/disk => utils/windows}/physical_disk.py (100%) rename cloudbaseinit/{plugins => utils}/windows/vds.py (100%) rename cloudbaseinit/{metadata/services/configdrive/windows/disk => utils/windows}/virtual_disk.py (100%) rename cloudbaseinit/{plugins => utils}/windows/x509.py (99%) diff --git a/cloudbaseinit/metadata/services/baseopenstackservice.py b/cloudbaseinit/metadata/services/baseopenstackservice.py index 5da7a47a..0e833eb5 100644 --- a/cloudbaseinit/metadata/services/baseopenstackservice.py +++ b/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/', diff --git a/cloudbaseinit/metadata/services/configdrive/manager.py b/cloudbaseinit/metadata/services/configdrive/manager.py index 8cafa50a..ee999204 100644 --- a/cloudbaseinit/metadata/services/configdrive/manager.py +++ b/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__) diff --git a/cloudbaseinit/metadata/services/configdrive/windows/disk/__init__.py b/cloudbaseinit/metadata/services/configdrive/windows/disk/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/cloudbaseinit/metadata/services/maasservice.py b/cloudbaseinit/metadata/services/maasservice.py index 5af8d8bb..f0ad8698 100644 --- a/cloudbaseinit/metadata/services/maasservice.py +++ b/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, diff --git a/cloudbaseinit/plugins/windows/extendvolumes.py b/cloudbaseinit/plugins/windows/extendvolumes.py index 67908291..c48bf8f4 100644 --- a/cloudbaseinit/plugins/windows/extendvolumes.py +++ b/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 diff --git a/cloudbaseinit/plugins/windows/winrmcertificateauth.py b/cloudbaseinit/plugins/windows/winrmcertificateauth.py index 0d769636..823de1cf 100644 --- a/cloudbaseinit/plugins/windows/winrmcertificateauth.py +++ b/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__) diff --git a/cloudbaseinit/plugins/windows/winrmlistener.py b/cloudbaseinit/plugins/windows/winrmlistener.py index 328d5187..21b61533 100644 --- a/cloudbaseinit/plugins/windows/winrmlistener.py +++ b/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__) diff --git a/cloudbaseinit/metadata/services/configdrive/windows/__init__.py b/cloudbaseinit/utils/windows/__init__.py similarity index 100% rename from cloudbaseinit/metadata/services/configdrive/windows/__init__.py rename to cloudbaseinit/utils/windows/__init__.py diff --git a/cloudbaseinit/plugins/windows/cryptoapi.py b/cloudbaseinit/utils/windows/cryptoapi.py similarity index 100% rename from cloudbaseinit/plugins/windows/cryptoapi.py rename to cloudbaseinit/utils/windows/cryptoapi.py diff --git a/cloudbaseinit/metadata/services/configdrive/windows/disk/physical_disk.py b/cloudbaseinit/utils/windows/physical_disk.py similarity index 100% rename from cloudbaseinit/metadata/services/configdrive/windows/disk/physical_disk.py rename to cloudbaseinit/utils/windows/physical_disk.py diff --git a/cloudbaseinit/plugins/windows/vds.py b/cloudbaseinit/utils/windows/vds.py similarity index 100% rename from cloudbaseinit/plugins/windows/vds.py rename to cloudbaseinit/utils/windows/vds.py diff --git a/cloudbaseinit/metadata/services/configdrive/windows/disk/virtual_disk.py b/cloudbaseinit/utils/windows/virtual_disk.py similarity index 100% rename from cloudbaseinit/metadata/services/configdrive/windows/disk/virtual_disk.py rename to cloudbaseinit/utils/windows/virtual_disk.py diff --git a/cloudbaseinit/plugins/windows/x509.py b/cloudbaseinit/utils/windows/x509.py similarity index 99% rename from cloudbaseinit/plugins/windows/x509.py rename to cloudbaseinit/utils/windows/x509.py index d04377de..35468445 100644 --- a/cloudbaseinit/plugins/windows/x509.py +++ b/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