x/python-ganttclient
Code Issues Proposed changes

Merge "Moves Hyper-V options to the hyperv section"

Browse Source
This commit is contained in:
Jenkins
2013-03-06 01:04:08 +00:00
committed by Gerrit Code Review
parent e16a7cb5b2 8b13b04c96
commit 083c34b025
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nova/tests/test_hypervapi.py
View File

@@ -56,7 +56,7 @@ from nova.virt.hyperv import volumeutilsv2
from nova.virt import images from nova.virt import images
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_opt('vswitch_name', 'nova.virt.hyperv.vif') CONF.import_opt('vswitch_name', 'nova.virt.hyperv.vif', 'hyperv')
class HyperVAPITestCase(test.TestCase): class HyperVAPITestCase(test.TestCase):
@@ -86,9 +86,11 @@ class HyperVAPITestCase(test.TestCase):
self._setup_stubs() self._setup_stubs()
self.flags(instances_path=r'C:\Hyper-V\test\instances', self.flags(instances_path=r'C:\Hyper-V\test\instances',
vswitch_name='external', network_api_class='nova.network.quantumv2.api.API')
network_api_class='nova.network.quantumv2.api.API',
force_volumeutils_v1=True) self.flags(vswitch_name='external',
force_volumeutils_v1=True,
group='hyperv')
self._conn = driver_hyperv.HyperVDriver(None) self._conn = driver_hyperv.HyperVDriver(None)
@@ -333,7 +335,7 @@ class HyperVAPITestCase(test.TestCase):
cdb.__exit__(None, None, None).AndReturn(None) cdb.__exit__(None, None, None).AndReturn(None)
if not use_cdrom: if not use_cdrom:
utils.execute(CONF.qemu_img_cmd, utils.execute(CONF.hyperv.qemu_img_cmd,
'convert', 'convert',
'-f', '-f',
'raw', 'raw',
@@ -353,7 +355,7 @@ class HyperVAPITestCase(test.TestCase):
def _test_spawn_config_drive(self, use_cdrom): def _test_spawn_config_drive(self, use_cdrom):
self.flags(force_config_drive=True) self.flags(force_config_drive=True)
self.flags(config_drive_cdrom=use_cdrom) self.flags(config_drive_cdrom=use_cdrom, group='hyperv')
self.flags(mkisofs_cmd='mkisofs.exe') self.flags(mkisofs_cmd='mkisofs.exe')
self._setup_spawn_config_drive_mocks(use_cdrom) self._setup_spawn_config_drive_mocks(use_cdrom)
@@ -393,7 +395,7 @@ class HyperVAPITestCase(test.TestCase):
fake_vswitch_port = 'fake port' fake_vswitch_port = 'fake port'
m = networkutils.NetworkUtils.get_external_vswitch( m = networkutils.NetworkUtils.get_external_vswitch(
CONF.vswitch_name) CONF.hyperv.vswitch_name)
m.AndReturn(fake_vswitch_path) m.AndReturn(fake_vswitch_path)
m = networkutils.NetworkUtils.create_vswitch_port( m = networkutils.NetworkUtils.create_vswitch_port(
@@ -412,7 +414,7 @@ class HyperVAPITestCase(test.TestCase):
def setup_vif_mocks(): def setup_vif_mocks():
m = networkutils.NetworkUtils.get_external_vswitch( m = networkutils.NetworkUtils.get_external_vswitch(
CONF.vswitch_name) CONF.hyperv.vswitch_name)
m.AndRaise(vmutils.HyperVException(_('fake vswitch not found'))) m.AndRaise(vmutils.HyperVException(_('fake vswitch not found')))
self.assertRaises(vmutils.HyperVException, self._test_spawn_instance, self.assertRaises(vmutils.HyperVException, self._test_spawn_instance,