Rename project to os-win

os_win will be the official name of the project. Updates the
name accordingly.

Change-Id: Ia284925cf9d940ac2f4ad9124f8b881af186091f

.coveragerc

@@ -1,7 +1,7 @@
 [run]
 branch = True
-source = os_windows
-omit = os_windows/openstack/*
+source = os_win
+omit = os_win/openstack/*
 
 [report]
 ignore-errors = True

.gitreview

@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=openstack/os-windows.git
+project=openstack/os-win.git

CONTRIBUTING.rst

@@ -14,4 +14,4 @@ Pull requests submitted through GitHub will be ignored.
 
 Bugs should be filed on Launchpad, not GitHub:
 
-   https://bugs.launchpad.net/os-windows
+   https://bugs.launchpad.net/os-win

HACKING.rst

@@ -1,4 +1,4 @@
-os-windows Style Commandments
+os-win Style Commandments
 ===============================================
 
 Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/

README.rst

@@ -1,5 +1,5 @@
 ===============================
-os-windows
+os-win
 ===============================
 
 Windows / Hyper-V library for OpenStack projects.
@@ -9,9 +9,9 @@ projects: nova, cinder, networking-hyperv. The library can be used in any
 other OpenStack projects where it is needed.
 
 * Free software: Apache license
-* Documentation: http://docs.openstack.org/developer/os-windows
-* Source: http://git.openstack.org/cgit/openstack/os-windows
-* Bugs: http://bugs.launchpad.net/os-windows
+* Documentation: http://docs.openstack.org/developer/os-win
+* Source: http://git.openstack.org/cgit/openstack/os-win
+* Bugs: http://bugs.launchpad.net/os-win
 
 Features
 --------

doc/source/conf.py

@@ -37,7 +37,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'os-windows'
+project = u'os-win'
 copyright = u'2015, Cloudbase Solutions Srl'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.

doc/source/index.rst

@@ -1,9 +1,9 @@
-.. os-windows documentation master file, created by
+.. os-win documentation master file, created by
    sphinx-quickstart on Tue Jul  9 22:26:36 2015.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to os-windows documentation!
+Welcome to os-win's documentation!
 ========================================================
 
 Contents:

doc/source/installation.rst

@@ -4,9 +4,9 @@ Installation
 
 At the command line::
 
-    $ pip install os-windows
+    $ pip install os-win
 
 Or, if you have virtualenvwrapper installed::
 
-    $ mkvirtualenv os-windows
-    $ pip install os-windows
+    $ mkvirtualenv os-win
+    $ pip install os-win

doc/source/usage.rst

@@ -2,6 +2,6 @@
 Usage
 ========
 
-To use os-windows in a project::
+To use os-win in a project::
 
-    import os_windows
+    import os_win

openstack-common.conf

@@ -3,4 +3,4 @@
 # The list of modules to copy from oslo-incubator.git
 
 # The base module to hold the copy of openstack.common
-base=os_windows
+base=os_win

os_win/__init__.py

@@ -18,4 +18,4 @@ import pbr.version
 
 
 __version__ = pbr.version.VersionInfo(
-    'os_windows').version_string()
+    'os_win').version_string()

os_win/_hacking/checks.py

@@ -21,7 +21,7 @@ import pep8
 """
 Guidelines for writing new hacking checks
 
- - Use only for os_windows specific tests. OpenStack general tests
+ - Use only for os_win specific tests. OpenStack general tests
    should be submitted to the common 'hacking' module.
  - Pick numbers in the range N3xx. Find the current test with
    the highest allocated number and then pick the next value.
@@ -69,7 +69,7 @@ mutable_default_args = re.compile(r"^\s*def .+\((.+=\{\}|.+=\[\])")
 string_translation = re.compile(r"[^_]*_\(\s*('|\")")
 underscore_import_check = re.compile(r"(.)*import _(.)*")
 import_translation_for_log_or_exception = re.compile(
-    r"(.)*(from\sos_windows._i18n\simport)\s_")
+    r"(.)*(from\sos_win._i18n\simport)\s_")
 # We need this for cases where they have created their own _ function.
 custom_underscore_check = re.compile(r"(.)*_\s*=\s*(.)*")
 dict_constructor_with_list_copy_re = re.compile(r".*\bdict\((\[)?(\(|\[)")
@@ -191,10 +191,10 @@ def no_translate_debug_logs(logical_line, filename):
 
 
 def no_import_translation_in_tests(logical_line, filename):
-    """Check for 'from os_windows._i18n import _'
+    """Check for 'from os_win._i18n import _'
     N337
     """
-    if 'os_windows/tests/' in filename:
+    if 'os_win/tests/' in filename:
         res = import_translation_for_log_or_exception.match(logical_line)
         if res:
             yield(0, "N337 Don't import translation in tests")
@@ -209,7 +209,7 @@ def no_setting_conf_directly_in_tests(logical_line, filename):
 
     N320
     """
-    if 'os_windows/tests/' in filename:
+    if 'os_win/tests/' in filename:
         res = conf_attribute_set_re.match(logical_line)
         if res:
             yield (0, "N320: Setting CONF.* attributes directly in tests is "
@@ -218,7 +218,7 @@ def no_setting_conf_directly_in_tests(logical_line, filename):
 
 def validate_log_translations(logical_line, physical_line, filename):
     # Translations are not required in the test directory
-    if "os_windows/tests" in filename:
+    if "os_win/tests" in filename:
         return
     if pep8.noqa(physical_line):
         return

os_win/_i18n.py

@@ -22,7 +22,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html .
 import oslo_i18n
 
 
-_translators = oslo_i18n.TranslatorFactory(domain='os_windows')
+_translators = oslo_i18n.TranslatorFactory(domain='os_win')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary

os_win/_utils.py

@@ -19,7 +19,7 @@ import netaddr
 from oslo_concurrency import processutils
 from oslo_log import log as logging
 
-from os_windows._i18n import _LE
+from os_win._i18n import _LE
 
 LOG = logging.getLogger(__name__)
 

os_win/tests/test_utils.py

@@ -15,13 +15,13 @@
 #    under the License.
 
 """
-Unit tests for the os_windows._utils module.
+Unit tests for the os_win._utils module.
 """
 
 import mock
 from oslotest import base
 
-from os_windows import _utils
+from os_win import _utils
 
 
 class UtilsTestCase(base.BaseTestCase):

os_win/tests/test_utilsfactory.py

@@ -21,13 +21,13 @@ import mock
 from oslo_config import cfg
 from oslotest import base
 
-from os_windows import exceptions
-from os_windows.utils import hostutils
-from os_windows.utils import networkutils
-from os_windows.utils import networkutilsv2
-from os_windows.utils import vmutils
-from os_windows.utils import vmutilsv2
-from os_windows import utilsfactory
+from os_win import exceptions
+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 import utilsfactory
 
 CONF = cfg.CONF
 

os_win/tests/utils/test_basevolumeutils.py

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

os_win/tests/utils/test_hostutils.py

@@ -15,8 +15,8 @@
 import mock
 from oslotest import base
 
-from os_windows.utils import constants
-from os_windows.utils import hostutils
+from os_win.utils import constants
+from os_win.utils import hostutils
 
 
 class FakeCPUSpec(object):
@@ -45,7 +45,7 @@ class HostUtilsTestCase(base.BaseTestCase):
 
         super(HostUtilsTestCase, self).setUp()
 
-    @mock.patch('os_windows.utils.hostutils.ctypes')
+    @mock.patch('os_win.utils.hostutils.ctypes')
     def test_get_host_tick_count64(self, mock_ctypes):
         tick_count64 = "100"
         mock_ctypes.windll.kernel32.GetTickCount64.return_value = tick_count64

os_win/tests/utils/test_hostutilsv2.py

@@ -16,7 +16,7 @@
 import mock
 from oslotest import base
 
-from os_windows.utils import hostutilsv2
+from os_win.utils import hostutilsv2
 
 
 class HostUtilsV2TestCase(base.BaseTestCase):

os_win/tests/utils/test_ioutils.py

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

os_win/tests/utils/test_jobutils.py

@@ -15,9 +15,9 @@
 import mock
 from oslotest import base
 
-from os_windows import exceptions
-from os_windows.utils import constants
-from os_windows.utils import jobutils
+from os_win import exceptions
+from os_win.utils import constants
+from os_win.utils import jobutils
 
 
 class JobUtilsTestCase(base.BaseTestCase):

os_win/tests/utils/test_livemigrationutils.py

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

os_win/tests/utils/test_networkutils.py

@@ -15,9 +15,9 @@
 import mock
 from oslotest import base
 
-from os_windows import exceptions
-from os_windows.utils import constants
-from os_windows.utils import networkutils
+from os_win import exceptions
+from os_win.utils import constants
+from os_win.utils import networkutils
 
 
 class NetworkUtilsTestCase(base.BaseTestCase):

os_win/tests/utils/test_networkutilsv2.py

@@ -15,8 +15,8 @@
 import mock
 from oslotest import base
 
-from os_windows import exceptions
-from os_windows.utils import networkutilsv2
+from os_win import exceptions
+from os_win.utils import networkutilsv2
 
 
 class NetworkUtilsV2TestCase(base.BaseTestCase):

os_win/tests/utils/test_pathutils.py

@@ -17,9 +17,9 @@ import os
 import mock
 from oslotest import base
 
-from os_windows import exceptions
-from os_windows.utils import constants
-from os_windows.utils import pathutils
+from os_win import exceptions
+from os_win.utils import constants
+from os_win.utils import pathutils
 
 
 class PathUtilsTestCase(base.BaseTestCase):

os_win/tests/utils/test_rdpconsoleutils.py

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

os_win/tests/utils/test_rdpconsoleutilsv2.py

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

os_win/tests/utils/test_vhdutils.py

@@ -16,9 +16,9 @@ import mock
 from oslo_utils import units
 from oslotest import base
 
-from os_windows import exceptions
-from os_windows.utils import constants
-from os_windows.utils import vhdutils
+from os_win import exceptions
+from os_win.utils import constants
+from os_win.utils import vhdutils
 
 
 class VHDUtilsBaseTestCase(base.BaseTestCase):
@@ -233,7 +233,7 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
         self.assertEqual(expected_vhd_size, real_size)
 
     def test_get_vhd_format_vhdx(self):
-        with mock.patch('os_windows.utils.vhdutils.open',
+        with mock.patch('os_win.utils.vhdutils.open',
                         mock.mock_open(read_data=vhdutils.VHDX_SIGNATURE),
                         create=True):
 
@@ -242,7 +242,7 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
             self.assertEqual(constants.DISK_FORMAT_VHDX, format)
 
     def test_get_vhd_format_vhd(self):
-        with mock.patch('os_windows.utils.vhdutils.open',
+        with mock.patch('os_win.utils.vhdutils.open',
                         mock.mock_open(),
                         create=True) as mock_open:
             f = mock_open.return_value
@@ -260,7 +260,7 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
             self.assertEqual(constants.DISK_FORMAT_VHD, format)
 
     def test_get_vhd_format_invalid_format(self):
-        with mock.patch('os_windows.utils.vhdutils.open',
+        with mock.patch('os_win.utils.vhdutils.open',
                         mock.mock_open(read_data='invalid'),
                         create=True) as mock_open:
             f = mock_open.return_value
@@ -271,7 +271,7 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
                               self._FAKE_VHD_PATH)
 
     def test_get_vhd_format_zero_length_file(self):
-        with mock.patch('os_windows.utils.vhdutils.open',
+        with mock.patch('os_win.utils.vhdutils.open',
                         mock.mock_open(read_data=''),
                         create=True) as mock_open:
             f = mock_open.return_value

os_win/tests/utils/test_vhdutilsv2.py

@@ -14,10 +14,10 @@
 
 import mock
 
-from os_windows import exceptions
-from os_windows.tests.utils import test_vhdutils
-from os_windows.utils import constants
-from os_windows.utils import vhdutilsv2
+from os_win import exceptions
+from os_win.tests.utils import test_vhdutils
+from os_win.utils import constants
+from os_win.utils 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_windows.utils.vhdutils.VHDUtils.get_vhd_format')
+    @mock.patch('os_win.utils.vhdutils.VHDUtils.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/test_vmutils.py

@@ -18,9 +18,9 @@ from oslotest import base
 
 from six.moves import range
 
-from os_windows import exceptions
-from os_windows.utils import constants
-from os_windows.utils import vmutils
+from os_win import exceptions
+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_windows.utils.vmutils.VMUtils._get_vm_disks')
+    @mock.patch('os_win.utils.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_windows.utils.vmutils.VMUtils.get_attached_disks")
+    @mock.patch("os_win.utils.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_windows.utils.vmutils.VMUtils.get_free_controller_slot")
-    @mock.patch("os_windows.utils.vmutils.VMUtils._get_vm_scsi_controller")
+    @mock.patch("os_win.utils.vmutils.VMUtils.get_free_controller_slot")
+    @mock.patch("os_win.utils.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()
@@ -572,9 +572,9 @@ class VMUtilsTestCase(base.BaseTestCase):
         self._vmutils._jobutils.check_ret_val.assert_called_once_with(
             fake_ret_val, fake_job_path)
 
-    @mock.patch('os_windows.utils.vmutils.VMUtils._get_wmi_obj')
-    @mock.patch('os_windows.utils.vmutils.VMUtils._modify_virtual_system')
-    @mock.patch('os_windows.utils.vmutils.VMUtils._get_vm_setting_data')
+    @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')
     def test_create_vm_obj(self, mock_get_vm_setting_data,
                            mock_modify_virtual_system,
                            mock_get_wmi_obj):

os_win/tests/utils/test_vmutilsv2.py

@@ -14,9 +14,9 @@
 
 import mock
 
-from os_windows.tests.utils import test_vmutils
-from os_windows.utils import constants
-from os_windows.utils import vmutilsv2
+from os_win.tests.utils import test_vmutils
+from os_win.utils import constants
+from os_win.utils import vmutilsv2
 
 
 class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
@@ -72,7 +72,7 @@ class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
         self._vmutils._jobutils.add_virt_resource.assert_called_once_with(
             fake_eth_port, mock_vm)
 
-    @mock.patch('os_windows.utils.vmutils.VMUtils._get_vm_disks')
+    @mock.patch('os_win.utils.vmutils.VMUtils._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]
@@ -128,7 +128,7 @@ class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
     def _get_fake_instance_notes(self):
         return [self._FAKE_VM_UUID]
 
-    @mock.patch('os_windows.utils.vmutilsv2.VMUtilsV2._get_wmi_obj')
+    @mock.patch('os_win.utils.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/test_volumeutils.py

@@ -16,9 +16,9 @@
 
 import mock
 
-from os_windows import exceptions
-from os_windows.tests.utils import test_basevolumeutils
-from os_windows.utils import volumeutils
+from os_win import exceptions
+from os_win.tests.utils import test_basevolumeutils
+from os_win.utils import volumeutils
 
 
 class VolumeUtilsTestCase(test_basevolumeutils.BaseVolumeUtilsTestCase):
@@ -130,7 +130,7 @@ class VolumeUtilsTestCase(test_basevolumeutils.BaseVolumeUtilsTestCase):
         else:
             output = 'The operation completed successfully'
 
-        with mock.patch('os_windows._utils.execute') as fake_execute:
+        with mock.patch('os_win._utils.execute') as fake_execute:
             fake_execute.return_value = (output, None)
 
             if raise_exception:

os_win/tests/utils/test_volumeutilsv2.py

@@ -15,8 +15,8 @@
 import mock
 from oslotest import base
 
-from os_windows import exceptions
-from os_windows.utils import volumeutilsv2
+from os_win import exceptions
+from os_win.utils import volumeutilsv2
 
 
 class VolumeUtilsV2TestCase(base.BaseTestCase):

os_win/utils/basevolumeutils.py

@@ -30,7 +30,7 @@ if sys.platform == 'win32':
 
 from oslo_log import log as logging
 
-from os_windows._i18n import _LI
+from os_win._i18n import _LI
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/hostutils.py

@@ -20,8 +20,8 @@ import sys
 if sys.platform == 'win32':
     import wmi
 
-from os_windows._i18n import _
-from os_windows.utils import constants
+from os_win._i18n import _
+from os_win.utils import constants
 
 
 class HostUtils(object):

os_win/utils/hostutilsv2.py

@@ -18,7 +18,7 @@ import sys
 if sys.platform == 'win32':
     import wmi
 
-from os_windows.utils import hostutils
+from os_win.utils import hostutils
 
 
 class HostUtilsV2(hostutils.HostUtils):

os_win/utils/ioutils.py

@@ -19,7 +19,7 @@ import os
 from eventlet import patcher
 from oslo_log import log as logging
 
-from os_windows._i18n import _LE
+from os_win._i18n import _LE
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/jobutils.py

@@ -26,9 +26,9 @@ if sys.platform == 'win32':
 
 from oslo_log import log as logging
 
-from os_windows._i18n import _
-from os_windows import exceptions
-from os_windows.utils import constants
+from os_win._i18n import _
+from os_win import exceptions
+from os_win.utils import constants
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/livemigrationutils.py

@@ -20,10 +20,10 @@ if sys.platform == 'win32':
 
 from oslo_log import log as logging
 
-from os_windows._i18n import _, _LE
-from os_windows import exceptions
-from os_windows.utils import vmutilsv2
-from os_windows.utils import volumeutilsv2
+from os_win._i18n import _, _LE
+from os_win import exceptions
+from os_win.utils import vmutilsv2
+from os_win.utils import volumeutilsv2
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/networkutils.py

@@ -25,9 +25,9 @@ if sys.platform == 'win32':
 
 from oslo_log import log as logging
 
-from os_windows._i18n import _, _LE
-from os_windows import exceptions
-from os_windows.utils import jobutils
+from os_win._i18n import _, _LE
+from os_win import exceptions
+from os_win.utils import jobutils
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/networkutilsv2.py

@@ -25,10 +25,10 @@ import sys
 if sys.platform == 'win32':
     import wmi
 
-from os_windows._i18n import _
-from os_windows import exceptions
-from os_windows.utils import jobutils
-from os_windows.utils import networkutils
+from os_win._i18n import _
+from os_win import exceptions
+from os_win.utils import jobutils
+from os_win.utils import networkutils
 
 
 class NetworkUtilsV2(networkutils.NetworkUtils):

os_win/utils/pathutils.py

@@ -24,10 +24,10 @@ if sys.platform == 'win32':
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from os_windows._i18n import _
-from os_windows import _utils
-from os_windows import exceptions
-from os_windows.utils import constants
+from os_win._i18n import _
+from os_win import _utils
+from os_win import exceptions
+from os_win.utils import constants
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/rdpconsoleutilsv2.py

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

os_win/utils/vhdutils.py

@@ -31,10 +31,10 @@ if sys.platform == 'win32':
 
 from xml.etree import ElementTree
 
-from os_windows._i18n import _
-from os_windows import exceptions
-from os_windows.utils import constants
-from os_windows.utils import jobutils
+from os_win._i18n import _
+from os_win import exceptions
+from os_win.utils import constants
+from os_win.utils import jobutils
 
 
 VHD_HEADER_SIZE_FIX = 512

os_win/utils/vhdutilsv2.py

@@ -28,11 +28,11 @@ from xml.etree import ElementTree
 
 from oslo_utils import units
 
-from os_windows._i18n import _
-from os_windows import exceptions
-from os_windows.utils import constants
-from os_windows.utils import jobutils
-from os_windows.utils import vhdutils
+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
 
 
 VHDX_BAT_ENTRY_SIZE = 8

os_win/utils/vmutils.py

@@ -30,11 +30,11 @@ from oslo_utils import uuidutils
 import six
 from six.moves import range
 
-from os_windows._i18n import _, _LW
-from os_windows import exceptions
-from os_windows.utils import constants
-from os_windows.utils import hostutils
-from os_windows.utils import jobutils
+from os_win._i18n import _, _LW
+from os_win import exceptions
+from os_win.utils import constants
+from os_win.utils import hostutils
+from os_win.utils import jobutils
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

os_win/utils/vmutilsv2.py

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

os_win/utils/volumeutils.py

@@ -30,10 +30,10 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from six.moves import range
 
-from os_windows._i18n import _
-from os_windows import _utils
-from os_windows import exceptions
-from os_windows.utils import basevolumeutils
+from os_win._i18n import _
+from os_win import _utils
+from os_win import exceptions
+from os_win.utils import basevolumeutils
 
 LOG = logging.getLogger(__name__)
 

os_win/utils/volumeutilsv2.py

@@ -28,10 +28,10 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from six.moves import range
 
-from os_windows._i18n import _
-from os_windows import _utils
-from os_windows import exceptions
-from os_windows.utils import basevolumeutils
+from os_win._i18n import _
+from os_win import _utils
+from os_win import exceptions
+from os_win.utils import basevolumeutils
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

os_win/utilsfactory.py

@@ -16,22 +16,22 @@
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from os_windows._i18n import _, _LW  # noqa
-from os_windows import exceptions
-from os_windows.utils import hostutils
-from os_windows.utils import hostutilsv2
-from os_windows.utils import livemigrationutils
-from os_windows.utils import networkutils
-from os_windows.utils import networkutilsv2
-from os_windows.utils import pathutils
-from os_windows.utils import rdpconsoleutils
-from os_windows.utils import rdpconsoleutilsv2
-from os_windows.utils import vhdutils
-from os_windows.utils import vhdutilsv2
-from os_windows.utils import vmutils
-from os_windows.utils import vmutilsv2
-from os_windows.utils import volumeutils
-from os_windows.utils import volumeutilsv2
+from os_win._i18n import _, _LW  # noqa
+from os_win import exceptions
+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 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
 
 hyper_opts = [
     cfg.BoolOpt('force_hyperv_utils_v1',

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-name = os-windows
+name = os-win
 summary = Windows / Hyper-V library for OpenStack projects.
 description-file =
     README.rst
@@ -21,7 +21,7 @@ classifier =
 
 [files]
 packages =
-    os_windows
+    os_win
 
 [build_sphinx]
 source-dir = doc/source
@@ -32,15 +32,15 @@ all_files = 1
 upload-dir = doc/build/html
 
 [compile_catalog]
-directory = os_windows/locale
-domain = os-windows
+directory = os_win/locale
+domain = os-win
 
 [update_catalog]
-domain = os-windows
-output_dir = os_windows/locale
-input_file = os_windows/locale/os-windows.pot
+domain = os-win
+output_dir = os_win/locale
+input_file = os_win/locale/os-win.pot
 
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
-output_file = os_windows/locale/os-windows.pot
+output_file = os_win/locale/os-win.pot

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py33,py34,py27,pypy,pep8
+envlist = py34,py27,pypy,pep8
 skipsdist = True
 
 [testenv]
@@ -36,5 +36,5 @@ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 max-complexity=25
 
 [hacking]
-local-check-factory = os_windows._hacking.checks.factory
-import_exceptions = os_windows._i18n
+local-check-factory = os_win._hacking.checks.factory
+import_exceptions = os_win._i18n