Inconsistent usage of cpus / vpcus in libvirt / requests. #1279

Merged
merged 1 commit into from Nov 15, 2012
View
4 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,