diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-01-12 15:49:44 -0600 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-01-12 15:49:44 -0600 |
| commit | afaec68e7a43499aaa07f8ea45cbb92341891b10 (patch) | |
| tree | 9769a07343b11c1fe6e60c84f9f84d6765595033 /nova/virt | |
| parent | eb146fd75183d80e50f8a67021dae565f4915b2e (diff) | |
| parent | c5c5b77a405cf1adb6d6289be24d4385ff6d5ea9 (diff) | |
| download | nova-afaec68e7a43499aaa07f8ea45cbb92341891b10.tar.gz nova-afaec68e7a43499aaa07f8ea45cbb92341891b10.tar.xz nova-afaec68e7a43499aaa07f8ea45cbb92341891b10.zip | |
Merging trunk
Diffstat (limited to 'nova/virt')
| -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 a623d10c7..6d2db7201 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""" |