Skip to content

Commit e437b2e

Browse files
agrareagrare
authored
Merge pull request #125 from dberg1/rubocopindent
fix rubocop Layout/RescueEnsureAlignment errors
2 parents 28e7181 + 5370126 commit e437b2e

File tree

2 files changed

+227
-214
lines changed

2 files changed

+227
-214
lines changed

‎app/models/manageiq/providers/ibm_power_hmc/inventory/collector/infra_manager.rb‎

Lines changed: 153 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ def collect!
99
attr_reader :connection
1010

1111
def hmc
12-
@hmc ||= begin
13-
connection.management_console
14-
rescue => e
15-
$ibm_power_hmc_log.error("management console query failed: #{e}")
16-
raise
17-
end
12+
@hmc ||= connection.management_console
13+
rescue => e
14+
$ibm_power_hmc_log.error("management console query failed: #{e}")
15+
raise
1816
end
1917

2018
def groups
@@ -25,36 +23,33 @@ def groups
2523
end
2624

2725
def ssps
28-
@ssps ||= begin
29-
connection.ssps
30-
rescue => e
31-
$ibm_power_hmc_log.error("ssps query failed: #{e}")
32-
raise
33-
end
26+
@ssps ||= connection.ssps
27+
rescue => e
28+
$ibm_power_hmc_log.error("ssps query failed: #{e}")
29+
raise
3430
end
3531

3632
def cecs_quick
37-
@cecs_quick ||= begin
38-
connection.managed_systems_quick
39-
rescue => e
40-
$ibm_power_hmc_log.error("managed systems quick query failed: #{e}")
41-
raise
42-
end
33+
@cecs_quick ||= connection.managed_systems_quick
34+
rescue => e
35+
$ibm_power_hmc_log.error("managed systems quick query failed: #{e}")
36+
raise
4337
end
4438

4539
def self.cec_unavailable?(cec_quick)
4640
["failed authentication", "no connection"].include?(cec_quick["State"].downcase)
4741
end
4842

4943
def cecs
50-
@cecs ||= cecs_quick.map do |cec_quick|
51-
connection.managed_system(cec_quick["UUID"], "SystemNetwork") unless self.class.cec_unavailable?(cec_quick)
52-
rescue IbmPowerHmc::Connection::HttpNotFound
53-
nil
54-
rescue => e
55-
$ibm_power_hmc_log.error("managed system query failed for #{cec_quick["UUID"]}: #{e}")
56-
raise
57-
end.compact
44+
@cecs ||=
45+
cecs_quick.map do |cec_quick|
46+
connection.managed_system(cec_quick["UUID"], "SystemNetwork") unless self.class.cec_unavailable?(cec_quick)
47+
rescue IbmPowerHmc::Connection::HttpNotFound
48+
nil
49+
rescue => e
50+
$ibm_power_hmc_log.error("managed system query failed for #{cec_quick["UUID"]}: #{e}")
51+
raise
52+
end.compact
5853
end
5954

6055
def cecs_unavailable
@@ -66,80 +61,84 @@ def cec_cpu_freqs_from_db
6661
end
6762

6863
def cec_cpu_freqs_from_api
69-
@cec_cpu_freqs_from_api ||= cecs.map do |sys|
70-
[sys.uuid, cec_cpu_freq(sys)]
71-
rescue => e
72-
$ibm_power_hmc_log.error("cpu frequency query failed for #{sys.uuid}: #{e}")
73-
nil
74-
end.compact.to_h
64+
@cec_cpu_freqs_from_api ||=
65+
cecs.map do |sys|
66+
[sys.uuid, cec_cpu_freq(sys)]
67+
rescue => e
68+
$ibm_power_hmc_log.error("cpu frequency query failed for #{sys.uuid}: #{e}")
69+
nil
70+
end.compact.to_h
7571
end
7672

7773
def cec_cpu_freqs
7874
@cec_cpu_freqs ||= cec_cpu_freqs_from_api.merge(cec_cpu_freqs_from_db)
7975
end
8076

