Fixes #16248 - sanitize improper virt-who hostnames (Katello#6266)

app/lib/actions/katello/host/hypervisors_update.rb

@@ -29,7 +29,8 @@ def update_or_create_hypervisor(hypervisor_json)
 
           # Since host names must be unique yet hypervisors may have unique subscription
           # facets in different orgs
-          duplicate_name = "virt-who-#{hypervisor_json[:name]}-#{organization.id}"
+          sanitized_name = ::Katello::Host::SubscriptionFacet.sanitize_name(hypervisor_json[:name])
+          duplicate_name = "virt-who-#{sanitized_name}-#{organization.id}"
           host = ::Katello::Host::SubscriptionFacet.find_by(:uuid => hypervisor_json[:uuid]).try(:host)
           host ||= ::Host.find_by(:name => duplicate_name)
           if host && host.organization.try(:id) != organization.id

app/models/katello/host/subscription_facet.rb

@@ -102,6 +102,10 @@ def self.find_host(name, organization)
         hosts.first
       end
 
+      def self.sanitize_name(name)
+        name.gsub('_', '-').chomp('.').downcase
+      end
+
       def candlepin_consumer
         @candlepin_consumer ||= Katello::Candlepin::Consumer.new(self.uuid)
       end

lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake

@@ -46,10 +46,8 @@ namespace :katello do
             subscription_facet.save!
 
             host = subscription_facet.host
-            if host.name.include?('_') || host.name != host.name.downcase || host.name.ends_with?('.')
-              host.name = host.name.gsub('_', '-').chomp('.').downcase
-              host.save!
-            end
+            host.name = ::Katello::Host::SubscriptionFacet.sanitize_name(host.name)
+            host.save! if host.name_changed?
 
             Katello::Host::SubscriptionFacet.update_facts(subscription_facet.host, candlepin_attrs[:facts])
           rescue StandardError => exception

test/lib/tasks/upgrades/3.0/update_subscription_facet_backend_data_test.rb

@@ -0,0 +1,24 @@
+require 'katello_test_helper'
+require 'rake'
+
+module Katello
+  class UpdateSubscriptionFacetBackendDataTest < ActiveSupport::TestCase
+    def setup
+      Rake.application.rake_require 'katello/tasks/upgrades/3.0/update_subscription_facet_backend_data'
+
+      Rake::Task['katello:upgrades:3.0:update_subscription_facet_backend_data'].reenable
+      Rake::Task.define_task(:environment)
+      @host = hosts(:one)
+    end
+
+    def test_run
+      Katello::Host::SubscriptionFacet.where("id != #{@host.subscription_facet.id}").destroy_all
+      Katello::Host::SubscriptionFacet.any_instance.stubs(:host).returns(@host)
+      Katello::Candlepin::Consumer.any_instance.stubs(:consumer_attributes).returns(:facts => {:foo => :bar})
+
+      Katello::Host::SubscriptionFacet.expects(:update_facts).with(@host, :foo => :bar).once
+
+      Rake.application.invoke_task('katello:upgrades:3.0:update_subscription_facet_backend_data')
+    end
+  end
+end

test/models/host/subscription_facet_test.rb

@@ -16,6 +16,12 @@ class SubscriptionFacetBase < ActiveSupport::TestCase
   end
 
   class SubscriptionFacetTest < SubscriptionFacetBase
+    def test_sanitize_name
+      assert_equal 'foo-bar', Host::SubscriptionFacet.sanitize_name('foo_bar')
+      assert_equal 'foobar', Host::SubscriptionFacet.sanitize_name('foobar.')
+      assert_equal 'foobar', Host::SubscriptionFacet.sanitize_name('FoOBar')
+    end
+
     def test_search_release_version
       subscription_facet.update_attributes!(:release_version => '7Server')