Fix up state toggles

NodeInstance.py

@@ -106,9 +106,10 @@ class NodeInstance(threading.Thread):
                 except:
                     self.domain_list.remove(domain)
 
-            # Start any VMs which should be running
+            # Toggle state management of all VMs to start any that are failed
-            for domain in self.s_domain:
+            for domain, instance in self.s_domain.items():
-                print(domain.getdomuuid())
+                if instance.gethypervisor() == self.name and ( instance.getstate() == 'start' or instance.getstate() == 'migrate' ):
+                    instance.manage_vm_state()
 
             # Set our information in zookeeper
             self.memfree = conn.getFreeMemory()

VMInstance.py

@@ -30,14 +30,11 @@ class VMInstance:
                 self.manage_vm_state()
 
     # Get data functions
-    def getdomuuid():
+    def getstate(self):
-        return self.domuuid
-
-    def getstate():
         return self.state
 
-    def getdom():
+    def gethypervisor(self):
-        return self.dom
+        return self.hypervisor
 
     # Start up the VM
     def start_vm(self, conn, xmlconfig):