8177
def vlans
82-
@vlans ||= cecs.map do |sys|
83-
[sys.uuid, connection.virtual_networks(sys.uuid)] unless sys.networks_uuids.empty?
84-
rescue IbmPowerHmc::Connection::HttpNotFound
85-
nil
86-
rescue => e
87-
$ibm_power_hmc_log.error("virtual networks query failed for #{sys.uuid}: #{e}")
88-
raise
89-
end.compact.to_h
78+
@vlans ||=
79+
cecs.map do |sys|
80+
[sys.uuid, connection.virtual_networks(sys.uuid)] unless sys.networks_uuids.empty?
81+
rescue IbmPowerHmc::Connection::HttpNotFound
82+
nil
83+
rescue => e
84+
$ibm_power_hmc_log.error("virtual networks query failed for #{sys.uuid}: #{e}")
85+
raise
86+
end.compact.to_h
9087
end
9188

9289
def vswitches
93-
@vswitches ||= cecs.map do |sys|
94-
[sys.uuid, connection.virtual_switches(sys.uuid)] unless sys.vswitches_uuids.empty?
95-
rescue IbmPowerHmc::Connection::HttpNotFound
96-
nil
97-
rescue => e
98-
$ibm_power_hmc_log.error("virtual switches query failed for #{sys.uuid}: #{e}")
99-
raise
100-
end.compact.to_h
90+
@vswitches ||=
91+
cecs.map do |sys|
92+
[sys.uuid, connection.virtual_switches(sys.uuid)] unless sys.vswitches_uuids.empty?
93+
rescue IbmPowerHmc::Connection::HttpNotFound
94+
nil
95+
rescue => e
96+
$ibm_power_hmc_log.error("virtual switches query failed for #{sys.uuid}: #{e}")
97+
raise
98+
end.compact.to_h
10199
end
102100

103101
def lpars
104-
@lpars ||= cecs.flat_map do |sys|
105-
connection.lpars(sys.uuid, nil, "None") unless sys.lpars_uuids.empty?
106-
rescue IbmPowerHmc::Connection::HttpNotFound
107-
nil
108-
rescue => e
109-
$ibm_power_hmc_log.error("lpars query failed for #{sys.uuid}: #{e}")
110-
raise
111-
end.compact
102+
@lpars ||=
103+
cecs.flat_map do |sys|
104+
connection.lpars(sys.uuid, nil, "None") unless sys.lpars_uuids.empty?
105+
rescue IbmPowerHmc::Connection::HttpNotFound
106+
nil
107+
rescue => e
108+
$ibm_power_hmc_log.error("lpars query failed for #{sys.uuid}: #{e}")
109+
raise
110+
end.compact
112111
end
113112

114113
def vioses
115-
@vioses ||= cecs.flat_map do |sys|
116-
connection.vioses(sys.uuid) unless sys.vioses_uuids.empty?
117-
rescue IbmPowerHmc::Connection::HttpNotFound
118-
nil
119-
rescue => e
120-
$ibm_power_hmc_log.error("vioses query failed for #{sys.uuid} #{e}")
121-
raise
122-
end.compact
114+
@vioses ||=
115+
cecs.flat_map do |sys|
116+
connection.vioses(sys.uuid) unless sys.vioses_uuids.empty?
117+
rescue IbmPowerHmc::Connection::HttpNotFound
118+
nil
119+
rescue => e
120+
$ibm_power_hmc_log.error("vioses query failed for #{sys.uuid} #{e}")
121+
raise
122+
end.compact
123123
end
124124

125125
def vioses_quick
126-
@vioses_quick ||= cecs.map do |sys|
127-
[sys.uuid, connection.vioses_quick(sys.uuid)] unless sys.vioses_uuids.empty?
128-
rescue IbmPowerHmc::Connection::HttpNotFound
129-
nil
130-
rescue => e
131-
$ibm_power_hmc_log.error("vioses quick query failed for #{sys.uuid}: #{e}")
132-
raise
133-
end.compact.to_h
126+
@vioses_quick ||=
127+
cecs.map do |sys|
128+
[sys.uuid, connection.vioses_quick(sys.uuid)] unless sys.vioses_uuids.empty?
129+
rescue IbmPowerHmc::Connection::HttpNotFound
130+
nil
131+
rescue => e
132+
$ibm_power_hmc_log.error("vioses quick query failed for #{sys.uuid}: #{e}")
133+
raise
134+
end.compact.to_h
134135
end
135136

136137
def pcm_enabled
137-
@pcm_enabled ||= begin
138-
connection.pcm_preferences.first.managed_system_preferences.index_by(&:id)
139-
rescue => e
140-
$ibm_power_hmc_log.error("pcm preferences query failed: #{e}")
141-
raise
142-
end
138+
@pcm_enabled ||= connection.pcm_preferences.first.managed_system_preferences.index_by(&:id)
139+
rescue => e
140+
$ibm_power_hmc_log.error("pcm preferences query failed: #{e}")
141+
raise
143142
end
144143

