vmware_web_service 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 226087a0ff6c13ce429b1afcc992b15be50f5bdd1b69cfff1d7ac6dd7783f947
-  data.tar.gz: fe185b7ae7a35bbb2b7c35e620b7a867644ab58d40b31dc927d1199d5ba9d528
+  metadata.gz: 7f42dc79ee808a2da4df5ea32342cc036a726d7be3ea58f807a592290d69f7a7
+  data.tar.gz: b81a9c1f4cb793767b53fef678b8b81775133cb8756bd19c8063828627fcecfb
 SHA512:
-  metadata.gz: 56d673e90ebcd77929efdd966466d074fb47a244c8ab98de0ff1f31ffd25d210396e9e9a2ac3a1d8984ac20980af76e5e176263c362ac6bd5bfd28880fcae0a3
-  data.tar.gz: 75d6e04f83ef0fee9df9d73dbaaca3497c0aa4f214da4ef83572e74c5697d9f40541e1bda8a3dad31ba628a37aa8e010b69c4b3286dc54a2a6141b21471a329a
+  metadata.gz: 3406916eda670ae52a2045cba881e9fde582829eab69368c9b1744fd4ce13e08997950e9a05c4aaf2e2a761202c2792a84912ad4d9a9bfb68957dc9ac6f2173f
+  data.tar.gz: d9e159b03345090ab4993bdc76002063decc23818852cc0a49a12b2826cc0e7960485dd8654e7c2935280ccbd0ca02c6ff47bafb86599224ca0126d17a322bef

data/lib/VMwareWebService/MiqVimInventory.rb

@@ -41,44 +41,8 @@ class MiqVimInventory < MiqVimClientBase
       $vim_log.info "MiqVimInventory: unrecognized cache scope #{cacheScope}, using FullPropMap"
     end
 
-    if @v2
-      @propMap = dupProps(@propMap)
-
-      deleteProperty(:HostSystem, "capability.storageVMotionSupported")
-      deleteProperty(:HostSystem, "capability.vmotionWithStorageVMotionSupported")
-
-      deleteProperty(:Datastore, "summary.uncommitted")
-      deleteProperty(:Datastore, "summary.maintenanceMode")
-
-      deleteProperty(:VirtualMachine, "config.cpuHotAddEnabled")
-      deleteProperty(:VirtualMachine, "config.cpuHotRemoveEnabled")
-      deleteProperty(:VirtualMachine, "config.hardware.numCoresPerSocket")
-      deleteProperty(:VirtualMachine, "config.hotPlugMemoryIncrementSize")
-      deleteProperty(:VirtualMachine, "config.hotPlugMemoryLimit")
-      deleteProperty(:VirtualMachine, "config.memoryHotAddEnabled")
-      deleteProperty(:VirtualMachine, "summary.config.ftInfo.instanceUuids")
-      deleteProperty(:VirtualMachine, "summary.storage.unshared")
-      deleteProperty(:VirtualMachine, "summary.storage.committed")
-
-      deleteProperty(:ClusterComputeResource, "configuration.dasConfig.admissionControlPolicy")
-      if @v20
-        deleteProperty(:VirtualMachine, "availableField")
-        deleteProperty(:HostSystem, "config.dateTimeInfo")
-      end
-    else
-      if @v4
-        @propMap = dupProps(@propMap)
-
-        deleteProperty(:Datastore, "summary.maintenanceMode")
-
-        if cacheScope != :cache_scope_event_monitor
-          addProperty(:VirtualMachine, "runtime.memoryOverhead")
-          deleteProperty(:VirtualMachine, "config.hardware.numCoresPerSocket")
-        end
-      end
-
-      @propMap = @propMap.merge(PropMap4)
-    end
+    # If we are connected to a virtual center then we can access additional properties
+    @propMap.merge!(PropMapVCenter) if isVirtualCenter && cacheScope != :cache_scope_event_monitor
 
     @propCol    = @sic.propertyCollector
     @rootFolder = @sic.rootFolder
@@ -197,13 +161,16 @@ class MiqVimInventory < MiqVimClientBase
         ps.type = "Datastore"
         ps.all  = "false"
       end
-      psa << VimHash.new("PropertySpec") do |ps|
-        ps.type = "LicenseManager"
-        ps.all  = "false"
-      end
-      psa << VimHash.new("PropertySpec") do |ps|
-        ps.type = "ExtensionManager"
-        ps.all  = "false"
+
+      if isVirtualCenter
+        psa << VimHash.new("PropertySpec") do |ps|
+          ps.type = "LicenseManager"
+          ps.all  = "false"
+        end
+        psa << VimHash.new("PropertySpec") do |ps|
+          ps.type = "ExtensionManager"
+          ps.all  = "false"
+        end
       end
     end
     VimArray.new("ArrayOfPropertyFilterSpec") do |pfsa|

