From c46f87101b07746aeaaa2fb6efda4e3b183f65cf Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 14 Aug 2012 15:17:02 +0200 Subject: [PATCH] feature #378: Return UnsupportedOperation when the action is not supported --- src/cloud/ec2/lib/econe-server.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb index af82e75f31..925d643d49 100644 --- a/src/cloud/ec2/lib/econe-server.rb +++ b/src/cloud/ec2/lib/econe-server.rb @@ -208,11 +208,15 @@ def do_http_request(params) result,rc = @econe_server.detach_volume(params) when 'DeleteVolume' result,rc = @econe_server.delete_volume(params) + else + result = OpenNebula::Error.new( + "#{params['Action']} feature is not supported", + OpenNebula::Error::ENO_EXISTS) end if OpenNebula::is_error?(result) logger.error(result.message) - error CloudServer::HTTP_ERROR_CODE[result.errno], result.to_ec2 + error CloudServer::HTTP_ERROR_CODE[result.errno], result.to_ec2.gsub(/\n\s*/,'') end headers['Content-Type'] = 'application/xml' @@ -221,5 +225,7 @@ def do_http_request(params) status rc end - result + logger.error { params['Action'] } + + result.gsub(/\n\s*/,'') end