145144
def vscsi_mappings
@@ -149,26 +148,28 @@ def vscsi_mappings
149148
end
150149

151150
def netadapters_lpar
152-
@netadapters_lpar ||= lpars.map do |lpar|
153-
[lpar.uuid, connection.network_adapter_lpar(lpar.uuid)] unless lpar.net_adap_uuids.empty?
154-
rescue IbmPowerHmc::Connection::HttpNotFound
155-
nil
156-
rescue => e
157-
$ibm_power_hmc_log.error("network adapters query failed for lpar #{lpar.uuid}: #{e}")
158-
raise
159-
end.compact.to_h
151+
@netadapters_lpar ||=
152+
lpars.map do |lpar|
153+
[lpar.uuid, connection.network_adapter_lpar(lpar.uuid)] unless lpar.net_adap_uuids.empty?
154+
rescue IbmPowerHmc::Connection::HttpNotFound
155+
nil
156+
rescue => e
157+
$ibm_power_hmc_log.error("network adapters query failed for lpar #{lpar.uuid}: #{e}")
158+
raise
159+
end.compact.to_h
160160
end
161161
private :netadapters_lpar
162162

163163
def netadapters_vios
164-
@netadapters_vios ||= vioses.map do |vios|
165-
[vios.uuid, connection.network_adapter_vios(vios.uuid)] unless vios.net_adap_uuids.empty?
166-
rescue IbmPowerHmc::Connection::HttpNotFound
167-
nil
168-
rescue => e
169-
$ibm_power_hmc_log.error("network adapters query failed for vios #{vios.uuid}: #{e}")
170-
raise
171-
end.compact.to_h
164+
@netadapters_vios ||=
165+
vioses.map do |vios|
166+
[vios.uuid, connection.network_adapter_vios(vios.uuid)] unless vios.net_adap_uuids.empty?
167+
rescue IbmPowerHmc::Connection::HttpNotFound
168+
nil
169+
rescue => e
170+
$ibm_power_hmc_log.error("network adapters query failed for vios #{vios.uuid}: #{e}")
171+
raise
172+
end.compact.to_h
172173
end
173174
private :netadapters_vios
174175

@@ -177,26 +178,28 @@ def netadapters
177178
end
178179

179180
def sriov_elps_lpar
180-
@sriov_elps_lpar ||= lpars.map do |lpar|
181-
[lpar.uuid, connection.sriov_elp_lpar(lpar.uuid)] unless lpar.sriov_elp_uuids.empty?
182-
rescue IbmPowerHmc::Connection::HttpNotFound
183-
nil
184-
rescue => e
185-
$ibm_power_hmc_log.error("sriov ethernet logical ports query failed for lpar #{lpar.uuid}: #{e}")
186-
raise
187-
end.compact.to_h
181+
@sriov_elps_lpar ||=
182+
lpars.map do |lpar|
183+
[lpar.uuid, connection.sriov_elp_lpar(lpar.uuid)] unless lpar.sriov_elp_uuids.empty?
184+
rescue IbmPowerHmc::Connection::HttpNotFound
185+
nil
186+
rescue => e
187+
$ibm_power_hmc_log.error("sriov ethernet logical ports query failed for lpar #{lpar.uuid}: #{e}")
188+
raise
189+
end.compact.to_h
188190
end
189191
private :sriov_elps_lpar
190192

191193
def sriov_elps_vios
192-
@sriov_elps_vios ||= vioses.map do |vios|
193-
[vios.uuid, connection.sriov_elp_vios(vios.uuid)] unless vios.sriov_elp_uuids.empty?
194-
rescue IbmPowerHmc::Connection::HttpNotFound
195-
nil
196-
rescue => e
197-
$ibm_power_hmc_log.error("sriov ethernet logical ports query failed for vios #{vios.uuid}: #{e}")
198-
raise
199-
end.compact.to_h
194+
@sriov_elps_vios ||=
195+
vioses.map do |vios|
196+
[vios.uuid, connection.sriov_elp_vios(vios.uuid)] unless vios.sriov_elp_uuids.empty?
197+
rescue IbmPowerHmc::Connection::HttpNotFound
198+
nil
199+
rescue => e
200+
$ibm_power_hmc_log.error("sriov ethernet logical ports query failed for vios #{vios.uuid}: #{e}")
201+
raise
202+
end.compact.to_h
200203
end
201204
private :sriov_elps_vios
202205

