Fixes #14718 - on rhsm registration, ignore centos os without minor v…

…ersion (#5988)

app/models/katello/rhsm_fact_parser.rb

@@ -42,13 +42,17 @@ def operatingsystem
      return nil if name.nil? || version.nil?

      os_name = ::Katello::Candlepin::Consumer.distribution_to_puppet_os(name)
      if os_name
        major, minor = version.split('.')
      major, minor = version.split('.')
      if os_name && !invalid_centos_os?(os_name, minor)
        os_attributes = {:major => major, :minor => minor || '', :name => os_name}
        ::Operatingsystem.find_by(os_attributes) || ::Operatingsystem.create!(os_attributes)
      end
    end

    def invalid_centos_os?(name, minor_version)
      name == 'CentOS' && minor_version.blank?
    end

    #required to be defined, even if they return nil
    def domain
    end

test/models/rhsm_fact_parser_test.rb

@@ -36,5 +36,21 @@ def test_get_facts_for_interface_without_ip
      }
      assert_equal expected_eth1, @parser.get_facts_for_interface('eth1')
    end

    def test_valid_centos_os
      @facts['distribution.name'] = 'CentOS'
      @facts['distribution.version'] = '7.2'
      @parser = RhsmFactParser.new(@facts)

      assert @parser.operatingsystem.is_a?(::Operatingsystem)
    end

    def test_invalid_centos_os
      @facts['distribution.name'] = 'CentOS'
      @facts['distribution.version'] = '7'
      @parser = RhsmFactParser.new(@facts)

      refute @parser.operatingsystem
    end
  end
end