Skip to content

Commit 940dfce

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "libvirt: Remove unused host parameters"
2 parents 28858c2 + e9eb52d commit 940dfce

File tree

4 files changed

+16
-27
lines changed

4 files changed

+16
-27
lines changed

nova/tests/unit/virt/libvirt/test_driver.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19243,8 +19243,7 @@ def _test_attach_detach_interface_get_config(self, method_name):
1924319243
expected = drvr.vif_driver.get_config(instance, network_info[0],
1924419244
fake_image_meta,
1924519245
instance.get_flavor(),
19246-
CONF.libvirt.virt_type,
19247-
drvr._host)
19246+
CONF.libvirt.virt_type)
1924819247
mock_get_config = self.useFixture(fixtures.MockPatchObject(
1924919248
drvr.vif_driver, 'get_config')).mock
1925019249
mock_get_config.return_value = expected
@@ -19261,7 +19260,7 @@ def _test_attach_detach_interface_get_config(self, method_name):
1926119260

1926219261
mock_get_config.assert_called_once_with(
1926319262
instance, network_info[0], test.MatchType(objects.ImageMeta),
19264-
test.MatchType(objects.Flavor), CONF.libvirt.virt_type, drvr._host)
19263+
test.MatchType(objects.Flavor), CONF.libvirt.virt_type)
1926519264

1926619265
@mock.patch.object(lockutils, "external_lock")
1926719266
def test_attach_interface_get_config(self, mock_lock):
@@ -23334,7 +23333,7 @@ def test_attach_interface_build_metadata_fails(self):
2333423333
{'id': instance.image_ref})
2333523334
expected = self.drvr.vif_driver.get_config(
2333623335
instance, network_info[0], fake_image_meta, instance.flavor,
23337-
CONF.libvirt.virt_type, self.drvr._host)
23336+
CONF.libvirt.virt_type)
2333823337
with test.nested(
2333923338
mock.patch.object(host.Host, '_get_domain', return_value=domain),
2334023339
mock.patch.object(domain, 'attachDeviceFlags'),
@@ -23357,7 +23356,7 @@ def test_attach_interface_build_metadata_fails(self):
2335723356
mock_info.assert_called_with()
2335823357
mock_get_config.assert_called_with(
2335923358
instance, network_info[0], fake_image_meta, instance.flavor,
23360-
CONF.libvirt.virt_type, self.drvr._host)
23359+
CONF.libvirt.virt_type)
2336123360
mock_build_device_metadata.assert_called_with(self.context,
2336223361
instance)
2336323362
mock_attach_device_flags.assert_called_with(
@@ -23397,7 +23396,7 @@ def _test_attach_interface(self, power_state, expected_flags,
2339723396
{'id': instance.image_ref})
2339823397
expected = self.drvr.vif_driver.get_config(
2339923398
instance, network_info[0], fake_image_meta, instance.flavor,
23400-
CONF.libvirt.virt_type, self.drvr._host)
23399+
CONF.libvirt.virt_type)
2340123400
mock_build.return_value = objects.InstanceDeviceMetadata()
2340223401

