diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-11 19:06:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-11 19:06:18 +0000 |
| commit | 314539cce77846a7fe9ff7dc52d6291fcc34814e (patch) | |
| tree | cd565c0122bbfed8cedffbd2d6b4918bdc10a1a8 /nova/api | |
| parent | ed3635f40fa31b896bb700610b93fe288a90e692 (diff) | |
| parent | d29f9e34555c2af2d996cd96e084af4be513a33b (diff) | |
| download | nova-314539cce77846a7fe9ff7dc52d6291fcc34814e.tar.gz nova-314539cce77846a7fe9ff7dc52d6291fcc34814e.tar.xz nova-314539cce77846a7fe9ff7dc52d6291fcc34814e.zip | |
Merge "Converting snapshot/backup to use instance objects"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index b913a2bb5..b3c4fbce9 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -567,8 +567,10 @@ class Controller(object): msg = _("Invalid metadata") raise exc.HTTPBadRequest(explanation=msg) + instance = self._get_server(context, instance_id) + image = self.compute_api.backup(context, - instance_id, + instance, image_name, backup_type, rotation, @@ -846,9 +848,11 @@ class Controller(object): msg = _("Invalid metadata") raise exc.HTTPBadRequest(explanation=msg) + instance = self._get_server(context, instance_id) + try: image = self.compute_api.snapshot(context, - instance_id, + instance, image_name, extra_properties=props) except exception.InstanceBusy: |