Merge pull request #1279 from rvrignaud/vcpu-count

Inconsistent usage of cpus / vpcus in libvirt / requests.
fog · Nov 15, 2012 · 6c1d734 · 6c1d734
2 parents 397b015 + f64b770
commit 6c1d734
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/fog/libvirt/requests/compute/list_domains.rb b/lib/fog/libvirt/requests/compute/list_domains.rb
@@ -58,7 +58,7 @@ def domain_to_attributes(dom)
             :max_memory_size => dom.info.max_mem,
             :cputime         => dom.info.cpu_time,
             :memory_size     => dom.info.memory,
-            :vcpus           => dom.info.nr_virt_cpu,
+            :cpus            => dom.info.nr_virt_cpu,
             :autostart       => dom.autostart?,
             :os_type         => dom.os_type,
             :active          => dom.active?,
@@ -89,7 +89,7 @@ def mock_domain name
               :max_memory_size => 8,
               :cputime         => 7,
               :memory_size     => 6,
-              :vcpus           => 5,
+              :cpus            => 5,
               :autostart       => false,
               :os_type         => "RHEL6",
               :active          => false,