diff --git a/instances/templates/instance.html b/instances/templates/instance.html index 5b6d3cd..ffa492c 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -1524,9 +1524,17 @@
+ {% if nvram %} +
+ +
+ {% endif %} {% endifequal %} diff --git a/vrtManager/instance.py b/vrtManager/instance.py index 08ab9c2..87a5e95 100644 --- a/vrtManager/instance.py +++ b/vrtManager/instance.py @@ -2,7 +2,7 @@ import time import os.path try: from libvirt import libvirtError, VIR_DOMAIN_XML_SECURE, VIR_MIGRATE_LIVE, VIR_MIGRATE_UNSAFE, VIR_DOMAIN_RUNNING, \ - VIR_DOMAIN_AFFECT_LIVE, VIR_DOMAIN_AFFECT_CONFIG + VIR_DOMAIN_AFFECT_LIVE, VIR_DOMAIN_AFFECT_CONFIG, VIR_DOMAIN_UNDEFINE_NVRAM, VIR_DOMAIN_UNDEFINE_KEEP_NVRAM except: from libvirt import libvirtError, VIR_DOMAIN_XML_SECURE, VIR_MIGRATE_LIVE @@ -150,8 +150,8 @@ class wvmInstance(wvmConnect): def resume(self): self.instance.resume() - def delete(self): - self.instance.undefine() + def delete(self, flags=0): + self.instance.undefineFlags(flags) def _XMLDesc(self, flag): return self.instance.XMLDesc(flag) @@ -186,6 +186,15 @@ class wvmInstance(wvmConnect): if cur_vcpu: return int(cur_vcpu) + def get_arch(self): + return util.get_xml_path(self._XMLDesc(0), "/domain/os/type/@arch") + + def get_machine_type(self): + return util.get_xml_path(self._XMLDesc(0), "/domain/os/type/@machine") + + def get_nvram(self): + return util.get_xml_path(self._XMLDesc(0), "/domain/os/nvram") + def get_vcpus(self): vcpus = OrderedDict() tree = etree.fromstring(self._XMLDesc(0))