shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-02 09:47:16 +03:00
Code Issues Projects Releases Wiki Activity

virtinst/osdict: remove internal cache of OS objects

Browse Source 
Now that we've removed all internal aliases, there is no longer any
reason to keep a cache of OS objects internally. We can directly
query the DB when we need it.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-11-26 18:43:54 +00:00 committed by Cole Robinson
parent 6b584b183f
commit 9423f6680a
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
virtinst/osdict.py
View File

@ -128,7 +128,6 @@ class _OSDB(object):
def __init__(self):
self.__os_loader = None
self.__os_generic = None
self.__all_variants = None
#################
# Internal APIs #
@ -157,38 +156,32 @@ class _OSDB(object):
def _os_db(self):
return self._os_loader.get_db()
@property
def _all_variants(self):
if not self.__all_variants:
allvariants = {}
oslist = self._os_db.get_os_list()
for o in _OsinfoIter(oslist):
osi = _OsVariant(o)
for name in osi.get_short_ids():
allvariants[name] = osi
allvariants["generic"] = self._os_generic
self.__all_variants = allvariants
return self.__all_variants
###############
# Public APIs #
###############
def lookup_os_by_full_id(self, full_id, raise_error=False):
for osobj in self._all_variants.values():
if osobj.full_id == full_id:
return osobj
if raise_error:
raise ValueError(_("Unknown libosinfo ID '%s'") % full_id)
osobj = self._os_db.get_os(full_id)
if osobj is None:
if raise_error:
raise ValueError(_("Unknown libosinfo ID '%s'") % full_id)
return None
return _OsVariant(osobj)
def lookup_os(self, key, raise_error=False):
ret = self._all_variants.get(key)
if ret is None and raise_error:
raise ValueError(_("Unknown OS name '%s'. "
"See `osinfo-query os` for valid values.") % key)
return ret
if key == self._os_generic.name:
return self._os_generic
flt = Libosinfo.Filter()
flt.add_constraint(Libosinfo.PRODUCT_PROP_SHORT_ID,
key)
oslist = self._os_db.get_os_list().new_filtered(flt).get_elements()
if len(oslist) == 0:
if raise_error:
raise ValueError(_("Unknown OS name '%s'. "
"See `osinfo-query os` for valid values.") % key)
return None
return _OsVariant(oslist[0])
def guess_os_by_iso(self, location):
try:
@ -234,8 +227,11 @@ class _OSDB(object):
"""
sortmap = {}
for osobj in self._all_variants.values():
oslist = self._os_db.get_os_list().get_elements()
for osent in oslist:
osobj = _OsVariant(osent)
sortmap[osobj.name] = osobj
sortmap[self._os_generic.name] = self._os_generic
return _sort(sortmap)