data/lib/VMwareWebService/MiqVimObjectSet.rb

@@ -139,11 +139,14 @@ module MiqVimObjectSet
         os.skip      = "false"
         os.selectSet = VimArray.new("ArrayOfSelectionSpec") { |ssa| ssa << folderTs }
       end
-      osa << VimHash.new("ObjectSpec") do |os|
-        os.obj = @sic.licenseManager
-      end
-      osa << VimHash.new("ObjectSpec") do |os|
-        os.obj = @sic.extensionManager
+
+      if isVirtualCenter
+        osa << VimHash.new("ObjectSpec") do |os|
+          os.obj = @sic.licenseManager
+        end
+        osa << VimHash.new("ObjectSpec") do |os|
+          os.obj = @sic.extensionManager
+        end
       end
     end
 

data/lib/VMwareWebService/VimPropMaps.rb

@@ -21,6 +21,11 @@ module VimPropMaps
       :keyPath  => nil, # by mor only
       :props    => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating.  See FB3269
     },
+    :VirtualApp                  => {
+      :baseName => "@virtualApps",
+      :keyPath  => nil, # by mor only
+      :props    => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating.  See FB3269
+    },
     :Folder                      => {
       :baseName => "@folders",
       :keyPath  => ['name'],
@@ -86,15 +91,18 @@ module VimPropMaps
         'summary',
         'parent'
       ]
-    },
-    :LicenseManager              => {
+    }
+  }
+
+  PropMapVCenter = {
+    :LicenseManager   => {
       :baseName => "@licenseManagers",
       :keyPath  => nil,
       :props    => [
         'licenses'
       ]
     },
-    :ExtensionManager            => {
+    :ExtensionManager => {
       :baseName => "@extensionManagers",
       :keyPath  => nil,
       :props    => [
@@ -103,14 +111,6 @@ module VimPropMaps
     }
   }
 
-  PropMap4 = {
-    :VirtualApp       => {
-      :baseName => "@virtualApps",
-      :keyPath  => nil, # by mor only
-      :props    => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating.  See FB3269
-    }
-  }
-
   UpdatePropMapsByType = [
     {
       :VirtualMachine            => {
@@ -164,6 +164,11 @@ module VimPropMaps
         :keyPath  => nil, # by mor only
         :props    => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating.  See FB3269
       },
+      :VirtualApp   => {
+        :baseName => "@virtualApps",
+        :keyPath  => nil, # by mor only
+        :props    => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating.  See FB3269
+      },
       :Folder       => {
         :baseName => "@folders",
         :keyPath  => ['name'],
@@ -285,6 +290,11 @@ module VimPropMaps
         "vm"
       ] # childConfiguration currently has a problem updating.  See FB3269
     },
+    :VirtualApp                  => {
+      :baseName => "@virtualApps",
+      :keyPath  => nil, # by mor only
+      :props    => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating.  See FB3269
+    },
     :Folder                      => {
       :baseName => "@folders",
       :keyPath  => ['name'],
@@ -490,6 +500,11 @@ module VimPropMaps
         "vm"
       ] # childConfiguration currently has a problem updating.  See FB3269
     },
+    :VirtualApp                  => {
+      :baseName => "@virtualApps",
+      :keyPath  => nil, # by mor only
+      :props    => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating.  See FB3269
+    },
     :Folder                      => {
       :baseName => "@folders",
       :keyPath  => ['name'],

data/lib/VMwareWebService/VimService.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/numeric/bytes'
 require 'VMwareWebService/VimTypes'
 
 class VimService < Handsoap::Service
-  attr_reader :sic, :about, :apiVersion, :isVirtualCenter, :v20, :v2, :v4, :serviceInstanceMor, :session_cookie
+  attr_reader :sic, :about, :apiVersion, :isVirtualCenter, :v20, :v2, :v4, :v5, :v6, :serviceInstanceMor, :session_cookie
 
   Handsoap.http_driver = :HTTPClient
 
@@ -26,6 +26,8 @@ class VimService < Handsoap::Service
     @v20             = @apiVersion =~ /2\.0\..*/
     @v2              = @apiVersion =~ /2\..*/
     @v4              = @apiVersion =~ /4\..*/
+    @v5              = @apiVersion =~ /5\..*/
+    @v6              = @apiVersion =~ /6\..*/
     @isVirtualCenter = @about.apiType == "VirtualCenter"
   end
 

data/lib/VMwareWebService/version.rb

@@ -1,3 +1,3 @@
 module VMwareWebService
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware_web_service
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2019-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement