NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

virtinst: s/_XML_ROOT_NAME/XML_NAME/g

Browse Source 
No reason for it to be privatized, could be useful in some cases
This commit is contained in:
Cole Robinson 2018-03-21 10:53:34 -04:00
parent 3e176f2aa4
commit 7fb1ddbc18
43 changed files with 106 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
virtinst/capabilities.py
View File

@ -42,17 +42,17 @@ class _CapsCPU(DomainCpu):
###########################
class _CapsTopologyCPU(XMLBuilder):
_XML_ROOT_NAME = "cpu"
XML_NAME = "cpu"
id = XMLProperty("./@id")
class _TopologyCell(XMLBuilder):
_XML_ROOT_NAME = "cell"
XML_NAME = "cell"
cpus = XMLChildProperty(_CapsTopologyCPU, relative_xpath="./cpus")
class _CapsTopology(XMLBuilder):
_XML_ROOT_NAME = "topology"
XML_NAME = "topology"
cells = XMLChildProperty(_TopologyCell, relative_xpath="./cells")
@ -61,19 +61,19 @@ class _CapsTopology(XMLBuilder):
######################################
class _CapsSecmodelBaselabel(XMLBuilder):
_XML_ROOT_NAME = "baselabel"
XML_NAME = "baselabel"
type = XMLProperty("./@type")
content = XMLProperty(".")
class _CapsSecmodel(XMLBuilder):
_XML_ROOT_NAME = "secmodel"
XML_NAME = "secmodel"
model = XMLProperty("./model")
baselabels = XMLChildProperty(_CapsSecmodelBaselabel)
class _CapsHost(XMLBuilder):
_XML_ROOT_NAME = "host"
XML_NAME = "host"
secmodels = XMLChildProperty(_CapsSecmodel)
cpu = XMLChildProperty(_CapsCPU, is_single=True)
topology = XMLChildProperty(_CapsTopology, is_single=True)
@ -84,20 +84,20 @@ class _CapsHost(XMLBuilder):
################################
class _CapsMachine(XMLBuilder):
_XML_ROOT_NAME = "machine"
XML_NAME = "machine"
name = XMLProperty(".")
canonical = XMLProperty("./@canonical")
class _CapsDomain(XMLBuilder):
_XML_ROOT_NAME = "domain"
XML_NAME = "domain"
hypervisor_type = XMLProperty("./@type")
emulator = XMLProperty("./emulator")
machines = XMLChildProperty(_CapsMachine)
class _CapsGuestFeatures(XMLBuilder):
_XML_ROOT_NAME = "features"
XML_NAME = "features"
pae = XMLProperty("./pae", is_bool=True)
acpi = XMLProperty("./acpi/@default", is_onoff=True)
@ -105,7 +105,7 @@ class _CapsGuestFeatures(XMLBuilder):
class _CapsGuest(XMLBuilder):
_XML_ROOT_NAME = "guest"
XML_NAME = "guest"
os_type = XMLProperty("./os_type")
arch = XMLProperty("./arch/@name")
@ -237,7 +237,7 @@ class Capabilities(XMLBuilder):
XMLBuilder.__init__(self, *args, **kwargs)
self._cpu_models_cache = {}
_XML_ROOT_NAME = "capabilities"
XML_NAME = "capabilities"
host = XMLChildProperty(_CapsHost, is_single=True)
guests = XMLChildProperty(_CapsGuest)

8
virtinst/devices/char.py
View File

@ -266,19 +266,19 @@ class _DeviceChar(Device):
class DeviceConsole(_DeviceChar):
_XML_ROOT_NAME = "console"
XML_NAME = "console"
TYPES = [_DeviceChar.TYPE_PTY]
class DeviceSerial(_DeviceChar):
_XML_ROOT_NAME = "serial"
XML_NAME = "serial"
class DeviceParallel(_DeviceChar):
_XML_ROOT_NAME = "parallel"
XML_NAME = "parallel"
class DeviceChannel(_DeviceChar):
_XML_ROOT_NAME = "channel"
XML_NAME = "channel"
TYPES = (_DeviceChar._TYPES_FOR_CHANNEL +
_DeviceChar._TYPES_FOR_ALL)

