vmware_web_service 1.0.8 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b73de1ee5f2d243a464a790d35752220e182e6f0fbe888707a35b2b5183c44f3
4
- data.tar.gz: 64f8c7d2b6643806068b2c4042fed7390f5905f59536e160f5633672b3eba215
3
+ metadata.gz: df40424f3d517dd28e1068afa27577ae38b41eefb926476c43116df2422fe841
4
+ data.tar.gz: b1ba415b69bb546c830354ad42fa39cccdeda19104d23672d82909654ea8938f
5
5
  SHA512:
6
- metadata.gz: 16a8effd7ef4615e017c543fc662f9a7eda22a74089f6a02518bc7a47687102d13e6fe3955c8b6b82d8b000c4db48ca0b176231f0d0e825f19be922370eb85cd
7
- data.tar.gz: 52bf388bc55afb1343e9d276812ee20b99c2d5b9e4250e62550b68ab73e150367ee3c43a3a46382a2ee65bf79577f8e52f4f2b94b89ca047c9c0759ad1d76594
6
+ metadata.gz: 6716525e09aef414ae8a4cbe341fbd0a10da794e61bc8455e29f1c7df4a1952949151f15be9aec381fab1d355564e4106626f49f9ad1fcb7efd71e3f66afc96b
7
+ data.tar.gz: 7c83374173415c650fc5cdd9629d04e298d2a8367191e564e11c5711b82165e23816b86d6c6e2e8e7eb743f99aeba279c0b941c12bac35faf3ccb962ed5daada
@@ -1,7 +1,6 @@
1
1
  require 'sync'
2
2
 
3
3
  require 'VMwareWebService/MiqVimInventory'
4
- require 'VMwareWebService/MiqPbmInventory'
5
4
  require 'VMwareWebService/MiqVimVm'
6
5
  require 'VMwareWebService/MiqVimVdlMod'
7
6
  require 'VMwareWebService/MiqVimFolder'
@@ -17,7 +16,6 @@ require 'VMwareWebService/MiqVimUpdate'
17
16
 
18
17
  class MiqVim < MiqVimInventory
19
18
  include MiqVimVdlConnectionMod
20
- include MiqPbmInventory
21
19
  include MiqVimUpdate
22
20
 
23
21
  attr_reader :updateThread, :monitor_updates
@@ -366,12 +366,7 @@ class MiqVimInventory < MiqVimClientBase
366
366
  #
367
367
  # Hash snapshot info by create time.
368
368
  #
369
- # VMware API strips trailing '0's from the fractional seconds
370
- # which causes the string to not match what .iso8601(6) returns
371
- #
372
- # Example 12:12:59.123Z instead of 12:12:59.123000Z
373
- create_time = Time.parse(ssObj['createTime']).iso8601(6)
374
- ssMorHash[create_time] = ssObj
369
+ ssMorHash[ssObj['createTime']] = ssObj
375
370
 
376
371
  #
377
372
  # Ensure childSnapshotList is always present and always an array,
@@ -1,3 +1,3 @@
1
1
  module VMwareWebService
2
- VERSION = '1.0.8'.freeze
2
+ VERSION = '2.0.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,35 +1,35 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vmware_web_service
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.8
4
+ version: 2.0.0
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-10-06 00:00:00.000000000 Z
11
+ date: 2020-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '5.0'
20
- - - "<"
19
+ version: 5.2.4
20
+ - - ">="
21
21
  - !ruby/object:Gem::Version
22
- version: '5.3'
22
+ version: 5.2.4.3
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
- - - ">="
27
+ - - "~>"
28
28
  - !ruby/object:Gem::Version
29
- version: '5.0'
30
- - - "<"
29
+ version: 5.2.4
30
+ - - ">="
31
31
  - !ruby/object:Gem::Version
32
- version: '5.3'
32
+ version: 5.2.4.3
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: ffi-vix_disk_lib
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -92,20 +92,6 @@ dependencies:
92
92
  - - "<"
93
93
  - !ruby/object:Gem::Version
94
94
  version: '5'
95
- - !ruby/object:Gem::Dependency
96
- name: rbvmomi
97
- requirement: !ruby/object:Gem::Requirement
98
- requirements:
99
- - - "~>"
100
- - !ruby/object:Gem::Version
101
- version: '2.0'
102
- type: :runtime
103
- prerelease: false
104
- version_requirements: !ruby/object:Gem::Requirement
105
- requirements:
106
- - - "~>"
107
- - !ruby/object:Gem::Version
108
- version: '2.0'
109
95
  - !ruby/object:Gem::Dependency
110
96
  name: bundler
111
97
  requirement: !ruby/object:Gem::Requirement
@@ -221,7 +207,6 @@ files:
221
207
  - lib/VMwareWebService/MiqHostSnmpSystem.rb
222
208
  - lib/VMwareWebService/MiqHostStorageSystem.rb
223
209
  - lib/VMwareWebService/MiqHostVirtualNicManager.rb
