vmware_web_service 1.0.1 → 1.0.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/VMwareWebService/MiqVimDataStore.rb +2 -2
- data/lib/VMwareWebService/MiqVimEventMonitor.rb +1 -1
- data/lib/VMwareWebService/MiqVimUpdate.rb +1 -1
- data/lib/VMwareWebService/MiqVimVm.rb +42 -50
- data/lib/VMwareWebService/VimTypes.rb +5 -4
- data/lib/VMwareWebService/version.rb +1 -1
- data/lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardOpaqueNetworkBackingInfo.yml +11 -0
- metadata +14 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d0b00e667598e644b035f2c3241e0c77ac2238044060045255a21701346320b6
|
4
|
+
data.tar.gz: 9d6b0cc3dbb8c4cb4cd2f5f54d48acb1b23d734b46e1ebce79e9945a954c9e35
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a62e1199199d1670c84485f0d304874838da6c7a292dfd17526c3a66e02e5ee746f0f2bc2db1b8caef326c211840b8d455d2149370cb170c0179778ac5705a35
|
7
|
+
data.tar.gz: 36f481706737461eb2bd5125e5aeb7959517c947d54d01ecc5837fcacfc87a18cea4bca10a35c3027ecf40d520ffe0db312acb6fd4a31dd2e7849c669760b879
|
@@ -290,8 +290,8 @@ class MiqVimDataStore
|
|
290
290
|
if block_given?
|
291
291
|
open(fileUrl, options) { |ret| yield(ret) }
|
292
292
|
else
|
293
|
-
|
294
|
-
open(fileUrl, options) { |ret| data = ret.read
|
293
|
+
data = nil
|
294
|
+
open(fileUrl, options) { |ret| data = ret.read }
|
295
295
|
return data
|
296
296
|
end
|
297
297
|
end
|
@@ -120,7 +120,7 @@ class MiqVimEventMonitor < MiqVimInventory
|
|
120
120
|
next unless (vmObj = virtualMachinesByMor_locked[eventVmObj['vm']])
|
121
121
|
|
122
122
|
eventVmObj['path'] = vmObj['summary']['config']['vmPathName']
|
123
|
-
eventVmObj['uuid'] = vmObj['summary']['config']['uuid']
|
123
|
+
eventVmObj['uuid'] = vmObj['summary']['config']['uuid'].presence
|
124
124
|
|
125
125
|
removeVirtualMachine(eventVmObj['vm']) if event['eventType'] == 'VmRemovedEvent'
|
126
126
|
end
|
@@ -112,7 +112,7 @@ module MiqVimUpdate
|
|
112
112
|
version = updates_version
|
113
113
|
sleep @updateDelay if @updateDelay
|
114
114
|
end # while @monitor
|
115
|
-
rescue SignalException
|
115
|
+
rescue SignalException
|
116
116
|
# Ignore signals, except TERM
|
117
117
|
rescue => herr
|
118
118
|
if herr.respond_to?(:reason) && herr.reason == 'The task was canceled by a user.'
|
@@ -87,14 +87,6 @@ class MiqVimVm
|
|
87
87
|
# @invObj.releaseObj(self)
|
88
88
|
end
|
89
89
|
|
90
|
-
def vmMor
|
91
|
-
(@vmMor)
|
92
|
-
end
|
93
|
-
|
94
|
-
def vmh
|
95
|
-
(@vmh)
|
96
|
-
end
|
97
|
-
|
98
90
|
#######################
|
99
91
|
# Power state methods.
|
100
92
|
#######################
|
@@ -317,24 +309,24 @@ class MiqVimVm
|
|
317
309
|
return(@snapshotInfo) if @snapshotInfo && !refresh
|
318
310
|
|
319
311
|
begin
|
320
|
-
|
321
|
-
|
322
|
-
unless (ssp = @invObj.getMoProp_local(@vmMor, "snapshot"))
|
323
|
-
@snapshotInfo = nil
|
324
|
-
return(nil)
|
325
|
-
end
|
312
|
+
@cacheLock.sync_lock(:EX) if (unlock = @cacheLock.sync_shared?)
|
326
313
|
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
rsl = [rsl] unless rsl.kind_of?(Array)
|
331
|
-
rsl.each { |rs| @invObj.snapshotFixup(rs, ssMorHash) }
|
332
|
-
ssObj['ssMorHash'] = ssMorHash
|
333
|
-
@snapshotInfo = ssObj
|
334
|
-
ensure
|
335
|
-
@cacheLock.sync_unlock if unlock
|
314
|
+
unless (ssp = @invObj.getMoProp_local(@vmMor, "snapshot"))
|
315
|
+
@snapshotInfo = nil
|
316
|
+
return(nil)
|
336
317
|
end
|
337
318
|
|
319
|
+
ssObj = ssp["snapshot"]
|
320
|
+
ssMorHash = {}
|
321
|
+
rsl = ssObj['rootSnapshotList']
|
322
|
+
rsl = [rsl] unless rsl.kind_of?(Array)
|
323
|
+
rsl.each { |rs| @invObj.snapshotFixup(rs, ssMorHash) }
|
324
|
+
ssObj['ssMorHash'] = ssMorHash
|
325
|
+
@snapshotInfo = ssObj
|
326
|
+
ensure
|
327
|
+
@cacheLock.sync_unlock if unlock
|
328
|
+
end
|
329
|
+
|
338
330
|
(@snapshotInfo)
|
339
331
|
end # def snapshotInfo_locked
|
340
332
|
|
@@ -800,11 +792,11 @@ class MiqVimVm
|
|
800
792
|
bck.writeThrough = "false"
|
801
793
|
bck.fileName = backingFile
|
802
794
|
begin
|
803
|
-
|
804
|
-
|
805
|
-
|
806
|
-
|
807
|
-
|
795
|
+
dsn = @invObj.path2dsName(@dsPath)
|
796
|
+
bck.datastore = @invObj.dsName2mo_local(dsn)
|
797
|
+
rescue
|
798
|
+
bck.datastore = nil
|
799
|
+
end
|
808
800
|
end
|
809
801
|
end
|
810
802
|
end
|
@@ -856,11 +848,11 @@ class MiqVimVm
|
|
856
848
|
bck.writeThrough = "false"
|
857
849
|
bck.fileName = backingFile
|
858
850
|
begin
|
859
|
-
|
860
|
-
|
861
|
-
|
862
|
-
|
863
|
-
|
851
|
+
dsn = @invObj.path2dsName(@dsPath)
|
852
|
+
bck.datastore = @invObj.dsName2mo(dsn)
|
853
|
+
rescue
|
854
|
+
bck.datastore = nil
|
855
|
+
end
|
864
856
|
end unless deleteBacking
|
865
857
|
end
|
866
858
|
end
|
@@ -1037,24 +1029,24 @@ class MiqVimVm
|
|
1037
1029
|
end
|
1038
1030
|
|
1039
1031
|
begin
|
1040
|
-
|
1041
|
-
|
1042
|
-
|
1043
|
-
|
1044
|
-
|
1045
|
-
|
1046
|
-
|
1047
|
-
|
1048
|
-
|
1049
|
-
|
1050
|
-
end
|
1051
|
-
$vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).addMiqAlarm_locked: calling createAlarm" if $vim_log
|
1052
|
-
alarmMor = @invObj.createAlarm(alarmManager, @vmMor, aSpec)
|
1053
|
-
$vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).addMiqAlarm_locked: returned from createAlarm" if $vim_log
|
1054
|
-
@miqAlarmMor = alarmMor
|
1055
|
-
ensure
|
1056
|
-
@cacheLock.sync_unlock if unlock
|
1032
|
+
@cacheLock.sync_lock(:EX) if (unlock = @cacheLock.sync_shared?)
|
1033
|
+
|
1034
|
+
alarmManager = @sic.alarmManager
|
1035
|
+
#
|
1036
|
+
# Add disabled if VM is running.
|
1037
|
+
#
|
1038
|
+
if poweredOff?
|
1039
|
+
aSpec = @miqAlarmSpecEnabled
|
1040
|
+
else
|
1041
|
+
aSpec = @miqAlarmSpecDisabled
|
1057
1042
|
end
|
1043
|
+
$vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).addMiqAlarm_locked: calling createAlarm" if $vim_log
|
1044
|
+
alarmMor = @invObj.createAlarm(alarmManager, @vmMor, aSpec)
|
1045
|
+
$vim_log.info "MiqVimVm(#{@invObj.server}, #{@invObj.username}).addMiqAlarm_locked: returned from createAlarm" if $vim_log
|
1046
|
+
@miqAlarmMor = alarmMor
|
1047
|
+
ensure
|
1048
|
+
@cacheLock.sync_unlock if unlock
|
1049
|
+
end
|
1058
1050
|
|
1059
1051
|
(alarmMor)
|
1060
1052
|
end # def addMiqAlarm_locked
|
@@ -27,10 +27,11 @@ end
|
|
27
27
|
class VimHash < Hash
|
28
28
|
include VimType
|
29
29
|
|
30
|
-
undef_method(:id)
|
31
|
-
undef_method(:type)
|
32
|
-
undef_method(:size)
|
33
|
-
undef_method(:key)
|
30
|
+
undef_method(:id) if method_defined?(:id)
|
31
|
+
undef_method(:type) if method_defined?(:type)
|
32
|
+
undef_method(:size) if method_defined?(:size)
|
33
|
+
undef_method(:key) if method_defined?(:key)
|
34
|
+
undef_method(:filter) if method_defined?(:filter)
|
34
35
|
|
35
36
|
def initialize(xsiType = nil, vimType = nil)
|
36
37
|
self.xsiType = xsiType
|
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: 1.0.
|
4
|
+
version: 1.0.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- ManageIQ Developers
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-07-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -76,30 +76,36 @@ dependencies:
|
|
76
76
|
name: more_core_extensions
|
77
77
|
requirement: !ruby/object:Gem::Requirement
|
78
78
|
requirements:
|
79
|
-
- - "
|
79
|
+
- - ">="
|
80
80
|
- !ruby/object:Gem::Version
|
81
81
|
version: '3.2'
|
82
|
+
- - "<"
|
83
|
+
- !ruby/object:Gem::Version
|
84
|
+
version: '5'
|
82
85
|
type: :runtime
|
83
86
|
prerelease: false
|
84
87
|
version_requirements: !ruby/object:Gem::Requirement
|
85
88
|
requirements:
|
86
|
-
- - "
|
89
|
+
- - ">="
|
87
90
|
- !ruby/object:Gem::Version
|
88
91
|
version: '3.2'
|
92
|
+
- - "<"
|
93
|
+
- !ruby/object:Gem::Version
|
94
|
+
version: '5'
|
89
95
|
- !ruby/object:Gem::Dependency
|
90
96
|
name: rbvmomi
|
91
97
|
requirement: !ruby/object:Gem::Requirement
|
92
98
|
requirements:
|
93
99
|
- - "~>"
|
94
100
|
- !ruby/object:Gem::Version
|
95
|
-
version: 2.0
|
101
|
+
version: '2.0'
|
96
102
|
type: :runtime
|
97
103
|
prerelease: false
|
98
104
|
version_requirements: !ruby/object:Gem::Requirement
|
99
105
|
requirements:
|
100
106
|
- - "~>"
|
101
107
|
- !ruby/object:Gem::Version
|
102
|
-
version: 2.0
|
108
|
+
version: '2.0'
|
103
109
|
- !ruby/object:Gem::Dependency
|
104
110
|
name: bundler
|
105
111
|
requirement: !ruby/object:Gem::Requirement
|
@@ -4062,6 +4068,7 @@ files:
|
|
4062
4068
|
- lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardNetworkBackingOption.yml
|
4063
4069
|
- lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardNotSupported.yml
|
4064
4070
|
- lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardNotSupportedFault.yml
|
4071
|
+
- lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardOpaqueNetworkBackingInfo.yml
|
4065
4072
|
- lib/VMwareWebService/wsdl41/methods/VirtualEthernetCardOption.yml
|
4066
4073
|
- lib/VMwareWebService/wsdl41/methods/VirtualFloppy.yml
|
4067
4074
|
- lib/VMwareWebService/wsdl41/methods/VirtualFloppyDeviceBackingInfo.yml
|
@@ -4469,7 +4476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
4469
4476
|
- !ruby/object:Gem::Version
|
4470
4477
|
version: '0'
|
4471
4478
|
requirements: []
|
4472
|
-
rubygems_version: 3.1.
|
4479
|
+
rubygems_version: 3.1.3
|
4473
4480
|
signing_key:
|
4474
4481
|
specification_version: 4
|
4475
4482
|
summary: A ruby interface to Vmware Web Services SDK
|