vmware_web_service 0.4.3 → 0.4.4
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7f42dc79ee808a2da4df5ea32342cc036a726d7be3ea58f807a592290d69f7a7
|
4
|
+
data.tar.gz: b81a9c1f4cb793767b53fef678b8b81775133cb8756bd19c8063828627fcecfb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3406916eda670ae52a2045cba881e9fde582829eab69368c9b1744fd4ce13e08997950e9a05c4aaf2e2a761202c2792a84912ad4d9a9bfb68957dc9ac6f2173f
|
7
|
+
data.tar.gz: d9e159b03345090ab4993bdc76002063decc23818852cc0a49a12b2826cc0e7960485dd8654e7c2935280ccbd0ca02c6ff47bafb86599224ca0126d17a322bef
|
@@ -41,44 +41,8 @@ class MiqVimInventory < MiqVimClientBase
|
|
41
41
|
$vim_log.info "MiqVimInventory: unrecognized cache scope #{cacheScope}, using FullPropMap"
|
42
42
|
end
|
43
43
|
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
deleteProperty(:HostSystem, "capability.storageVMotionSupported")
|
48
|
-
deleteProperty(:HostSystem, "capability.vmotionWithStorageVMotionSupported")
|
49
|
-
|
50
|
-
deleteProperty(:Datastore, "summary.uncommitted")
|
51
|
-
deleteProperty(:Datastore, "summary.maintenanceMode")
|
52
|
-
|
53
|
-
deleteProperty(:VirtualMachine, "config.cpuHotAddEnabled")
|
54
|
-
deleteProperty(:VirtualMachine, "config.cpuHotRemoveEnabled")
|
55
|
-
deleteProperty(:VirtualMachine, "config.hardware.numCoresPerSocket")
|
56
|
-
deleteProperty(:VirtualMachine, "config.hotPlugMemoryIncrementSize")
|
57
|
-
deleteProperty(:VirtualMachine, "config.hotPlugMemoryLimit")
|
58
|
-
deleteProperty(:VirtualMachine, "config.memoryHotAddEnabled")
|
59
|
-
deleteProperty(:VirtualMachine, "summary.config.ftInfo.instanceUuids")
|
60
|
-
deleteProperty(:VirtualMachine, "summary.storage.unshared")
|
61
|
-
deleteProperty(:VirtualMachine, "summary.storage.committed")
|
62
|
-
|
63
|
-
deleteProperty(:ClusterComputeResource, "configuration.dasConfig.admissionControlPolicy")
|
64
|
-
if @v20
|
65
|
-
deleteProperty(:VirtualMachine, "availableField")
|
66
|
-
deleteProperty(:HostSystem, "config.dateTimeInfo")
|
67
|
-
end
|
68
|
-
else
|
69
|
-
if @v4
|
70
|
-
@propMap = dupProps(@propMap)
|
71
|
-
|
72
|
-
deleteProperty(:Datastore, "summary.maintenanceMode")
|
73
|
-
|
74
|
-
if cacheScope != :cache_scope_event_monitor
|
75
|
-
addProperty(:VirtualMachine, "runtime.memoryOverhead")
|
76
|
-
deleteProperty(:VirtualMachine, "config.hardware.numCoresPerSocket")
|
77
|
-
end
|
78
|
-
end
|
79
|
-
|
80
|
-
@propMap = @propMap.merge(PropMap4)
|
81
|
-
end
|
44
|
+
# If we are connected to a virtual center then we can access additional properties
|
45
|
+
@propMap.merge!(PropMapVCenter) if isVirtualCenter && cacheScope != :cache_scope_event_monitor
|
82
46
|
|
83
47
|
@propCol = @sic.propertyCollector
|
84
48
|
@rootFolder = @sic.rootFolder
|
@@ -197,13 +161,16 @@ class MiqVimInventory < MiqVimClientBase
|
|
197
161
|
ps.type = "Datastore"
|
198
162
|
ps.all = "false"
|
199
163
|
end
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
164
|
+
|
165
|
+
if isVirtualCenter
|
166
|
+
psa << VimHash.new("PropertySpec") do |ps|
|
167
|
+
ps.type = "LicenseManager"
|
168
|
+
ps.all = "false"
|
169
|
+
end
|
170
|
+
psa << VimHash.new("PropertySpec") do |ps|
|
171
|
+
ps.type = "ExtensionManager"
|
172
|
+
ps.all = "false"
|
173
|
+
end
|
207
174
|
end
|
208
175
|
end
|
209
176
|
VimArray.new("ArrayOfPropertyFilterSpec") do |pfsa|
|
@@ -139,11 +139,14 @@ module MiqVimObjectSet
|
|
139
139
|
os.skip = "false"
|
140
140
|
os.selectSet = VimArray.new("ArrayOfSelectionSpec") { |ssa| ssa << folderTs }
|
141
141
|
end
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
142
|
+
|
143
|
+
if isVirtualCenter
|
144
|
+
osa << VimHash.new("ObjectSpec") do |os|
|
145
|
+
os.obj = @sic.licenseManager
|
146
|
+
end
|
147
|
+
osa << VimHash.new("ObjectSpec") do |os|
|
148
|
+
os.obj = @sic.extensionManager
|
149
|
+
end
|
147
150
|
end
|
148
151
|
end
|
149
152
|
|
@@ -21,6 +21,11 @@ module VimPropMaps
|
|
21
21
|
:keyPath => nil, # by mor only
|
22
22
|
:props => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating. See FB3269
|
23
23
|
},
|
24
|
+
:VirtualApp => {
|
25
|
+
:baseName => "@virtualApps",
|
26
|
+
:keyPath => nil, # by mor only
|
27
|
+
:props => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating. See FB3269
|
28
|
+
},
|
24
29
|
:Folder => {
|
25
30
|
:baseName => "@folders",
|
26
31
|
:keyPath => ['name'],
|
@@ -86,15 +91,18 @@ module VimPropMaps
|
|
86
91
|
'summary',
|
87
92
|
'parent'
|
88
93
|
]
|
89
|
-
}
|
90
|
-
|
94
|
+
}
|
95
|
+
}
|
96
|
+
|
97
|
+
PropMapVCenter = {
|
98
|
+
:LicenseManager => {
|
91
99
|
:baseName => "@licenseManagers",
|
92
100
|
:keyPath => nil,
|
93
101
|
:props => [
|
94
102
|
'licenses'
|
95
103
|
]
|
96
104
|
},
|
97
|
-
:ExtensionManager
|
105
|
+
:ExtensionManager => {
|
98
106
|
:baseName => "@extensionManagers",
|
99
107
|
:keyPath => nil,
|
100
108
|
:props => [
|
@@ -103,14 +111,6 @@ module VimPropMaps
|
|
103
111
|
}
|
104
112
|
}
|
105
113
|
|
106
|
-
PropMap4 = {
|
107
|
-
:VirtualApp => {
|
108
|
-
:baseName => "@virtualApps",
|
109
|
-
:keyPath => nil, # by mor only
|
110
|
-
:props => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating. See FB3269
|
111
|
-
}
|
112
|
-
}
|
113
|
-
|
114
114
|
UpdatePropMapsByType = [
|
115
115
|
{
|
116
116
|
:VirtualMachine => {
|
@@ -164,6 +164,11 @@ module VimPropMaps
|
|
164
164
|
:keyPath => nil, # by mor only
|
165
165
|
:props => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating. See FB3269
|
166
166
|
},
|
167
|
+
:VirtualApp => {
|
168
|
+
:baseName => "@virtualApps",
|
169
|
+
:keyPath => nil, # by mor only
|
170
|
+
:props => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating. See FB3269
|
171
|
+
},
|
167
172
|
:Folder => {
|
168
173
|
:baseName => "@folders",
|
169
174
|
:keyPath => ['name'],
|
@@ -285,6 +290,11 @@ module VimPropMaps
|
|
285
290
|
"vm"
|
286
291
|
] # childConfiguration currently has a problem updating. See FB3269
|
287
292
|
},
|
293
|
+
:VirtualApp => {
|
294
|
+
:baseName => "@virtualApps",
|
295
|
+
:keyPath => nil, # by mor only
|
296
|
+
:props => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating. See FB3269
|
297
|
+
},
|
288
298
|
:Folder => {
|
289
299
|
:baseName => "@folders",
|
290
300
|
:keyPath => ['name'],
|
@@ -490,6 +500,11 @@ module VimPropMaps
|
|
490
500
|
"vm"
|
491
501
|
] # childConfiguration currently has a problem updating. See FB3269
|
492
502
|
},
|
503
|
+
:VirtualApp => {
|
504
|
+
:baseName => "@virtualApps",
|
505
|
+
:keyPath => nil, # by mor only
|
506
|
+
:props => ["name", "summary.config", "resourcePool", "owner", "parent", "vm"] # childConfiguration currently has a problem updating. See FB3269
|
507
|
+
},
|
493
508
|
:Folder => {
|
494
509
|
:baseName => "@folders",
|
495
510
|
:keyPath => ['name'],
|
@@ -3,7 +3,7 @@ require 'active_support/core_ext/numeric/bytes'
|
|
3
3
|
require 'VMwareWebService/VimTypes'
|
4
4
|
|
5
5
|
class VimService < Handsoap::Service
|
6
|
-
attr_reader :sic, :about, :apiVersion, :isVirtualCenter, :v20, :v2, :v4, :serviceInstanceMor, :session_cookie
|
6
|
+
attr_reader :sic, :about, :apiVersion, :isVirtualCenter, :v20, :v2, :v4, :v5, :v6, :serviceInstanceMor, :session_cookie
|
7
7
|
|
8
8
|
Handsoap.http_driver = :HTTPClient
|
9
9
|
|
@@ -26,6 +26,8 @@ class VimService < Handsoap::Service
|
|
26
26
|
@v20 = @apiVersion =~ /2\.0\..*/
|
27
27
|
@v2 = @apiVersion =~ /2\..*/
|
28
28
|
@v4 = @apiVersion =~ /4\..*/
|
29
|
+
@v5 = @apiVersion =~ /5\..*/
|
30
|
+
@v6 = @apiVersion =~ /6\..*/
|
29
31
|
@isVirtualCenter = @about.apiType == "VirtualCenter"
|
30
32
|
end
|
31
33
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vmware_web_service
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- ManageIQ Developers
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-07-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -19,7 +19,7 @@ dependencies:
|
|
19
19
|
version: '5.0'
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: '5.
|
22
|
+
version: '5.3'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -29,7 +29,7 @@ dependencies:
|
|
29
29
|
version: '5.0'
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: '5.
|
32
|
+
version: '5.3'
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: ffi
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|