6be668e519
When we try to use either virtio1.0-block or virtio1.0-net it is correctly rejected by libvirt. We get these returned from libosinfo for newer operating systems that support virtio1.0. As we want to support libvirts older than 5.2.0, its best we just request "virtio", please see: https://libvirt.org/formatdomain.html#elementsVirtioTransitional You can see virtio1.0-net and virtio-block being added here: https://gitlab.com/libosinfo/osinfo-db/blob/master/data/os/fedoraproject.org/fedora-23.xml.in#L31 Change-Id: I633faae47ad5a33b27f5e2eef6e0107f60335146 Closes-Bug: #1835400
131 lines
5.1 KiB
Python
131 lines
5.1 KiB
Python
# Copyright 2015 Red Hat, Inc
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import fixtures
|
|
import mock
|
|
|
|
from nova import exception
|
|
from nova import objects
|
|
from nova import test
|
|
from nova.tests.unit.virt import fakelibosinfo
|
|
from nova.virt import osinfo
|
|
|
|
|
|
class LibvirtOsInfoTest(test.NoDBTestCase):
|
|
|
|
def setUp(self):
|
|
super(LibvirtOsInfoTest, self).setUp()
|
|
image_meta = {'properties':
|
|
{'os_distro': 'fedora22',
|
|
'hw_disk_bus': 'ide',
|
|
'hw_vif_model': 'rtl8139'}
|
|
}
|
|
self.img_meta = objects.ImageMeta.from_dict(image_meta)
|
|
self.useFixture(fixtures.MonkeyPatch(
|
|
'nova.virt.osinfo.libosinfo',
|
|
fakelibosinfo))
|
|
self.useFixture(fixtures.MonkeyPatch(
|
|
'nova.virt.osinfo._OsInfoDatabase._instance',
|
|
None))
|
|
|
|
def test_get_os(self):
|
|
os_info_db = osinfo._OsInfoDatabase.get_instance()
|
|
os_name = os_info_db.get_os('fedora22').get_name()
|
|
self.assertEqual('Fedora 22', os_name)
|
|
|
|
def test_get_os_fails(self):
|
|
os_info_db = osinfo._OsInfoDatabase.get_instance()
|
|
self.assertRaises(exception.OsInfoNotFound,
|
|
os_info_db.get_os,
|
|
'test33')
|
|
|
|
def test_module_load_failed(self):
|
|
self.useFixture(fixtures.MonkeyPatch(
|
|
'nova.virt.osinfo.libosinfo',
|
|
None))
|
|
with test.nested(
|
|
mock.patch.object(osinfo.importutils, 'import_module',
|
|
side_effect=ImportError('gi.repository.Libosinfo')),
|
|
mock.patch.object(osinfo.LOG, 'info')) as (mock_import, mock_log):
|
|
|
|
os_info_db = osinfo._OsInfoDatabase.get_instance()
|
|
self.assertIsNone(os_info_db.get_os('fedora22'))
|
|
|
|
os_info_db = osinfo._OsInfoDatabase.get_instance()
|
|
self.assertIsNone(os_info_db.get_os('fedora19'))
|
|
self.assertEqual(1, mock_log.call_count)
|
|
|
|
def test_hardware_properties_from_osinfo_fedora19(self):
|
|
"""Verifies that HardwareProperties attributes are being set
|
|
from libosinfo.
|
|
"""
|
|
img_meta = {'properties':
|
|
{'os_distro': 'fedora19'}
|
|
}
|
|
|
|
img_meta = objects.ImageMeta.from_dict(img_meta)
|
|
osinfo_obj = osinfo.HardwareProperties(img_meta)
|
|
self.assertEqual('rtl8139', osinfo_obj.network_model)
|
|
self.assertEqual('ide', osinfo_obj.disk_model)
|
|
|
|
def test_hardware_properties_from_osinfo_fedora22(self):
|
|
"""Verifies that HardwareProperties attributes are being set
|
|
from libosinfo.
|
|
"""
|
|
img_meta = {'properties':
|
|
{'os_distro': 'fedora22'}
|
|
}
|
|
|
|
img_meta = objects.ImageMeta.from_dict(img_meta)
|
|
osinfo_obj = osinfo.HardwareProperties(img_meta)
|
|
self.assertEqual('virtio', osinfo_obj.network_model)
|
|
self.assertEqual('virtio', osinfo_obj.disk_model)
|
|
|
|
def test_hardware_properties_from_osinfo_fedora23(self):
|
|
"""Verifies that HardwareProperties attributes are being set
|
|
from libosinfo.
|
|
"""
|
|
img_meta = {'properties':
|
|
{'os_distro': 'fedora23'}
|
|
}
|
|
|
|
img_meta = objects.ImageMeta.from_dict(img_meta)
|
|
osinfo_obj = osinfo.HardwareProperties(img_meta)
|
|
self.assertEqual('virtio', osinfo_obj.network_model)
|
|
self.assertEqual('virtio', osinfo_obj.disk_model)
|
|
|
|
def test_hardware_properties_from_meta(self):
|
|
"""Verifies that HardwareProperties attributes are being set
|
|
from image properties.
|
|
"""
|
|
with mock.patch.object(osinfo._OsInfoDatabase, 'get_instance'):
|
|
osinfo_obj = osinfo.HardwareProperties(self.img_meta)
|
|
self.assertEqual('rtl8139', osinfo_obj.network_model)
|
|
self.assertEqual('ide', osinfo_obj.disk_model)
|
|
|
|
@mock.patch('nova.virt.osinfo.LOG.warning')
|
|
def test_hardware_properties_from_meta_no_os_distro(self, mock_warn):
|
|
"""Verifies that HardwareProperties attributes are not being set
|
|
from image properties if there is no os_distro provided.
|
|
"""
|
|
img_meta = {'properties': {'hw_watchdog_action': 'disabled'}}
|
|
img_meta = objects.ImageMeta.from_dict(img_meta)
|
|
with mock.patch.object(osinfo._OsInfoDatabase,
|
|
'get_instance') as get_instance:
|
|
osinfo_obj = osinfo.HardwareProperties(img_meta)
|
|
self.assertIsNone(osinfo_obj.network_model)
|
|
self.assertIsNone(osinfo_obj.disk_model)
|
|
get_instance.assert_not_called()
|
|
mock_warn.assert_not_called()
|