Merge pull request ManageIQ#16913 from bdunne/server_hostname

Only store the hostname if the hostname is valid
(cherry picked from commit 27e646c)

https://bugzilla.redhat.com/show_bug.cgi?id=1550732

app/models/miq_server.rb

@@ -52,6 +52,11 @@ def self.active_miq_servers
     where(:status => STATUSES_ACTIVE)
   end
 
+  def hostname
+    h = super
+    h if h.to_s.hostname?
+  end
+
   def self.atStartup
     starting_roles = ::Settings.server.role
 
@@ -195,7 +200,7 @@ def self.start
       server_hash[:ipaddress] = config_hash[:host] = ipaddr
     end
 
-    unless hostname.blank?
+    if hostname.present? && hostname.hostname?
       hostname = nil if hostname =~ /.*localhost.*/
       server_hash[:hostname] = config_hash[:hostname] = hostname
     end

spec/models/miq_server_spec.rb

@@ -12,6 +12,13 @@
     described_class.invoke_at_startups
   end
 
+  context "#hostname" do
+    it("with a valid hostname")    { expect(MiqServer.new(:hostname => "test").hostname).to eq("test") }
+    it("with a valid fqdn")        { expect(MiqServer.new(:hostname => "test.example.com").hostname).to eq("test.example.com") }
+    it("with an invalid hostname") { expect(MiqServer.new(:hostname => "test_host").hostname).to be_nil }
+    it("without a hostname")       { expect(MiqServer.new.hostname).to be_nil }
+  end
+
   context ".my_guid" do
     let(:guid_file) { Rails.root.join("GUID") }