Add maxmemory to the data for each VMInstance object

pvcd/NodeInstance.py

@@ -231,7 +231,7 @@ class NodeInstance():
         for domain, instance in self.s_domain.items():
             if instance.inshutdown == False and domain in self.domain_list:
                 # 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.getdom() != None:
                         try:

pvcd/VMInstance.py

@@ -44,6 +44,7 @@ class VMInstance:
         self.instop = False
 
         self.dom = self.lookupByUUID(self.domuuid)
+        self.maxmemory = self.dom.maxMemory()
 
         # Watch for changes to the state field in Zookeeper
         @zk_conn.DataWatch('/domains/{}/state'.format(self.domuuid))
@@ -65,6 +66,9 @@ class VMInstance:
     def getdom(self):
         return self.dom
 
+    def getmaxmemory(self):
+        return self.maxmemory
+
     # Manage local node domain_list
     def addDomainToList(self):
         if not self.domuuid in self.thishypervisor.domain_list: