Skip to content

Commit c2e6195

Browse files
author
Damien Bergamini
committed
use vios groups to limit query to vscsi and vfc mappings
Signed-off-by: Damien Bergamini <[email protected]>
1 parent 182f73f commit c2e6195

File tree

1 file changed

+8
-8
lines changed
  • app/models/manageiq/providers/ibm_power_hmc/infra_manager

1 file changed

+8
-8
lines changed

app/models/manageiq/providers/ibm_power_hmc/infra_manager/lpar.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ def poweroff(params = {})
3838

3939
def raw_destroy
4040
ext_management_system.with_provider_connection do |connection|
41-
# Delete associated VIOS VSCSI and VFC mappings.
41+
# Delete associated VIOS VSCSI and VFC server adapters.
4242
adapters_by_vios = connection.vscsi_client_adapter(ems_ref).group_by(&:vios_uuid)
4343
adapters_by_vios.merge!(connection.vfc_client_adapter(ems_ref).group_by(&:lpar_uuid)) { |_, v1, v2| v1.concat(v2) }
4444

4545
adapters_by_vios.each do |vios_uuid, adapters|
4646
connection.modify_object do
47-
connection.vios(vios_uuid).tap do |vios|
48-
adapters.each do |adapt|
49-
case adapt
50-
when IbmPowerHmc::VirtualSCSIClientAdapter
51-
vios.vscsi_mapping_delete!(adapt.server.location)
52-
when IbmPowerHmc::VirtualFibreChannelClientAdapter
53-
vios.vfc_mapping_delete!(adapt.server.location)
47+
connection.vios(vios_uuid, nil, "ViosSCSIMapping,ViosFCMapping").tap do |vios|
48+
adapters.collect(&:server).each do |server|
49+
case server
50+
when IbmPowerHmc::VirtualSCSIServerAdapter
51+
vios.vscsi_mapping_delete!(server.location)
52+
when IbmPowerHmc::VirtualFibreChannelServerAdapter
53+
vios.vfc_mapping_delete!(server.location)
5454
end
5555
end
5656
end

0 commit comments

Comments
 (0)