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

Bug #4695: Fsck fixes vnet IPs with whitespaces

Browse Source
This commit is contained in:
Carlos Martín 2016-08-23 18:01:13 +02:00
parent fbf8d4be72
commit 2d1f2da794
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/onedb/fsck.rb
View File

@ -1613,7 +1613,7 @@ EOT
# IP
first_ip = nil
if (!ar.at_xpath("IP").nil?)
first_ip = IPAddr.new(ar.at_xpath("IP").text, Socket::AF_INET)
first_ip = IPAddr.new(ar.at_xpath("IP").text.strip, Socket::AF_INET)
end
# IP6
@ -1715,7 +1715,18 @@ EOT
# IP
first_ip = nil
if !net_ar.at_xpath("IP").nil?
first_ip = IPAddr.new(net_ar.at_xpath("IP").text, Socket::AF_INET)
first_ip_st = net_ar.at_xpath("IP").text
if (first_ip_st != first_ip_st.strip)
log_error("VNet #{oid} AR #{ar_id} "<<
"IP \"#{first_ip_st}\" contains whitespaces")
first_ip_st.strip!
net_ar.at_xpath("IP").content = first_ip_st
end
first_ip = IPAddr.new(first_ip_st, Socket::AF_INET)
end
# IP6