shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

feature #192 Fixed problem on REXML parser adding \n and whitespaces

Browse Source
This commit is contained in:
Daniel Molina 2010-07-02 16:19:26 +02:00 committed by Ruben S. Montero
parent 76040825aa
commit 909bdb0381
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/ruby/onehost
View File

@ -278,7 +278,7 @@ when "show"
puts host.template_str
else
puts host.to_xml
puts host.to_xml(true)
end
when "delete"
@ -322,7 +322,7 @@ when "list"
else
hostpool=OpenNebula::HostPool.new(get_one_client)
hostpool.info
puts hostpool.to_xml
puts hostpool.to_xml(true)
end
when "top"

2
src/client/ruby/oneuser
View File

@ -202,7 +202,7 @@ when "list"
else
userpool=OpenNebula::UserPool.new(get_one_client)
userpool.info
puts userpool.to_xml
puts userpool.to_xml(true)
end
else

4
src/client/ruby/onevm
View File

@ -633,7 +633,7 @@ when "list"
vmpool=OpenNebula::VirtualMachinePool.new(get_one_client,
ops[:filter_user].to_i)
vmpool.info
puts vmpool.to_xml
puts vmpool.to_xml(true)
end
when "top"
@ -718,7 +718,7 @@ when "show"
puts vm.template_str
else
puts vm.to_xml
puts vm.to_xml(true)
end
end
else

4
src/client/ruby/onevnet
View File

@ -236,7 +236,7 @@ when "show"
puts leases_str
end
else
puts vn.to_xml
puts vn.to_xml(true)
end
else
puts "Error: "+result.message
@ -286,7 +286,7 @@ when "list"
vnpool=OpenNebula::VirtualNetworkPool.new(get_one_client,
filter_flag.to_i)
vnpool.info
puts vnpool.to_xml
puts vnpool.to_xml(true)
end
else

16
src/oca/ruby/OpenNebula/XMLUtils.rb
View File

@ -104,12 +104,16 @@ module OpenNebula
return @hash
end
def to_xml
def to_xml(pretty=false)
if NOKOGIRI
@xml.to_xml
else
str = ""
REXML::Formatters::Pretty.new(1).write(@xml,str)
if pretty
REXML::Formatters::Pretty.new(1).write(@xml,str)
else
REXML::Formatters::Default.new.write(@xml,str)
end
str
end
end
@ -149,12 +153,16 @@ module OpenNebula
end
end
def to_xml
def to_xml(pretty=false)
if NOKOGIRI
@xml.to_xml
else
str = ""
REXML::Formatters::Pretty.new(1).write(@xml,str)
if pretty
REXML::Formatters::Pretty.new(1).write(@xml,str)
else
REXML::Formatters::Default.new.write(@xml,str)
end
str
end
end