Merge 5877b4e into 6e7ceb2

ManageIQ · Feb 28, 2020 · 87eb707 · 87eb707
2 parents 6e7ceb2 + 5877b4e
commit 87eb707
Show file tree

Hide file tree

Showing 3 changed files with 201 additions and 259 deletions.
diff --git a/manageiq-providers-vmware.gemspec b/manageiq-providers-vmware.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("fog-vcloud-director", ["~> 0.3.0"])
   s.add_dependency "ffi-vix_disk_lib",        "~>1.1"
-  s.add_dependency "rbvmomi",                 "~>2.0.0"
+  s.add_dependency "rbvmomi",                 "~>2.3"
   s.add_dependency "vmware_web_service",      "~>1.0"
   s.add_dependency "vsphere-automation-sdk",  "~>0.2.1"
 

diff --git a/spec/models/manageiq/providers/vmware/infra_manager/inventory/cache_spec.rb b/spec/models/manageiq/providers/vmware/infra_manager/inventory/cache_spec.rb
@@ -1,4 +1,4 @@
-require "rbvmomi/vim"
+require "rbvmomi"
 
 describe ManageIQ::Providers::Vmware::InfraManager::Inventory::Cache do
   let(:cache) { described_class.new }
@@ -10,7 +10,6 @@
         :hardware => {
           :device => [
             RbVmomi::VIM::VirtualLsiLogicController(
-              :dynamicProperty    => [],
               :key                => 1000,
               :deviceInfo         => RbVmomi::VIM::Description(:label => "SCSI controller 0", :summary => "LSI Logic"),
               :controllerKey      => 100,
@@ -22,7 +21,6 @@
               :scsiCtlrUnitNumber => 7,
             ),
             RbVmomi::VIM::VirtualDisk(
-              :dynamicProperty => [],
               :key             => 2000,
               :deviceInfo      => RbVmomi::VIM::Description(:label => "Hard disk 1", :summary => "41,943,040 KB"),
               :backing         => RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo(