shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-15 23:24:09 +03:00
Code Releases Wiki Activity

Check malformed XML in OCCI Client

Browse Source
This commit is contained in:
Daniel Molina 2010-12-02 19:29:49 +01:00
parent 3e9627c946
commit 17d9dd08c5
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cloud/occi/lib/OCCIClient.rb
View File

@ -162,7 +162,13 @@ module OCCIClient
######################################################################
def post_image(xmlfile, curb=true)
xml = File.read(xmlfile)
image_info = REXML::Document.new(xml).root
begin
image_info = REXML::Document.new(xml).root
rescue Exception => e
error = CloudClient::Error.new(e.message)
return error
end
if image_info.elements['URL'] == nil
return CloudClient::Error.new("Can not find URL")
@ -285,10 +291,16 @@ module OCCIClient
######################################################################
def put_vm(xmlfile)
xml = File.read(xmlfile)
vm_info = REXML::Document.new(xml).root
begin
vm_info = REXML::Document.new(xml).root
rescue Exception => e
error = CloudClient::Error.new(e.message)
return error
end
if vm_info.elements['ID'] == nil
return CloudClient::Error.new("Can not find VM_ID")
return CloudClient::Error.new("Can not find COMPUTE_ID")
end
vm_id = vm_info.elements['ID'].text
@ -358,7 +370,13 @@ module OCCIClient
######################################################################
def put_network(xmlfile)
xml = File.read(xmlfile)
vnet_info = REXML::Document.new(xml).root
begin
vnet_info = REXML::Document.new(xml).root
rescue Exception => e
error = CloudClient::Error.new(e.message)
return error
end
if vnet_info.elements['ID'] == nil
return CloudClient::Error.new("Can not find NETWORK_ID")
@ -431,6 +449,7 @@ module OCCIClient
######################################################################
def put_image(xmlfile)
xml = File.read(xmlfile)
begin
image_info = REXML::Document.new(xml).root
rescue Exception => e