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

Development: Fix fsck for empty XML elements in VNETs

Browse Source
This commit is contained in:
Ruben S. Montero 2016-04-28 12:56:36 +02:00
parent 563afe9bfa
commit f518b526c7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/onedb/fsck.rb
View File

@ -1288,7 +1288,7 @@ EOT
end
end
end
if !db_version[:is_slave]
@db.transaction do
apps_fix.each do |id, body|
@ -1337,7 +1337,7 @@ EOT
markets_fix[row[:oid]] = doc.root.to_s
end
if !db_version[:is_slave]
@db.transaction do
markets_fix.each do |id, body|
@ -1734,7 +1734,7 @@ EOT
elsif (binary_magic & NET_BIN != 0)
lease[:vnet] = lease_oid
lease_obj = "VNet"
else #(binary_magic & VROUTER_BIN != 0)
else #(binary_magic & VROUTER_BIN != 0)
lease[:vrouter] = lease_oid
lease_obj = "VRouter"
end
@ -2344,6 +2344,7 @@ EOT
end
def mac_s_to_i(mac)
return nil if mac.empty?
return mac.split(":").map {|e|
e.to_i(16).to_s(16).rjust(2,"0")}.join("").to_i(16)
end
@ -2355,6 +2356,7 @@ EOT
end
def ip6_prefix_s_to_i(prefix)
return nil if prefix.empty?
return prefix.split(":", 4).map {|e|
e.to_i(16).to_s(16).rjust(4, "0")}.join("").to_i(16)
end