Merge pull request #305 from agrare/use_unix_socket_for_drb_connection

Use the full URI for the broker connection
(cherry picked from commit 675cc09cac238bfa52850a46d447afa2a9143aa2)

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

app/models/miq_vim_broker_worker.rb

@@ -55,14 +55,6 @@ def self.drb_uri
     broker.uri
   end
 
-  def self.drb_port
-    uri = drb_uri
-    return nil if uri.nil?
-    _scheme, _userinfo, _host, port, _registry, _path, _opaque, _query, _fragment = URI.split(uri)
-    _log.debug("Active VimBroker DRb Port is #{port}")
-    port.to_i
-  end
-
   def self.broker_unavailable(err_class, message)
     _log.warn("The following error was encountered, '#{message}', the broker server should be restarted on the next heartbeat")
     broker = find_current.first

app/models/miq_vim_broker_worker/runner.rb

@@ -253,7 +253,7 @@ def create_miq_vim_broker_server
 
     _log.info("#{log_prefix} Creating broker server with [#{MiqVimBroker.cacheScope}]")
 
-    @vim_broker_server = MiqVimBroker.new(:server, 0)   # Port 0 means to let it pick any available port
+    @vim_broker_server = MiqVimBroker.new(:server)
   end
 
   def start_broker_server(emses_to_prime = nil)

app/models/mixins/vim_connect_mixin.rb

@@ -15,7 +15,7 @@ def connect(options = {})
       _log.error(msg)
       raise MiqException::MiqVimBrokerUnavailable, _("Broker Worker is not available")
     end
-    options[:vim_broker_drb_port] ||= MiqVimBrokerWorker.method(:drb_port) if options[:use_broker]
+    options[:vim_broker_drb_uri] ||= MiqVimBrokerWorker.method(:drb_uri) if options[:use_broker]
 
     # The following require pulls in both MiqFaultTolerantVim and MiqVim
     require 'VMwareWebService/miq_fault_tolerant_vim'

spec/models/miq_vim_broker_worker/runner_spec.rb

@@ -140,22 +140,22 @@
     context "#create_miq_vim_broker_server" do
       it "with ems_inventory role" do
         @vim_broker_worker.instance_variable_set(:@active_roles, ['ems_inventory'])
-        expect(MiqVimBroker).to receive(:new).with(:server, 0).once
+        expect(MiqVimBroker).to receive(:new).with(:server).once
         @vim_broker_worker.create_miq_vim_broker_server
         expect(MiqVimBroker.cacheScope).to eq(:cache_scope_ems_refresh)
       end
 
       it "without ems_inventory role" do
         @vim_broker_worker.instance_variable_set(:@active_roles, ['ems_operations'])
-        expect(MiqVimBroker).to receive(:new).with(:server, 0).once
+        expect(MiqVimBroker).to receive(:new).with(:server).once
         @vim_broker_worker.create_miq_vim_broker_server
         expect(MiqVimBroker.cacheScope).to eq(:cache_scope_core)
       end
 
       it "with ems_inventory role using update_driven_refresh" do
         stub_settings(:prototype => {:ems_vmware => {:update_driven_refresh => true}})
         @vim_broker_worker.instance_variable_set(:@active_roles, ['ems_inventory'])
-        expect(MiqVimBroker).to receive(:new).with(:server, 0).once
+        expect(MiqVimBroker).to receive(:new).with(:server).once
         @vim_broker_worker.create_miq_vim_broker_server
         expect(MiqVimBroker.cacheScope).to eq(:cache_scope_core)
       end