From 79fafe0be888f4158d956dc72c9437f18f418b51 Mon Sep 17 00:00:00 2001
From: Anael Beutot <anael.beutot@smartjog.com>
Date: Mon, 7 May 2012 19:09:44 +0200
Subject: [PATCH] Fixed VM unregister callback on hypervisor.
---
ccnode/hypervisor/__init__.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/ccnode/hypervisor/__init__.py b/ccnode/hypervisor/__init__.py
index 66afcf2..83c51ef 100644
--- a/ccnode/hypervisor/__init__.py
+++ b/ccnode/hypervisor/__init__.py
@@ -225,10 +225,9 @@ class Hypervisor(object):
vm = self.domains.pop(dom.name())
# self.sjproxy.unregister(vm.name)
self.async_calls[self.rpc_con.rpc.async_call_cb(
- self.register_cb,
- 'register',
+ self.unregister_cb,
+ 'unregister',
vm.name,
- 'vm',
)] = vm.name
elif event in ('Started', 'Suspended', 'Resumed', 'Stopped', 'Saved',
'Restored'):
@@ -251,11 +250,11 @@ class Hypervisor(object):
self.main.reset_sub_tag(vm.name, tag)
def unregister_cb(self, call_id, response=None, error=None):
- vm = self.domains[self.async_calls.pop(call_id)]
+ vm_name = self.async_calls.pop(call_id)
if error is not None:
logger.error('Error while unregistering domain to server, %s', error)
- logger.info('Delete domain: %s (%s)', vm.name, vm.uuid)
- self.main.remove_sub_object(vm)
+ logger.info('Delete domain: %s', vm_name)
+ self.main.remove_sub_object(vm_name)
def vm_define(self, xml_desc):
"""Create a VM on the Hypervisor
--
GitLab