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/11/28 10:41:23 UTC
svn commit: r1207038 -
/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
Author: mfojtik
Date: Mon Nov 28 09:41:23 2011
New Revision: 1207038
URL: http://svn.apache.org/viewvc?rev=1207038&view=rev
Log:
RHEVM: Deleting VMs does not work with rhevm backend (JIRA: DTACLOUD-110)
Modified:
deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
Modified: deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb?rev=1207038&r1=1207037&r2=1207038&view=diff
==============================================================================
--- deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb (original)
+++ deltacloud/trunk/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb Mon Nov 28 09:41:23 2011
@@ -68,13 +68,11 @@ module RHEVM
def vm_action(id, action, headers={})
headers.merge!(auth_header)
- headers.merge!({
- :content_type => 'application/xml',
- :accept => 'application/xml',
- })
+ headers.merge!({:accept => 'application/xml'})
if action==:delete
RHEVM::client(@api_entrypoint)["/vms/%s" % id].delete(headers)
else
+ headers.merge!({ :content_type => 'application/xml' })
begin
client_response = RHEVM::client(@api_entrypoint)["/vms/%s/%s" % [id, action]].post('<action/>', headers)
rescue