@@ -205,25 +208,27 @@ def sriov_elps
205208
end
206209

207210
def vnics
208-
@vnics ||= lpars.map do |lpar|
209-
[lpar.uuid, connection.vnic_dedicated(lpar.uuid)] unless lpar.vnic_dedicated_uuids.empty?
210-
rescue IbmPowerHmc::Connection::HttpNotFound
211-
nil
212-
rescue => e
213-
$ibm_power_hmc_log.error("vnics query failed for #{lpar.uuid}: #{e}")
214-
raise
215-
end.compact.to_h
211+
@vnics ||=
212+
lpars.map do |lpar|
213+
[lpar.uuid, connection.vnic_dedicated(lpar.uuid)] unless lpar.vnic_dedicated_uuids.empty?
214+
rescue IbmPowerHmc::Connection::HttpNotFound
215+
nil
216+
rescue => e
217+
$ibm_power_hmc_log.error("vnics query failed for #{lpar.uuid}: #{e}")
218+
raise
219+
end.compact.to_h
216220
end
217221

218222
def vscsi_client_adapters
219-
@vscsi_client_adapters ||= lpars.map do |lpar|
220-
[lpar.uuid, connection.vscsi_client_adapter(lpar.uuid)] unless lpar.vscsi_client_uuids.empty?
221-
rescue IbmPowerHmc::Connection::HttpNotFound
222-
nil
223-
rescue => e
224-
$ibm_power_hmc_log.error("vscsi client adapters query failed for #{lpar.uuid}: #{e}")
225-
raise
226-
end.compact.to_h
223+
@vscsi_client_adapters ||=
224+
lpars.map do |lpar|
225+
[lpar.uuid, connection.vscsi_client_adapter(lpar.uuid)] unless lpar.vscsi_client_uuids.empty?
226+
rescue IbmPowerHmc::Connection::HttpNotFound
227+
nil
228+
rescue => e
229+
$ibm_power_hmc_log.error("vscsi client adapters query failed for #{lpar.uuid}: #{e}")
230+
raise
231+
end.compact.to_h
227232
end
228233

229234
def lpar_disks_from_db
@@ -251,34 +256,34 @@ def lpar_disks
251256
end
252257

253258
def templates
254-
@templates ||= begin
255-
connection.templates
256-
rescue => e
257-
$ibm_power_hmc_log.error("templates query failed: #{e}")
258-
raise
259-
end
259+
@templates ||= connection.templates
260+
rescue => e
261+
$ibm_power_hmc_log.error("templates query failed: #{e}")
262+
raise
260263
end
261264

262265
def shared_processor_pools
263-
@shared_processor_pools ||= cecs.flat_map do |sys|
264-
connection.shared_processor_pool(sys.uuid)
265-
rescue IbmPowerHmc::Connection::HttpNotFound
266-
nil
267-
rescue => e
268-
$ibm_power_hmc_log.error("shared processor pool query failed for #{sys.uuid}: #{e}")
269-
raise
270-
end.compact
266+
@shared_processor_pools ||=
267+
cecs.flat_map do |sys|
268+
connection.shared_processor_pool(sys.uuid)
269+
rescue IbmPowerHmc::Connection::HttpNotFound
270+
nil
271+
rescue => e
272+
$ibm_power_hmc_log.error("shared processor pool query failed for #{sys.uuid}: #{e}")
273+
raise
274+
end.compact
271275
end
272276

273277
def shared_memory_pools
274-
@shared_memory_pools ||= cecs.flat_map do |sys|
275-
connection.shared_memory_pool(sys.uuid)
276-
rescue IbmPowerHmc::Connection::HttpNotFound
277-
nil
278-
rescue IbmPowerHmc::Connection::HttpError => e
279-
$ibm_power_hmc_log.error("shared_memory_pool query failed for #{sys.uuid}: #{e}")
280-
raise
281-
end.compact
278+
@shared_memory_pools ||=
279+
cecs.flat_map do |sys|
280+
connection.shared_memory_pool(sys.uuid)
281+
rescue IbmPowerHmc::Connection::HttpNotFound
282+
nil
283+
rescue IbmPowerHmc::Connection::HttpError => e
284+
$ibm_power_hmc_log.error("shared memory pool query failed for #{sys.uuid}: #{e}")
285+
raise
286+
end.compact
282287
end
283288

284289
private

0 commit comments

Comments
 (0)