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/05/03 16:33:51 UTC
svn commit: r1099078 - in /incubator/deltacloud/trunk/server:
lib/deltacloud/base_driver/exceptions.rb
lib/deltacloud/drivers/rhevm/rhevm_driver.rb tests/drivers/mock/api_test.rb
Author: mfojtik
Date: Tue May 3 14:33:51 2011
New Revision: 1099078
URL: http://svn.apache.org/viewvc?rev=1099078&view=rev
Log:
RHEV-M driver updated to support new error handling
Modified:
incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/exceptions.rb
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/exceptions.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/exceptions.rb?rev=1099078&r1=1099077&r2=1099078&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/exceptions.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/base_driver/exceptions.rb Tue May 3 14:33:51 2011
@@ -28,6 +28,9 @@ module Deltacloud
end
class BackendError < DeltacloudException
+
+ attr_accessor :cause
+
def initialize(e, details)
super(500, e.class.name, e.message, e.backtrace, details)
end
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb?rev=1099078&r1=1099077&r2=1099078&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb Tue May 3 14:33:51 2011
@@ -277,15 +277,20 @@ class RHEVMDriver < Deltacloud::BaseDriv
)
end
- # Disabling this error catching will lead to more verbose messages
- # on console (eg. response from RHEV-M API (so far I didn't figure our
- # how to pass those message to our exception handling tool)
- def catched_exceptions_list
- {
- :auth => [RestClient::Unauthorized],
- :error => [RestClient::InternalServerError],
- :glob => [ /(RestClient|RHEVM)::(\w+)/ ]
- }
+ exceptions do
+
+ on /RestClient::Unauthorized/ do
+ status 401
+ end
+
+ on /RestClient::InternalServerError/ do
+ status 502
+ end
+
+ on /(RestClient|RHEVM)/ do
+ status 500
+ end
+
end
end
Modified: incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb?rev=1099078&r1=1099077&r2=1099078&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb (original)
+++ incubator/deltacloud/trunk/server/tests/drivers/mock/api_test.rb Tue May 3 14:33:51 2011
@@ -69,7 +69,7 @@ module DeltacloudUnitTest
with_provider("storage") do
get_auth_url '/api/instances'
- last_response.status.should == 404
+ last_response.status.should == 403
end
end
@@ -79,7 +79,7 @@ module DeltacloudUnitTest
with_provider("storage") do
get_url '/api/docs/instances'
- last_response.status.should == 404
+ last_response.status.should == 403
end
end