mirror of
https://github.com/retspen/webvirtcloud
synced 2026-11-09 03:36:48 +00:00
fix(instances): a running VM's options and CPU edits keep the pending changes
On an active VM the options and CPU forms write the persistent definition but showed the running VM's title, description and vCPUs, so saving one posted the live values back over a pending change. They now read the persistent definition (get_vcpu, get_cur_vcpu, get_title and get_description take config=). Buttons in the settings and resize tabs that were disabled only by class get the disabled attribute: Enter in a field no longer submits a form the page shows as unavailable while the VM runs.
This commit is contained in:
parent
ea9424ee1f
commit
042530fbfd
8 changed files with 106 additions and 37 deletions
|
|
@ -446,13 +446,13 @@ class wvmInstance(wvmConnect):
|
|||
def get_uuid(self):
|
||||
return self.instance.UUIDString()
|
||||
|
||||
def get_vcpu(self):
|
||||
vcpu = util.get_xml_path(self._XMLDesc(0), "/domain/vcpu")
|
||||
def get_vcpu(self, config=False):
|
||||
vcpu = util.get_xml_path(self._XMLDesc(PERSISTENT_XML if config else 0), "/domain/vcpu")
|
||||
return int(vcpu)
|
||||
|
||||
def get_cur_vcpu(self):
|
||||
cur_vcpu = util.get_xml_path(self._XMLDesc(0), "/domain/vcpu/@current")
|
||||
return int(cur_vcpu) if cur_vcpu else self.get_vcpu()
|
||||
def get_cur_vcpu(self, config=False):
|
||||
cur_vcpu = util.get_xml_path(self._XMLDesc(PERSISTENT_XML if config else 0), "/domain/vcpu/@current")
|
||||
return int(cur_vcpu) if cur_vcpu else self.get_vcpu(config)
|
||||
|
||||
def get_arch(self):
|
||||
return util.get_xml_path(self._XMLDesc(0), "/domain/os/type/@arch")
|
||||
|
|
@ -497,8 +497,8 @@ class wvmInstance(wvmConnect):
|
|||
mem = util.get_xml_path(self._XMLDesc(0), "/domain/currentMemory")
|
||||
return int(mem) // 1024
|
||||
|
||||
def get_title(self):
|
||||
title = util.get_xml_path(self._XMLDesc(0), "/domain/title")
|
||||
def get_title(self, config=False):
|
||||
title = util.get_xml_path(self._XMLDesc(PERSISTENT_XML if config else 0), "/domain/title")
|
||||
return title or ""
|
||||
|
||||
def get_filterrefs(self):
|
||||
|
|
@ -512,8 +512,8 @@ class wvmInstance(wvmConnect):
|
|||
|
||||
return util.get_xml_path(self._XMLDesc(0), func=filterrefs)
|
||||
|
||||
def get_description(self):
|
||||
description = util.get_xml_path(self._XMLDesc(0), "/domain/description")
|
||||
def get_description(self, config=False):
|
||||
description = util.get_xml_path(self._XMLDesc(PERSISTENT_XML if config else 0), "/domain/description")
|
||||
return description or ""
|
||||
|
||||
def get_max_memory(self):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue