Skip to content

Commit caf4b5b

Browse files
author
Damien Bergamini
committed
refactor build_proc_config_spec
Signed-off-by: Damien Bergamini <[email protected]>
1 parent d76fdad commit caf4b5b

File tree

1 file changed

+11
-10
lines changed
  • app/models/manageiq/providers/ibm_power_hmc/infra_manager/vm

1 file changed

+11
-10
lines changed

app/models/manageiq/providers/ibm_power_hmc/infra_manager/vm/reconfigure.rb

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,20 @@ def build_memory_config_spec(lpar, spec, options)
5353
end
5454

5555
def build_proc_config_spec(lpar, spec, options)
56-
desired_procs = options[:number_of_cpus].to_i
57-
5856
if lpar.dedicated == "true"
59-
raise MiqException::MiqVmError, "Processor count cannot be lower than #{lpar.minimum_procs}" if desired_procs < lpar.minimum_procs.to_i
60-
raise MiqException::MiqVmError, "Processor count cannot be greater than #{lpar.maximum_procs}" if desired_procs > lpar.maximum_procs.to_i
61-
62-
spec[:desired_procs] = desired_procs
57+
min, max = lpar.minimum_procs, lpar.maximum_procs
58+
attr = :desired_procs
6359
else
64-
raise MiqException::MiqVmError, "Virtual processor count cannot be lower than #{lpar.minimum_vprocs}" if desired_procs < lpar.minimum_vprocs.to_i
65-
raise MiqException::MiqVmError, "Virtual processor count cannot be greater than #{lpar.maximum_vprocs}" if desired_procs > lpar.maximum_vprocs.to_i
66-
67-
spec[:desired_vprocs] = desired_procs
60+
min, max = lpar.minimum_vprocs, lpar.maximum_vprocs
61+
attr = :desired_vprocs
6862
end
63+
64+
desired_procs = options[:number_of_cpus].to_i
65+
66+
raise MiqException::MiqVmError, "Processor count cannot be lower than #{min}" if desired_procs < min.to_i
67+
raise MiqException::MiqVmError, "Processor count cannot be greater than #{max}" if desired_procs > max.to_i
68+
69+
spec[attr] = desired_procs
6970
end
7071

7172
def build_netadap_create_config_spec(spec, options)

0 commit comments

Comments
 (0)