2340323402
with test.nested(
@@ -23409,8 +23408,7 @@ def _test_attach_interface(self, power_state, expected_flags,
2340923408

2341023409
mock_get_config.assert_called_once_with(
2341123410
instance, network_info[0], test.MatchType(objects.ImageMeta),
23412-
test.MatchType(objects.Flavor), CONF.libvirt.virt_type,
23413-
self.drvr._host)
23411+
test.MatchType(objects.Flavor), CONF.libvirt.virt_type)
2341423412
mock_get_domain.assert_called_once_with(instance)
2341523413
mock_info.assert_called_once_with()
2341623414
mock_build.assert_called_once_with(self.context, instance)
@@ -23493,8 +23491,7 @@ def _test_detach_interface(self, power_state, expected_flags,
2349323491
mock_get_guest.assert_called_once_with(instance)
2349423492
mock_get_config.assert_called_once_with(
2349523493
instance, network_info[0], test.MatchType(objects.ImageMeta),
23496-
test.MatchType(objects.Flavor), CONF.libvirt.virt_type,
23497-
self.drvr._host)
23494+
test.MatchType(objects.Flavor), CONF.libvirt.virt_type)
2349823495
mock_get_interface.assert_has_calls(
2349923496
[mock.call(expected_cfg) for x in range(len(get_interface_calls))])
2350023497

@@ -23632,8 +23629,7 @@ def test_detach_interface_device_with_same_mac_address(
2363223629
self.assertEqual(4, mock_get_interface.call_count)
2363323630
mock_get_config.assert_called_once_with(
2363423631
instance, network_info[0], test.MatchType(objects.ImageMeta),
23635-
test.MatchType(objects.Flavor), CONF.libvirt.virt_type,
23636-
self.drvr._host)
23632+
test.MatchType(objects.Flavor), CONF.libvirt.virt_type)
2363723633
mock_get_domain.assert_called_once_with(instance)
2363823634
mock_info.assert_called_once_with()
2363923635
mock_detach.assert_called_once_with(expected.to_xml(),

nova/tests/unit/virt/libvirt/test_vif.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
from nova.tests.unit.virt import fakelibosinfo
3333
from nova.tests.unit.virt.libvirt import fakelibvirt
3434
from nova.virt.libvirt import config as vconfig
35-
from nova.virt.libvirt import host
3635
from nova.virt.libvirt import vif
3736

3837
CONF = cfg.CONF
@@ -591,10 +590,8 @@ def _get_instance_xml(self, driver, vif, image_meta=None, flavor=None):
591590
image_meta = objects.ImageMeta.from_dict({})
592591

593592
conf = self._get_conf()
594-
hostimpl = host.Host("qemu:///system")
595593
nic = driver.get_config(self.instance, vif, image_meta,
596-
flavor, CONF.libvirt.virt_type,
597-
hostimpl)
594+
flavor, CONF.libvirt.virt_type)
598595
# TODO(stephenfin): There doesn't appear to be any reason we should do
599596
# this: just return 'nic.to_xml()' and remove '_get_node'
600597
conf.add_device(nic)

nova/virt/libvirt/driver.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2195,8 +2195,7 @@ def attach_interface(self, context, instance, image_meta, vif):
21952195
self.vif_driver.plug(instance, vif)
21962196
cfg = self.vif_driver.get_config(instance, vif, image_meta,
21972197
instance.flavor,
2198-
CONF.libvirt.virt_type,
2199-
self._host)
2198+
CONF.libvirt.virt_type)
22002199
try:
22012200
state = guest.get_power_state(self._host)
22022201
live = state in (power_state.RUNNING, power_state.PAUSED)
@@ -2237,7 +2236,7 @@ def detach_interface(self, context, instance, vif):
22372236
cfg = self.vif_driver.get_config(instance, vif,
22382237
instance.image_meta,
22392238
instance.flavor,
2240-
CONF.libvirt.virt_type, self._host)
2239+
CONF.libvirt.virt_type)
22412240
interface = guest.get_interface_by_cfg(cfg)
22422241
try:
22432242
self.vif_driver.unplug(instance, vif)
@@ -4396,8 +4395,7 @@ def _attach_direct_passthrough_ports(
43964395
vif,
43974396
instance.image_meta,
43984397
instance.flavor,
4399-
CONF.libvirt.virt_type,
4400-
self._host)
4398+
CONF.libvirt.virt_type)
44014399
LOG.debug('Attaching direct passthrough port %(port)s '
44024400
'to %(dom)s', {'port': vif, 'dom': guest.id},
44034401
instance=instance)
@@ -6107,8 +6105,8 @@ def _get_guest_config(self, instance, network_info, image_meta,
61076105

61086106
for vif in network_info:
61096107
config = self.vif_driver.get_config(
6110-
instance, vif, image_meta,
6111-
flavor, virt_type, self._host)
6108+
instance, vif, image_meta, flavor, virt_type,
6109+
)
61126110
guest.add_device(config)
61136111

61146112
self._create_consoles(virt_type, guest, instance, flavor, image_meta)
@@ -9064,7 +9062,7 @@ def _live_migration_operation(self, context, instance, dest,
90649062
image_meta=instance.image_meta,
90659063
inst_type=instance.flavor,
90669064
virt_type=CONF.libvirt.virt_type,
9067-
host=self._host)
9065+
)
90689066
self._detach_direct_passthrough_vifs(context,
90699067
migrate_data, instance)
90709068
new_resources = None

nova/virt/libvirt/vif.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,7 @@ def _get_config_os_vif(self, instance, vif, image_meta, inst_type,
516516

517517
return conf
518518

519-
# TODO(stephenfin): Remove unused host argument
520-
def get_config(self, instance, vif, image_meta,
521-
inst_type, virt_type, host):
519+
def get_config(self, instance, vif, image_meta, inst_type, virt_type):
522520
vif_type = vif['type']
523521
vnic_type = vif['vnic_type']
524522

0 commit comments

Comments
 (0)