From 407cc0e930b9bee0a5887d8a77b3437b9f1bbd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantino=20V=C3=A1zquez=20Blanco?= Date: Tue, 6 Oct 2009 13:29:30 +0000 Subject: [PATCH] Deleting an OCCI resource tells if it exists or not git-svn-id: http://svn.opennebula.org/one/trunk@815 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/cloud/occi/OCCIServer.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/cloud/occi/OCCIServer.rb b/src/cloud/occi/OCCIServer.rb index 63ef8d08bf..bbacb125f7 100755 --- a/src/cloud/occi/OCCIServer.rb +++ b/src/cloud/occi/OCCIServer.rb @@ -399,8 +399,12 @@ end delete '/compute/:id' do protected! vm = VirtualMachineOCCI.new(VirtualMachine.build_xml(params[:id]),get_one_client_user(@auth.credentials[0])) - vm.finalize - "The Compute resource has been successfully deleted" + result = vm.finalize + if OpenNebula::is_error?(result) + "Error: " + result.message + else + "The Compute resource has been successfully deleted" + end end put '/compute/:id' do @@ -429,8 +433,14 @@ end delete '/network/:id' do protected! vn = VirtualNetworkOCCI.new(VirtualNetwork.build_xml(params[:id]),get_one_client_user(@auth.credentials[0])) - vn.delete - "The Virtual Network has been successfully deleted" + + result = vn.delete + + if OpenNebula::is_error?(result) + "Error: " + result.message + else + "The Virtual Network has been successfully deleted" + end end get '/storage/:id' do