diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-01-12 21:34:05 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-01-12 21:34:05 +0000 |
| commit | aa20d2c7ce4567b1bab540a1d4c06b6ef5e42571 (patch) | |
| tree | 663d81f1311c1ac754c4f0a46f77ad48bb557d6a | |
| parent | 67307428d6d6f47f3215f485a1af720013a5c2ae (diff) | |
| parent | c29fe496c1124369a8b9b77aeee84e8296f964f9 (diff) | |
| download | nova-aa20d2c7ce4567b1bab540a1d4c06b6ef5e42571.tar.gz nova-aa20d2c7ce4567b1bab540a1d4c06b6ef5e42571.tar.xz nova-aa20d2c7ce4567b1bab540a1d4c06b6ef5e42571.zip | |
_wait_with_callback was changed out from under suspend/resume. fixed.
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 7e3585991..7aebb502f 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -252,7 +252,7 @@ class VMOps(object): raise Exception(_("suspend: instance not present %s") % instance_name) task = self._session.call_xenapi('Async.VM.suspend', vm) - self._wait_with_callback(task, callback) + self._wait_with_callback(instance.id, task, callback) def resume(self, instance, callback): """resume the specified instance""" @@ -262,7 +262,7 @@ class VMOps(object): raise Exception(_("resume: instance not present %s") % instance_name) task = self._session.call_xenapi('Async.VM.resume', vm, False, True) - self._wait_with_callback(task, callback) + self._wait_with_callback(instance.id, task, callback) def get_info(self, instance_id): """Return data about VM instance""" |