2
virtinst/devices/controller.py
View File

@ -10,7 +10,7 @@ from ..xmlbuilder import XMLProperty
class DeviceController(Device):
_XML_ROOT_NAME = "controller"
XML_NAME = "controller"
TYPE_IDE = "ide"
TYPE_FDC = "fdc"

8
virtinst/devices/device.py
View File

@ -11,12 +11,12 @@ from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
class DeviceAlias(XMLBuilder):
_XML_ROOT_NAME = "alias"
XML_NAME = "alias"
name = XMLProperty("./@name")
class DeviceBoot(XMLBuilder):
_XML_ROOT_NAME = "boot"
XML_NAME = "boot"
order = XMLProperty("./@order", is_int=True)
@ -39,7 +39,7 @@ class DeviceAddress(XMLBuilder):
ADDRESS_TYPE_VIRTIO_SERIAL, ADDRESS_TYPE_CCID,
ADDRESS_TYPE_SPAPR_VIO]
_XML_ROOT_NAME = "address"
XML_NAME = "address"
_XML_PROP_ORDER = ["type", "domain", "controller", "bus", "slot",
"function", "target", "unit", "multifunction"]
@ -118,7 +118,7 @@ class Device(XMLBuilder):
@property
def DEVICE_TYPE(self):
return self._XML_ROOT_NAME
return self.XML_NAME
def setup(self, meter=None):
"""

6
virtinst/devices/disk.py
View File

@ -81,7 +81,7 @@ def _is_dir_searchable(uid, username, path):
class _Host(XMLBuilder):
_XML_PROP_ORDER = ["name", "port"]
_XML_ROOT_NAME = "host"
XML_NAME = "host"
name = XMLProperty("./@name")
port = XMLProperty("./@port", is_int=True)
@ -92,14 +92,14 @@ class _DiskSeclabel(XMLBuilder):
This is for disk source <seclabel>. It's similar to a domain
<seclabel> but has fewer options
"""
_XML_ROOT_NAME = "seclabel"
XML_NAME = "seclabel"
model = XMLProperty("./@model")
relabel = XMLProperty("./@relabel", is_yesno=True)
label = XMLProperty("./label")
class DeviceDisk(Device):
_XML_ROOT_NAME = "disk"
XML_NAME = "disk"
DRIVER_NAME_PHY = "phy"
DRIVER_NAME_QEMU = "qemu"

2
virtinst/devices/filesystem.py
View File

@ -12,7 +12,7 @@ from ..xmlbuilder import XMLProperty
class DeviceFilesystem(Device):
_XML_ROOT_NAME = "filesystem"
XML_NAME = "filesystem"
TYPE_MOUNT = "mount"
TYPE_TEMPLATE = "template"

4
virtinst/devices/graphics.py
View File

@ -28,7 +28,7 @@ def _validate_port(name, val):
class _GraphicsListen(XMLBuilder):
_XML_ROOT_NAME = "listen"
XML_NAME = "listen"
type = XMLProperty("./@type")
address = XMLProperty("./@address")
@ -37,7 +37,7 @@ class _GraphicsListen(XMLBuilder):
class DeviceGraphics(Device):
_XML_ROOT_NAME = "graphics"
XML_NAME = "graphics"
TYPE_SDL = "sdl"
TYPE_VNC = "vnc"

2
virtinst/devices/hostdev.py
View File

