Fixes local imports
This commit replaces the references from nova.virt.hyperv.* to hyperv.nova.* and nova.tests.unit.virt.hyperv.* to hyperv.tests.unit.*.
This commit is contained in:
parent
5714d32fd0
commit
d629972f9b
@ -12,6 +12,6 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from nova.virt.hyperv import driver
|
||||
from hyperv.nova import driver
|
||||
|
||||
HyperVDriver = driver.HyperVDriver
|
||||
|
@ -23,13 +23,13 @@ from oslo_log import log as logging
|
||||
|
||||
from nova.i18n import _
|
||||
from nova.virt import driver
|
||||
from nova.virt.hyperv import hostops
|
||||
from nova.virt.hyperv import livemigrationops
|
||||
from nova.virt.hyperv import migrationops
|
||||
from nova.virt.hyperv import rdpconsoleops
|
||||
from nova.virt.hyperv import snapshotops
|
||||
from nova.virt.hyperv import vmops
|
||||
from nova.virt.hyperv import volumeops
|
||||
from hyperv.nova import hostops
|
||||
from hyperv.nova import livemigrationops
|
||||
from hyperv.nova import migrationops
|
||||
from hyperv.nova import rdpconsoleops
|
||||
from hyperv.nova import snapshotops
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import volumeops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -30,8 +30,8 @@ from nova.compute import arch
|
||||
from nova.compute import hv_type
|
||||
from nova.compute import vm_mode
|
||||
from nova.i18n import _
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import utilsfactory
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('my_ip', 'nova.netconf')
|
||||
|
@ -21,7 +21,7 @@ if sys.platform == 'win32':
|
||||
import wmi
|
||||
|
||||
from nova.i18n import _
|
||||
from nova.virt.hyperv import constants
|
||||
from hyperv.nova import constants
|
||||
|
||||
|
||||
class HostUtils(object):
|
||||
|
@ -24,8 +24,8 @@ from oslo_utils import units
|
||||
|
||||
from nova.i18n import _
|
||||
from nova import utils
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import utilsfactory
|
||||
from hyperv.nova import vmutils
|
||||
from nova.virt import images
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
@ -24,10 +24,10 @@ from oslo_utils import excutils
|
||||
|
||||
from nova.i18n import _
|
||||
from nova.virt import configdrive
|
||||
from nova.virt.hyperv import imagecache
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from nova.virt.hyperv import vmops
|
||||
from nova.virt.hyperv import volumeops
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.nova import utilsfactory
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import volumeops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
@ -22,9 +22,9 @@ from oslo_log import log as logging
|
||||
|
||||
from nova import exception
|
||||
from nova.i18n import _, _LE
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import vmutilsv2
|
||||
from nova.virt.hyperv import volumeutilsv2
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import vmutilsv2
|
||||
from hyperv.nova import volumeutilsv2
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -25,11 +25,11 @@ from oslo_utils import units
|
||||
from nova import exception
|
||||
from nova.i18n import _, _LE
|
||||
from nova.virt import configdrive
|
||||
from nova.virt.hyperv import imagecache
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from nova.virt.hyperv import vmops
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import volumeops
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.nova import utilsfactory
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import volumeops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -24,7 +24,7 @@ if sys.platform == 'win32':
|
||||
import wmi
|
||||
|
||||
from nova.i18n import _
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
|
||||
class NetworkUtils(object):
|
||||
|
@ -25,8 +25,8 @@ if sys.platform == 'win32':
|
||||
import wmi
|
||||
|
||||
from nova.i18n import _
|
||||
from nova.virt.hyperv import networkutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import networkutils
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
|
||||
class NetworkUtilsV2(networkutils.NetworkUtils):
|
||||
|
@ -25,8 +25,8 @@ from oslo_log import log as logging
|
||||
|
||||
from nova.i18n import _
|
||||
from nova import utils
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -16,8 +16,8 @@
|
||||
from oslo_log import log as logging
|
||||
|
||||
from nova.console import type as ctype
|
||||
from nova.virt.hyperv import hostops
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from hyperv.nova import hostops
|
||||
from hyperv.nova import utilsfactory
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
import sys
|
||||
|
||||
from nova.virt.hyperv import rdpconsoleutils
|
||||
from hyperv.nova import rdpconsoleutils
|
||||
|
||||
if sys.platform == 'win32':
|
||||
import wmi
|
||||
|
@ -24,7 +24,7 @@ from oslo_log import log as logging
|
||||
from nova.compute import task_states
|
||||
from nova.i18n import _LW
|
||||
from nova.image import glance
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from hyperv.nova import utilsfactory
|
||||
|
||||
CONF = cfg.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
@ -17,19 +17,19 @@ from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from nova.i18n import _
|
||||
from nova.virt.hyperv import hostutils
|
||||
from nova.virt.hyperv import livemigrationutils
|
||||
from nova.virt.hyperv import networkutils
|
||||
from nova.virt.hyperv import networkutilsv2
|
||||
from nova.virt.hyperv import pathutils
|
||||
from nova.virt.hyperv import rdpconsoleutils
|
||||
from nova.virt.hyperv import rdpconsoleutilsv2
|
||||
from nova.virt.hyperv import vhdutils
|
||||
from nova.virt.hyperv import vhdutilsv2
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import vmutilsv2
|
||||
from nova.virt.hyperv import volumeutils
|
||||
from nova.virt.hyperv import volumeutilsv2
|
||||
from hyperv.nova import hostutils
|
||||
from hyperv.nova import livemigrationutils
|
||||
from hyperv.nova import networkutils
|
||||
from hyperv.nova import networkutilsv2
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import rdpconsoleutils
|
||||
from hyperv.nova import rdpconsoleutilsv2
|
||||
from hyperv.nova import vhdutils
|
||||
from hyperv.nova import vhdutilsv2
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import vmutilsv2
|
||||
from hyperv.nova import volumeutils
|
||||
from hyperv.nova import volumeutilsv2
|
||||
|
||||
hyper_opts = [
|
||||
cfg.BoolOpt('force_hyperv_utils_v1',
|
||||
|
@ -32,8 +32,8 @@ if sys.platform == 'win32':
|
||||
from xml.etree import ElementTree
|
||||
|
||||
from nova.i18n import _
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
|
||||
VHD_HEADER_SIZE_FIX = 512
|
||||
|
@ -29,10 +29,10 @@ from xml.etree import ElementTree
|
||||
from oslo_utils import units
|
||||
|
||||
from nova.i18n import _
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vhdutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import vmutilsv2
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vhdutils
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import vmutilsv2
|
||||
|
||||
|
||||
VHDX_BAT_ENTRY_SIZE = 8
|
||||
|
@ -19,7 +19,7 @@ import abc
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from hyperv.nova import utilsfactory
|
||||
|
||||
hyperv_opts = [
|
||||
cfg.StrOpt('vswitch_name',
|
||||
|
@ -38,12 +38,12 @@ from nova.openstack.common import loopingcall
|
||||
from nova import utils
|
||||
from nova.virt import configdrive
|
||||
from nova.virt import hardware
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import imagecache
|
||||
from nova.virt.hyperv import ioutils
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import volumeops
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.nova import ioutils
|
||||
from hyperv.nova import utilsfactory
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import volumeops
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -117,9 +117,9 @@ def check_admin_permissions(function):
|
||||
class VMOps(object):
|
||||
_vif_driver_class_map = {
|
||||
'nova.network.neutronv2.api.API':
|
||||
'nova.virt.hyperv.vif.HyperVNeutronVIFDriver',
|
||||
'hyperv.nova.vif.HyperVNeutronVIFDriver',
|
||||
'nova.network.api.API':
|
||||
'nova.virt.hyperv.vif.HyperVNovaNetworkVIFDriver',
|
||||
'hyperv.nova.vif.HyperVNovaNetworkVIFDriver',
|
||||
}
|
||||
|
||||
# The console log is stored in two files, each should have at most half of
|
||||
|
@ -30,8 +30,8 @@ from oslo_log import log as logging
|
||||
|
||||
from nova import exception
|
||||
from nova.i18n import _, _LW
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import hostutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import hostutils
|
||||
|
||||
CONF = cfg.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
@ -27,8 +27,8 @@ if sys.platform == 'win32':
|
||||
from oslo_config import cfg
|
||||
from oslo_log import log as logging
|
||||
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
CONF = cfg.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
@ -29,8 +29,8 @@ from oslo_utils import excutils
|
||||
from nova import exception
|
||||
from nova.i18n import _, _LE, _LW
|
||||
from nova.virt import driver
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import utilsfactory
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -31,8 +31,8 @@ from oslo_log import log as logging
|
||||
|
||||
from nova.i18n import _
|
||||
from nova import utils
|
||||
from nova.virt.hyperv import basevolumeutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import basevolumeutils
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
@ -29,8 +29,8 @@ from oslo_log import log as logging
|
||||
|
||||
from nova.i18n import _
|
||||
from nova import utils
|
||||
from nova.virt.hyperv import basevolumeutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import basevolumeutils
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
|
@ -22,7 +22,7 @@ from nova.compute import task_states
|
||||
from nova.compute import vm_states
|
||||
from nova import db
|
||||
from nova import utils
|
||||
from nova.virt.hyperv import constants
|
||||
from hyperv.nova import constants
|
||||
|
||||
|
||||
def get_fake_instance_data(name, project_id, user_id):
|
||||
|
@ -17,7 +17,7 @@
|
||||
import mock
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import basevolumeutils
|
||||
from hyperv.nova import basevolumeutils
|
||||
|
||||
|
||||
def _exception_thrower():
|
||||
|
@ -20,9 +20,9 @@ from oslo_config import cfg
|
||||
from oslo_serialization import jsonutils
|
||||
from oslo_utils import units
|
||||
|
||||
from nova.tests.unit.virt.hyperv import test_base
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import hostops
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import hostops
|
||||
from hyperv.tests.unit import test_base
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
@ -15,8 +15,8 @@
|
||||
import mock
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import hostutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import hostutils
|
||||
|
||||
|
||||
class FakeCPUSpec(object):
|
||||
@ -45,7 +45,7 @@ class HostUtilsTestCase(test.NoDBTestCase):
|
||||
|
||||
super(HostUtilsTestCase, self).setUp()
|
||||
|
||||
@mock.patch('nova.virt.hyperv.hostutils.ctypes')
|
||||
@mock.patch('hyperv.nova.hostutils.ctypes')
|
||||
def test_get_host_tick_count64(self, mock_ctypes):
|
||||
tick_count64 = "100"
|
||||
mock_ctypes.windll.kernel32.GetTickCount64.return_value = tick_count64
|
||||
|
@ -38,29 +38,29 @@ from nova import test
|
||||
from nova.tests.unit import fake_instance
|
||||
from nova.tests.unit import fake_network
|
||||
from nova.tests.unit.image import fake as fake_image
|
||||
from nova.tests.unit.virt.hyperv import db_fakes
|
||||
from nova.tests.unit.virt.hyperv import fake
|
||||
from nova import utils
|
||||
from nova.virt import configdrive
|
||||
from nova.virt import driver
|
||||
from nova.virt.hyperv import basevolumeutils
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import driver as driver_hyperv
|
||||
from nova.virt.hyperv import hostutils
|
||||
from nova.virt.hyperv import imagecache
|
||||
from nova.virt.hyperv import ioutils
|
||||
from nova.virt.hyperv import networkutils
|
||||
from nova.virt.hyperv import pathutils
|
||||
from nova.virt.hyperv import rdpconsoleutils
|
||||
from nova.virt.hyperv import vhdutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import volumeops
|
||||
from nova.virt.hyperv import volumeutils
|
||||
from nova.virt.hyperv import volumeutilsv2
|
||||
from hyperv.nova import basevolumeutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import driver as driver_hyperv
|
||||
from hyperv.nova import hostutils
|
||||
from hyperv.nova import imagecache
|
||||
from hyperv.nova import ioutils
|
||||
from hyperv.nova import networkutils
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import rdpconsoleutils
|
||||
from hyperv.nova import vhdutils
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import volumeops
|
||||
from hyperv.nova import volumeutils
|
||||
from hyperv.nova import volumeutilsv2
|
||||
from hyperv.tests.unit import db_fakes
|
||||
from hyperv.tests.unit import fake
|
||||
from nova.virt import images
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('vswitch_name', 'nova.virt.hyperv.vif', 'hyperv')
|
||||
CONF.import_opt('vswitch_name', 'hyperv.nova.vif', 'hyperv')
|
||||
|
||||
|
||||
class HyperVAPIBaseTestCase(test.NoDBTestCase):
|
||||
|
@ -23,8 +23,8 @@ from nova import objects
|
||||
from nova import test
|
||||
from nova.tests.unit import fake_instance
|
||||
from nova.tests.unit.objects import test_flavor
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import imagecache
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import imagecache
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
@ -18,7 +18,7 @@ import mock
|
||||
import os
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import ioutils
|
||||
from hyperv.nova import ioutils
|
||||
|
||||
|
||||
class IOThreadTestCase(test.NoDBTestCase):
|
||||
|
@ -17,9 +17,9 @@ import mock
|
||||
from oslo_config import cfg
|
||||
|
||||
from nova.tests.unit import fake_instance
|
||||
from nova.tests.unit.virt.hyperv import test_base
|
||||
from nova.virt.hyperv import livemigrationops
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import livemigrationops
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.tests.unit import test_base
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
@ -33,9 +33,9 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
self._livemigrops = livemigrationops.LiveMigrationOps()
|
||||
self._livemigrops._livemigrutils = mock.MagicMock()
|
||||
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps.copy_vm_console_logs')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.copy_vm_console_logs')
|
||||
@mock.patch('nova.virt.configdrive.required_by')
|
||||
@mock.patch('nova.virt.hyperv.pathutils.PathUtils.copy_configdrive')
|
||||
@mock.patch('hyperv.nova.pathutils.PathUtils.copy_configdrive')
|
||||
def _test_live_migration(self, mock_copy_configdrive, mock_required_by,
|
||||
mock_copy_logs, side_effect, configdrive=False):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
@ -91,10 +91,10 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
def test_live_migration_with_configdrive(self):
|
||||
self._test_live_migration(side_effect=None, configdrive=True)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.volumeops.VolumeOps'
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps'
|
||||
'.ebs_root_in_block_devices')
|
||||
@mock.patch('nova.virt.hyperv.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('nova.virt.hyperv.volumeops.VolumeOps'
|
||||
@mock.patch('hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps'
|
||||
'.initialize_volumes_connection')
|
||||
def test_pre_live_migration(self, mock_initialize_connection,
|
||||
mock_get_cached_image,
|
||||
@ -118,7 +118,7 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
mock_initialize_connection.assert_called_once_with(
|
||||
mock.sentinel.BLOCK_INFO)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.volumeops.VolumeOps.disconnect_volumes')
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps.disconnect_volumes')
|
||||
def test_post_live_migration(self, mock_disconnect_volumes):
|
||||
self._livemigrops.post_live_migration(
|
||||
self.context, mock.sentinel.instance,
|
||||
@ -126,7 +126,7 @@ class LiveMigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
mock_disconnect_volumes.assert_called_once_with(
|
||||
mock.sentinel.block_device_info)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps.log_vm_serial_output')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.log_vm_serial_output')
|
||||
def test_post_live_migration_at_destination(self, mock_log_vm):
|
||||
mock_instance = fake_instance.fake_instance_obj(self.context)
|
||||
self._livemigrops.post_live_migration_at_destination(
|
||||
|
@ -16,7 +16,7 @@
|
||||
import mock
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import livemigrationutils
|
||||
from hyperv.nova import livemigrationutils
|
||||
|
||||
|
||||
class LiveMigrationUtilsTestCase(test.NoDBTestCase):
|
||||
|
@ -15,9 +15,9 @@
|
||||
import mock
|
||||
|
||||
from nova.tests.unit import fake_instance
|
||||
from nova.tests.unit.virt.hyperv import test_base
|
||||
from nova.virt.hyperv import migrationops
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import migrationops
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class MigrationOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
|
@ -15,8 +15,8 @@
|
||||
import mock
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import networkutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import networkutils
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
|
||||
class NetworkUtilsTestCase(test.NoDBTestCase):
|
||||
|
@ -14,8 +14,8 @@
|
||||
|
||||
import mock
|
||||
|
||||
from nova.tests.unit.virt.hyperv import test_networkutils
|
||||
from nova.virt.hyperv import networkutilsv2
|
||||
from hyperv.nova import networkutilsv2
|
||||
from hyperv.tests.unit import test_networkutils
|
||||
|
||||
|
||||
class NetworkUtilsV2TestCase(test_networkutils.NetworkUtilsTestCase):
|
||||
|
@ -16,10 +16,10 @@ import os
|
||||
|
||||
import mock
|
||||
|
||||
from nova.tests.unit.virt.hyperv import test_base
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import pathutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class PathUtilsTestCase(test_base.HyperVBaseTestCase):
|
||||
|
@ -13,7 +13,7 @@
|
||||
# under the License.
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import rdpconsoleutils
|
||||
from hyperv.nova import rdpconsoleutils
|
||||
|
||||
|
||||
class RDPConsoleUtilsTestCase(test.NoDBTestCase):
|
||||
|
@ -15,7 +15,7 @@
|
||||
import mock
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import rdpconsoleutilsv2
|
||||
from hyperv.nova import rdpconsoleutilsv2
|
||||
|
||||
|
||||
class RDPConsoleUtilsV2TestCase(test.NoDBTestCase):
|
||||
|
@ -19,8 +19,8 @@ import mock
|
||||
|
||||
from nova.compute import task_states
|
||||
from nova.tests.unit import fake_instance
|
||||
from nova.tests.unit.virt.hyperv import test_base
|
||||
from nova.virt.hyperv import snapshotops
|
||||
from hyperv.nova import snapshotops
|
||||
from hyperv.tests.unit import test_base
|
||||
|
||||
|
||||
class SnapshotOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
@ -55,7 +55,7 @@ class SnapshotOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
self.context, mock.sentinel.IMAGE_ID, image_metadata,
|
||||
self._snapshotops._pathutils.open().__enter__())
|
||||
|
||||
@mock.patch('nova.virt.hyperv.snapshotops.SnapshotOps._save_glance_image')
|
||||
@mock.patch('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()
|
||||
|
@ -21,10 +21,10 @@ import mock
|
||||
from oslo_config import cfg
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import hostutils
|
||||
from nova.virt.hyperv import utilsfactory
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import vmutilsv2
|
||||
from hyperv.nova import hostutils
|
||||
from hyperv.nova import utilsfactory
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import vmutilsv2
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
@ -16,9 +16,9 @@ import mock
|
||||
from oslo_utils import units
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vhdutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vhdutils
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
|
||||
class VHDUtilsBaseTestCase(test.NoDBTestCase):
|
||||
@ -233,7 +233,7 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
|
||||
self.assertEqual(expected_vhd_size, real_size)
|
||||
|
||||
def test_get_vhd_format_vhdx(self):
|
||||
with mock.patch('nova.virt.hyperv.vhdutils.open',
|
||||
with mock.patch('hyperv.nova.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('nova.virt.hyperv.vhdutils.open',
|
||||
with mock.patch('hyperv.nova.vhdutils.open',
|
||||
mock.mock_open(read_data=vhdutils.VHD_SIGNATURE),
|
||||
create=True) as mock_open:
|
||||
f = mock_open.return_value
|
||||
@ -253,7 +253,7 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
|
||||
self.assertEqual(constants.DISK_FORMAT_VHD, format)
|
||||
|
||||
def test_get_vhd_format_invalid_format(self):
|
||||
with mock.patch('nova.virt.hyperv.vhdutils.open',
|
||||
with mock.patch('hyperv.nova.vhdutils.open',
|
||||
mock.mock_open(read_data='invalid'),
|
||||
create=True) as mock_open:
|
||||
f = mock_open.return_value
|
||||
@ -264,7 +264,7 @@ class VHDUtilsTestCase(VHDUtilsBaseTestCase):
|
||||
self._FAKE_VHD_PATH)
|
||||
|
||||
def test_get_vhd_format_zero_length_file(self):
|
||||
with mock.patch('nova.virt.hyperv.vhdutils.open',
|
||||
with mock.patch('hyperv.nova.vhdutils.open',
|
||||
mock.mock_open(read_data=''),
|
||||
create=True) as mock_open:
|
||||
f = mock_open.return_value
|
||||
|
@ -14,10 +14,10 @@
|
||||
|
||||
import mock
|
||||
|
||||
from nova.tests.unit.virt.hyperv import test_vhdutils
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vhdutilsv2
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vhdutilsv2
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.tests.unit import test_vhdutils
|
||||
|
||||
|
||||
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('nova.virt.hyperv.vhdutils.VHDUtils.get_vhd_format')
|
||||
@mock.patch('hyperv.nova.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()
|
||||
|
@ -22,10 +22,10 @@ from oslo_utils import units
|
||||
|
||||
from nova import exception
|
||||
from nova.tests.unit import fake_instance
|
||||
from nova.tests.unit.virt.hyperv import test_base
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vmops
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vmops
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.tests.unit import test_base
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
@ -71,7 +71,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
|
||||
return mock_instance
|
||||
|
||||
@mock.patch('nova.virt.hyperv.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('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_vhd_mocks(
|
||||
@ -91,7 +91,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
self._vmops._pathutils.remove.assert_called_once_with(
|
||||
fake_root_path)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('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_vhd_mocks(
|
||||
use_cow_images=True, vhd_format=vhd_format,
|
||||
@ -123,7 +123,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('nova.virt.hyperv.imagecache.ImageCache.get_cached_image')
|
||||
@mock.patch('hyperv.nova.imagecache.ImageCache.get_cached_image')
|
||||
def _test_create_root_vhd(self, mock_get_cached_image, vhd_format):
|
||||
mock_instance = self._prepare_create_root_vhd_mocks(
|
||||
use_cow_images=False, vhd_format=vhd_format,
|
||||
@ -197,18 +197,18 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
mock.sentinel.FAKE_FORMAT)
|
||||
self.assertEqual(mock.sentinel.FAKE_PATH, response)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps.destroy')
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps.power_on')
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps.attach_config_drive')
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps._create_config_drive')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.destroy')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.power_on')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps.attach_config_drive')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._create_config_drive')
|
||||
@mock.patch('nova.virt.configdrive.required_by')
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps.create_instance')
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps.get_image_vm_generation')
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps.create_ephemeral_vhd')
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps._create_root_vhd')
|
||||
@mock.patch('nova.virt.hyperv.volumeops.VolumeOps.'
|
||||
@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_ephemeral_vhd')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._create_root_vhd')
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps.'
|
||||
'ebs_root_in_block_devices')
|
||||
@mock.patch('nova.virt.hyperv.vmops.VMOps._delete_disk_files')
|
||||
@mock.patch('hyperv.nova.vmops.VMOps._delete_disk_files')
|
||||
def _test_spawn(self, mock_delete_disk_files,
|
||||
mock_ebs_root_in_block_devices, mock_create_root_vhd,
|
||||
mock_create_ephemeral_vhd, mock_get_image_vm_gen,
|
||||
@ -291,7 +291,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
self._test_spawn(exists=False, boot_from_volume=True,
|
||||
configdrive_required=False, fail=None)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.volumeops.VolumeOps'
|
||||
@mock.patch('hyperv.nova.volumeops.VolumeOps'
|
||||
'.attach_volumes')
|
||||
@mock.patch.object(vmops.VMOps, '_attach_drive')
|
||||
def _test_create_instance(self, mock_attach_drive, mock_attach_volumes,
|
||||
@ -557,20 +557,20 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
self._test_reboot(vmops.REBOOT_TYPE_HARD,
|
||||
constants.HYPERV_VM_STATE_REBOOT)
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("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,
|
||||
constants.HYPERV_VM_STATE_ENABLED)
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("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,
|
||||
constants.HYPERV_VM_STATE_REBOOT)
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps.power_on")
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("hyperv.nova.vmops.VMOps.power_on")
|
||||
@mock.patch("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 = vmutils.HyperVException("Expected failure")
|
||||
@ -588,7 +588,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
self._vmops.reboot(instance, {}, reboot_type)
|
||||
mock_set_state.assert_called_once_with(instance, vm_state)
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps._wait_for_power_off")
|
||||
@mock.patch("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
|
||||
@ -615,7 +615,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
mock_shutdown_vm.assert_called_once_with(instance.name)
|
||||
self.assertFalse(result)
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps._wait_for_power_off")
|
||||
@mock.patch("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]
|
||||
@ -630,7 +630,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
|
||||
self.assertTrue(result)
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps._wait_for_power_off")
|
||||
@mock.patch("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
|
||||
@ -656,13 +656,13 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
def test_power_off_hard(self):
|
||||
self._test_power_off(timeout=0)
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("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("nova.virt.hyperv.vmops.VMOps._set_vm_state")
|
||||
@mock.patch("nova.virt.hyperv.vmops.VMOps._soft_shutdown")
|
||||
@mock.patch("hyperv.nova.vmops.VMOps._set_vm_state")
|
||||
@mock.patch("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
|
||||
@ -734,7 +734,7 @@ class VMOpsTestCase(test_base.HyperVBaseTestCase):
|
||||
mock.sentinel.fake_console_log_path,
|
||||
mock.sentinel.fake_console_log_archived)
|
||||
|
||||
with mock.patch('nova.virt.hyperv.vmops.open', fake_open, create=True):
|
||||
with mock.patch('hyperv.nova.vmops.open', fake_open, create=True):
|
||||
self.assertRaises(vmutils.HyperVException,
|
||||
self._vmops.get_console_output,
|
||||
fake_vm)
|
||||
|
@ -17,8 +17,8 @@ import mock
|
||||
|
||||
from nova import exception
|
||||
from nova import test
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vmutils
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vmutils
|
||||
|
||||
|
||||
class VMUtilsTestCase(test.NoDBTestCase):
|
||||
@ -173,7 +173,7 @@ class VMUtilsTestCase(test.NoDBTestCase):
|
||||
self._vmutils.soft_shutdown_vm(self._FAKE_VM_NAME)
|
||||
self.assertFalse(mock_check.called)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.vmutils.VMUtils._get_vm_disks')
|
||||
@mock.patch('hyperv.nova.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()
|
||||
@ -252,7 +252,7 @@ class VMUtilsTestCase(test.NoDBTestCase):
|
||||
path = self._vmutils.get_vm_scsi_controller(self._FAKE_VM_NAME)
|
||||
self.assertEqual(self._FAKE_RES_PATH, path)
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmutils.VMUtils.get_attached_disks")
|
||||
@mock.patch("hyperv.nova.vmutils.VMUtils.get_attached_disks")
|
||||
def test_get_free_controller_slot(self, mock_get_attached_disks):
|
||||
mock_disk = mock.MagicMock()
|
||||
mock_disk.AddressOnParent = 3
|
||||
@ -307,8 +307,8 @@ class VMUtilsTestCase(test.NoDBTestCase):
|
||||
mock_rasds.ResourceSubType = mock_subtype
|
||||
return mock_rasds
|
||||
|
||||
@mock.patch("nova.virt.hyperv.vmutils.VMUtils.get_free_controller_slot")
|
||||
@mock.patch("nova.virt.hyperv.vmutils.VMUtils._get_vm_scsi_controller")
|
||||
@mock.patch("hyperv.nova.vmutils.VMUtils.get_free_controller_slot")
|
||||
@mock.patch("hyperv.nova.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()
|
||||
@ -652,7 +652,7 @@ class VMUtilsTestCase(test.NoDBTestCase):
|
||||
['ElementName', 'Notes'],
|
||||
SettingType=self._vmutils._VIRTUAL_SYSTEM_CURRENT_SETTINGS)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.vmutils.VMUtils.check_ret_val')
|
||||
@mock.patch('hyperv.nova.vmutils.VMUtils.check_ret_val')
|
||||
def test_modify_virtual_system(self, mock_check_ret_val):
|
||||
mock_vs_man_svc = mock.MagicMock()
|
||||
mock_vmsetting = mock.MagicMock()
|
||||
@ -672,10 +672,10 @@ class VMUtilsTestCase(test.NoDBTestCase):
|
||||
SystemSettingData=mock_vmsetting.GetText_(1))
|
||||
mock_check_ret_val.assert_called_once_with(fake_ret_val, fake_job_path)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.vmutils.VMUtils.check_ret_val')
|
||||
@mock.patch('nova.virt.hyperv.vmutils.VMUtils._get_wmi_obj')
|
||||
@mock.patch('nova.virt.hyperv.vmutils.VMUtils._modify_virtual_system')
|
||||
@mock.patch('nova.virt.hyperv.vmutils.VMUtils._get_vm_setting_data')
|
||||
@mock.patch('hyperv.nova.vmutils.VMUtils.check_ret_val')
|
||||
@mock.patch('hyperv.nova.vmutils.VMUtils._get_wmi_obj')
|
||||
@mock.patch('hyperv.nova.vmutils.VMUtils._modify_virtual_system')
|
||||
@mock.patch('hyperv.nova.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, mock_check_ret_val):
|
||||
|
@ -14,9 +14,9 @@
|
||||
|
||||
import mock
|
||||
|
||||
from nova.tests.unit.virt.hyperv import test_vmutils
|
||||
from nova.virt.hyperv import constants
|
||||
from nova.virt.hyperv import vmutilsv2
|
||||
from hyperv.nova import constants
|
||||
from hyperv.nova import vmutilsv2
|
||||
from hyperv.tests.unit import test_vmutils
|
||||
|
||||
|
||||
class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
|
||||
@ -89,7 +89,7 @@ class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
|
||||
self._vmutils.set_nic_connection(self._FAKE_VM_NAME, None, None)
|
||||
mock_add_virt_res.assert_called_with(fake_eth_port, self._FAKE_VM_PATH)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.vmutils.VMUtils._get_vm_disks')
|
||||
@mock.patch('hyperv.nova.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]
|
||||
@ -148,8 +148,8 @@ class VMUtilsV2TestCase(test_vmutils.VMUtilsTestCase):
|
||||
['ElementName', 'Notes'],
|
||||
VirtualSystemType=self._vmutils._VIRTUAL_SYSTEM_TYPE_REALIZED)
|
||||
|
||||
@mock.patch('nova.virt.hyperv.vmutilsv2.VMUtilsV2.check_ret_val')
|
||||
@mock.patch('nova.virt.hyperv.vmutilsv2.VMUtilsV2._get_wmi_obj')
|
||||
@mock.patch('hyperv.nova.vmutilsv2.VMUtilsV2.check_ret_val')
|
||||
@mock.patch('hyperv.nova.vmutilsv2.VMUtilsV2._get_wmi_obj')
|
||||
def _test_create_vm_obj(self, mock_get_wmi_obj, mock_check_ret_val,
|
||||
vm_path, dynamic_memory_ratio=1.0):
|
||||
mock_vs_man_svc = mock.MagicMock()
|
||||
|
@ -20,11 +20,11 @@ import os
|
||||
import mock
|
||||
|
||||
from nova import exception
|
||||
from nova.tests.unit.virt.hyperv import db_fakes
|
||||
from nova.tests.unit.virt.hyperv import test_base
|
||||
from nova.virt.hyperv import pathutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import volumeops
|
||||
from hyperv.nova import pathutils
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import volumeops
|
||||
from hyperv.tests.unit import db_fakes
|
||||
from hyperv.tests.unit import test_base
|
||||
|
||||
FAKE_TARGET_PORTAL = 'fakeportal:3260'
|
||||
FAKE_VOLUME_ID = 'fake_volume_id'
|
||||
|
@ -17,12 +17,12 @@
|
||||
import mock
|
||||
from oslo_config import cfg
|
||||
|
||||
from nova.tests.unit.virt.hyperv import test_basevolumeutils
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import volumeutils
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import volumeutils
|
||||
from hyperv.tests.unit import test_basevolumeutils
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('volume_attach_retry_count', 'nova.virt.hyperv.volumeops',
|
||||
CONF.import_opt('volume_attach_retry_count', 'hyperv.nova.volumeops',
|
||||
'hyperv')
|
||||
|
||||
|
||||
|
@ -16,11 +16,11 @@ import mock
|
||||
from oslo_config import cfg
|
||||
|
||||
from nova import test
|
||||
from nova.virt.hyperv import vmutils
|
||||
from nova.virt.hyperv import volumeutilsv2
|
||||
from hyperv.nova import vmutils
|
||||
from hyperv.nova import volumeutilsv2
|
||||
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('volume_attach_retry_count', 'nova.virt.hyperv.volumeops',
|
||||
CONF.import_opt('volume_attach_retry_count', 'hyperv.nova.volumeops',
|
||||
'hyperv')
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user