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 2011/03/22 00:05:51 UTC
svn commit: r1084014 - in /incubator/deltacloud/trunk/server:
lib/deltacloud/drivers/ec2/ec2_driver.rb server.rb
Author: lutter
Date: Mon Mar 21 23:05:51 2011
New Revision: 1084014
URL: http://svn.apache.org/viewvc?rev=1084014&view=rev
Log:
bug fixes in destroy_storage_snapshot
Modified:
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
incubator/deltacloud/trunk/server/server.rb
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb?rev=1084014&r1=1084013&r2=1084014&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb Mon Mar 21 23:05:51 2011
@@ -497,7 +497,7 @@ module Deltacloud
def destroy_storage_snapshot(credentials, opts={})
ec2 = new_client(credentials)
safely do
- unless convert_snapshot(opts[:id])
+ unless ec2.delete_snapshot(opts[:id])
raise Deltacloud::BackendError.new(500, "StorageSnapshot", "Cannot destroy this snapshot")
end
end
Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1084014&r1=1084013&r2=1084014&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Mon Mar 21 23:05:51 2011
@@ -510,7 +510,7 @@ collection :storage_snapshots do
with_capability :destroy_storage_snapshot
param :id, :string, :required
control do
- driver.create_storage_snapshot(credentials, params)
+ driver.destroy_storage_snapshot(credentials, params)
respond_to do |format|
format.xml { return 204 }
format.json { return 204 }
@@ -518,7 +518,6 @@ collection :storage_snapshots do
end
end
end
-
end
get '/api/storage_volumes/new' do