osdict: Allow inheiriting from another OS entry

This commit is contained in:
Cole Robinson 2013-08-10 14:44:20 -04:00
parent 3ef81d5d1e
commit f1bf4c7188

View File

@ -81,7 +81,7 @@ DEFAULTS = {
INPUT : {
"type" : [
(HV_ALL, "mouse")
],
],
"bus" : [
(HV_ALL, "ps2")
],
@ -199,7 +199,6 @@ def parse_key_entry(conn, hv_type, key_entry, defaults):
def lookup_osdict_key(conn, hv_type, os_type, var, key):
defaults = DEFAULTS[key]
dictval = defaults
if os_type:
@ -212,7 +211,6 @@ def lookup_osdict_key(conn, hv_type, os_type, var, key):
def lookup_device_param(conn, hv_type, os_type, var, device_key, param):
os_devs = lookup_osdict_key(conn, hv_type, os_type, var, "devices")
defaults = DEFAULTS["devices"]
@ -227,34 +225,50 @@ def lookup_device_param(conn, hv_type, os_type, var, device_key, param):
(device_key, param)))
_SENTINEL = -1234
OS_TYPES = {}
_allvariants = {}
def _add_type(*args, **kwargs):
kwargs["is_type"] = True
_t = _OSVariant(*args, **kwargs)
OS_TYPES[_t.name] = _t.to_dict()
OS_TYPES[_t.name]["variants"] = {}
_allvariants[_t.name] = _t
return _t
class _OSVariant(object):
def __init__(self, name, label,
is_type=False, distro=None, sortby=None,
cont=False, supported=False,
devices=None, acpi=None, apic=None, clock=None):
def __init__(self, name, label, is_type=False, sortby=None,
parent=_SENTINEL,
distro=_SENTINEL, cont=_SENTINEL, supported=_SENTINEL,
devices=_SENTINEL, acpi=_SENTINEL,
apic=_SENTINEL, clock=_SENTINEL):
if parent == _SENTINEL:
raise RuntimeError("Must specify explicit parent")
elif parent:
parent = _allvariants[parent]
def _get_default(name, val, default):
if val == _SENTINEL:
if parent:
return getattr(parent, name)
return default
return val
self.name = name.lower()
self.label = label
self.is_type = bool(is_type)
self.distro = distro
self.sortby = sortby
self.supported = bool(supported)
self.cont = cont
self.devices = devices
self.acpi = acpi
self.apic = apic
self.clock = clock
self.distro = _get_default("distro", distro, None)
self.supported = bool(_get_default("supported", supported, False))
self.cont = bool(_get_default("cont", cont, False))
self.devices = _get_default("devices", devices, None)
self.acpi = _get_default("acpi", acpi, None)
self.apic = _get_default("apic", apic, None)
self.clock = _get_default("clock", clock, None)
def to_dict(self):
ret = {}
@ -273,117 +287,111 @@ class _OSVariant(object):
def add(self, *args, **kwargs):
v = _OSVariant(*args, **kwargs)
OS_TYPES[self.name]["variants"][v.name] = v.to_dict()
_allvariants[v.name] = v
t = _add_type("linux", "Linux", parent=None)
t.add("rhel2.1", "Red Hat Enterprise Linux 2.1", distro="rhel", parent="linux")
t.add("rhel3", "Red Hat Enterprise Linux 3", parent="rhel2.1")
t.add("rhel4", "Red Hat Enterprise Linux 4", supported=True, parent="rhel2.1")
t.add("rhel5", "Red Hat Enterprise Linux 5", supported=False, parent="rhel4")
t.add("rhel5.4", "Red Hat Enterprise Linux 5.4 or later", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="rhel5")
t.add("rhel6", "Red Hat Enterprise Linux 6", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET}, parent="rhel5.4")
t.add("rhel7", "Red Hat Enterprise Linux 7", supported=False, parent="rhel6")
t = _add_type("linux", "Linux")
t.add("rhel2.1", label="Red Hat Enterprise Linux 2.1", distro="rhel")
t.add("rhel3", label="Red Hat Enterprise Linux 3", distro="rhel")
t.add("rhel4", label="Red Hat Enterprise Linux 4", distro="rhel", supported=True)
t.add("rhel5", label="Red Hat Enterprise Linux 5", distro="rhel")
t.add("rhel5.4", label="Red Hat Enterprise Linux 5.4 or later", distro="rhel", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("rhel6", label="Red Hat Enterprise Linux 6", distro="rhel", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("rhel7", label="Red Hat Enterprise Linux 7", distro="rhel", supported=False, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora5", sortby="fedora05", label="Fedora Core 5", distro="fedora")
t.add("fedora6", sortby="fedora06", label="Fedora Core 6", distro="fedora")
t.add("fedora7", sortby="fedora07", label="Fedora 7", distro="fedora")
t.add("fedora8", sortby="fedora08", label="Fedora 8", distro="fedora")
t.add("fedora5", "Fedora Core 5", sortby="fedora05", distro="fedora", parent="linux")
t.add("fedora6", "Fedora Core 6", sortby="fedora06", parent="fedora5")
t.add("fedora7", "Fedora 7", sortby="fedora07", parent="fedora6")
t.add("fedora8", "Fedora 8", sortby="fedora08", parent="fedora7")
# Apparently F9 has selinux errors when installing with virtio:
# https: //bugzilla.redhat.com/show_bug.cgi?id=470386
t.add("fedora9", sortby="fedora09", label="Fedora 9", distro="fedora", devices={NET: VIRTIO_NET})
t.add("fedora10", label="Fedora 10", distro="fedora", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("fedora11", label="Fedora 11", distro="fedora", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora12", label="Fedora 12", distro="fedora", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora13", label="Fedora 13", distro="fedora", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora14", label="Fedora 14", distro="fedora", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora15", label="Fedora 15", distro="fedora", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora16", label="Fedora 16", distro="fedora", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora17", label="Fedora 17", distro="fedora", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora18", label="Fedora 18", distro="fedora", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora19", label="Fedora 19", distro="fedora", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("fedora9", "Fedora 9", sortby="fedora09", devices={NET: VIRTIO_NET}, parent="fedora8")
t.add("fedora10", "Fedora 10", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="fedora9")
t.add("fedora11", "Fedora 11", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET}, parent="fedora10")
t.add("fedora12", "Fedora 12", parent="fedora11")
t.add("fedora13", "Fedora 13", parent="fedora12")
t.add("fedora14", "Fedora 14", parent="fedora13")
t.add("fedora15", "Fedora 15", parent="fedora14")
t.add("fedora16", "Fedora 16", parent="fedora15")
t.add("fedora17", "Fedora 17", supported=True, parent="fedora16")
t.add("fedora18", "Fedora 18", parent="fedora17")
t.add("fedora19", "Fedora 19", parent="fedora18")
t.add("opensuse11", label="openSuse 11", distro="suse", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("opensuse12", label="openSuse 12", distro="suse", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("opensuse11", "openSuse 11", distro="suse", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="linux")
t.add("opensuse12", "openSuse 12", parent="opensuse11")
t.add("sles10", label="Suse Linux Enterprise Server", distro="suse", supported=True)
t.add("sles11", label="Suse Linux Enterprise Server 11", distro="suse", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("sles10", "Suse Linux Enterprise Server", distro="suse", supported=True, parent="linux")
t.add("sles11", "Suse Linux Enterprise Server 11", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="sles10")
t.add("mandriva2009", label="Mandriva Linux 2009 and earlier", distro="mandriva")
t.add("mandriva2010", label="Mandriva Linux 2010 and later", distro="mandriva", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("mandriva2009", "Mandriva Linux 2009 and earlier", distro="mandriva", parent="linux")
t.add("mandriva2010", "Mandriva Linux 2010 and later", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="mandriva2009")
t.add("mes5", label="Mandriva Enterprise Server 5.0", distro="mandriva")
t.add("mes5.1", label="Mandriva Enterprise Server 5.1 and later", distro="mandriva", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("mes5", "Mandriva Enterprise Server 5.0", distro="mandriva", parent="linux")
t.add("mes5.1", "Mandriva Enterprise Server 5.1 and later", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="mes5")
t.add("mageia1", label="Mageia 1 and later", distro="mageia", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("mageia1", "Mageia 1 and later", distro="mageia", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET}, parent="linux")
t.add("altlinux", label="ALT Linux", distro="altlinux", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("altlinux", "ALT Linux", distro="altlinux", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET}, parent="linux")
t.add("debianetch", label="Debian Etch", distro="debian", sortby="debian4")
t.add("debianlenny", label="Debian Lenny", distro="debian", sortby="debian5", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("debiansqueeze", label="Debian Squeeze", distro="debian", sortby="debian6", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("debianwheezy", label="Debian Wheezy", distro="debian", sortby="debian7", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET})
t.add("debianetch", "Debian Etch", distro="debian", sortby="debian4", parent="linux")
t.add("debianlenny", "Debian Lenny", sortby="debian5", supported=True, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="debianetch")
t.add("debiansqueeze", "Debian Squeeze", sortby="debian6", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, INPUT: USB_TABLET}, parent="debianlenny")
t.add("debianwheezy", "Debian Wheezy", sortby="debian7", parent="debiansqueeze")
t.add("ubuntuhardy", label="Ubuntu 8.04 LTS (Hardy Heron)", distro="ubuntu", devices={NET: VIRTIO_NET})
t.add("ubuntuintrepid", label="Ubuntu 8.10 (Intrepid Ibex)", distro="ubuntu", devices={NET: VIRTIO_NET})
t.add("ubuntujaunty", label="Ubuntu 9.04 (Jaunty Jackalope)", distro="ubuntu", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("ubuntukarmic", label="Ubuntu 9.10 (Karmic Koala)", distro="ubuntu", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("ubuntulucid", label="Ubuntu 10.04 LTS (Lucid Lynx)", distro="ubuntu", supported=True,
devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("ubuntumaverick", label="Ubuntu 10.10 (Maverick Meerkat)", distro="ubuntu", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("ubuntunatty", label="Ubuntu 11.04 (Natty Narwhal)", distro="ubuntu", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("ubuntuoneiric", label="Ubuntu 11.10 (Oneiric Ocelot)", distro="ubuntu", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("ubuntuprecise", label="Ubuntu 12.04 LTS (Precise Pangolin)", distro="ubuntu", supported=True,
devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("ubuntuquantal", label="Ubuntu 12.10 (Quantal Quetzal)", distro="ubuntu", supported=True,
devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("ubunturaring", label="Ubuntu 13.04 (Raring Ringtail)", distro="ubuntu", supported=True,
devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, VIDEO: VMVGA_VIDEO})
t.add("ubuntusaucy", label="Ubuntu 13.10 (Saucy Salamander)", distro="ubuntu", supported=True,
devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, VIDEO: VMVGA_VIDEO})
t.add("ubuntuhardy", "Ubuntu 8.04 LTS (Hardy Heron)", distro="ubuntu", devices={NET: VIRTIO_NET}, parent="linux")
t.add("ubuntuintrepid", "Ubuntu 8.10 (Intrepid Ibex)", parent="ubuntuhardy")
t.add("ubuntujaunty", "Ubuntu 9.04 (Jaunty Jackalope)", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="ubuntuintrepid")
t.add("ubuntukarmic", "Ubuntu 9.10 (Karmic Koala)", parent="ubuntujaunty")
t.add("ubuntulucid", "Ubuntu 10.04 LTS (Lucid Lynx)", supported=True, parent="ubuntukarmic")
t.add("ubuntumaverick", "Ubuntu 10.10 (Maverick Meerkat)", supported=False, parent="ubuntulucid")
t.add("ubuntunatty", "Ubuntu 11.04 (Natty Narwhal)", parent="ubuntumaverick")
t.add("ubuntuoneiric", "Ubuntu 11.10 (Oneiric Ocelot)", parent="ubuntunatty")
t.add("ubuntuprecise", "Ubuntu 12.04 LTS (Precise Pangolin)", supported=True, parent="ubuntuoneiric")
t.add("ubuntuquantal", "Ubuntu 12.10 (Quantal Quetzal)", parent="ubuntuprecise")
t.add("ubunturaring", "Ubuntu 13.04 (Raring Ringtail)", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET, VIDEO: VMVGA_VIDEO}, parent="ubuntuquantal")
t.add("ubuntusaucy", "Ubuntu 13.10 (Saucy Salamander)", parent="ubunturaring")
t.add("generic24", label="Generic 2.4.x kernel")
t.add("generic26", label="Generic 2.6.x kernel")
t.add("virtio26", sortby="genericvirtio26", label="Generic 2.6.25 or later kernel with virtio", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("generic24", "Generic 2.4.x kernel", parent="linux")
t.add("generic26", "Generic 2.6.x kernel", parent="generic24")
t.add("virtio26", "Generic 2.6.25 or later kernel with virtio", sortby="genericvirtio26", devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="generic26")
t = _add_type("windows", "Windows", clock="localtime", cont=True, devices={INPUT: USB_TABLET, VIDEO: VGA_VIDEO})
t.add("winxp", label="Microsoft Windows XP", sortby="mswin5", distro="win", supported=True, acpi=[(support.SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI, False)], apic=[(support.SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI, False)])
t.add("winxp64", label="Microsoft Windows XP (x86_64)", supported=True, sortby="mswin564", distro="win")
t.add("win2k", label="Microsoft Windows 2000", sortby="mswin4", distro="win", acpi=[(support.SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI, False)], apic=[(support.SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI, False)],
)
t.add("win2k3", label="Microsoft Windows Server 2003", supported=True, sortby="mswinserv2003", distro="winserv")
t.add("win2k8", label="Microsoft Windows Server 2008", supported=True, sortby="mswinserv2008", distro="winserv")
t.add("vista", label="Microsoft Windows Vista", supported=True, sortby="mswin6", distro="win")
t.add("win7", label="Microsoft Windows 7", supported=True, sortby="mswin7", distro="win")
t = _add_type("windows", "Windows", clock="localtime", cont=True, devices={INPUT: USB_TABLET, VIDEO: VGA_VIDEO}, parent=None)
t.add("win2k", "Microsoft Windows 2000", sortby="mswin4", acpi=[(support.SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI, False)], apic=[(support.SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI, False)], parent="windows")
t.add("winxp", "Microsoft Windows XP", sortby="mswin5", supported=True, acpi=[(support.SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI, False)], apic=[(support.SUPPORT_CONN_HV_SKIP_DEFAULT_ACPI, False)], parent="windows")
t.add("winxp64", "Microsoft Windows XP (x86_64)", supported=True, sortby="mswin564", parent="windows")
t.add("win2k3", "Microsoft Windows Server 2003", supported=True, sortby="mswinserv2003", parent="windows")
t.add("win2k8", "Microsoft Windows Server 2008", supported=True, sortby="mswinserv2008", parent="windows")
t.add("vista", "Microsoft Windows Vista", supported=True, sortby="mswin6", parent="windows")
t.add("win7", "Microsoft Windows 7", supported=True, sortby="mswin7", parent="windows")
t = _add_type("solaris", label="Solaris", clock="localtime")
t.add("solaris9", label="Sun Solaris 9")
t.add("solaris10", label="Sun Solaris 10", devices={INPUT: USB_TABLET})
t.add("opensolaris", label="Sun OpenSolaris", devices={INPUT: USB_TABLET})
t = _add_type("solaris", "Solaris", clock="localtime", parent=None)
t.add("solaris9", "Sun Solaris 9", parent="solaris")
t.add("solaris10", "Sun Solaris 10", devices={INPUT: USB_TABLET}, parent="solaris")
t.add("opensolaris", "Sun OpenSolaris", devices={INPUT: USB_TABLET}, parent="solaris")
t = _add_type("unix", label="UNIX")
t = _add_type("unix", "UNIX", parent=None)
# http: //www.nabble.com/Re%3A-Qemu%3A-bridging-on-FreeBSD-7.0-STABLE-p15919603.html
t.add("freebsd6", label="FreeBSD 6.x", devices={NET: {"model": [(HV_ALL, "ne2k_pci")]}})
t.add("freebsd7", label="FreeBSD 7.x", devices={NET: {"model": [(HV_ALL, "ne2k_pci")]}})
t.add("freebsd8", label="FreeBSD 8.x", supported=True, devices={NET: {"model": [(HV_ALL, "e1000")]}})
t.add("freebsd9", label="FreeBSD 9.x", supported=True, devices={NET: {"model": [(HV_ALL, "e1000")]}})
t.add("freebsd10", label="FreeBSD 10.x", supported=False, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET})
t.add("freebsd6", "FreeBSD 6.x", devices={NET: {"model": [(HV_ALL, "ne2k_pci")]}}, parent="unix")
t.add("freebsd7", "FreeBSD 7.x", parent="freebsd6")
t.add("freebsd8", "FreeBSD 8.x", supported=True, devices={NET: {"model": [(HV_ALL, "e1000")]}}, parent="freebsd7")
t.add("freebsd9", "FreeBSD 9.x", parent="freebsd8")
t.add("freebsd10", "FreeBSD 10.x", supported=False, devices={DISK: VIRTIO_DISK, NET: VIRTIO_NET}, parent="freebsd9")
# http: //calamari.reverse-dns.net: 980/cgi-bin/moin.cgi/OpenbsdOnQemu
# https: //www.redhat.com/archives/et-mgmt-tools/2008-June/msg00018.html
t.add("openbsd4", label="OpenBSD 4.x", devices={NET: {"model": [(HV_ALL, "pcnet")]}})
t.add("openbsd4", "OpenBSD 4.x", devices={NET: {"model": [(HV_ALL, "pcnet")]}}, parent="unix")
t = _add_type("other", label="Other")
t.add("msdos", label="MS-DOS", acpi=False, apic=False)
t.add("netware4", label="Novell Netware 4")
t.add("netware5", label="Novell Netware 5")
t.add("netware6", label="Novell Netware 6")
t.add("generic", supported=True, label="Generic")
t = _add_type("other", "Other", parent=None)
t.add("msdos", "MS-DOS", acpi=False, apic=False, parent="other")
t.add("netware4", "Novell Netware 4", parent="other")
t.add("netware5", "Novell Netware 5", parent="other")
t.add("netware6", "Novell Netware 6", parent="other")
t.add("generic", "Generic", supported=True, parent="other")