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

Bug #2586: Better nokogiri formatting options

Browse Source
This commit is contained in:
Carlos Martín 2014-04-22 15:23:10 +02:00
parent 395b20830a
commit 85c4b7bd92
8 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/onedb/fsck.rb
View File

@ -766,7 +766,7 @@ EOT
# Aggregate information of the RUNNING vms
@db.fetch("SELECT oid,body FROM vm_pool WHERE state<>6") do |row|
vm_doc = Nokogiri::XML(row[:body])
vm_doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
state = vm_doc.root.at_xpath('STATE').text.to_i
lcm_state = vm_doc.root.at_xpath('LCM_STATE').text.to_i
@ -1101,7 +1101,7 @@ EOT
@db.transaction do
@db[:leases].each do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
used = (doc.root.at_xpath('USED').text == "1")
vid = doc.root.at_xpath('VID').text.to_i
@ -1286,7 +1286,7 @@ EOT
end
@db.fetch("SELECT * FROM old_user_quotas WHERE user_oid>0") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
calculate_quotas(doc, "uid=#{row[:user_oid]}", "User")
@ -1334,7 +1334,7 @@ EOT
end
@db.fetch("SELECT * FROM old_group_quotas WHERE group_oid>0") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
calculate_quotas(doc, "gid=#{row[:group_oid]}", "Group")
@ -1382,7 +1382,7 @@ EOT
img_usage = {}
@db.fetch("SELECT body FROM vm_pool WHERE #{where_filter} AND state<>6") do |vm_row|
vmdoc = Nokogiri::XML(vm_row[:body])
vmdoc = Nokogiri::XML(vm_row[:body]){|c| c.default_xml.noblanks}
# VM quotas
vmdoc.root.xpath("TEMPLATE/CPU").each { |e|
@ -1567,7 +1567,7 @@ EOT
ds_usage = {}
@db.fetch("SELECT body FROM image_pool WHERE #{where_filter}") do |img_row|
img_doc = Nokogiri::XML(img_row[:body])
img_doc = Nokogiri::XML(img_row[:body]){|c| c.default_xml.noblanks}
img_doc.root.xpath("DATASTORE_ID").each { |e|
ds_usage[e.text] = [0,0] if ds_usage[e.text].nil?

22
src/onedb/import_slave.rb
View File

@ -275,7 +275,7 @@ EOT
new_user = users[row[:oid]]
new_group = groups[row[:gid]]
slave_doc = Nokogiri::XML(row[:body])
slave_doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
if new_user[:merged]
# Merge user objects, giving priority to the contents
@ -289,7 +289,7 @@ EOT
@db.fetch("SELECT body from user_pool "<<
"WHERE oid=#{new_user[:oid]}") do |master_row|
master_doc = Nokogiri::XML(master_row[:body])
master_doc = Nokogiri::XML(master_row[:body]){|c| c.default_xml.noblanks}
end
# Merge secondary groups
@ -363,14 +363,14 @@ EOT
@slave_db.fetch("SELECT * FROM group_pool") do |row|
new_group = groups[row[:gid]]
slave_doc = Nokogiri::XML(row[:body])
slave_doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
if new_group[:merged]
master_doc = nil
@db.fetch("SELECT body from group_pool "<<
"WHERE oid=#{new_group[:oid]}") do |master_row|
master_doc = Nokogiri::XML(master_row[:body])
master_doc = Nokogiri::XML(master_row[:body]){|c| c.default_xml.noblanks}
end
slave_users_elem = slave_doc.root.at_xpath("USERS")
@ -452,7 +452,7 @@ EOT
@slave_db.fetch("SELECT * FROM old_user_quotas") do |row|
new_user_id = users[row[:user_oid]][:oid]
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("ID").content = new_user_id
@ -470,7 +470,7 @@ EOT
@slave_db.fetch("SELECT * FROM old_group_quotas") do |row|
new_group_id = groups[row[:group_oid]][:oid]
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("ID").content = new_group_id
@ -672,7 +672,7 @@ EOT
new_user = users[row[:uid]]
new_group = groups[row[:gid]]
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("UID").content = new_user[:oid]
doc.root.at_xpath("UNAME").content = new_user[:name]
@ -727,7 +727,7 @@ EOT
new_user = users[row[:uid]]
new_group = groups[row[:gid]]
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("UID").content = new_user[:oid]
doc.root.at_xpath("UNAME").content = new_user[:name]
@ -750,7 +750,7 @@ EOT
new_user = users[row[:uid]]
new_group = groups[row[:gid]]
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("UID").content = new_user[:oid]
doc.root.at_xpath("UNAME").content = new_user[:name]
@ -774,7 +774,7 @@ EOT
new_user = users[row[:uid]]
new_group = groups[row[:gid]]
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("UID").content = new_user[:oid]
doc.root.at_xpath("UNAME").content = new_user[:name]
@ -798,7 +798,7 @@ EOT
new_user = users[row[:uid]]
new_group = groups[row[:gid]]
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("UID").content = new_user[:oid]
doc.root.at_xpath("UNAME").content = new_user[:name]

2
src/onedb/shared/3.8.0_to_3.8.1.rb
View File

@ -56,7 +56,7 @@ module Migrator
# Aggregate information of the RUNNING vms
@db.fetch("SELECT oid,body FROM vm_pool WHERE state<>6") do |row|
vm_doc = Nokogiri::XML(row[:body])
vm_doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
state = vm_doc.root.at_xpath('STATE').text.to_i
lcm_state = vm_doc.root.at_xpath('LCM_STATE').text.to_i

10
src/onedb/shared/3.8.5_to_3.9.80.rb
View File

@ -291,7 +291,7 @@ module Migrator
end
@db.fetch("SELECT * FROM old_user_pool WHERE oid>0") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
set_default_quotas(doc)
@ -329,7 +329,7 @@ module Migrator
end
@db.fetch("SELECT * FROM old_group_pool WHERE oid>0") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
set_default_quotas(doc)
@ -452,7 +452,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_vm_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
user_template = doc.create_element("USER_TEMPLATE")
e = doc.root.at_xpath("TEMPLATE")
@ -509,7 +509,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_template_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
template = doc.root.at_xpath("TEMPLATE")
@ -559,7 +559,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_vm_pool") do |row|
if ( row[:state] != 6 ) # DONE
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
nic_id = 0

4
src/onedb/shared/3.9.80_to_3.9.90.rb
View File

@ -49,7 +49,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_vm_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.xpath("HISTORY_RECORDS/HISTORY").each do |e|
update_history(e)
@ -79,7 +79,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_history") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.xpath("/HISTORY").each do |e|
update_history(e)

4
src/onedb/shared/4.0.1_to_4.1.80.rb
View File

@ -49,7 +49,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_user_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("TEMPLATE").
add_child(doc.create_element("TOKEN_PASSWORD")).
@ -80,7 +80,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_datastore_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.add_child(doc.create_element("TOTAL_MB")).content = "0"
doc.root.add_child(doc.create_element("FREE_MB")).content = "0"

12
src/onedb/shared/4.2.0_to_4.3.80.rb
View File

@ -90,7 +90,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_user_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
g_elem = doc.create_element("GROUPS")
g_elem.add_child(doc.create_element("ID")).content = row[:gid].to_s
@ -140,7 +140,7 @@ module Migrator
end
@db.fetch("SELECT * FROM old_group_pool WHERE oid>0") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
redo_vm_quotas(doc, "gid=#{row[:oid]}")
@ -235,7 +235,7 @@ http://opennebula.org/documentation:rel4.4:upgrade
@db.transaction do
@db.fetch("SELECT * FROM old_vm_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.xpath("HISTORY_RECORDS/HISTORY").each do |e|
update_history(e)
@ -265,7 +265,7 @@ http://opennebula.org/documentation:rel4.4:upgrade
@db.transaction do
@db.fetch("SELECT * FROM old_history") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.xpath("/HISTORY").each do |e|
update_history(e)
@ -293,7 +293,7 @@ http://opennebula.org/documentation:rel4.4:upgrade
@db.transaction do
@db.fetch("SELECT * FROM old_host_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
doc.root.at_xpath("HOST_SHARE").
add_child(doc.create_element("DATASTORES"))
@ -362,7 +362,7 @@ http://opennebula.org/documentation:rel4.4:upgrade
vol_used = 0
@db.fetch("SELECT body FROM vm_pool WHERE #{where_filter} AND state<>6") do |vm_row|
vmdoc = Nokogiri::XML(vm_row[:body])
vmdoc = Nokogiri::XML(vm_row[:body]){|c| c.default_xml.noblanks}
# VM quotas
vmdoc.root.xpath("TEMPLATE/CPU").each { |e|

10
src/onedb/shared/4.4.1_to_4.5.80.rb
View File

@ -56,7 +56,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_user_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
quotas_doc = extract_quotas(doc)
@ -92,7 +92,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_group_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
quotas_doc = extract_quotas(doc)
@ -125,7 +125,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_network_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
template = doc.root.at_xpath("TEMPLATE")
@ -166,7 +166,7 @@ module Migrator
@db.transaction do
@db.fetch("SELECT * FROM old_template_pool") do |row|
doc = Nokogiri::XML(row[:body])
doc = Nokogiri::XML(row[:body]){|c| c.default_xml.noblanks}
atts = ["SCHED_REQUIREMENTS", "SCHED_RANK", "REQUIREMENTS", "RANK"]
@ -219,7 +219,7 @@ module Migrator
vm_quota = doc.root.at_xpath("VM_QUOTA")
img_quota = doc.root.at_xpath("IMAGE_QUOTA")
quotas_doc = Nokogiri::XML("<QUOTAS></QUOTAS>")
quotas_doc = Nokogiri::XML("<QUOTAS></QUOTAS>"){|c| c.default_xml.noblanks}
ds_quota = quotas_doc.create_element("DATASTORE_QUOTA") if ds_quota.nil?
net_quota = quotas_doc.create_element("NETWORK_QUOTA") if net_quota.nil?