allow changing number of dedicated cpus

Signed-off-by: Damien Bergamini <[email protected]>

Author: Damien Bergamini

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

@@ -4,10 +4,10 @@ def reconfigurable?
   end
 
   def max_total_vcpus
-    # This is based on CurrentMaximumVirtualProcessorsPerAIXOrLinuxPartition and
-    # CurrentMaximumVirtualProcessorsPerVirtualIOServerPartition settings for CECs.
+    # 64 is based on the CEC's CurrentMaximumVirtualProcessorsPerAIXOrLinuxPartition and
+    # CurrentMaximumVirtualProcessorsPerVirtualIOServerPartition settings.
     # This can be further reduced by the partition's MaximumVirtualProcessors setting.
-    64
+    host && processor_share_type == "dedicated" ? host.cpu_total_cores : 64
   end
 
   def max_vcpus
@@ -27,9 +27,6 @@ def build_config_spec(options)
 
     lpar = ext_management_system.with_provider_connection { |connection| provider_object(connection) }
 
-    # We do not support partitions with dedicated CPUs yet (would require changes to the SDK).
-    raise MiqException::MiqVmError, "Cannot change number of dedicated CPUs" if lpar.dedicated == "true" && options.key?(:number_of_cpus)
-
     # Dynamic Reconfiguration requires RMC to be active.
     raise MiqException::MiqVmError, "RMC is not active on target" if lpar.state == "running" && lpar.rmc_state != "active"
 
@@ -39,7 +36,8 @@ def build_config_spec(options)
 
     spec = {}
     build_memory_config_spec(lpar, spec, options) if options.key?(:vm_memory)
-    build_vproc_config_spec(lpar, spec, options) if options.key?(:number_of_cpus)
+    build_proc_config_spec(lpar, spec, options) if options.key?(:number_of_cpus) && lpar.dedicated == "true"
+    build_vproc_config_spec(lpar, spec, options) if options.key?(:number_of_cpus) && lpar.dedicated != "true"
     build_netadap_create_config_spec(spec, options) if options.key?(:network_adapter_add)
     build_netadap_delete_config_spec(spec, options) if options.key?(:network_adapter_remove)
 
@@ -55,6 +53,15 @@ def build_memory_config_spec(lpar, spec, options)
     spec[:desired_memory] = desired_memory
   end
 
+  def build_proc_config_spec(lpar, spec, options)
+    desired_procs = options[:number_of_cpus].to_i
+
+    raise MiqException::MiqVmError, "Processor count cannot be lower than #{lpar.minimum_procs}"   if desired_procs < lpar.minimum_procs.to_i
+    raise MiqException::MiqVmError, "Processor count cannot be greater than #{lpar.maximum_procs}" if desired_procs > lpar.maximum_procs.to_i
+
+    spec[:desired_procs] = desired_procs
+  end
+
   def build_vproc_config_spec(lpar, spec, options)
     desired_vprocs = options[:number_of_cpus].to_i
 
@@ -92,7 +99,7 @@ def raw_reconfigure(spec)
     $ibm_power_hmc_log.debug("reconfiguring with spec=#{spec}")
 
     ext_management_system.with_provider_connection do |connection|
-      attrs = spec.slice(:desired_memory, :desired_vprocs)
+      attrs = spec.slice(:desired_memory, :desired_procs, :desired_vprocs)
       modify_attrs(connection, attrs) unless attrs.empty?
 
       spec[:netadap_delete].try(:each) do |uuid|

manageiq-providers-ibm_power_hmc.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "ibm_power_hmc", "~> 0.21.0"
+  spec.add_dependency "ibm_power_hmc", "~> 0.21.1"
 
   spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "simplecov", ">= 0.21.2"