Merge branch '109012608-whiteips-import' into staging

This commit is contained in:
Stas 2015-11-30 12:17:09 +02:00
commit 025fc4c035

View file

@ -173,11 +173,15 @@ namespace :import do
x.acl.all.each do |y|
next if existing_ips.include?(y.ipaddr)
if !y.ipaddr.nil? && y.ipaddr != ''
ips << WhiteIp.new({
registrar_id: Registrar.find_by(legacy_id: x.try(:id)).try(:id),
ipv4: y.ipaddr,
interfaces: ['api', 'registrar']
})
y.ipaddr.split(',').each do |ip|
ips << WhiteIp.new({
registrar_id: Registrar.find_by(legacy_id: x.try(:id)).try(:id),
ipv4: ip,
interfaces: ['api', 'registrar']
})
end
end
end
end