Add maxmemory to the data for each VMInstance object
This commit is contained in:
parent
7c89fa8aea
commit
2c988430db
|
@ -231,7 +231,7 @@ class NodeInstance():
|
||||||
for domain, instance in self.s_domain.items():
|
for domain, instance in self.s_domain.items():
|
||||||
if instance.inshutdown == False and domain in self.domain_list:
|
if instance.inshutdown == False and domain in self.domain_list:
|
||||||
# Add the allocated memory to our memalloc value
|
# Add the allocated memory to our memalloc value
|
||||||
memalloc += instance.maxMemory()
|
memalloc += instance.getmaxmemory()
|
||||||
if instance.getstate() == 'start' and instance.gethypervisor() == self.name:
|
if instance.getstate() == 'start' and instance.gethypervisor() == self.name:
|
||||||
if instance.getdom() != None:
|
if instance.getdom() != None:
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -44,6 +44,7 @@ class VMInstance:
|
||||||
self.instop = False
|
self.instop = False
|
||||||
|
|
||||||
self.dom = self.lookupByUUID(self.domuuid)
|
self.dom = self.lookupByUUID(self.domuuid)
|
||||||
|
self.maxmemory = self.dom.maxMemory()
|
||||||
|
|
||||||
# Watch for changes to the state field in Zookeeper
|
# Watch for changes to the state field in Zookeeper
|
||||||
@zk_conn.DataWatch('/domains/{}/state'.format(self.domuuid))
|
@zk_conn.DataWatch('/domains/{}/state'.format(self.domuuid))
|
||||||
|
@ -65,6 +66,9 @@ class VMInstance:
|
||||||
def getdom(self):
|
def getdom(self):
|
||||||
return self.dom
|
return self.dom
|
||||||
|
|
||||||
|
def getmaxmemory(self):
|
||||||
|
return self.maxmemory
|
||||||
|
|
||||||
# Manage local node domain_list
|
# Manage local node domain_list
|
||||||
def addDomainToList(self):
|
def addDomainToList(self):
|
||||||
if not self.domuuid in self.thishypervisor.domain_list:
|
if not self.domuuid in self.thishypervisor.domain_list:
|
||||||
|
|
Loading…
Reference in New Issue