[SCVMM] Parse CPUCount into logical_cpus

The UI (and other places) use Vm#logical_cpus to indicate the number of CPUs available in a VM. Numbers like Vm#hardware#numvcpus and Vm#hardware#cores_per_socket help determine how Vm#logical_cpus is calculated. However, in the case of SCVMM there is only on CPUCount value returned when collecting inventory. So, defaulting this value to logical_cpus will at least show the number of CPUs the Vm has available even if the constituent parts are not known. https://bugzilla.redhat.com/show_bug.cgi?id=1210657 https://bugzilla.redhat.com/show_bug.cgi?id=1247655
ManageIQ · Aug 14, 2015 · be379d0 · be379d0
1 parent 446f024
commit be379d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/ems_refresh/parsers/scvmm.rb b/app/models/ems_refresh/parsers/scvmm.rb
@@ -215,7 +215,7 @@ def parse_image(image)
         :template         => true,
         :storages         => process_vm_storages(p),
         :hardware         => {
-          :numvcpus           => p[:CPUCount],
+          :logical_cpus       => p[:CPUCount],
           :memory_cpu         => normalize_blank_property_num(p[:Memory]),
           :cpu_type           => p[:CPUType].blank? ? nil : p[:CPUType][:ToString],
           :disks              => process_disks(p),
@@ -308,7 +308,7 @@ def process_vm_hardware(vm)
       p = vm[:Properties][:Props]
 
       {
-        :numvcpus           => p[:CPUCount],
+        :logical_cpus       => p[:CPUCount],
         :guest_os           => p[:OperatingSystem][:Props][:Name],
         :guest_os_full_name => p[:OperatingSystem][:Props][:Name],
         :memory_cpu         => normalize_blank_property_num(p[:Memory]),

diff --git a/spec/models/ems_refresh/refreshers/scvmm_refresher_spec.rb b/spec/models/ems_refresh/refreshers/scvmm_refresher_spec.rb
@@ -182,7 +182,7 @@ def assert_specific_vm
       :guest_os           => "64-bit edition of Windows Server 2008 R2 Standard",
       :guest_os_full_name => "64-bit edition of Windows Server 2008 R2 Standard",
       :bios               => "67b7b7ae-34aa-474e-9050-02ed3c633f6c",
-      :numvcpus           => 1,
+      :logical_cpus       => 1,
       :annotation         => nil,
       :memory_cpu         => 512   # MB
     )