Split out MiqSockUtil methods into their on Environment methods, and …

…add corresponding specs.

app/models/miq_server/environment_management.rb

@@ -44,8 +44,8 @@ def get_network_information
           mac_address = eth0.mac_address
         else
           require 'socket'
-          ipaddr      = Socket.ip_address_list.detect { |addr| addr.ipv4? && !addr.ipv4_private? }&.ip_address
-          hostname    = Socket.gethostbyname(Socket.gethostname).first
+          ipaddr      = MiqEnvironment.local_ip_address
+          hostname    = MiqEnvironment.fully_qualified_domain_name
           mac_address = UUIDTools::UUID.mac_address.dup
         end
       rescue

lib/miq_environment.rb

@@ -1,6 +1,19 @@
 require 'sys-uname'
+require 'socket'
 
 module MiqEnvironment
+  # Return the fully qualified hostname for the local host.
+  #
+  def self.fully_qualified_domain_name
+    Socket.gethostbyname(Socket.gethostname).first
+  end
+
+  # Return the local IP v4 address of the local host, ignoring private addresses.
+  #
+  def self.local_ip_address
+    Socket.ip_address_list.detect { |addr| addr.ipv4? && !addr.ipv4_private? }&.ip_address
+  end
+
   class Command
     EVM_KNOWN_COMMANDS = %w[apachectl memcached memcached-tool nohup service systemctl].freeze
 

spec/lib/miq_environment_spec.rb

@@ -9,6 +9,16 @@
       silence_warnings { Sys::Platform::IMPL = @old_impl } if @old_impl
     end
 
+    context "Host Info" do
+      example "fully_qualified_domain_name" do
+        expect(described_class.fully_qualified_domain_name).to eq(`hostname -f`.chomp)
+      end
+
+      example "local_ip_address" do
+        expect(described_class.local_ip_address).to eq(`hostname -i`.chomp)
+      end
+    end
+
     context "Command" do
       context ".supports_memcached?" do
         it "should run once and cache the result" do

spec/models/miq_server/environment_manager_spec.rb

@@ -1,4 +1,17 @@
+require 'socket'
+
 RSpec.describe "Server Environment Management" do
+  let(:mac_address) { 'a:1:b:2:c:3:d:4' }
+  let(:hostname) { Socket.gethostname }
+  let(:loopback) { '127.0.0.1' }
+
+  context ".get_network_information" do
+    it "when in non-production mode" do
+      allow(UUIDTools::UUID).to receive(:mac_address).and_return(mac_address)
+      expect(MiqServer.get_network_information).to eq([loopback, hostname, mac_address])
+    end
+  end
+
   context ".spartan_mode" do
     before { MiqServer.class_eval { instance_variable_set :@spartan_mode, nil } }
     after { MiqServer.class_eval { instance_variable_set :@spartan_mode, nil } }