summaryrefslogtreecommitdiffstats
path: root/nova-model/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'nova-model/src/main/java')
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/CpuInfo.java104
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java6
2 files changed, 3 insertions, 107 deletions
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/CpuInfo.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/CpuInfo.java
deleted file mode 100644
index bf52fb7..0000000
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/CpuInfo.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package com.woorea.openstack.nova.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class CpuInfo {
-
- @JsonProperty("arch")
- private String arch;
- @JsonProperty("model")
- private String model;
- @JsonProperty("vendor")
- private String vendor;
- @JsonProperty("features")
- private List<String> features = null;
- @JsonProperty("topology")
- private Topology topology;
- @JsonIgnore
- private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
- @JsonProperty("arch")
- public String getArch() {
- return arch;
- }
-
- @JsonProperty("arch")
- public void setArch(String arch) {
- this.arch = arch;
- }
-
- @JsonProperty("model")
- public String getModel() {
- return model;
- }
-
- @JsonProperty("model")
- public void setModel(String model) {
- this.model = model;
- }
-
- @JsonProperty("vendor")
- public String getVendor() {
- return vendor;
- }
-
- @JsonProperty("vendor")
- public void setVendor(String vendor) {
- this.vendor = vendor;
- }
-
- @JsonProperty("features")
- public List<String> getFeatures() {
- return features;
- }
-
- @JsonProperty("features")
- public void setFeatures(List<String> features) {
- this.features = features;
- }
-
- @JsonProperty("topology")
- public Topology getTopology() {
- return topology;
- }
-
- @JsonProperty("topology")
- public void setTopology(Topology topology) {
- this.topology = topology;
- }
-
- @JsonAnyGetter
- public Map<String, Object> getAdditionalProperties() {
- return this.additionalProperties;
- }
-
- @JsonAnySetter
- public void setAdditionalProperty(String name, Object value) {
- this.additionalProperties.put(name, value);
- }
-
-}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java
index fb5d9d2..c96ae97 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hypervisor.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class Hypervisor {
@JsonProperty("cpu_info")
- private CpuInfo cpuInfo;
+ private String cpuInfo;
@JsonProperty("current_workload")
private Integer currentWorkload;
@JsonProperty("status")
@@ -64,12 +64,12 @@ public class Hypervisor {
private Integer vcpusUsed;
@JsonProperty("cpu_info")
- public CpuInfo getCpuInfo() {
+ public String getCpuInfo() {
return cpuInfo;
}
@JsonProperty("cpu_info")
- public void setCpuInfo(CpuInfo cpuInfo) {
+ public void setCpuInfo(String cpuInfo) {
this.cpuInfo = cpuInfo;
}