Skip to content

Fix cpu info in hypervisor #1028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auhlig merged 2 commits into from
May 31, 2017
Merged

Fix cpu info in hypervisor #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1fcaaa
Merge pull request #8 from ContainX/master
zizhongwei May 23, 2017
3716116
fix cpu_info in hypervisor
zizhongwei May 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/org/openstack4j/model/compute/ext/Hypervisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ public interface CPUInfo extends ModelEntity {
/**
* @return cpu vendor
*/
String getVendor();
List<Object> getVendor();

/**
* @return cpu model
*/
String getModel();
List<Object> getModel();

/**
* @return chipset architecture
Expand Down
9 changes: 5 additions & 4 deletions core/src/main/java/org/openstack4j/openstack/compute/domain/ext/ExtHypervisor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import com.google.common.base.MoreObjects;

import org.openstack4j.core.transport.ObjectMapperSingleton;
import org.openstack4j.model.compute.ext.Hypervisor;
import org.openstack4j.openstack.common.ListResult;
Expand Down Expand Up @@ -219,8 +220,8 @@ static class HypervisorCPUInfo implements CPUInfo {

private static final long serialVersionUID = 1L;

private String vendor;
private String model;
private List<Object> vendor;
private List<Object> model;
private String arch;
private List<String> features;
private HypervisorCPUTopology topology;
Expand All @@ -239,12 +240,12 @@ public static HypervisorCPUInfo value(String json) {
}

@Override
public String getVendor() {
public List<Object> getVendor() {
return vendor;
}

@Override
public String getModel() {
public List<Object> getModel() {
return model;
}

Expand Down