diff --git a/src/client/ruby/onehost b/src/client/ruby/onehost index d6a9cf6d05..3b5fd7db80 100755 --- a/src/client/ruby/onehost +++ b/src/client/ruby/onehost @@ -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" diff --git a/src/client/ruby/oneuser b/src/client/ruby/oneuser index 8bbeff18ce..e175761b31 100755 --- a/src/client/ruby/oneuser +++ b/src/client/ruby/oneuser @@ -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 diff --git a/src/client/ruby/onevm b/src/client/ruby/onevm index 9e40e67632..43135f2314 100755 --- a/src/client/ruby/onevm +++ b/src/client/ruby/onevm @@ -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 diff --git a/src/client/ruby/onevnet b/src/client/ruby/onevnet index 55171dcbd6..8baa6bed24 100755 --- a/src/client/ruby/onevnet +++ b/src/client/ruby/onevnet @@ -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 diff --git a/src/oca/ruby/OpenNebula/XMLUtils.rb b/src/oca/ruby/OpenNebula/XMLUtils.rb index b481c5f730..6ee470d0f3 100644 --- a/src/oca/ruby/OpenNebula/XMLUtils.rb +++ b/src/oca/ruby/OpenNebula/XMLUtils.rb @@ -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