vmware_web_service 0.2.13 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c928bedb5eb3eff7198d23dee64dcf0762ec025
-  data.tar.gz: f068c16fa2aaca98da5fb26419080c87b60cb5ce
+  metadata.gz: 4aad1c37f7d0f84ae2588d905da9793e0002d709
+  data.tar.gz: 3f843141887206673235d16ded28f1f872740834
 SHA512:
-  metadata.gz: 2ee5b51c875807726e357e8475c7a2b726845dafade638ce5ffef6e3d9968820f3655dc0314177faaa6f419adfed1e4a9a33775d4af62c800dd8ab77d3624319
-  data.tar.gz: e3d9d3f29f25ec9187e13054ce680eb10d2380f52805a59be197bf0b39aaed5e488773440a98b9ad82da3ec5790b585db52f0e831ddcbf8e3a75c840ade114f0
+  metadata.gz: 2e41f397f84815a3d9cd7fa54d9f504d184609a8ddab1ff39c6d986c232a364895ee6de5e6cc65d111f131a34884cd70c96e18bec6d75161e001b49c73598a01
+  data.tar.gz: c1c3c7a237ecbbfefb1e44669a8841edb4a769f2898b71b26f2bfa8d1e394bce13df2c95f33ef589fed7fb0382ac71ec8120cf272b55e730f0293108b3e54a26

data/lib/VMwareWebService/MiqVimBroker.rb

@@ -1,6 +1,7 @@
 require 'drb'
 require 'drb/acl'
 require 'sync'
+require 'tmpdir'
 
 require 'VMwareWebService/MiqVimInventory'
 require 'VMwareWebService/VimTypes'
@@ -32,7 +33,7 @@ class MiqVimBroker
   @@maxWait    = 60
   @@maxObjects = 250
 
-  def initialize(mode = :client, port = 9001)
+  def initialize(mode = :client, uri = nil)
     if mode == :client
       require 'rubygems'
       require 'httpclient'  # needed for exception classes
@@ -66,7 +67,8 @@ class MiqVimBroker
       rescue DRb::DRbServerNotFound
         DRb.start_service
       end
-      @broker = DRbObject.new(nil, "druby://127.0.0.1:#{port}")
+
+      @broker = DRbObject.new(nil, uri)
     elsif mode == :server
       require 'timeout'
       require 'VMwareWebService/broker_timeout'
@@ -95,7 +97,11 @@ class MiqVimBroker
 
       acl = ACL.new(%w( deny all allow 127.0.0.1/32 ))
       DRb.install_acl(acl)
-      DRb.start_service("druby://127.0.0.1:#{port}", self, :idconv => VimBrokerIdConv.new)
+
+      Dir::Tmpname.create('MiqVimBroker', nil) do |path|
+        DRb.start_service("drbunix://#{path}", self, :idconv => VimBrokerIdConv.new)
+        FileUtils.chmod(0o750, path)
+      end
     else
       raise "MiqVimBroker: unrecognized mode #{mode}"
     end

data/lib/VMwareWebService/miq_fault_tolerant_vim.rb

@@ -16,19 +16,19 @@ class MiqFaultTolerantVim
 
     @use_broker = options.key?(:use_broker) ? options[:use_broker] : true
     if @use_broker
-      if options[:vim_broker_drb_port].respond_to?(:call)
-        @vim_broker_drb_port_method = options[:vim_broker_drb_port]
-        @vim_broker_drb_port        = @vim_broker_drb_port_method.call
+      if options[:vim_broker_drb_uri].respond_to?(:call)
+        @vim_broker_drb_uri_method = options[:vim_broker_drb_uri]
+        @vim_broker_drb_uri        = @vim_broker_drb_uri_method.call
       else
-        @vim_broker_drb_port_method = nil
-        @vim_broker_drb_port        = options[:vim_broker_drb_port]
+        @vim_broker_drb_uri_method = nil
+        @vim_broker_drb_uri        = options[:vim_broker_drb_uri]
       end
     end
 
     begin
       _connect
     rescue MiqException::MiqVimBrokerUnavailable
-      retry if _handle_broker_port_change
+      retry if _handle_broker_uri_change
       raise
     end
   end
@@ -57,8 +57,8 @@ class MiqFaultTolerantVim
     @use_broker
   end
 
-  def _vim_broker_drb_port
-    @vim_broker_drb_port
+  def _vim_broker_drb_uri
+    @vim_broker_drb_uri
   end
 
   def _reconnect
@@ -116,7 +116,7 @@ class MiqFaultTolerantVim
       #   'DRb::DRbConnError: druby://localhost:9001 - #<Errno::ECONNREFUSED: Connection refused - connect(2)>'
       #
       if err.kind_of?(DRb::DRbConnError)
-        if _handle_broker_port_change
+        if _handle_broker_uri_change
           _connect
           retry
         end
@@ -204,9 +204,9 @@ class MiqFaultTolerantVim
 
   def _connect_broker_client
     return unless $vim_broker_client.nil?
-    raise MiqException::MiqVimBrokerUnavailable, "Broker is not available (not running)." if @vim_broker_drb_port.blank?
-    $vim_broker_client = MiqVimBroker.new(:client, @vim_broker_drb_port)
-    $vim_broker_client_port = @vim_broker_drb_port
+    raise MiqException::MiqVimBrokerUnavailable, "Broker is not available (not running)." if @vim_broker_drb_uri.blank?
+    $vim_broker_client = MiqVimBroker.new(:client, @vim_broker_drb_uri)
+    $vim_broker_client_uri = @vim_broker_drb_uri
   end
 
   def _disconnect_broker_client
@@ -229,16 +229,16 @@ class MiqFaultTolerantVim
     err.to_s
   end
 
-  def _handle_broker_port_change
-    log_header = "MIQ(#{self.class.name}._handle_broker_port_change)"
-    if @vim_broker_drb_port_method
-      new_port = @vim_broker_drb_port_method.call
-      if new_port != $vim_broker_client_port
-        $log.warn("#{log_header} Retrying communication via VimBroker to [#{_ems_address}] because [Broker DRb Port changed from #{$vim_broker_client_port} to #{new_port}]") if $log && !new_port.blank?
-        @vim_broker_drb_port = new_port
+  def _handle_broker_uri_change
+    log_header = "MIQ(#{self.class.name}._handle_broker_uri_change)"
+    if @vim_broker_drb_uri_method
+      new_uri = @vim_broker_drb_uri_method.call
+      if new_uri != $vim_broker_client_uri
+        $log.warn("#{log_header} Retrying communication via VimBroker to [#{_ems_address}] because [Broker DRb URI changed from #{$vim_broker_client_uri} to #{new_uri}]") if $log && !new_uri.blank?
+        @vim_broker_drb_uri = new_uri
         _disconnect
         _disconnect_broker_client
-        return (new_port.blank? ? false : true)
+        return (new_uri.blank? ? false : true)
       end
     end
     false

data/lib/VMwareWebService/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '0.2.13'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport