Fix some faulty logic with migrations

This commit is contained in:
Joshua Boniface 2018-06-02 15:29:12 -04:00
parent 87954559a1
commit 15cee50eee
1 changed files with 2 additions and 6 deletions

View File

@ -76,7 +76,7 @@ class VMInstance:
target_dom = self.dom.migrate(dest_conn, libvirt.VIR_MIGRATE_LIVE, None, None, 0) target_dom = self.dom.migrate(dest_conn, libvirt.VIR_MIGRATE_LIVE, None, None, 0)
if target_dom == None: if target_dom == None:
print('Could not migrate to the new domain') print('Could not migrate to the new domain')
exit(1) self.stop_vm()
self.thishypervisor.domain_list.remove(self.domuuid) self.thishypervisor.domain_list.remove(self.domuuid)
print('Migrated successfully') print('Migrated successfully')
@ -118,10 +118,6 @@ class VMInstance:
if running == libvirt.VIR_DOMAIN_RUNNING and self.state == "stop" and self.hypervisor == self.thishypervisor.name: if running == libvirt.VIR_DOMAIN_RUNNING and self.state == "stop" and self.hypervisor == self.thishypervisor.name:
self.stop_vm() self.stop_vm()
# VM should not be running on this hypervisor
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "start" and self.hypervisor != self.thishypervisor.name:
self.stop_vm()
# VM should be shut down # VM should be shut down
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "shutdown" and self.hypervisor == self.thishypervisor.name: elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "shutdown" and self.hypervisor == self.thishypervisor.name:
self.shutdown_vm() self.shutdown_vm()
@ -131,7 +127,7 @@ class VMInstance:
self.receive_migrate() self.receive_migrate()
# VM should be migrated away from this hypervisor # VM should be migrated away from this hypervisor
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "migrate" and self.hypervisor != self.thishypervisor.name: elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "start" and self.hypervisor != self.thishypervisor.name:
self.migrate_vm() self.migrate_vm()
# VM should be started # VM should be started