You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2011/04/06 11:21:17 UTC
svn commit: r1089370 - in /incubator/deltacloud/trunk/server:
lib/deltacloud/drivers/rackspace/rackspace_driver.rb server.rb
Author: mfojtik
Date: Wed Apr 6 09:21:16 2011
New Revision: 1089370
URL: http://svn.apache.org/viewvc?rev=1089370&view=rev
Log:
Fixed Rackspace driver error code when you're trying to get non-existing instance Removed extra call to images when you're starting a new instance.
Modified:
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb
incubator/deltacloud/trunk/server/server.rb
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb?rev=1089370&r1=1089369&r2=1089370&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb Wed Apr 6 09:21:16 2011
@@ -154,13 +154,16 @@ class RackspaceDriver < Deltacloud::Base
insts = []
safely do
- if opts[:id]
- server = rs.get_server(opts[:id].to_i)
- insts << convert_instance_after_create(server, credentials.user)
- else
- insts = rs.list_servers_detail.collect do |server|
- convert_instance(server, credentials.user)
+ begin
+ if opts[:id]
+ server = rs.get_server(opts[:id].to_i)
+ insts << convert_instance_after_create(server, credentials.user)
+ else
+ insts = rs.list_servers_detail.collect do |server|
+ convert_instance(server, credentials.user)
+ end
end
+ rescue CloudServers::Exception::ItemNotFound
end
end
Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1089370&r1=1089369&r2=1089370&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Wed Apr 6 09:21:16 2011
@@ -393,17 +393,15 @@ END
param :realm_id, :string, :optional
param :hwp_id, :string, :optional
control do
- @image = driver.image(credentials, :id => params[:image_id])
- instance = driver.create_instance(credentials, @image.id, params)
+ @instance = driver.create_instance(credentials, params[:image_id], params)
respond_to do |format|
format.xml do
response.status = 201 # Created
- response['Location'] = instance_url(instance.id)
- @instance = instance
+ response['Location'] = instance_url(@instance.id)
haml :"instances/show"
end
format.html do
- redirect instance_url(instance.id) if instance and instance.id
+ redirect instance_url(@instance.id) if @instance and @instance.id
redirect instances_url
end
end