Skip to content

Commit 7dea38a

Browse files
author
Damien Bergamini
committed
move code to delete VIOS mappings to SDK
Signed-off-by: Damien Bergamini <[email protected]>
1 parent c2e6195 commit 7dea38a

File tree

2 files changed

+3
-22
lines changed

2 files changed

+3
-22
lines changed

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

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

3939
def raw_destroy
4040
ext_management_system.with_provider_connection do |connection|
41-
# Delete associated VIOS VSCSI and VFC server adapters.
42-
adapters_by_vios = connection.vscsi_client_adapter(ems_ref).group_by(&:vios_uuid)
43-
adapters_by_vios.merge!(connection.vfc_client_adapter(ems_ref).group_by(&:lpar_uuid)) { |_, v1, v2| v1.concat(v2) }
44-
45-
adapters_by_vios.each do |vios_uuid, adapters|
46-
connection.modify_object do
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)
54-
end
55-
end
56-
end
57-
end
58-
end
59-
60-
# Delete LPAR.
61-
connection.lpar_delete(ems_ref)
41+
# Delete LPAR and associated VIOS VSCSI and VFC server adapters.
42+
connection.lpar_delete(ems_ref, :delete_vios_mappings => true)
6243
rescue IbmPowerHmc::Connection::HttpError => e
6344
$ibm_power_hmc_log.error("error deleting LPAR #{ems_ref}: #{e}")
6445
raise

manageiq-providers-ibm_power_hmc.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
1919
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
2020
spec.require_paths = ["lib"]
2121

22-
spec.add_dependency "ibm_power_hmc", "~> 0.24.0"
22+
spec.add_dependency "ibm_power_hmc", "~> 0.25.0"
2323

2424
spec.add_development_dependency "manageiq-style"
2525
spec.add_development_dependency "simplecov", ">= 0.21.2"

0 commit comments

Comments
 (0)