diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-12 17:41:15 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-12 17:41:15 -0500 |
| commit | 73e49ac35cc8b0a97dd7cd9b39cf00cd15b1d9dd (patch) | |
| tree | c4b4a5718226d774a4336fc0326c682a041cea23 /nova | |
| parent | 038c9c7663ee1a884726521afe181d30ebe00cc6 (diff) | |
| parent | 27369c18bde257c068ffc51e5ef51b479ad351d0 (diff) | |
| download | nova-73e49ac35cc8b0a97dd7cd9b39cf00cd15b1d9dd.tar.gz nova-73e49ac35cc8b0a97dd7cd9b39cf00cd15b1d9dd.tar.xz nova-73e49ac35cc8b0a97dd7cd9b39cf00cd15b1d9dd.zip | |
Merge trunk
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 2e4f8fc39..39df21e30 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -765,12 +765,14 @@ def instance_get_by_id(context, instance_id): if is_admin_context(context): result = session.query(models.Instance).\ options(joinedload('security_groups')).\ + options(joinedload_all('fixed_ip.floating_ips')).\ filter_by(id=instance_id).\ filter_by(deleted=can_read_deleted(context)).\ first() elif is_user_context(context): result = session.query(models.Instance).\ options(joinedload('security_groups')).\ + options(joinedload_all('fixed_ip.floating_ips')).\ filter_by(project_id=context.project_id).\ filter_by(id=instance_id).\ filter_by(deleted=False).\ 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""" |