You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2012/12/05 07:09:21 UTC
git commit: CIMI: make retrieving individual volumes and volume
images work again
Updated Branches:
refs/heads/master 53fee983c -> 70a00e422
CIMI: make retrieving individual volumes and volume images work again
Fixes problems introduced by commits 775cbdf2 and 14f9103e
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/70a00e42
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/70a00e42
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/70a00e42
Branch: refs/heads/master
Commit: 70a00e422df6ce49f777c62274683778ae4deab6
Parents: 53fee98
Author: David Lutterkort <lu...@redhat.com>
Authored: Tue Dec 4 22:07:47 2012 -0800
Committer: David Lutterkort <lu...@redhat.com>
Committed: Tue Dec 4 22:07:47 2012 -0800
----------------------------------------------------------------------
server/lib/cimi/models/volume.rb | 4 ++--
server/lib/cimi/models/volume_image.rb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/70a00e42/server/lib/cimi/models/volume.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/volume.rb b/server/lib/cimi/models/volume.rb
index f1d60f7..a2904ce 100644
--- a/server/lib/cimi/models/volume.rb
+++ b/server/lib/cimi/models/volume.rb
@@ -43,9 +43,9 @@ class CIMI::Model::Volume < CIMI::Model::Base
volumes = context.driver.storage_volumes(creds)
volumes.collect{ |volume| from_storage_volume(volume, context) }
else
- volume = context.driver.storage_volumes(creds)
+ volume = context.driver.storage_volumes(creds, :id => id).first
raise CIMI::Model::NotFound unless volume
- from_storage_volume(volume)
+ from_storage_volume(volume, context)
end
end
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/70a00e42/server/lib/cimi/models/volume_image.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/volume_image.rb b/server/lib/cimi/models/volume_image.rb
index 811d9c9..3ca839e 100644
--- a/server/lib/cimi/models/volume_image.rb
+++ b/server/lib/cimi/models/volume_image.rb
@@ -30,9 +30,9 @@ class CIMI::Model::VolumeImage < CIMI::Model::Base
snapshots = context.driver.storage_snapshots(creds)
snapshots.collect{ |snapshot| from_storage_snapshot(snapshot, context) }
else
- snapshot = context.driver.storage_snapshots(creds)
+ snapshot = context.driver.storage_snapshots(creds, id => :id).first
raise CIMI::Model::NotFound unless snapshot
- from_storage_snapshot(snapshot)
+ from_storage_snapshot(snapshot, context)
end
end