@ -11,7 +11,7 @@ from ..xmlbuilder import XMLProperty
class DeviceHostdev(Device):
_XML_ROOT_NAME = "hostdev"
XML_NAME = "hostdev"
def set_from_nodedev(self, nodedev):
"""

2
virtinst/devices/input.py
View File

@ -10,7 +10,7 @@ from ..xmlbuilder import XMLProperty
class DeviceInput(Device):
_XML_ROOT_NAME = "input"
XML_NAME = "input"
TYPE_MOUSE = "mouse"
TYPE_TABLET = "tablet"

4
virtinst/devices/interface.py
View File

@ -101,7 +101,7 @@ def _default_network(conn):
class _VirtualPort(XMLBuilder):
_XML_ROOT_NAME = "virtualport"
XML_NAME = "virtualport"
type = XMLProperty("./@type")
managerid = XMLProperty("./parameters/@managerid", is_int=True)
@ -113,7 +113,7 @@ class _VirtualPort(XMLBuilder):
class DeviceInterface(Device):
_XML_ROOT_NAME = "interface"
XML_NAME = "interface"
TYPE_BRIDGE = "bridge"
TYPE_VIRTUAL = "network"

2
virtinst/devices/memballoon.py
View File

@ -11,7 +11,7 @@ from ..xmlbuilder import XMLProperty
class DeviceMemballoon(Device):
_XML_ROOT_NAME = "memballoon"
XML_NAME = "memballoon"
MODEL_DEFAULT = "default"
MODELS = ["virtio", "xen", "none"]

6
virtinst/devices/memory.py
View File

@ -10,7 +10,7 @@ from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
class _DeviceMemoryTarget(XMLBuilder):
_XML_ROOT_NAME = "target"
XML_NAME = "target"
size = XMLProperty("./size", is_int=True)
node = XMLProperty("./node", is_int=True)
@ -18,7 +18,7 @@ class _DeviceMemoryTarget(XMLBuilder):
class _DeviceMemorySource(XMLBuilder):
_XML_ROOT_NAME = "source"
XML_NAME = "source"
pagesize = XMLProperty("./pagesize", is_int=True)
nodemask = XMLProperty("./nodemask")
@ -26,7 +26,7 @@ class _DeviceMemorySource(XMLBuilder):
class DeviceMemory(Device):
_XML_ROOT_NAME = "memory"
XML_NAME = "memory"
MODEL_DIMM = "dimm"
MODEL_NVDIMM = "nvdimm"

2
virtinst/devices/panic.py
View File

@ -10,7 +10,7 @@ from ..xmlbuilder import XMLProperty
class DevicePanic(Device):
_XML_ROOT_NAME = "panic"
XML_NAME = "panic"
MODEL_DEFAULT = "default"
MODEL_ISA = "isa"

2
virtinst/devices/redirdev.py
View File

@ -11,7 +11,7 @@ from ..xmlbuilder import XMLProperty
class DeviceRedirdev(Device):
_XML_ROOT_NAME = "redirdev"
XML_NAME = "redirdev"
BUS_DEFAULT = "default"
BUSES = ["usb"]

2
virtinst/devices/rng.py
View File

@ -10,7 +10,7 @@ from ..xmlbuilder import XMLProperty
class DeviceRng(Device):
_XML_ROOT_NAME = "rng"
XML_NAME = "rng"
TYPE_RANDOM = "random"
TYPE_EGD = "egd"

2
virtinst/devices/smartcard.py
View File

@ -11,7 +11,7 @@ from ..xmlbuilder import XMLProperty
class DeviceSmartcard(Device):
_XML_ROOT_NAME = "smartcard"
XML_NAME = "smartcard"
# Default models list
MODE_DEFAULT = "default"

2
virtinst/devices/sound.py
View File

@ -10,7 +10,7 @@ from ..xmlbuilder import XMLProperty
class DeviceSound(Device):
_XML_ROOT_NAME = "sound"
XML_NAME = "sound"
MODEL_DEFAULT = "default"
MODELS = ["es1370", "sb16", "pcspk", "ac97", "ich6", "ich9"]

2
virtinst/devices/tpm.py
View File

@ -14,7 +14,7 @@ from ..xmlbuilder import XMLProperty
class DeviceTpm(Device):
_XML_ROOT_NAME = "tpm"
XML_NAME = "tpm"
TYPE_PASSTHROUGH = "passthrough"
TYPE_DEFAULT = "default"

2
virtinst/devices/video.py
View File

@ -10,7 +10,7 @@ from ..xmlbuilder import XMLProperty
class DeviceVideo(Device):
_XML_ROOT_NAME = "video"
XML_NAME = "video"
# Default models list
MODEL_DEFAULT = "default"

2
virtinst/devices/watchdog.py
View File

@ -10,7 +10,7 @@ from ..xmlbuilder import XMLProperty
class DeviceWatchdog(Device):
_XML_ROOT_NAME = "watchdog"
XML_NAME = "watchdog"
MODEL_I6300 = "i6300esb"
MODEL_IB700 = "ib700"

2
virtinst/domain/blkiotune.py
View File

@ -13,7 +13,7 @@ class DomainBlkiotune(XMLBuilder):
Class for generating <blkiotune> XML
"""
_XML_ROOT_NAME = "blkiotune"
XML_NAME = "blkiotune"
_XML_PROP_ORDER = ["weight", "device_path", "device_weight"]
weight = XMLProperty("./weight", is_int=True)

4
virtinst/domain/clock.py
View File

@ -9,7 +9,7 @@ from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
class _ClockTimer(XMLBuilder):
_XML_ROOT_NAME = "timer"
XML_NAME = "timer"
name = XMLProperty("./@name")
present = XMLProperty("./@present", is_yesno=True)
@ -17,7 +17,7 @@ class _ClockTimer(XMLBuilder):
class DomainClock(XMLBuilder):
_XML_ROOT_NAME = "clock"
XML_NAME = "clock"
TIMER_NAMES = ["platform", "pit", "rtc", "hpet", "tsc", "kvmclock",
"hypervclock"]

10
virtinst/domain/cpu.py
View File

@ -12,7 +12,7 @@ class _CPUCellSibling(XMLBuilder):
"""
Class for generating <distances> <sibling> nodes
"""
_XML_ROOT_NAME = "sibling"
XML_NAME = "sibling"
_XML_PROP_ORDER = ["id", "value"]
id = XMLProperty("./@id", is_int=True)
@ -23,7 +23,7 @@ class _CPUCell(XMLBuilder):
"""
Class for generating <cpu><numa> child <cell> XML
"""
_XML_ROOT_NAME = "cell"
XML_NAME = "cell"
_XML_PROP_ORDER = ["id", "cpus", "memory"]
id = XMLProperty("./@id", is_int=True)
@ -37,7 +37,7 @@ class _CPUCache(XMLBuilder):
Class for generating <cpu> child <cache> XML
"""
_XML_ROOT_NAME = "cache"
XML_NAME = "cache"
_XML_PROP_ORDER = ["mode", "level"]
mode = XMLProperty("./@mode")
@ -51,7 +51,7 @@ class _CPUFeature(XMLBuilder):
POLICIES = ["force", "require", "optional", "disable", "forbid"]
_XML_ROOT_NAME = "feature"
XML_NAME = "feature"
_XML_PROP_ORDER = ["policy", "name"]
name = XMLProperty("./@name")
@ -64,7 +64,7 @@ class DomainCpu(XMLBuilder):
"""
MATCHS = ["minimum", "exact", "strict"]
_XML_ROOT_NAME = "cpu"
XML_NAME = "cpu"
_XML_PROP_ORDER = ["mode", "match", "model", "vendor",
"sockets", "cores", "threads", "features"]

4
virtinst/domain/cputune.py
View File

@ -10,7 +10,7 @@ class _VCPUPin(XMLBuilder):
"""
Class for generating <cputune> child <vcpupin> XML
"""
_XML_ROOT_NAME = "vcpupin"
XML_NAME = "vcpupin"
_XML_PROP_ORDER = ["vcpu", "cpuset"]
vcpu = XMLProperty("./@vcpu", is_int=True)
@ -21,5 +21,5 @@ class DomainCputune(XMLBuilder):
"""
Class for generating <cpu> XML
"""
_XML_ROOT_NAME = "cputune"
XML_NAME = "cputune"
vcpus = XMLChildProperty(_VCPUPin)

2
virtinst/domain/features.py
View File