224
- - lib/VMwareWebService/MiqPbmInventory.rb
225
210
  - lib/VMwareWebService/MiqVim.rb
226
211
  - lib/VMwareWebService/MiqVimAlarmManager.rb
227
212
  - lib/VMwareWebService/MiqVimBroker.rb
@@ -242,7 +227,6 @@ files:
242
227
  - lib/VMwareWebService/MiqVimUpdate.rb
243
228
  - lib/VMwareWebService/MiqVimVdlMod.rb
244
229
  - lib/VMwareWebService/MiqVimVm.rb
245
- - lib/VMwareWebService/PbmService.rb
246
230
  - lib/VMwareWebService/VimConstants.rb
247
231
  - lib/VMwareWebService/VimMappingRegistry.rb
248
232
  - lib/VMwareWebService/VimPropMaps.rb
@@ -1,67 +0,0 @@
1
- require 'VMwareWebService/PbmService'
2
-
3
- module MiqPbmInventory
4
- def pbm_initialize(vim)
5
- begin
6
- # SPBM endpoint was introduced in vSphere Management SDK 5.5 and
7
- # isn't supported by Hosts (only vCenters)
8
- @pbm_svc = PbmService.new(vim) if apiVersion >= '5.5' && isVirtualCenter
9
- rescue => err
10
- $vim_log.warn("MiqPbmInventory: Failed to connect to SPBM endpoint: #{err}")
11
- end
12
- end
13
-
14
- def pbmProfilesByUid(_selspec = nil)
15
- profiles = {}
16
- return profiles if @pbm_svc.nil?
17
-
18
- begin
19
- profile_ids = @pbm_svc.queryProfile
20
- @pbm_svc.retrieveContent(profile_ids).to_a.each do |pbm_profile|
21
- uid = pbm_profile.profileId.uniqueId
22
-
23
- profiles[uid] = pbm_profile
24
- end
25
- rescue => err
26
- $vim_log.warn("MiqPbmInventory: pbmProfilesByUid: #{err}")
27
- end
28
-
29
- profiles
30
- end
31
-
32
- def pbmQueryAssociatedEntity(profile_ids)
33
- assoc_entities = {}
34
- return assoc_entities if @pbm_svc.nil?
35
-
36
- begin
37
- profile_ids.each do |profile_id|
38
- # If a string was passed in create a PbmProfileId object
39
- profile_id = RbVmomi::PBM::PbmProfileId(:uniqueId => profile_id) if profile_id.kind_of?(String)
40
-
41
- assoc_entities[profile_id.uniqueId] = @pbm_svc.queryAssociatedEntity(profile_id)
42
- end
43
- rescue => err
44
- $vim_log.warn("MiqPbmInventory: pbmQueryAssociatedEntity: #{err}")
45
- end
46
-
47
- assoc_entities
48
- end
49
-
50
- def pbmQueryMatchingHub(profile_ids)
51
- hubs = {}
52
- return hubs if @pbm_svc.nil?
53
-
54
- begin
55
- profile_ids.each do |profile_id|
56
- # If a string was passed in create a PbmProfileId object
57
- profile_id = RbVmomi::PBM::PbmProfileId(:uniqueId => profile_id) if profile_id.kind_of?(String)
58
-
59
- hubs[profile_id.uniqueId] = @pbm_svc.queryMatchingHub(profile_id)
60
- end
61
- rescue => err
62
- $vim_log.warn("MiqPbmInventory: pbmQueryMatchingHub: #{err}")
63
- end
64
-
65
- hubs
66
- end
67
- end
@@ -1,36 +0,0 @@
1
- require 'rbvmomi'
2
- require 'rbvmomi/pbm'
3
-
4
- PbmVimConnection = Struct.new(:host, :cookie)
5
-
6
- class PbmService
7
- def initialize(vim)
8
- # RbVmomi::PBM#connect expects a RbVmomi::VIM object, use a struct
9
- # to fake it out into using our vim Handsoap connection
10
- pbm_vim_conn = PbmVimConnection.new(vim.server.dup, vim.session_cookie.dup)
11
-
12
- @pbm = RbVmomi::PBM.connect(pbm_vim_conn, :insecure => true)
13
- @sic = @pbm.serviceContent
14
- end
15
-
16
- def queryAssociatedEntity(profileId)
17
- @sic.profileManager.PbmQueryAssociatedEntity(:profile => profileId)
18
- end
19
-
20
- def queryMatchingHub(profileId, hubsToSearch = nil)
21
- @sic.placementSolver.PbmQueryMatchingHub(
22
- :profile => profileId,
23
- :hubsToSearch => hubsToSearch
24
- )
25
- end
26
-
27
- def queryProfile
28
- @sic.profileManager.PbmQueryProfile(
29
- :resourceType => RbVmomi::PBM::PbmProfileResourceType(:resourceType => "STORAGE")
30
- )
31
- end
32
-
33
- def retrieveContent(profileIds)
34
- @sic.profileManager.PbmRetrieveContent(:profileIds => profileIds)
35
- end
36
- end