fixes #17115 - validate ip from RHSM

app/models/katello/rhsm_fact_parser.rb

@@ -23,7 +23,7 @@ def get_facts_for_interface(interface)
       {
         'link' => true,
         'macaddress' => facts["net.interface.#{interface}.mac_address"],
-        'ipaddress' => facts["net.interface.#{interface}.ipv4_address"]
+        'ipaddress' => get_rhsm_ip(interface)
       }
     end
 
@@ -71,5 +71,12 @@ def environment
 
     def ipmi_interface
     end
+
+    private
+
+    def get_rhsm_ip(interface)
+      ip = facts["net.interface.#{interface}.ipv4_address"]
+      Net::Validations.validate_ip(ip) ? ip : nil
+    end
   end
 end

db/migrate/20161026191118_fix_invalid_interfaces.rb

@@ -0,0 +1,15 @@
+class FixInvalidInterfaces < ActiveRecord::Migration
+  class FakeNic < ActiveRecord::Base
+    self.table_name = 'nics'
+
+    def type
+      Nic::Base
+    end
+  end
+
+  def up
+    FakeNic.where(:ip => "Unknown").each do |nic|
+      nic.update_attributes(:ip => nil)
+    end
+  end
+end

test/models/rhsm_fact_parser_test.rb

@@ -9,7 +9,9 @@ def setup
         'net.interface.eth0.1.mac_address' => '00:00:00:00:00:12',
         'net.interface.eth0.1.ipv4_address' => '192.168.0.2',
         'net.interface.ethnone.mac_address' => 'none',
-        'net.interface.eth2.mac_address' => '00:00:00:00:00:13'
+        'net.interface.eth2.mac_address' => '00:00:00:00:00:13',
+        'net.interface.eth3.ipv4_address' => 'Unknown',
+        'net.interface.eth3.mac_address' => '00:00:00:00:00:14'
       }
       @parser = RhsmFactParser.new(@facts)
     end
@@ -44,6 +46,11 @@ def test_get_facts_for_interface_without_ip
       assert_equal expected_eth1, @parser.get_facts_for_interface('eth1')
     end
 
+    def test_get_facts_for_interface_with_invalid_ip
+      assert_equal @facts['net.interface.eth3.mac_address'], @parser.get_facts_for_interface('eth3')['macaddress']
+      assert_empty @parser.get_facts_for_interface('eth3')['ipaddress']
+    end
+
     def test_valid_centos_os
       @facts['distribution.name'] = 'CentOS'
       @facts['distribution.version'] = '7.2'