move to compute_hyperv namespace
In order to avoid namespace sharing with networking-hyperv, compute-hyperv should use the compute_hyperv namespace. Closes-Bug: #1709085 Change-Id: I44eede0ea6b6558c0ddf6ebdc342ed8f11395f3b
This commit is contained in:
parent
3dd606cc65
commit
37b3a54aea
|
@ -1,7 +1,7 @@
|
|||
[run]
|
||||
branch = True
|
||||
source = hyperv
|
||||
omit = hyperv/tests/*
|
||||
source = compute_hyperv
|
||||
omit = compute_hyperv/tests/*
|
||||
|
||||
[report]
|
||||
ignore_errors = True
|
||||
|
|
|
@ -27,9 +27,9 @@ from nova.virt import configdrive
|
|||
from nova.virt import driver
|
||||
from os_win import constants as os_win_const
|
||||
|
||||
from hyperv.i18n import _
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import volumeops
|
||||
from compute_hyperv.i18n import _
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import volumeops
|
||||
|
||||
|
||||
class BlockDeviceInfoManager(object):
|
|
@ -29,13 +29,13 @@ from os_win import exceptions as os_win_exc
|
|||
from os_win import utilsfactory
|
||||
from oslo_log import log as logging
|
||||
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import hostops
|
||||
from hyperv.nova import serialconsoleops
|
||||
from hyperv.nova import vmops
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import hostops
|
||||
from compute_hyperv.nova import serialconsoleops
|
||||
from compute_hyperv.nova import vmops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
class ClusterOps(object):
|
|
@ -14,9 +14,9 @@
|
|||
|
||||
"""A Hyper-V Cluster Nova Compute driver."""
|
||||
|
||||
from hyperv.nova.cluster import clusterops
|
||||
from hyperv.nova.cluster import livemigrationops
|
||||
from hyperv.nova import driver
|
||||
from compute_hyperv.nova.cluster import clusterops
|
||||
from compute_hyperv.nova.cluster import livemigrationops
|
||||
from compute_hyperv.nova import driver
|
||||
|
||||
|
||||
class HyperVClusterDriver(driver.HyperVDriver):
|
|
@ -22,11 +22,11 @@ from os_win import utilsfactory
|
|||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from hyperv.i18n import _
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import livemigrationops
|
||||
from compute_hyperv.i18n import _
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import livemigrationops
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -29,17 +29,17 @@ from os_win import utilsfactory
|
|||
from oslo_log import log as logging
|
||||
import six
|
||||
|
||||
from hyperv.nova import eventhandler
|
||||
from hyperv.nova import hostops
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.nova import livemigrationops
|
||||
from hyperv.nova import migrationops
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import rdpconsoleops
|
||||
from hyperv.nova import serialconsoleops
|
||||
from hyperv.nova import snapshotops
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import volumeops
|
||||
from compute_hyperv.nova import eventhandler
|
||||
from compute_hyperv.nova import hostops
|
||||
from compute_hyperv.nova import imagecache
|
||||
from compute_hyperv.nova import livemigrationops
|
||||
from compute_hyperv.nova import migrationops
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import rdpconsoleops
|
||||
from compute_hyperv.nova import serialconsoleops
|
||||
from compute_hyperv.nova import snapshotops
|
||||
from compute_hyperv.nova import vmops
|
||||
from compute_hyperv.nova import volumeops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -20,12 +20,12 @@ from os_win import exceptions as os_win_exc
|
|||
from os_win import utilsfactory
|
||||
from oslo_log import log as logging
|
||||
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import serialconsoleops
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import serialconsoleops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
class InstanceEventHandler(object):
|
|
@ -32,13 +32,13 @@ from oslo_log import log as logging
|
|||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import units
|
||||
|
||||
from hyperv.i18n import _
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import vmops
|
||||
from compute_hyperv.i18n import _
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import vmops
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -28,13 +28,13 @@ from oslo_utils import excutils
|
|||
from oslo_utils import units
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
from hyperv.i18n import _
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import pathutils
|
||||
from compute_hyperv.i18n import _
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import pathutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
class ImageCache(imagecache.ImageCacheManager):
|
|
@ -23,17 +23,17 @@ from os_win import utilsfactory
|
|||
from oslo_log import log as logging
|
||||
from oslo_utils import excutils
|
||||
|
||||
from hyperv.i18n import _
|
||||
from hyperv.nova import block_device_manager
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import serialconsoleops
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import volumeops
|
||||
from compute_hyperv.i18n import _
|
||||
from compute_hyperv.nova import block_device_manager
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import imagecache
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import serialconsoleops
|
||||
from compute_hyperv.nova import vmops
|
||||
from compute_hyperv.nova import volumeops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
class LiveMigrationOps(object):
|
|
@ -28,13 +28,13 @@ from oslo_log import log as logging
|
|||
from oslo_utils import excutils
|
||||
from oslo_utils import units
|
||||
|
||||
from hyperv.i18n import _
|
||||
from hyperv.nova import block_device_manager
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import volumeops
|
||||
from compute_hyperv.i18n import _
|
||||
from compute_hyperv.nova import block_device_manager
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import imagecache
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import vmops
|
||||
from compute_hyperv.nova import volumeops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = nova.conf.CONF
|
|
@ -24,13 +24,13 @@ from os_win import utilsfactory
|
|||
from oslo_log import log as logging
|
||||
from oslo_utils import uuidutils
|
||||
|
||||
from hyperv.i18n import _
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from compute_hyperv.i18n import _
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
ERROR_INVALID_NAME = 123
|
||||
|
|
@ -17,7 +17,7 @@ from nova.console import type as ctype
|
|||
from os_win import utilsfactory
|
||||
from oslo_log import log as logging
|
||||
|
||||
from hyperv.nova import hostops
|
||||
from compute_hyperv.nova import hostops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -22,12 +22,12 @@ from os_win.utils.io import ioutils
|
|||
from os_win import utilsfactory
|
||||
from oslo_log import log as logging
|
||||
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import serialproxy
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import serialproxy
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
threading = patcher.original('threading')
|
|
@ -23,8 +23,8 @@ from os_win import utilsfactory
|
|||
from oslo_log import log as logging
|
||||
import six
|
||||
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import serialconsolehandler
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import serialconsolehandler
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -20,7 +20,7 @@ from eventlet import patcher
|
|||
from nova import exception
|
||||
from nova.i18n import _
|
||||
|
||||
from hyperv.nova import constants
|
||||
from compute_hyperv.nova import constants
|
||||
|
||||
# Note(lpetrut): Eventlet greenpipes are not supported on Windows. The named
|
||||
# pipe handlers implemented in os-win use Windows API calls which can block
|
|
@ -23,7 +23,7 @@ from nova.image import glance
|
|||
from os_win import utilsfactory
|
||||
from oslo_log import log as logging
|
||||
|
||||
from hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import pathutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -24,9 +24,9 @@ from nova.network import os_vif_util
|
|||
import os_vif
|
||||
from os_win import utilsfactory
|
||||
|
||||
import hyperv.nova.conf
|
||||
import compute_hyperv.nova.conf
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
class HyperVBaseVIFPlugin(object):
|
|
@ -43,20 +43,20 @@ from oslo_utils import units
|
|||
from oslo_utils import uuidutils
|
||||
import six
|
||||
|
||||
from hyperv.i18n import _
|
||||
from hyperv.nova import block_device_manager
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import pdk
|
||||
from hyperv.nova import serialconsoleops
|
||||
from hyperv.nova import vif as vif_utils
|
||||
from hyperv.nova import volumeops
|
||||
from compute_hyperv.i18n import _
|
||||
from compute_hyperv.nova import block_device_manager
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import imagecache
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import pdk
|
||||
from compute_hyperv.nova import serialconsoleops
|
||||
from compute_hyperv.nova import vif as vif_utils
|
||||
from compute_hyperv.nova import volumeops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
SHUTDOWN_TIME_INCREMENT = 5
|
||||
REBOOT_TYPE_SOFT = 'SOFT'
|
|
@ -36,14 +36,14 @@ from oslo_utils import excutils
|
|||
from oslo_utils import importutils
|
||||
from oslo_utils import strutils
|
||||
|
||||
from hyperv.i18n import _
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import pathutils
|
||||
from compute_hyperv.i18n import _
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import pathutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
def volume_snapshot_lock(f):
|
||||
|
@ -458,7 +458,7 @@ class SMBFSVolumeDriver(BaseVolumeDriver):
|
|||
# We have to avoid a circular dependency.
|
||||
if not self._vmops_prop:
|
||||
self._vmops_prop = importutils.import_class(
|
||||
'hyperv.nova.vmops.VMOps')()
|
||||
'compute_hyperv.nova.vmops.VMOps')()
|
||||
return self._vmops_prop
|
||||
|
||||
def export_path_synchronized(f):
|
|
@ -38,9 +38,9 @@ from oslotest import moxstubout
|
|||
import six
|
||||
import testtools
|
||||
|
||||
import hyperv.nova.conf
|
||||
import compute_hyperv.nova.conf
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
logging.register_options(CONF)
|
||||
CONF.set_override('use_stderr', False)
|
|
@ -21,9 +21,9 @@ from nova.compute import vm_states
|
|||
from nova import objects
|
||||
from os_win import exceptions as os_win_exc
|
||||
|
||||
from hyperv.nova.cluster import clusterops
|
||||
from hyperv.tests import fake_instance
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova.cluster import clusterops
|
||||
from compute_hyperv.tests import fake_instance
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
@ddt.ddt
|
|
@ -17,10 +17,10 @@
|
|||
|
||||
import mock
|
||||
|
||||
from hyperv.nova.cluster import clusterops
|
||||
from hyperv.nova.cluster import driver
|
||||
from hyperv.nova import driver as base_driver
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova.cluster import clusterops
|
||||
from compute_hyperv.nova.cluster import driver
|
||||
from compute_hyperv.nova import driver as base_driver
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class HyperVClusterTestCase(test_base.HyperVBaseTestCase):
|
|
@ -20,10 +20,10 @@ from nova import exception
|
|||
from nova import test as nova_test
|
||||
from os_win import constants as os_win_const
|
||||
|
||||
from hyperv.nova.cluster import livemigrationops
|
||||
from hyperv.nova import livemigrationops as base_livemigrationops
|
||||
from hyperv.tests import fake_instance
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova.cluster import livemigrationops
|
||||
from compute_hyperv.nova import livemigrationops as base_livemigrationops
|
||||
from compute_hyperv.tests import fake_instance
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
@ddt.ddt
|
|
@ -17,7 +17,7 @@
|
|||
import mock
|
||||
from os_win import utilsfactory
|
||||
|
||||
from hyperv.tests import test
|
||||
from compute_hyperv.tests import test
|
||||
|
||||
|
||||
class HyperVBaseTestCase(test.NoDBTestCase):
|
|
@ -16,9 +16,9 @@ import mock
|
|||
from nova import exception
|
||||
from os_win import constants as os_win_const
|
||||
|
||||
from hyperv.nova import block_device_manager
|
||||
from hyperv.nova import constants
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import block_device_manager
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class BlockDeviceManagerTestCase(test_base.HyperVBaseTestCase):
|
|
@ -27,8 +27,8 @@ from nova.tests.unit import fake_instance
|
|||
from nova.virt import driver as base_driver
|
||||
from os_win import exceptions as os_win_exc
|
||||
|
||||
from hyperv.nova import driver
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import driver
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class HyperVDriverTestCase(test_base.HyperVBaseTestCase):
|
|
@ -19,8 +19,8 @@ from os_win import constants
|
|||
from os_win import exceptions as os_win_exc
|
||||
from os_win import utilsfactory
|
||||
|
||||
from hyperv.nova import eventhandler
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import eventhandler
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class EventHandlerTestCase(test_base.HyperVBaseTestCase):
|
|
@ -24,12 +24,12 @@ from os_win import constants as os_win_const
|
|||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import units
|
||||
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import hostops
|
||||
from hyperv.tests.unit import test_base
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import hostops
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
class HostOpsTestCase(test_base.HyperVBaseTestCase):
|
|
@ -23,13 +23,13 @@ from nova.tests.unit.objects import test_flavor
|
|||
from nova.tests import uuidsentinel as uuids
|
||||
from oslo_utils import units
|
||||
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.tests import fake_instance
|
||||
from hyperv.tests.unit import test_base
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import imagecache
|
||||
from compute_hyperv.tests import fake_instance
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
class ImageCacheTestCase(test_base.HyperVBaseTestCase):
|
|
@ -19,13 +19,13 @@ from nova import exception
|
|||
from nova.objects import migrate_data as migrate_data_obj
|
||||
from os_win import exceptions as os_win_exc
|
||||
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import livemigrationops
|
||||
from hyperv.nova import serialconsoleops
|
||||
from hyperv.tests import fake_instance
|
||||
from hyperv.tests.unit import test_base
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import livemigrationops
|
||||
from compute_hyperv.nova import serialconsoleops
|
||||
from compute_hyperv.tests import fake_instance
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
@ddt.ddt
|
||||
|
@ -43,7 +43,7 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
|
||||
@mock.patch.object(serialconsoleops.SerialConsoleOps,
|
||||
'stop_console_handler')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.copy_vm_dvd_disks')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.copy_vm_dvd_disks')
|
||||
def _test_live_migration(self, mock_copy_dvd_disk,
|
||||
mock_stop_console_handler,
|
||||
side_effect=None,
|
||||
|
@ -137,9 +137,10 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
def test_live_migration_shared_storage(self):
|
||||
self._test_live_migration(shared_storage=True)
|
||||
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps.get_disk_path_mapping')
|
||||
@mock.patch('hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps.connect_volumes')
|
||||
@mock.patch('compute_hyperv.nova.volumeops.VolumeOps'
|
||||
'.get_disk_path_mapping')
|
||||
@mock.patch('compute_hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('compute_hyperv.nova.volumeops.VolumeOps.connect_volumes')
|
||||
def _test_pre_live_migration(self, mock_connect_volumes,
|
||||
mock_get_cached_image,
|
||||
mock_get_disk_path_mapping,
|
||||
|
@ -182,7 +183,7 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
def test_pre_live_migration_invalid_disk_mapping(self):
|
||||
self._test_pre_live_migration(phys_disks_attached=False)
|
||||
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps.disconnect_volumes')
|
||||
@mock.patch('compute_hyperv.nova.volumeops.VolumeOps.disconnect_volumes')
|
||||
def _test_post_live_migration(self, mock_disconnect_volumes,
|
||||
shared_storage=False):
|
||||
migrate_data = migrate_data_obj.HyperVLiveMigrateData(
|
|
@ -20,10 +20,10 @@ from nova import exception
|
|||
from os_win import exceptions as os_win_exc
|
||||
from oslo_utils import units
|
||||
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import migrationops
|
||||
from hyperv.tests import fake_instance
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import migrationops
|
||||
from compute_hyperv.tests import fake_instance
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
@ddt.ddt
|
|
@ -21,9 +21,9 @@ from nova import exception
|
|||
from os_win import exceptions as os_win_exc
|
||||
from six.moves import builtins
|
||||
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
@ddt.ddt
|
|
@ -16,8 +16,8 @@
|
|||
import mock
|
||||
from nova import exception
|
||||
|
||||
from hyperv.nova import pdk
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import pdk
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
from six.moves import builtins
|
||||
|
||||
|
|
@ -19,8 +19,8 @@ Unit tests for the Hyper-V RDPConsoleOps.
|
|||
|
||||
import mock
|
||||
|
||||
from hyperv.nova import rdpconsoleops
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import rdpconsoleops
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class RDPConsoleOpsTestCase(test_base.HyperVBaseTestCase):
|
|
@ -16,11 +16,11 @@
|
|||
import mock
|
||||
from nova import exception
|
||||
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import serialconsolehandler
|
||||
from hyperv.nova import serialproxy
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import pathutils
|
||||
from compute_hyperv.nova import serialconsolehandler
|
||||
from compute_hyperv.nova import serialproxy
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class SerialConsoleHandlerTestCase(test_base.HyperVBaseTestCase):
|
|
@ -17,9 +17,9 @@ import mock
|
|||
from nova import exception
|
||||
from six.moves import builtins
|
||||
|
||||
from hyperv.nova import serialconsolehandler
|
||||
from hyperv.nova import serialconsoleops
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import serialconsolehandler
|
||||
from compute_hyperv.nova import serialconsoleops
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class SerialConsoleOpsTestCase(test_base.HyperVBaseTestCase):
|
|
@ -17,8 +17,8 @@ import mock
|
|||
from nova import exception
|
||||
import socket
|
||||
|
||||
from hyperv.nova import serialproxy
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import serialproxy
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class SerialProxyTestCase(test_base.HyperVBaseTestCase):
|
|
@ -18,9 +18,9 @@ import os
|
|||
import mock
|
||||
from nova.compute import task_states
|
||||
|
||||
from hyperv.nova import snapshotops
|
||||
from hyperv.tests import fake_instance
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import snapshotops
|
||||
from compute_hyperv.tests import fake_instance
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class SnapshotOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
|
@ -55,7 +55,8 @@ class SnapshotOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
self._snapshotops._pathutils.open().__enter__(),
|
||||
purge_props=False)
|
||||
|
||||
@mock.patch('hyperv.nova.snapshotops.SnapshotOps._save_glance_image')
|
||||
@mock.patch('compute_hyperv.nova.snapshotops.SnapshotOps'
|
||||
'._save_glance_image')
|
||||
def _test_snapshot(self, mock_save_glance_image, base_disk_path):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
mock_update = mock.MagicMock()
|
|
@ -18,12 +18,12 @@ import mock
|
|||
from nova import exception
|
||||
from nova.network import model
|
||||
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import vif
|
||||
from hyperv.tests.unit import test_base
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import vif
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
class HyperVNovaNetworkVIFPluginTestCase(test_base.HyperVBaseTestCase):
|
|
@ -29,16 +29,16 @@ from oslo_concurrency import processutils
|
|||
from oslo_utils import fileutils
|
||||
from oslo_utils import units
|
||||
|
||||
from hyperv.nova import block_device_manager
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import pdk
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import volumeops
|
||||
from hyperv.tests import fake_instance
|
||||
from hyperv.tests.unit import test_base
|
||||
from compute_hyperv.nova import block_device_manager
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import pdk
|
||||
from compute_hyperv.nova import vmops
|
||||
from compute_hyperv.nova import volumeops
|
||||
from compute_hyperv.tests import fake_instance
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
|
||||
@ddt.ddt
|
||||
|
@ -202,7 +202,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
|
||||
return mock_instance
|
||||
|
||||
@mock.patch('hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('compute_hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
def _test_create_root_vhd_exception(self, mock_get_cached_image,
|
||||
vhd_format):
|
||||
mock_instance = self._prepare_create_root_device_mocks(
|
||||
|
@ -222,7 +222,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
self._vmops._pathutils.remove.assert_called_once_with(
|
||||
fake_root_path)
|
||||
|
||||
@mock.patch('hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('compute_hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
def _test_create_root_vhd_qcow(self, mock_get_cached_image, vhd_format):
|
||||
mock_instance = self._prepare_create_root_device_mocks(
|
||||
use_cow_images=True, vhd_format=vhd_format,
|
||||
|
@ -254,7 +254,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
self._vmops._vhdutils.resize_vhd.assert_called_once_with(
|
||||
fake_root_path, root_vhd_internal_size, is_file_max_size=False)
|
||||
|
||||
@mock.patch('hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('compute_hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
def _test_create_root_vhd(self, mock_get_cached_image, vhd_format,
|
||||
is_rescue_vhd=False):
|
||||
mock_instance = self._prepare_create_root_device_mocks(
|
||||
|
@ -419,19 +419,19 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
mock.sentinel.instance_name, mock_get_boot_order.return_value)
|
||||
|
||||
@mock.patch.object(vmops.VMOps, 'plug_vifs')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.destroy')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.power_on')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.destroy')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.power_on')
|
||||
@mock.patch.object(vmops.VMOps, 'set_boot_order')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.attach_config_drive')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._create_config_drive')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.attach_config_drive')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._create_config_drive')
|
||||
@mock.patch('nova.virt.configdrive.required_by')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._save_device_metadata')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.create_instance')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.get_image_vm_generation')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._create_ephemerals')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._create_root_device')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._delete_disk_files')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._get_neutron_events',
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._save_device_metadata')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.create_instance')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.get_image_vm_generation')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._create_ephemerals')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._create_root_device')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._delete_disk_files')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._get_neutron_events',
|
||||
return_value=[])
|
||||
@mock.patch.object(block_device_manager.BlockDeviceInfoManager,
|
||||
'validate_and_update_bdi')
|
||||
|
@ -1219,10 +1219,10 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
self._pathutils.check_remove_dir.assert_called_once_with(
|
||||
exp_inst_path)
|
||||
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps.disconnect_volumes')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._delete_disk_files')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.power_off')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.unplug_vifs')
|
||||
@mock.patch('compute_hyperv.nova.volumeops.VolumeOps.disconnect_volumes')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._delete_disk_files')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.power_off')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.unplug_vifs')
|
||||
def test_destroy(self, mock_unplug_vifs, mock_power_off,
|
||||
mock_delete_disk_files, mock_disconnect_volumes):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
|
@ -1255,7 +1255,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
self._vmops.destroy(instance=mock_instance)
|
||||
self.assertFalse(self._vmops._vmutils.destroy_vm.called)
|
||||
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.power_off')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps.power_off')
|
||||
def test_destroy_exception(self, mock_power_off):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
self._vmops._vmutils.destroy_vm.side_effect = (
|
||||
|
@ -1269,20 +1269,20 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
self._test_reboot(vmops.REBOOT_TYPE_HARD,
|
||||
os_win_const.HYPERV_VM_STATE_REBOOT)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
def test_reboot_soft(self, mock_soft_shutdown):
|
||||
mock_soft_shutdown.return_value = True
|
||||
self._test_reboot(vmops.REBOOT_TYPE_SOFT,
|
||||
os_win_const.HYPERV_VM_STATE_ENABLED)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
def test_reboot_soft_failed(self, mock_soft_shutdown):
|
||||
mock_soft_shutdown.return_value = False
|
||||
self._test_reboot(vmops.REBOOT_TYPE_SOFT,
|
||||
os_win_const.HYPERV_VM_STATE_REBOOT)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps.power_on")
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps.power_on")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
def test_reboot_soft_exception(self, mock_soft_shutdown, mock_power_on):
|
||||
mock_soft_shutdown.return_value = True
|
||||
mock_power_on.side_effect = os_win_exc.HyperVException(
|
||||
|
@ -1301,7 +1301,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
self._vmops.reboot(instance, {}, reboot_type)
|
||||
mock_set_state.assert_called_once_with(instance, vm_state)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._wait_for_power_off")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._wait_for_power_off")
|
||||
def test_soft_shutdown(self, mock_wait_for_power_off):
|
||||
instance = fake_instance.fake_instance_obj(self.context)
|
||||
mock_wait_for_power_off.return_value = True
|
||||
|
@ -1328,7 +1328,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
mock_shutdown_vm.assert_called_once_with(instance.name)
|
||||
self.assertFalse(result)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._wait_for_power_off")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._wait_for_power_off")
|
||||
def test_soft_shutdown_wait(self, mock_wait_for_power_off):
|
||||
instance = fake_instance.fake_instance_obj(self.context)
|
||||
mock_wait_for_power_off.side_effect = [False, True]
|
||||
|
@ -1343,7 +1343,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
|
||||
self.assertTrue(result)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._wait_for_power_off")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._wait_for_power_off")
|
||||
def test_soft_shutdown_wait_timeout(self, mock_wait_for_power_off):
|
||||
instance = fake_instance.fake_instance_obj(self.context)
|
||||
mock_wait_for_power_off.return_value = False
|
||||
|
@ -1358,28 +1358,28 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
|
||||
self.assertFalse(result)
|
||||
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
def test_pause(self, mock_set_vm_state):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
self._vmops.pause(instance=mock_instance)
|
||||
mock_set_vm_state.assert_called_once_with(
|
||||
mock_instance, os_win_const.HYPERV_VM_STATE_PAUSED)
|
||||
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
def test_unpause(self, mock_set_vm_state):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
self._vmops.unpause(instance=mock_instance)
|
||||
mock_set_vm_state.assert_called_once_with(
|
||||
mock_instance, os_win_const.HYPERV_VM_STATE_ENABLED)
|
||||
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
def test_suspend(self, mock_set_vm_state):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
self._vmops.suspend(instance=mock_instance)
|
||||
mock_set_vm_state.assert_called_once_with(
|
||||
mock_instance, os_win_const.HYPERV_VM_STATE_SUSPENDED)
|
||||
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
def test_resume(self, mock_set_vm_state):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
self._vmops.resume(instance=mock_instance)
|
||||
|
@ -1401,13 +1401,13 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
def test_power_off_hard(self):
|
||||
self._test_power_off(timeout=0)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
def test_power_off_exception(self, mock_soft_shutdown):
|
||||
mock_soft_shutdown.return_value = False
|
||||
self._test_power_off(timeout=1)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._set_vm_state")
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._set_vm_state")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
def test_power_off_soft(self, mock_soft_shutdown, mock_set_state):
|
||||
instance = fake_instance.fake_instance_obj(self.context)
|
||||
mock_soft_shutdown.return_value = True
|
||||
|
@ -1421,13 +1421,13 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
instance, 1, vmops.SHUTDOWN_TIME_INCREMENT)
|
||||
self.assertFalse(mock_set_state.called)
|
||||
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("compute_hyperv.nova.vmops.VMOps._soft_shutdown")
|
||||
def test_power_off_unexisting_instance(self, mock_soft_shutdown):
|
||||
mock_soft_shutdown.side_effect = os_win_exc.HyperVVMNotFoundException(
|
||||
vm_name=mock.sentinel.vm_name)
|
||||
self._test_power_off(timeout=1, set_state_expected=False)
|
||||
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
def test_power_on(self, mock_set_vm_state):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
|
||||
|
@ -1436,9 +1436,9 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
|||
mock_set_vm_state.assert_called_once_with(
|
||||
mock_instance, os_win_const.HYPERV_VM_STATE_ENABLED)
|
||||
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps'
|
||||
@mock.patch('compute_hyperv.nova.volumeops.VolumeOps'
|
||||
'.fix_instance_volume_disk_paths')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
@mock.patch('compute_hyperv.nova.vmops.VMOps._set_vm_state')
|
||||
def test_power_on_having_block_devices(self, mock_set_vm_state,
|
||||
mock_fix_instance_vol_paths):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
|
@ -27,13 +27,13 @@ from os_brick.initiator import connector
|
|||
from os_win import constants as os_win_const
|
||||
from oslo_utils import units
|
||||
|
||||
import hyperv.nova.conf
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import volumeops
|
||||
from hyperv.tests.unit import test_base
|
||||
import compute_hyperv.nova.conf
|
||||
from compute_hyperv.nova import constants
|
||||
from compute_hyperv.nova import vmops
|
||||
from compute_hyperv.nova import volumeops
|
||||
from compute_hyperv.tests.unit import test_base
|
||||
|
||||
CONF = hyperv.nova.conf.CONF
|
||||
CONF = compute_hyperv.nova.conf.CONF
|
||||
|
||||
connection_data = {'volume_id': 'fake_vol_id',
|
||||
'target_lun': mock.sentinel.fake_lun,
|
|
@ -4,4 +4,4 @@ Usage
|
|||
|
||||
To use compute-hyperv in a project::
|
||||
|
||||
import hyperv
|
||||
import compute_hyperv
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
"""A Hyper-V Cluster Nova Compute driver."""
|
||||
|
||||
from hyperv.nova.cluster import driver
|
||||
from compute_hyperv.nova.cluster import driver
|
||||
|
||||
# NOTE: nova changed the way it imports drivers. All drivers must belong
|
||||
# in the nova.virt namespace.
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
A Hyper-V Nova Compute driver.
|
||||
"""
|
||||
|
||||
from hyperv.nova import driver
|
||||
from compute_hyperv.nova import driver
|
||||
|
||||
# NOTE: nova changed the way it imports drivers. All drivers must belong
|
||||
# in the nova.virt namespace.
|
||||
|
|
10
setup.cfg
10
setup.cfg
|
@ -23,7 +23,7 @@ keywords = openstack nova hyper-v compute
|
|||
|
||||
[files]
|
||||
packages =
|
||||
hyperv
|
||||
compute_hyperv
|
||||
nova
|
||||
nova.virt.compute_hyperv
|
||||
|
||||
|
@ -36,15 +36,15 @@ all_files = 1
|
|||
upload-dir = doc/build/html
|
||||
|
||||
[compile_catalog]
|
||||
directory = hyperv/locale
|
||||
directory = compute_hyperv/locale
|
||||
domain = compute-hyperv
|
||||
|
||||
[update_catalog]
|
||||
domain = compute-hyperv
|
||||
output_dir = hyperv/locale/nova
|
||||
input_file = hyperv/locale/compute-hyperv.pot
|
||||
output_dir = compute_hyperv/locale/nova
|
||||
input_file = compute_hyperv/locale/compute-hyperv.pot
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
output_file = hyperv/locale/compute-hyperv.pot
|
||||
output_file = compute_hyperv/locale/compute-hyperv.pot
|
||||
|
|
8
tox.ini
8
tox.ini
|
@ -13,7 +13,7 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac
|
|||
# random hash seed successfully.
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONHASHSEED=0
|
||||
OS_TEST_PATH=./hyperv/tests/unit
|
||||
OS_TEST_PATH=./compute_hyperv/tests/unit
|
||||
LANGUAGE=en_US
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
@ -36,7 +36,7 @@ commands =
|
|||
python setup.py testr --coverage \
|
||||
--testr-args='{posargs}'
|
||||
coverage combine
|
||||
coverage html --include='hyperv/*' --omit='hyperv/openstack/common/*' -d covhtml -i
|
||||
coverage html --include='compute_hyperv/*' --omit='compute_hyperv/openstack/common/*' -d covhtml -i
|
||||
|
||||
[testenv:venv]
|
||||
commands = {posargs}
|
||||
|
@ -63,7 +63,7 @@ max-complexity=38
|
|||
enable-extensions = H904
|
||||
|
||||
[hacking]
|
||||
local-check-factory = hyperv.hacking.checks.factory
|
||||
local-check-factory = compute_hyperv.hacking.checks.factory
|
||||
|
||||
[testenv:pip-missing-reqs]
|
||||
# do not install test-requirements as that will pollute the virtualenv for
|
||||
|
@ -72,4 +72,4 @@ local-check-factory = hyperv.hacking.checks.factory
|
|||
# of the requirements.txt files
|
||||
deps = pip_missing_reqs
|
||||
-rrequirements.txt
|
||||
commands=pip-missing-reqs -d --ignore-file=hyperv/tests/* hyperv
|
||||
commands=pip-missing-reqs -d --ignore-file=compute_hyperv/tests/* compute_hyperv
|
||||
|
|
Loading…
Reference in New Issue