@ -12,7 +12,7 @@ class DomainFeatures(XMLBuilder):
"""
Class for generating <features> XML
"""
_XML_ROOT_NAME = "features"
XML_NAME = "features"
_XML_PROP_ORDER = ["acpi", "apic", "pae", "gic_version"]
acpi = XMLProperty("./acpi", is_bool=True,

2
virtinst/domain/idmap.py
View File

@ -12,7 +12,7 @@ class DomainIdmap(XMLBuilder):
"""
Class for generating user namespace related XML
"""
_XML_ROOT_NAME = "idmap"
XML_NAME = "idmap"
_XML_PROP_ORDER = ["uid_start", "uid_target", "uid_count",
"gid_start", "gid_target", "gid_count"]

2
virtinst/domain/memorybacking.py
View File

@ -13,7 +13,7 @@ class DomainMemoryBacking(XMLBuilder):
Class for generating <memoryBacking> XML
"""
_XML_ROOT_NAME = "memoryBacking"
XML_NAME = "memoryBacking"
_XML_PROP_ORDER = ["hugepages", "nosharepages", "locked"]
hugepages = XMLProperty("./hugepages", is_bool=True)

2
virtinst/domain/memtune.py
View File

@ -13,7 +13,7 @@ class DomainMemtune(XMLBuilder):
Class for generating <memtune> XML
"""
_XML_ROOT_NAME = "memtune"
XML_NAME = "memtune"
_XML_PROP_ORDER = ["hard_limit", "soft_limit", "swap_hard_limit",
"min_guarantee"]

2
virtinst/domain/numatune.py
View File

@ -83,7 +83,7 @@ class DomainNumatune(XMLBuilder):
MEMORY_MODES = ["interleave", "strict", "preferred"]
_XML_ROOT_NAME = "numatune"
XML_NAME = "numatune"
_XML_PROP_ORDER = ["memory_mode", "memory_nodeset"]
memory_nodeset = XMLProperty("./memory/@nodeset")

6
virtinst/domain/os.py
View File

@ -9,12 +9,12 @@ from ..xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty
class _InitArg(XMLBuilder):
_XML_ROOT_NAME = "initarg"
XML_NAME = "initarg"
val = XMLProperty(".")
class _BootDevice(XMLBuilder):
_XML_ROOT_NAME = "boot"
XML_NAME = "boot"
dev = XMLProperty("./@dev")
@ -62,7 +62,7 @@ class DomainOs(XMLBuilder):
def is_s390x(self):
return self.arch == "s390x"
_XML_ROOT_NAME = "os"
XML_NAME = "os"
_XML_PROP_ORDER = ["arch", "os_type", "loader", "loader_ro", "loader_type",
"nvram", "nvram_template", "kernel", "initrd",
"kernel_args", "dtb", "_bootdevs", "smbios_mode"]

2
virtinst/domain/pm.py
View File

@ -9,7 +9,7 @@ from ..xmlbuilder import XMLBuilder, XMLProperty
class DomainPm(XMLBuilder):
_XML_ROOT_NAME = "pm"
XML_NAME = "pm"
suspend_to_mem = XMLProperty("./suspend-to-mem/@enabled", is_yesno=True)
suspend_to_disk = XMLProperty("./suspend-to-disk/@enabled", is_yesno=True)

2
virtinst/domain/resource.py
View File

@ -13,7 +13,7 @@ class DomainResource(XMLBuilder):
Class for generating <resource> XML
"""
_XML_ROOT_NAME = "resource"
XML_NAME = "resource"
_XML_PROP_ORDER = ["partition"]
partition = XMLProperty("./partition")

2
virtinst/domain/seclabel.py
View File

@ -26,7 +26,7 @@ class DomainSeclabel(XMLBuilder):
MODEL_NONE = "none"
MODELS = [MODEL_SELINUX, MODEL_DAC, MODEL_NONE]
_XML_ROOT_NAME = "seclabel"
XML_NAME = "seclabel"
_XML_PROP_ORDER = ["type", "model", "relabel", "label", "imagelabel"]
def _guess_secmodel(self):

2
virtinst/domain/sysinfo.py
View File

@ -14,7 +14,7 @@ class DomainSysinfo(XMLBuilder):
Class for building and domain <sysinfo> XML
"""
_XML_ROOT_NAME = "sysinfo"
XML_NAME = "sysinfo"
_XML_PROP_ORDER = ["type",
"bios_vendor", "bios_version", "bios_date", "bios_release",
"system_manufacturer", "system_product", "system_version",

6
virtinst/domain/xmlnsqemu.py
View File

@ -8,13 +8,13 @@ from ..xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
class _XMLNSQemuArg(XMLBuilder):
_XML_ROOT_NAME = "qemu:arg"
XML_NAME = "qemu:arg"
value = XMLProperty("./@value")
class _XMLNSQemuEnv(XMLBuilder):
_XML_ROOT_NAME = "qemu:env"
XML_NAME = "qemu:env"
name = XMLProperty("./@name")
value = XMLProperty("./@value")
@ -24,7 +24,7 @@ class DomainXMLNSQemu(XMLBuilder):
"""
Class for generating <qemu:commandline> XML
"""
_XML_ROOT_NAME = "qemu:commandline"
XML_NAME = "qemu:commandline"
_XML_PROP_ORDER = ["args", "envs"]
args = XMLChildProperty(_XMLNSQemuArg)

14
virtinst/domcapabilities.py
View File

@ -13,7 +13,7 @@ from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
class _Value(XMLBuilder):
_XML_ROOT_NAME = "value"
XML_NAME = "value"
value = XMLProperty(".")
@ -25,7 +25,7 @@ class _HasValues(XMLBuilder):
class _Enum(_HasValues):
_XML_ROOT_NAME = "enum"
XML_NAME = "enum"
name = XMLProperty("./@name")
@ -44,23 +44,23 @@ class _CapsBlock(_HasValues):
def _make_capsblock(xml_root_name):
class TmpClass(_CapsBlock):
pass
setattr(TmpClass, "_XML_ROOT_NAME", xml_root_name)
setattr(TmpClass, "XML_NAME", xml_root_name)
return TmpClass
class _OS(_CapsBlock):
_XML_ROOT_NAME = "os"
XML_NAME = "os"
loader = XMLChildProperty(_make_capsblock("loader"), is_single=True)
class _Devices(_CapsBlock):
_XML_ROOT_NAME = "devices"
XML_NAME = "devices"
hostdev = XMLChildProperty(_make_capsblock("hostdev"), is_single=True)
disk = XMLChildProperty(_make_capsblock("disk"), is_single=True)
class _Features(_CapsBlock):
_XML_ROOT_NAME = "features"
XML_NAME = "features"
gic = XMLChildProperty(_make_capsblock("gic"), is_single=True)
@ -149,7 +149,7 @@ class DomainCapabilities(XMLBuilder):
"yes" in self.os.loader.get_enum("readonly").get_values())
_XML_ROOT_NAME = "domainCapabilities"
XML_NAME = "domainCapabilities"
os = XMLChildProperty(_OS, is_single=True)
devices = XMLChildProperty(_Devices, is_single=True)

4
virtinst/guest.py
View File

@ -27,7 +27,7 @@ _ignore = Device
class _DomainDevices(XMLBuilder):
_XML_ROOT_NAME = "devices"
XML_NAME = "devices"
_XML_PROP_ORDER = ['disk', 'controller', 'filesystem', 'interface',
'smartcard', 'serial', 'parallel', 'console', 'channel',
'input', 'tpm', 'graphics', 'sound', 'video', 'hostdev',
@ -104,7 +104,7 @@ class Guest(XMLBuilder):
raise ValueError(_("Guest name '%s' is already in use.") % name)
_XML_ROOT_NAME = "domain"
XML_NAME = "domain"
_XML_PROP_ORDER = ["type", "name", "uuid", "title", "description",
"hotplugmemorymax", "hotplugmemoryslots", "maxmemory", "memory",
"blkiotune", "memtune", "memoryBacking",

12
virtinst/interface.py
View File

@ -19,7 +19,7 @@ from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
class _IPAddress(XMLBuilder):
_XML_PROP_ORDER = ["address", "prefix"]
_XML_ROOT_NAME = "ip"
XML_NAME = "ip"
######################
# Validation helpers #
@ -39,7 +39,7 @@ class InterfaceProtocol(XMLBuilder):
INTERFACE_PROTOCOL_FAMILIES = [INTERFACE_PROTOCOL_FAMILY_IPV4,
INTERFACE_PROTOCOL_FAMILY_IPV6]
_XML_ROOT_NAME = "protocol"
XML_NAME = "protocol"
_XML_PROP_ORDER = ["autoconf", "dhcp", "dhcp_peerdns", "ips", "gateway"]
family = XMLProperty("./@family")
@ -64,15 +64,15 @@ class InterfaceProtocol(XMLBuilder):
class _BondConfig(XMLBuilder):
_XML_ROOT_NAME = "bond"
XML_NAME = "bond"
class _BridgeConfig(XMLBuilder):
_XML_ROOT_NAME = "bridge"
XML_NAME = "bridge"
class _VLANConfig(XMLBuilder):
_XML_ROOT_NAME = "vlan"
XML_NAME = "vlan"
class Interface(XMLBuilder):
@ -121,7 +121,7 @@ class Interface(XMLBuilder):
return util.generate_name(prefix, conn.interfaceLookupByName, sep="",
force_num=True)
_XML_ROOT_NAME = "interface"
XML_NAME = "interface"
_XML_PROP_ORDER = ["type", "name", "start_mode", "macaddr", "mtu",
"stp", "delay", "bond_mode", "arp_interval",
"arp_target", "arp_validate_mode", "mii_frequency",

20
virtinst/network.py
View File

@ -17,20 +17,20 @@ from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
class _NetworkDHCPRange(XMLBuilder):
_XML_ROOT_NAME = "range"
XML_NAME = "range"
start = XMLProperty("./@start")
end = XMLProperty("./@end")
class _NetworkDHCPHost(XMLBuilder):
_XML_ROOT_NAME = "host"
XML_NAME = "host"
macaddr = XMLProperty("./@mac")
name = XMLProperty("./@name")
ip = XMLProperty("./@ip")
class _NetworkIP(XMLBuilder):
_XML_ROOT_NAME = "ip"
XML_NAME = "ip"
family = XMLProperty("./@family")
address = XMLProperty("./@address")
@ -46,7 +46,7 @@ class _NetworkIP(XMLBuilder):
class _NetworkRoute(XMLBuilder):
_XML_ROOT_NAME = "route"
XML_NAME = "route"
family = XMLProperty("./@family")
address = XMLProperty("./@address")
@ -56,12 +56,12 @@ class _NetworkRoute(XMLBuilder):
class _NetworkForwardPf(XMLBuilder):
_XML_ROOT_NAME = "pf"
XML_NAME = "pf"
dev = XMLProperty("./@dev")
class _NetworkForwardAddress(XMLBuilder):
_XML_ROOT_NAME = "address"
XML_NAME = "address"
type = XMLProperty("./@type")
domain = XMLProperty("./@domain", is_int=True)
bus = XMLProperty("./@bus", is_int=True)
@ -70,7 +70,7 @@ class _NetworkForwardAddress(XMLBuilder):
class _NetworkForward(XMLBuilder):
_XML_ROOT_NAME = "forward"
XML_NAME = "forward"
mode = XMLProperty("./@mode")
dev = XMLProperty("./@dev")
@ -83,7 +83,7 @@ class _NetworkForward(XMLBuilder):
class _NetworkBandwidth(XMLBuilder):
_XML_ROOT_NAME = "bandwidth"
XML_NAME = "bandwidth"
inbound_average = XMLProperty("./inbound/@average")
inbound_peak = XMLProperty("./inbound/@peak")
@ -135,7 +135,7 @@ class _NetworkBandwidth(XMLBuilder):
class _NetworkPortgroup(XMLBuilder):
_XML_ROOT_NAME = "portgroup"
XML_NAME = "portgroup"
name = XMLProperty("./@name")
default = XMLProperty("./@default", is_yesno=True)
@ -202,7 +202,7 @@ class Network(XMLBuilder):
# XML properties #
##################
_XML_ROOT_NAME = "network"
XML_NAME = "network"
_XML_PROP_ORDER = ["ipv6", "name", "uuid", "forward", "virtualport_type",
"bridge", "stp", "delay", "domain_name",
"macaddr", "ips", "routes", "bandwidth"]

4
virtinst/nodedev.py
View File

@ -27,7 +27,7 @@ def _compare_int(nodedev_val, hostdev_val):
class DevNode(XMLBuilder):
_XML_ROOT_NAME = "devnode"
XML_NAME = "devnode"
node_type = XMLProperty("./@type")
path = XMLProperty(".")
@ -91,7 +91,7 @@ class NodeDevice(XMLBuilder):
XMLBuilder.__init__(self, *args, **kwargs)
_XML_ROOT_NAME = "device"
XML_NAME = "device"
# Libvirt can generate bogus 'system' XML:
# https://bugzilla.redhat.com/show_bug.cgi?id=1184131

4
virtinst/snapshot.py
View File

@ -12,7 +12,7 @@ from .xmlbuilder import XMLBuilder, XMLChildProperty, XMLProperty
class _SnapshotDisk(XMLBuilder):
_XML_ROOT_NAME = "disk"
XML_NAME = "disk"
name = XMLProperty("./@name")
snapshot = XMLProperty("./@snapshot")
@ -42,7 +42,7 @@ class DomainSnapshot(XMLBuilder):
return statemap.get(state, libvirt.VIR_DOMAIN_NOSTATE)
_XML_ROOT_NAME = "domainsnapshot"
XML_NAME = "domainsnapshot"
_XML_PROP_ORDER = ["name", "description", "creationTime"]
name = XMLProperty("./name")

12
virtinst/storage.py
View File

@ -22,7 +22,7 @@ _DEFAULT_MPATH_TARGET = "/dev/mapper"
class _StoragePermissions(XMLBuilder):
_XML_ROOT_NAME = "permissions"
XML_NAME = "permissions"
_XML_PROP_ORDER = ["mode", "owner", "group", "label"]
mode = XMLProperty("./mode")
@ -72,7 +72,7 @@ def _get_default_pool_path(conn):
class _Host(XMLBuilder):
_XML_PROP_ORDER = ["name", "port"]
_XML_ROOT_NAME = "host"
XML_NAME = "host"
name = XMLProperty("./@name")
port = XMLProperty("./@port", is_int=True)
@ -152,9 +152,9 @@ class StoragePool(_StorageObject):
raise
class _EnumerateSource(XMLBuilder):
_XML_ROOT_NAME = "source"
XML_NAME = "source"
class _EnumerateSources(XMLBuilder):
_XML_ROOT_NAME = "sources"
XML_NAME = "sources"
sources = XMLChildProperty(_EnumerateSource)
@ -370,7 +370,7 @@ class StoragePool(_StorageObject):
# Properties #
##############
_XML_ROOT_NAME = "pool"
XML_NAME = "pool"
_XML_PROP_ORDER = ["name", "type", "uuid",
"capacity", "allocation", "available",
"format", "hosts",
@ -675,7 +675,7 @@ class StorageVolume(_StorageObject):
# XML properties #
##################
_XML_ROOT_NAME = "volume"
XML_NAME = "volume"
_XML_PROP_ORDER = ["name", "key", "capacity", "allocation", "format",
"target_path", "permissions"]

8
virtinst/xmlbuilder.py
View File

@ -117,7 +117,7 @@ class XMLChildProperty(property):
xmlbuilder._propstore[self._findpropname(xmlbuilder)] = obj
def get_prop_xpath(self, _xmlbuilder, obj):
return self.relative_xpath + "/" + obj._XML_ROOT_NAME
return self.relative_xpath + "/" + obj.XML_NAME
class XMLProperty(property):
@ -458,7 +458,7 @@ class XMLBuilder(object):
_XML_PROP_ORDER = []
# Name of the root XML element
_XML_ROOT_NAME = None
XML_NAME = None
# In some cases, libvirt can incorrectly generate unparseable XML.
# These are libvirt bugs, but this allows us to work around it in
@ -489,7 +489,7 @@ class XMLBuilder(object):
parsexml = "".join([c for c in parsexml if c in string.printable])
self._propstore = collections.OrderedDict()
self._xmlstate = _XMLState(self._XML_ROOT_NAME,
self._xmlstate = _XMLState(self.XML_NAME,
parsexml, parentxmlstate,
relative_object_xpath)
@ -523,7 +523,7 @@ class XMLBuilder(object):
def __repr__(self):
return "<%s %s %s>" % (self.__class__.__name__.split(".")[-1],
self._XML_ROOT_NAME, id(self))
self.XML_NAME, id(self))
############################