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/Certificate.java48
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java248
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java34
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java112
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java454
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java262
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java100
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java84
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java46
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java78
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java178
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java174
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java120
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java438
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java200
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java44
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java154
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java64
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java760
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java70
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java32
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java558
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java40
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java58
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java284
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java392
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java96
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java372
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java918
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java1194
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java604
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java436
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java46
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java136
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java132
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java206
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java72
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java44
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java220
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java120
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java42
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java42
50 files changed, 5024 insertions, 5024 deletions
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
index 1e2558d..31811f5 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
@@ -22,31 +22,31 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("certificate")
public class Certificate {
- private String data;
-
- @JsonProperty("private_key")
- private String privateKey;
+ private String data;
+
+ @JsonProperty("private_key")
+ private String privateKey;
- /**
- * @return the data
- */
- public String getData() {
- return data;
- }
+ /**
+ * @return the data
+ */
+ public String getData() {
+ return data;
+ }
- /**
- * @return the privateKey
- */
- public String getPrivateKey() {
- return privateKey;
- }
+ /**
+ * @return the privateKey
+ */
+ public String getPrivateKey() {
+ return privateKey;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Certificate [data=" + data + ", privateKey=" + privateKey + "]";
- }
-
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Certificate [data=" + data + ", privateKey=" + privateKey + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
index 8d77d39..dc0f21d 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
@@ -23,128 +23,128 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("cloudpipe")
public class Cloudpipe implements Serializable {
-
- private String projectId;
-
- private String internalIp;
-
- private String publicIp;
-
- private String publicPort;
-
- private String state;
-
- private String instanceId;
-
- private Calendar createdAt;
-
- /**
- * @return the projectId
- */
- public String getProjectId() {
- return projectId;
- }
-
- /**
- * @param projectId the projectId to set
- */
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
-
- /**
- * @return the internalIp
- */
- public String getInternalIp() {
- return internalIp;
- }
-
- /**
- * @param internalIp the internalIp to set
- */
- public void setInternalIp(String internalIp) {
- this.internalIp = internalIp;
- }
-
- /**
- * @return the publicIp
- */
- public String getPublicIp() {
- return publicIp;
- }
-
- /**
- * @param publicIp the publicIp to set
- */
- public void setPublicIp(String publicIp) {
- this.publicIp = publicIp;
- }
-
- /**
- * @return the publicPort
- */
- public String getPublicPort() {
- return publicPort;
- }
-
- /**
- * @param publicPort the publicPort to set
- */
- public void setPublicPort(String publicPort) {
- this.publicPort = publicPort;
- }
-
- /**
- * @return the state
- */
- public String getState() {
- return state;
- }
-
- /**
- * @param state the state to set
- */
- public void setState(String state) {
- this.state = state;
- }
-
- /**
- * @return the instanceId
- */
- public String getInstanceId() {
- return instanceId;
- }
-
- /**
- * @param instanceId the instanceId to set
- */
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
-
- /**
- * @return the createdAt
- */
- public Calendar getCreatedAt() {
- return createdAt;
- }
-
- /**
- * @param createdAt the createdAt to set
- */
- public void setCreatedAt(Calendar createdAt) {
- this.createdAt = createdAt;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "CloudPipe [projectId=" + projectId + ", internalIp="
- + internalIp + ", publicIp=" + publicIp + ", publicPort="
- + publicPort + ", state=" + state + ", instanceId="
- + instanceId + ", createdAt=" + createdAt + "]";
- }
-
+
+ private String projectId;
+
+ private String internalIp;
+
+ private String publicIp;
+
+ private String publicPort;
+
+ private String state;
+
+ private String instanceId;
+
+ private Calendar createdAt;
+
+ /**
+ * @return the projectId
+ */
+ public String getProjectId() {
+ return projectId;
+ }
+
+ /**
+ * @param projectId the projectId to set
+ */
+ public void setProjectId(String projectId) {
+ this.projectId = projectId;
+ }
+
+ /**
+ * @return the internalIp
+ */
+ public String getInternalIp() {
+ return internalIp;
+ }
+
+ /**
+ * @param internalIp the internalIp to set
+ */
+ public void setInternalIp(String internalIp) {
+ this.internalIp = internalIp;
+ }
+
+ /**
+ * @return the publicIp
+ */
+ public String getPublicIp() {
+ return publicIp;
+ }
+
+ /**
+ * @param publicIp the publicIp to set
+ */
+ public void setPublicIp(String publicIp) {
+ this.publicIp = publicIp;
+ }
+
+ /**
+ * @return the publicPort
+ */
+ public String getPublicPort() {
+ return publicPort;
+ }
+
+ /**
+ * @param publicPort the publicPort to set
+ */
+ public void setPublicPort(String publicPort) {
+ this.publicPort = publicPort;
+ }
+
+ /**
+ * @return the state
+ */
+ public String getState() {
+ return state;
+ }
+
+ /**
+ * @param state the state to set
+ */
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ /**
+ * @return the instanceId
+ */
+ public String getInstanceId() {
+ return instanceId;
+ }
+
+ /**
+ * @param instanceId the instanceId to set
+ */
+ public void setInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
+
+ /**
+ * @return the createdAt
+ */
+ public Calendar getCreatedAt() {
+ return createdAt;
+ }
+
+ /**
+ * @param createdAt the createdAt to set
+ */
+ public void setCreatedAt(Calendar createdAt) {
+ this.createdAt = createdAt;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "CloudPipe [projectId=" + projectId + ", internalIp="
+ + internalIp + ", publicIp=" + publicIp + ", publicPort="
+ + publicPort + ", state=" + state + ", instanceId="
+ + instanceId + ", createdAt=" + createdAt + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
index 4436361..a9920d6 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
@@ -23,22 +23,22 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class Cloudpipes implements Serializable {
- @JsonProperty("cloudpipes")
- private List<Cloudpipe> list;
+ @JsonProperty("cloudpipes")
+ private List<Cloudpipe> list;
- /**
- * @return the list
- */
- public List<Cloudpipe> getList() {
- return list;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Flavors [list=" + list + "]";
- }
-
+ /**
+ * @return the list
+ */
+ public List<Cloudpipe> getList() {
+ return list;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Flavors [list=" + list + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
index 320ad3e..bdf37c2 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
@@ -25,67 +25,67 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("extension")
public class Extension implements Serializable {
- private String alias;
-
- private String description;
-
- private String name;
-
- private String namespace;
-
- private Calendar updated;
-
- private List<Link> links;
+ private String alias;
+
+ private String description;
+
+ private String name;
+
+ private String namespace;
+
+ private Calendar updated;
+
+ private List<Link> links;
- /**
- * @return the alias
- */
- public String getAlias() {
- return alias;
- }
+ /**
+ * @return the alias
+ */
+ public String getAlias() {
+ return alias;
+ }
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * @return the namespace
- */
- public String getNamespace() {
- return namespace;
- }
+ /**
+ * @return the namespace
+ */
+ public String getNamespace() {
+ return namespace;
+ }
- /**
- * @return the updated
- */
- public Calendar getUpdated() {
- return updated;
- }
+ /**
+ * @return the updated
+ */
+ public Calendar getUpdated() {
+ return updated;
+ }
- /**
- * @return the links
- */
- public List<Link> getLinks() {
- return links;
- }
+ /**
+ * @return the links
+ */
+ public List<Link> getLinks() {
+ return links;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Extension [alias=" + alias + ", description=" + description
- + ", name=" + name + ", namespace=" + namespace + "]";
- }
-
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Extension [alias=" + alias + ", description=" + description
+ + ", name=" + name + ", namespace=" + namespace + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
index 232b424..0ecb493 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class Extensions implements Iterable<Extension>, Serializable {
- @JsonProperty("extensions")
- private List<Extension> list;
+ @JsonProperty("extensions")
+ private List<Extension> list;
- /**
- * @return the list
- */
- public List<Extension> getList() {
- return list;
- }
-
- @Override
- public Iterator<Extension> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Extensions [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<Extension> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<Extension> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Extensions [list=" + list + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
index 6db8da1..817c50f 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
@@ -25,231 +25,231 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("flavor")
public class Flavor implements Serializable {
- private String id;
-
- private String name;
-
- private Integer vcpus;
-
- private Integer ram;
-
- private Integer disk;
-
- @JsonProperty("OS-FLV-EXT-DATA:ephemeral")
- private Integer ephemeral;
-
- private String swap;
-
- @JsonProperty("rxtx_factor")
- private Float rxtxFactor;
-
- @JsonProperty("OS-FLV-DISABLED:disabled")
- private Boolean disabled;
-
- @JsonProperty("rxtx_quota")
- private Integer rxtxQuota;
-
- @JsonProperty("rxtx_cap")
- private Integer rxtxCap;
-
- private List<Link> links;
-
- @JsonProperty("os-flavor-access:is_public")
- private Boolean isPublic;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id the id to set
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the vcpus
- */
- public Integer getVcpus() {
- return vcpus;
- }
-
- /**
- * @param vcpus the vcpus to set
- */
- public void setVcpus(Integer vcpus) {
- this.vcpus = vcpus;
- }
-
- /**
- * @return the ram
- */
- public Integer getRam() {
- return ram;
- }
-
- /**
- * @param ram the ram to set
- */
- public void setRam(Integer ram) {
- this.ram = ram;
- }
-
- /**
- * @return the disk
- */
- public Integer getDisk() {
- return disk;
- }
-
- /**
- * @param disk the disk to set
- */
- public void setDisk(Integer disk) {
- this.disk = disk;
- }
-
- /**
- * @return the ephemeral
- */
- public Integer getEphemeral() {
- return ephemeral;
- }
-
- /**
- * @param ephemeral the ephemeral to set
- */
- public void setEphemeral(Integer ephemeral) {
- this.ephemeral = ephemeral;
- }
-
- /**
- * @return the swap
- */
- public String getSwap() {
- return swap;
- }
-
- /**
- * @param swap the swap to set
- */
- public void setSwap(String swap) {
- this.swap = swap;
- }
-
- /**
- * @return the rxtxFactor
- */
- public Float getRxtxFactor() {
- return rxtxFactor;
- }
-
- /**
- * @param rxtxFactor the rxtxFactor to set
- */
- public void setRxtxFactor(Float rxtxFactor) {
- this.rxtxFactor = rxtxFactor;
- }
-
- /**
- * @return the rxtxQuota
- */
- public Integer getRxtxQuota() {
- return rxtxQuota;
- }
-
- /**
- * @param rxtxQuota the rxtxQuota to set
- */
- public void setRxtxQuota(Integer rxtxQuota) {
- this.rxtxQuota = rxtxQuota;
- }
-
- /**
- * @return the rxtxCap
- */
- public Integer getRxtxCap() {
- return rxtxCap;
- }
-
- /**
- * @param rxtxCap the rxtxCap to set
- */
- public void setRxtxCap(Integer rxtxCap) {
- this.rxtxCap = rxtxCap;
- }
-
- /**
- * @return the disabled
- */
- public Boolean getDisabled() {
- return disabled;
- }
-
- /**
- * @param disabled the disabled to set
- */
- public void setDisabled(Boolean disabled) {
- this.disabled = disabled;
- }
-
- /**
- * @return the isPublic
- */
- public Boolean isPublic() {
- return isPublic;
- }
-
- /**
- * @param isPublic the isPublic to set
- */
- public void setPublic(Boolean isPublic) {
- this.isPublic = isPublic;
- }
-
- /**
- * @return the links
- */
- public List<Link> getLinks() {
- return links;
- }
-
- /**
- * @param links the links to set
- */
- public void setLinks(List<Link> links) {
- this.links = links;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Flavor [id=" + id + ", name=" + name + ", vcpus=" + vcpus
- + ", ram=" + ram + ", disk=" + disk + ", ephemeral="
- + ephemeral + ", swap=" + swap + ", rxtxFactor=" + rxtxFactor
- + ", disabled=" + disabled + ", rxtxQuota=" + rxtxQuota
- + ", rxtxCap=" + rxtxCap + ", links=" + links + ", isPublic="
- + isPublic + "]";
- }
-
+ private String id;
+
+ private String name;
+
+ private Integer vcpus;
+
+ private Integer ram;
+
+ private Integer disk;
+
+ @JsonProperty("OS-FLV-EXT-DATA:ephemeral")
+ private Integer ephemeral;
+
+ private String swap;
+
+ @JsonProperty("rxtx_factor")
+ private Float rxtxFactor;
+
+ @JsonProperty("OS-FLV-DISABLED:disabled")
+ private Boolean disabled;
+
+ @JsonProperty("rxtx_quota")
+ private Integer rxtxQuota;
+
+ @JsonProperty("rxtx_cap")
+ private Integer rxtxCap;
+
+ private List<Link> links;
+
+ @JsonProperty("os-flavor-access:is_public")
+ private Boolean isPublic;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @param id the id to set
+ */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the vcpus
+ */
+ public Integer getVcpus() {
+ return vcpus;
+ }
+
+ /**
+ * @param vcpus the vcpus to set
+ */
+ public void setVcpus(Integer vcpus) {
+ this.vcpus = vcpus;
+ }
+
+ /**
+ * @return the ram
+ */
+ public Integer getRam() {
+ return ram;
+ }
+
+ /**
+ * @param ram the ram to set
+ */
+ public void setRam(Integer ram) {
+ this.ram = ram;
+ }
+
+ /**
+ * @return the disk
+ */
+ public Integer getDisk() {
+ return disk;
+ }
+
+ /**
+ * @param disk the disk to set
+ */
+ public void setDisk(Integer disk) {
+ this.disk = disk;
+ }
+
+ /**
+ * @return the ephemeral
+ */
+ public Integer getEphemeral() {
+ return ephemeral;
+ }
+
+ /**
+ * @param ephemeral the ephemeral to set
+ */
+ public void setEphemeral(Integer ephemeral) {
+ this.ephemeral = ephemeral;
+ }
+
+ /**
+ * @return the swap
+ */
+ public String getSwap() {
+ return swap;
+ }
+
+ /**
+ * @param swap the swap to set
+ */
+ public void setSwap(String swap) {
+ this.swap = swap;
+ }
+
+ /**
+ * @return the rxtxFactor
+ */
+ public Float getRxtxFactor() {
+ return rxtxFactor;
+ }
+
+ /**
+ * @param rxtxFactor the rxtxFactor to set
+ */
+ public void setRxtxFactor(Float rxtxFactor) {
+ this.rxtxFactor = rxtxFactor;
+ }
+
+ /**
+ * @return the rxtxQuota
+ */
+ public Integer getRxtxQuota() {
+ return rxtxQuota;
+ }
+
+ /**
+ * @param rxtxQuota the rxtxQuota to set
+ */
+ public void setRxtxQuota(Integer rxtxQuota) {
+ this.rxtxQuota = rxtxQuota;
+ }
+
+ /**
+ * @return the rxtxCap
+ */
+ public Integer getRxtxCap() {
+ return rxtxCap;
+ }
+
+ /**
+ * @param rxtxCap the rxtxCap to set
+ */
+ public void setRxtxCap(Integer rxtxCap) {
+ this.rxtxCap = rxtxCap;
+ }
+
+ /**
+ * @return the disabled
+ */
+ public Boolean getDisabled() {
+ return disabled;
+ }
+
+ /**
+ * @param disabled the disabled to set
+ */
+ public void setDisabled(Boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ /**
+ * @return the isPublic
+ */
+ public Boolean isPublic() {
+ return isPublic;
+ }
+
+ /**
+ * @param isPublic the isPublic to set
+ */
+ public void setPublic(Boolean isPublic) {
+ this.isPublic = isPublic;
+ }
+
+ /**
+ * @return the links
+ */
+ public List<Link> getLinks() {
+ return links;
+ }
+
+ /**
+ * @param links the links to set
+ */
+ public void setLinks(List<Link> links) {
+ this.links = links;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Flavor [id=" + id + ", name=" + name + ", vcpus=" + vcpus
+ + ", ram=" + ram + ", disk=" + disk + ", ephemeral="
+ + ephemeral + ", swap=" + swap + ", rxtxFactor=" + rxtxFactor
+ + ", disabled=" + disabled + ", rxtxQuota=" + rxtxQuota
+ + ", rxtxCap=" + rxtxCap + ", links=" + links + ", isPublic="
+ + isPublic + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
index 8d632a4..481e3bf 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
@@ -24,135 +24,135 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("flavor")
public class FlavorForCreate implements Serializable {
-
- private String id;
-
- private String name;
-
- private String vcpus;
-
- private Integer ram;
-
- private String disk;
-
- @JsonProperty("OS-FLV-EXT-DATA:ephemeral")
- private Integer ephemeral;
-
- private String swap;
-
- @JsonProperty("rxtx_factor")
- private Float rxtxFactor;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id the id to set
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the vcpus
- */
- public String getVcpus() {
- return vcpus;
- }
-
- /**
- * @param vcpus the vcpus to set
- */
- public void setVcpus(String vcpus) {
- this.vcpus = vcpus;
- }
-
- /**
- * @return the ram
- */
- public Integer getRam() {
- return ram;
- }
-
- /**
- * @param ram the ram to set
- */
- public void setRam(Integer ram) {
- this.ram = ram;
- }
-
- /**
- * @return the disk
- */
- public String getDisk() {
- return disk;
- }
-
- /**
- * @param disk the disk to set
- */
- public void setDisk(String disk) {
- this.disk = disk;
- }
-
- /**
- * @return the ephemeral
- */
- public Integer getEphemeral() {
- return ephemeral;
- }
-
- /**
- * @param ephemeral the ephemeral to set
- */
- public void setEphemeral(Integer ephemeral) {
- this.ephemeral = ephemeral;
- }
-
- /**
- * @return the swap
- */
- public String getSwap() {
- return swap;
- }
-
- /**
- * @param swap the swap to set
- */
- public void setSwap(String swap) {
- this.swap = swap;
- }
-
- /**
- * @return the rxtxFactor
- */
- public Float getRxtxFactor() {
- return rxtxFactor;
- }
-
- /**
- * @param rxtxFactor the rxtxFactor to set
- */
- public void setRxtxFactor(Float rxtxFactor) {
- this.rxtxFactor = rxtxFactor;
- }
-
+
+ private String id;
+
+ private String name;
+
+ private String vcpus;
+
+ private Integer ram;
+
+ private String disk;
+
+ @JsonProperty("OS-FLV-EXT-DATA:ephemeral")
+ private Integer ephemeral;
+
+ private String swap;
+
+ @JsonProperty("rxtx_factor")
+ private Float rxtxFactor;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @param id the id to set
+ */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the vcpus
+ */
+ public String getVcpus() {
+ return vcpus;
+ }
+
+ /**
+ * @param vcpus the vcpus to set
+ */
+ public void setVcpus(String vcpus) {
+ this.vcpus = vcpus;
+ }
+
+ /**
+ * @return the ram
+ */
+ public Integer getRam() {
+ return ram;
+ }
+
+ /**
+ * @param ram the ram to set
+ */
+ public void setRam(Integer ram) {
+ this.ram = ram;
+ }
+
+ /**
+ * @return the disk
+ */
+ public String getDisk() {
+ return disk;
+ }
+
+ /**
+ * @param disk the disk to set
+ */
+ public void setDisk(String disk) {
+ this.disk = disk;
+ }
+
+ /**
+ * @return the ephemeral
+ */
+ public Integer getEphemeral() {
+ return ephemeral;
+ }
+
+ /**
+ * @param ephemeral the ephemeral to set
+ */
+ public void setEphemeral(Integer ephemeral) {
+ this.ephemeral = ephemeral;
+ }
+
+ /**
+ * @return the swap
+ */
+ public String getSwap() {
+ return swap;
+ }
+
+ /**
+ * @param swap the swap to set
+ */
+ public void setSwap(String swap) {
+ this.swap = swap;
+ }
+
+ /**
+ * @return the rxtxFactor
+ */
+ public Float getRxtxFactor() {
+ return rxtxFactor;
+ }
+
+ /**
+ * @param rxtxFactor the rxtxFactor to set
+ */
+ public void setRxtxFactor(Float rxtxFactor) {
+ this.rxtxFactor = rxtxFactor;
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
index 5720340..0bc4ae8 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class Flavors implements Iterable<Flavor>, Serializable {
- @JsonProperty("flavors")
- private List<Flavor> list;
+ @JsonProperty("flavors")
+ private List<Flavor> list;
- /**
- * @return the list
- */
- public List<Flavor> getList() {
- return list;
- }
-
- @Override
- public Iterator<Flavor> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Flavors [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<Flavor> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<Flavor> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Flavors [list=" + list + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
index f92ec2a..b38e78e 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
@@ -24,60 +24,60 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("floating_ip")
public class FloatingIp implements Serializable {
- private String id;
-
- private String pool;
-
- private String ip;
-
- @JsonProperty("fixed_ip")
- private String fixedIp;
-
- @JsonProperty("instance_id")
- private String instanceId;
+ private String id;
+
+ private String pool;
+
+ private String ip;
+
+ @JsonProperty("fixed_ip")
+ private String fixedIp;
+
+ @JsonProperty("instance_id")
+ private String instanceId;
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
- /**
- * @return the pool
- */
- public String getPool() {
- return pool;
- }
+ /**
+ * @return the pool
+ */
+ public String getPool() {
+ return pool;
+ }
- /**
- * @return the ip
- */
- public String getIp() {
- return ip;
- }
+ /**
+ * @return the ip
+ */
+ public String getIp() {
+ return ip;
+ }
- /**
- * @return the fixedIp
- */
- public String getFixedIp() {
- return fixedIp;
- }
+ /**
+ * @return the fixedIp
+ */
+ public String getFixedIp() {
+ return fixedIp;
+ }
- /**
- * @return the instanceId
- */
- public String getInstanceId() {
- return instanceId;
- }
+ /**
+ * @return the instanceId
+ */
+ public String getInstanceId() {
+ return instanceId;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "FloatingIp [id=" + id + ", pool=" + pool + ", ip=" + ip
- + ", fixedIp=" + fixedIp + ", instanceId=" + instanceId + "]";
- }
-
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "FloatingIp [id=" + id + ", pool=" + pool + ", ip=" + ip
+ + ", fixedIp=" + fixedIp + ", instanceId=" + instanceId + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
index 1aa0b79..2a5eb75 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
@@ -24,51 +24,51 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("floating-ip-pool")
public class FloatingIpDomain implements Serializable {
- private String domain;
-
- private String scope;
-
- private String project;
-
- @JsonProperty("availabilityZone")
- private String availabilityZone;
+ private String domain;
+
+ private String scope;
+
+ private String project;
+
+ @JsonProperty("availabilityZone")
+ private String availabilityZone;
- /**
- * @return the domain
- */
- public String getDomain() {
- return domain;
- }
+ /**
+ * @return the domain
+ */
+ public String getDomain() {
+ return domain;
+ }
- /**
- * @return the scope
- */
- public String getScope() {
- return scope;
- }
+ /**
+ * @return the scope
+ */
+ public String getScope() {
+ return scope;
+ }
- /**
- * @return the project
- */
- public String getProject() {
- return project;
- }
+ /**
+ * @return the project
+ */
+ public String getProject() {
+ return project;
+ }
- /**
- * @return the availabilityZone
- */
- public String getAvailabilityZone() {
- return availabilityZone;
- }
+ /**
+ * @return the availabilityZone
+ */
+ public String getAvailabilityZone() {
+ return availabilityZone;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "FloatingIpDomain [domain=" + domain + ", scope=" + scope
- + ", project=" + project + ", availabilityZone="
- + availabilityZone + "]";
- }
-
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "FloatingIpDomain [domain=" + domain + ", scope=" + scope
+ + ", project=" + project + ", availabilityZone="
+ + availabilityZone + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
index 3b452d6..bf849f3 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class FloatingIpDomains implements Iterable<FloatingIpDomain>, Serializable {
- @JsonProperty("domain_entries")
- private List<FloatingIpDomain> list;
-
- /**
- * @return the list
- */
- public List<FloatingIpDomain> getList() {
- return list;
- }
-
- @Override
- public Iterator<FloatingIpDomain> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "FloatingIpDomains [list=" + list + "]";
- }
-
+ @JsonProperty("domain_entries")
+ private List<FloatingIpDomain> list;
+
+ /**
+ * @return the list
+ */
+ public List<FloatingIpDomain> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<FloatingIpDomain> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "FloatingIpDomains [list=" + list + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
index a6341ec..b3196b6 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
@@ -25,49 +25,49 @@ import org.codehaus.jackson.annotate.JsonProperty;
import com.woorea.openstack.nova.model.FloatingIpPools.FloatingIpPool;
public class FloatingIpPools implements Iterable<FloatingIpPool>, Serializable {
-
- public static class FloatingIpPool implements Serializable {
+
+ public static class FloatingIpPool implements Serializable {
- private String name;
+ private String name;
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "FloatingIpPool [name=" + name + "]";
- }
-
- }
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "FloatingIpPool [name=" + name + "]";
+ }
+
+ }
- @JsonProperty("floating_ip_pools")
- private List<FloatingIpPool> list;
+ @JsonProperty("floating_ip_pools")
+ private List<FloatingIpPool> list;
- /**
- * @return the list
- */
- public List<FloatingIpPool> getList() {
- return list;
- }
-
- @Override
- public Iterator<FloatingIpPool> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "FloatingIpPools [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<FloatingIpPool> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<FloatingIpPool> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "FloatingIpPools [list=" + list + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
index 995f9d9..5c05794 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class FloatingIps implements Iterable<FloatingIp>, Serializable {
- @JsonProperty("floating_ips")
- private List<FloatingIp> list;
+ @JsonProperty("floating_ips")
+ private List<FloatingIp> list;
- /**
- * @return the list
- */
- public List<FloatingIp> getList() {
- return list;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "FloatingIps [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<FloatingIp> getList() {
+ return list;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "FloatingIps [list=" + list + "]";
+ }
- @Override
- public Iterator<FloatingIp> iterator() {
- return list.iterator();
- }
-
+ @Override
+ public Iterator<FloatingIp> iterator() {
+ return list.iterator();
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
index dd3c620..f193e2d 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
@@ -22,104 +22,104 @@ import java.util.List;
import org.codehaus.jackson.annotate.JsonProperty;
public class Host implements Serializable {
-
- public static final class ResourceWrapper implements Serializable {
-
- public static final class Resource implements Serializable {
-
- private String project;
-
- @JsonProperty("memory_mb")
- private Integer memoryMb;
-
- private String host;
-
- private Integer cpu;
-
- @JsonProperty("disk_gb")
- private Integer diskGb;
+
+ public static final class ResourceWrapper implements Serializable {
+
+ public static final class Resource implements Serializable {
+
+ private String project;
+
+ @JsonProperty("memory_mb")
+ private Integer memoryMb;
+
+ private String host;
+
+ private Integer cpu;
+
+ @JsonProperty("disk_gb")
+ private Integer diskGb;
- /**
- * @return the project
- */
- public String getProject() {
- return project;
- }
+ /**
+ * @return the project
+ */
+ public String getProject() {
+ return project;
+ }
- /**
- * @return the memoryMb
- */
- public Integer getMemoryMb() {
- return memoryMb;
- }
+ /**
+ * @return the memoryMb
+ */
+ public Integer getMemoryMb() {
+ return memoryMb;
+ }
- /**
- * @return the host
- */
- public String getHost() {
- return host;
- }
+ /**
+ * @return the host
+ */
+ public String getHost() {
+ return host;
+ }
- /**
- * @return the cpu
- */
- public Integer getCpu() {
- return cpu;
- }
+ /**
+ * @return the cpu
+ */
+ public Integer getCpu() {
+ return cpu;
+ }
- /**
- * @return the diskGb
- */
- public Integer getDiskGb() {
- return diskGb;
- }
+ /**
+ * @return the diskGb
+ */
+ public Integer getDiskGb() {
+ return diskGb;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Resource [project=" + project + ", memoryMb="
- + memoryMb + ", host=" + host + ", cpu=" + cpu
- + ", diskGb=" + diskGb + "]";
- }
-
- }
-
- private Resource resource;
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Resource [project=" + project + ", memoryMb="
+ + memoryMb + ", host=" + host + ", cpu=" + cpu
+ + ", diskGb=" + diskGb + "]";
+ }
+
+ }
+
+ private Resource resource;
- /**
- * @return the resource
- */
- public Resource getResource() {
- return resource;
- }
+ /**
+ * @return the resource
+ */
+ public Resource getResource() {
+ return resource;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "ResourceWrapper [resource=" + resource + "]";
- }
-
- }
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "ResourceWrapper [resource=" + resource + "]";
+ }
+
+ }
- private List<ResourceWrapper> host;
+ private List<ResourceWrapper> host;
- /**
- * @return the host
- */
- public List<ResourceWrapper> getHost() {
- return host;
- }
+ /**
+ * @return the host
+ */
+ public List<ResourceWrapper> getHost() {
+ return host;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Host [host=" + host + "]";
- }
-
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Host [host=" + host + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
index 8273688..4ba26e7 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
@@ -25,102 +25,102 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("aggregate")
public class HostAggregate implements Serializable {
-
- private String id;
+
+ private String id;
- private String name;
-
- @JsonProperty("availability_zone")
- private String availabilityZone;
-
- @JsonProperty("created_at")
- private String createdAt;
-
- @JsonProperty("updated_at")
- private String updatedAt;
-
- @JsonProperty("deleted_at")
- private String deletedAt;
-
- private Boolean deleted;
-
- private List<String> hosts;
-
- private Map<String, String> metadata;
+ private String name;
+
+ @JsonProperty("availability_zone")
+ private String availabilityZone;
+
+ @JsonProperty("created_at")
+ private String createdAt;
+
+ @JsonProperty("updated_at")
+ private String updatedAt;
+
+ @JsonProperty("deleted_at")
+ private String deletedAt;
+
+ private Boolean deleted;
+
+ private List<String> hosts;
+
+ private Map<String, String> metadata;
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * @return the availabilityZone
- */
- public String getAvailabilityZone() {
- return availabilityZone;
- }
+ /**
+ * @return the availabilityZone
+ */
+ public String getAvailabilityZone() {
+ return availabilityZone;
+ }
- /**
- * @return the createdAt
- */
- public String getCreatedAt() {
- return createdAt;
- }
+ /**
+ * @return the createdAt
+ */
+ public String getCreatedAt() {
+ return createdAt;
+ }
- /**
- * @return the updatedAt
- */
- public String getUpdatedAt() {
- return updatedAt;
- }
+ /**
+ * @return the updatedAt
+ */
+ public String getUpdatedAt() {
+ return updatedAt;
+ }
- /**
- * @return the deletedAt
- */
- public String getDeletedAt() {
- return deletedAt;
- }
+ /**
+ * @return the deletedAt
+ */
+ public String getDeletedAt() {
+ return deletedAt;
+ }
- /**
- * @return the deleted
- */
- public Boolean getDeleted() {
- return deleted;
- }
+ /**
+ * @return the deleted
+ */
+ public Boolean getDeleted() {
+ return deleted;
+ }
- /**
- * @return the hosts
- */
- public List<String> getHosts() {
- return hosts;
- }
+ /**
+ * @return the hosts
+ */
+ public List<String> getHosts() {
+ return hosts;
+ }
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "HostAggregate [id=" + id + ", name=" + name
- + ", availabilityZone=" + availabilityZone + ", createdAt="
- + createdAt + ", updatedAt=" + updatedAt + ", deletedAt="
- + deletedAt + ", deleted=" + deleted + ", hosts=" + hosts
- + ", metadata=" + metadata + "]";
- }
-
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "HostAggregate [id=" + id + ", name=" + name
+ + ", availabilityZone=" + availabilityZone + ", createdAt="
+ + createdAt + ", updatedAt=" + updatedAt + ", deletedAt="
+ + deletedAt + ", deleted=" + deleted + ", hosts=" + hosts
+ + ", metadata=" + metadata + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
index 04355ff..56da094 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class HostAggregates implements Iterable<HostAggregate>, Serializable {
- @JsonProperty("aggregates")
- private List<HostAggregate> list;
+ @JsonProperty("aggregates")
+ private List<HostAggregate> list;
- /**
- * @return the list
- */
- public List<HostAggregate> getList() {
- return list;
- }
-
- @Override
- public Iterator<HostAggregate> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "HostAggregates [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<HostAggregate> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<HostAggregate> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "HostAggregates [list=" + list + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
index e119eae..b97a7ae 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
@@ -23,71 +23,71 @@ import java.util.List;
import org.codehaus.jackson.annotate.JsonProperty;
public class Hosts implements Iterable<Hosts.Host>, Serializable {
-
- public static final class Host {
-
- private String zone;
-
- @JsonProperty("host_name")
- private String hostName;
-
- private String service;
+
+ public static final class Host {
+
+ private String zone;
+
+ @JsonProperty("host_name")
+ private String hostName;
+
+ private String service;
- /**
- * @return the hostName
- */
- public String getHostName() {
- return hostName;
- }
+ /**
+ * @return the hostName
+ */
+ public String getHostName() {
+ return hostName;
+ }
- /**
- * @return the service
- */
- public String getService() {
- return service;
- }
-
- public String getZone() {
- return zone;
- }
+ /**
+ * @return the service
+ */
+ public String getService() {
+ return service;
+ }
+
+ public String getZone() {
+ return zone;
+ }
- public void setZone(String zone) {
- this.zone = zone;
- }
+ public void setZone(String zone) {
+ this.zone = zone;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Host [hostName=" + hostName + ", service=" + service + "]";
- }
-
- }
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Host [hostName=" + hostName + ", service=" + service + "]";
+ }
+
+ }
- @JsonProperty("hosts")
- private List<Host> list;
+ @JsonProperty("hosts")
+ private List<Host> list;
- /**
- * @return the list
- */
- public List<Host> getList() {
- return list;
- }
-
- @Override
- public Iterator<Hosts.Host> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Hosts [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<Host> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<Hosts.Host> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Hosts [list=" + list + "]";
+ }
-
-
+
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
index af62019..2a03f6f 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
@@ -26,223 +26,223 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("image")
public class Image implements Serializable {
-
- public static final class Server implements Serializable {
-
- private String id;
-
- private List<Link> links;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the links
- */
- public List<Link> getLinks() {
- return links;
- }
-
- @Override
- public String toString() {
- return "Server [id=" + id + ", links=" + links + "]";
- }
-
- }
-
- private String id;
-
- private String status;
-
- private String name;
-
- private Integer progress;
-
- private Integer minRam;
-
- private Integer minDisk;
-
- private Calendar created;
-
- private Calendar updated;
-
- @JsonProperty("OS-EXT-IMG-SIZE:size")
- private Long size;
-
- private Map<String, String> metadata;
-
- private Server server;
-
- private List<Link> links;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id the id to set
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @param status the status to set
- */
- public void setStatus(String status) {
- this.status = status;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the progress
- */
- public Integer getProgress() {
- return progress;
- }
-
- /**
- * @param progress the progress to set
- */
- public void setProgress(Integer progress) {
- this.progress = progress;
- }
-
- /**
- * @return the minRam
- */
- public Integer getMinRam() {
- return minRam;
- }
-
- /**
- * @param minRam the minRam to set
- */
- public void setMinRam(Integer minRam) {
- this.minRam = minRam;
- }
-
- /**
- * @return the minDisk
- */
- public Integer getMinDisk() {
- return minDisk;
- }
-
- /**
- * @param minDisk the minDisk to set
- */
- public void setMinDisk(Integer minDisk) {
- this.minDisk = minDisk;
- }
-
- /**
- * @return the created
- */
- public Calendar getCreated() {
- return created;
- }
-
- /**
- * @param created the created to set
- */
- public void setCreated(Calendar created) {
- this.created = created;
- }
-
- /**
- * @return the updated
- */
- public Calendar getUpdated() {
- return updated;
- }
-
- /**
- * @param updated the updated to set
- */
- public void setUpdated(Calendar updated) {
- this.updated = updated;
- }
-
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- /**
- * @return the size
- */
- public Long getSize() {
- return size;
- }
-
- /**
- * @param metadata the metadata to set
- */
- public void setMetadata(Map<String, String> metadata) {
- this.metadata = metadata;
- }
-
- /**
- * @return the server
- */
- public Server getServer() {
- return server;
- }
-
- /**
- * @return the links
- */
- public List<Link> getLinks() {
- return links;
- }
-
- /**
- * @param links the links to set
- */
- public void setLinks(List<Link> links) {
- this.links = links;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Image [id=" + id + ", status=" + status + ", name=" + name
- + ", progress=" + progress + ", minRam=" + minRam
- + ", minDisk=" + minDisk + ", created=" + (created != null ? created.getTime() : null)
- + ", updated=" + (updated != null ? updated.getTime() : null) + ", size=" + size + ", metadata="
- + metadata + ", server="+server+", links=" + links + "]";
- }
-
+
+ public static final class Server implements Serializable {
+
+ private String id;
+
+ private List<Link> links;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @return the links
+ */
+ public List<Link> getLinks() {
+ return links;
+ }
+
+ @Override
+ public String toString() {
+ return "Server [id=" + id + ", links=" + links + "]";
+ }
+
+ }
+
+ private String id;
+
+ private String status;
+
+ private String name;
+
+ private Integer progress;
+
+ private Integer minRam;
+
+ private Integer minDisk;
+
+ private Calendar created;
+
+ private Calendar updated;
+
+ @JsonProperty("OS-EXT-IMG-SIZE:size")
+ private Long size;
+
+ private Map<String, String> metadata;
+
+ private Server server;
+
+ private List<Link> links;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @param id the id to set
+ */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /**
+ * @return the status
+ */
+ public String getStatus() {
+ return status;
+ }
+
+ /**
+ * @param status the status to set
+ */
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the progress
+ */
+ public Integer getProgress() {
+ return progress;
+ }
+
+ /**
+ * @param progress the progress to set
+ */
+ public void setProgress(Integer progress) {
+ this.progress = progress;
+ }
+
+ /**
+ * @return the minRam
+ */
+ public Integer getMinRam() {
+ return minRam;
+ }
+
+ /**
+ * @param minRam the minRam to set
+ */
+ public void setMinRam(Integer minRam) {
+ this.minRam = minRam;
+ }
+
+ /**
+ * @return the minDisk
+ */
+ public Integer getMinDisk() {
+ return minDisk;
+ }
+
+ /**
+ * @param minDisk the minDisk to set
+ */
+ public void setMinDisk(Integer minDisk) {
+ this.minDisk = minDisk;
+ }
+
+ /**
+ * @return the created
+ */
+ public Calendar getCreated() {
+ return created;
+ }
+
+ /**
+ * @param created the created to set
+ */
+ public void setCreated(Calendar created) {
+ this.created = created;
+ }
+
+ /**
+ * @return the updated
+ */
+ public Calendar getUpdated() {
+ return updated;
+ }
+
+ /**
+ * @param updated the updated to set
+ */
+ public void setUpdated(Calendar updated) {
+ this.updated = updated;
+ }
+
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ /**
+ * @return the size
+ */
+ public Long getSize() {
+ return size;
+ }
+
+ /**
+ * @param metadata the metadata to set
+ */
+ public void setMetadata(Map<String, String> metadata) {
+ this.metadata = metadata;
+ }
+
+ /**
+ * @return the server
+ */
+ public Server getServer() {
+ return server;
+ }
+
+ /**
+ * @return the links
+ */
+ public List<Link> getLinks() {
+ return links;
+ }
+
+ /**
+ * @param links the links to set
+ */
+ public void setLinks(List<Link> links) {
+ this.links = links;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Image [id=" + id + ", status=" + status + ", name=" + name
+ + ", progress=" + progress + ", minRam=" + minRam
+ + ", minDisk=" + minDisk + ", created=" + (created != null ? created.getTime() : null)
+ + ", updated=" + (updated != null ? updated.getTime() : null) + ", size=" + size + ", metadata="
+ + metadata + ", server="+server+", links=" + links + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
index e8d634a..1e34a43 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
@@ -24,105 +24,105 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("os-volume_upload_image")
public class ImageFromVolume implements Serializable {
- @JsonProperty("id")
- String id;
- @JsonProperty("updates_at")
- String updates_at;
- @JsonProperty("status")
- String status;
- @JsonProperty("display_description")
- String display_description;
- @JsonProperty("size")
- String size;
- @JsonProperty("volume_type")
- String volume_type;
- @JsonProperty("image_id")
- String image_id;
- @JsonProperty("container_format")
- String container_format;
- @JsonProperty("disk_format")
- String disk_format;
- @JsonProperty("image_name")
- String image_name;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getUpdates_at() {
- return updates_at;
- }
-
- public void setUpdates_at(String updates_at) {
- this.updates_at = updates_at;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getDisplay_description() {
- return display_description;
- }
-
- public void setDisplay_description(String display_description) {
- this.display_description = display_description;
- }
-
- public String getSize() {
- return size;
- }
-
- public void setSize(String size) {
- this.size = size;
- }
-
- public String getVolume_type() {
- return volume_type;
- }
-
- public void setVolume_type(String volume_type) {
- this.volume_type = volume_type;
- }
-
- public String getImage_id() {
- return image_id;
- }
-
- public void setImage_id(String image_id) {
- this.image_id = image_id;
- }
-
- public String getContainer_format() {
- return container_format;
- }
-
- public void setContainer_format(String container_format) {
- this.container_format = container_format;
- }
-
- public String getDisk_format() {
- return disk_format;
- }
-
- public void setDisk_format(String disk_format) {
- this.disk_format = disk_format;
- }
-
- public String getImage_name() {
- return image_name;
- }
-
- public void setImage_name(String image_name) {
- this.image_name = image_name;
- }
+ @JsonProperty("id")
+ String id;
+ @JsonProperty("updates_at")
+ String updates_at;
+ @JsonProperty("status")
+ String status;
+ @JsonProperty("display_description")
+ String display_description;
+ @JsonProperty("size")
+ String size;
+ @JsonProperty("volume_type")
+ String volume_type;
+ @JsonProperty("image_id")
+ String image_id;
+ @JsonProperty("container_format")
+ String container_format;
+ @JsonProperty("disk_format")
+ String disk_format;
+ @JsonProperty("image_name")
+ String image_name;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getUpdates_at() {
+ return updates_at;
+ }
+
+ public void setUpdates_at(String updates_at) {
+ this.updates_at = updates_at;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getDisplay_description() {
+ return display_description;
+ }
+
+ public void setDisplay_description(String display_description) {
+ this.display_description = display_description;
+ }
+
+ public String getSize() {
+ return size;
+ }
+
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+ public String getVolume_type() {
+ return volume_type;
+ }
+
+ public void setVolume_type(String volume_type) {
+ this.volume_type = volume_type;
+ }
+
+ public String getImage_id() {
+ return image_id;
+ }
+
+ public void setImage_id(String image_id) {
+ this.image_id = image_id;
+ }
+
+ public String getContainer_format() {
+ return container_format;
+ }
+
+ public void setContainer_format(String container_format) {
+ this.container_format = container_format;
+ }
+
+ public String getDisk_format() {
+ return disk_format;
+ }
+
+ public void setDisk_format(String disk_format) {
+ this.disk_format = disk_format;
+ }
+
+ public String getImage_name() {
+ return image_name;
+ }
+
+ public void setImage_name(String image_name) {
+ this.image_name = image_name;
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
index c4baaba..e19892d 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
@@ -24,28 +24,28 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class Images implements Iterable<Image>, Serializable {
- @JsonProperty("images")
- private List<Image> list;
+ @JsonProperty("images")
+ private List<Image> list;
- /**
- * @return the list
- */
- public List<Image> getList() {
- return list;
- }
-
- @Override
- public Iterator<Image> iterator() {
- return list.iterator();
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Images [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<Image> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<Image> iterator() {
+ return list.iterator();
+ }
+
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Images [list=" + list + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
index 1db2ee4..b7bd148 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
@@ -24,91 +24,91 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("keypair")
public class KeyPair implements Serializable {
- private String name;
-
- @JsonProperty("user_id")
- private String userId;
-
- @JsonProperty("public_key")
- private String publicKey;
-
- @JsonProperty("private_key")
- private String privateKey;
-
- private String fingerprint;
+ private String name;
+
+ @JsonProperty("user_id")
+ private String userId;
+
+ @JsonProperty("public_key")
+ private String publicKey;
+
+ @JsonProperty("private_key")
+ private String privateKey;
+
+ private String fingerprint;
- public KeyPair() {
- super();
- }
-
- public KeyPair(String name) {
- this.name = name;
- }
-
- public KeyPair(String name, String publicKey) {
- this(name);
- this.publicKey = publicKey;
- }
+ public KeyPair() {
+ super();
+ }
+
+ public KeyPair(String name) {
+ this.name = name;
+ }
+
+ public KeyPair(String name, String publicKey) {
+ this(name);
+ this.publicKey = publicKey;
+ }
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
- /**
- * @return the userId
- */
- public String getUserId() {
- return userId;
- }
+ /**
+ * @return the userId
+ */
+ public String getUserId() {
+ return userId;
+ }
- /**
- * @return the publicKey
- */
- public String getPublicKey() {
- return publicKey;
- }
+ /**
+ * @return the publicKey
+ */
+ public String getPublicKey() {
+ return publicKey;
+ }
- /**
- * @param publicKey the publicKey to set
- */
- public void setPublicKey(String publicKey) {
- this.publicKey = publicKey;
- }
+ /**
+ * @param publicKey the publicKey to set
+ */
+ public void setPublicKey(String publicKey) {
+ this.publicKey = publicKey;
+ }
- /**
- * @return the privateKey
- */
- public String getPrivateKey() {
- return privateKey;
- }
+ /**
+ * @return the privateKey
+ */
+ public String getPrivateKey() {
+ return privateKey;
+ }
- /**
- * @return the fingerprint
- */
- public String getFingerprint() {
- return fingerprint;
- }
+ /**
+ * @return the fingerprint
+ */
+ public String getFingerprint() {
+ return fingerprint;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "KeyPair [name=" + name + ", userId=" + userId + ", publicKey="
- + publicKey + ", privateKey=" + privateKey + ", fingerprint="
- + fingerprint + "]";
- }
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "KeyPair [name=" + name + ", userId=" + userId + ", publicKey="
+ + publicKey + ", privateKey=" + privateKey + ", fingerprint="
+ + fingerprint + "]";
+ }
-
-
+
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
index db24f8d..b36a91e 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
@@ -24,39 +24,39 @@ import java.util.List;
import org.codehaus.jackson.annotate.JsonProperty;
public class KeyPairs implements Iterable<KeyPair>, Serializable {
-
- public static final class KeyPairWrapper implements Serializable {
-
- @JsonProperty
- private KeyPair keypair;
-
- }
+
+ public static final class KeyPairWrapper implements Serializable {
+
+ @JsonProperty
+ private KeyPair keypair;
+
+ }
- @JsonProperty("keypairs")
- private List<KeyPairWrapper> list;
+ @JsonProperty("keypairs")
+ private List<KeyPairWrapper> list;
- /**
- * @return the list
- */
- public List<KeyPair> getList() {
- List<KeyPair> keyPairList = new ArrayList<>();
- for(KeyPairWrapper wrapper : this.list) {
- keyPairList.add(wrapper.keypair);
- }
- return keyPairList;
- }
-
- @Override
- public Iterator<KeyPair> iterator() {
- return getList().iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "KeyPairs [list=" + getList() + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<KeyPair> getList() {
+ List<KeyPair> keyPairList = new ArrayList<>();
+ for(KeyPairWrapper wrapper : this.list) {
+ keyPairList.add(wrapper.keypair);
+ }
+ return keyPairList;
+ }
+
+ @Override
+ public Iterator<KeyPair> iterator() {
+ return getList().iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "KeyPairs [list=" + getList() + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
index 7a80b1e..d9a949e 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
@@ -26,385 +26,385 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("limits")
public class Limits implements Serializable {
- public static final class RateLimit implements Serializable {
-
- public static final class LimitEntry implements Serializable {
-
- @JsonProperty("next-available")
- private Calendar nextAvailable;
-
- private String unit;
-
- private String verb;
-
- private Integer remaining;
-
- private Integer available;
-
- private Integer value;
-
- /**
- * @return the nextAvailable
- */
- public Calendar getNextAvailable() {
- return nextAvailable;
- }
-
- /**
- * @return the unit
- */
- public String getUnit() {
- return unit;
- }
-
- /**
- * @return the verb
- */
- public String getVerb() {
- return verb;
- }
-
- /**
- * @return the remaining
- */
- public Integer getRemaining() {
- return remaining;
- }
-
- /**
- * @return the available
- */
- public Integer getAvailable() {
- return available;
- }
-
- /**
- * @return the value
- */
- public Integer getValue() {
- return value;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "LimitEntry [nextAvailable=" + nextAvailable + ", unit="
- + unit + ", verb=" + verb + ", remaining=" + remaining
- + ", available=" + available + ", value=" + value + "]";
- }
-
- }
-
- private String regex;
-
- private String uri;
-
- private List<LimitEntry> limit;
-
- /**
- * @return the regex
- */
- public String getRegex() {
- return regex;
- }
-
- /**
- * @return the uri
- */
- public String getUri() {
- return uri;
- }
-
- /**
- * @return the limit
- */
- public List<LimitEntry> getLimit() {
- return limit;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "RateLimit [regex=" + regex + ", uri=" + uri + ", limit="
- + limit + "]";
- }
-
- }
-
- public static final class AbsoluteLimit {
-
- private Integer maxServerMeta;
- private Integer serverMetaUsed;
-
- private Integer maxPersonality;
- private Integer personalityUsed;
-
- private Integer maxImageMeta;
- private Integer imageMetaUsed;
-
- private Integer maxPersonalitySize;
- private Integer personalitySizeUsed;
-
- private Integer maxTotalCores;
- private Integer totalCoresUsed;
-
- private Integer maxTotalInstances;
- private Integer totalInstancesUsed;
-
- private Integer maxTotalRAMSize;
- private Integer totalRAMUsed;
-
- private Integer maxSecurityGroupRules;
- private Integer securityGroupRulesUsed;
-
- private Integer maxTotalKeypairs;
- private Integer totalKeyPairsUsed;
-
- private Integer maxTotalVolumes;
- private Integer totalVolumesUsed;
-
- private Integer maxSecurityGroups;
- private Integer totalSecurityGroupsUsed;
-
- private Integer maxTotalFloatingIps;
- private Integer totalFloatingIpsUsed;
-
- private Integer maxTotalVolumeGigabytes;
- private Integer totalVolumeGigabytesUsed;
-
- /**
- * @return the maxServerMeta
- */
- public Integer getMaxServerMeta() {
- return maxServerMeta;
- }
-
- /**
- * @return the maxPersonality
- */
- public Integer getMaxPersonality() {
- return maxPersonality;
- }
-
- /**
- * @return the maxImageMeta
- */
- public Integer getMaxImageMeta() {
- return maxImageMeta;
- }
-
- /**
- * @return the maxPersonalitySize
- */
- public Integer getMaxPersonalitySize() {
- return maxPersonalitySize;
- }
-
- /**
- * @return the maxTotalCores
- */
- public Integer getMaxTotalCores() {
- return maxTotalCores;
- }
-
- /**
- * @return the maxTotalInstances
- */
- public Integer getMaxTotalInstances() {
- return maxTotalInstances;
- }
-
- /**
- * @return the maxTotalRAMSize
- */
- public Integer getMaxTotalRAMSize() {
- return maxTotalRAMSize;
- }
-
- /**
- * @return the totalVolumesUsed
- */
- public Integer getTotalVolumesUsed() {
- return totalVolumesUsed;
- }
-
- /**
- * @return the maxSecurityGroupRules
- */
- public Integer getMaxSecurityGroupRules() {
- return maxSecurityGroupRules;
- }
-
- /**
- * @return the maxTotalKeypairs
- */
- public Integer getMaxTotalKeypairs() {
- return maxTotalKeypairs;
- }
-
- /**
- * @return the totalCoresUsed
- */
- public Integer getTotalCoresUsed() {
- return totalCoresUsed;
- }
-
- /**
- * @return the maxTotalVolumes
- */
- public Integer getMaxTotalVolumes() {
- return maxTotalVolumes;
- }
-
- /**
- * @return the totalRAMUsed
- */
- public Integer getTotalRAMUsed() {
- return totalRAMUsed;
- }
-
- /**
- * @return the totalInstancesUsed
- */
- public Integer getTotalInstancesUsed() {
- return totalInstancesUsed;
- }
-
- /**
- * @return the maxSecurityGroups
- */
- public Integer getMaxSecurityGroups() {
- return maxSecurityGroups;
- }
-
- /**
- * @return the totalVolumeGigabytesUsed
- */
- public Integer getTotalVolumeGigabytesUsed() {
- return totalVolumeGigabytesUsed;
- }
-
- /**
- * @return the totalSecurityGroupsUsed
- */
- public Integer getTotalSecurityGroupsUsed() {
- return totalSecurityGroupsUsed;
- }
-
- /**
- * @return the maxTotalFloatingIps
- */
- public Integer getMaxTotalFloatingIps() {
- return maxTotalFloatingIps;
- }
-
- /**
- * @return the totalKeyPairsUsed
- */
- public Integer getTotalKeyPairsUsed() {
- return totalKeyPairsUsed;
- }
-
- /**
- * @return the maxTotalVolumeGigabytes
- */
- public Integer getMaxTotalVolumeGigabytes() {
- return maxTotalVolumeGigabytes;
- }
-
- /**
- * @return the serverMetaUsed
- */
- public Integer getServerMetaUsed() {
- return serverMetaUsed;
- }
-
- /**
- * @return the personalityUsed
- */
- public Integer getPersonalityUsed() {
- return personalityUsed;
- }
-
- /**
- * @return the imageMetaUsed
- */
- public Integer getImageMetaUsed() {
- return imageMetaUsed;
- }
-
- /**
- * @return the personalitySizeUsed
- */
- public Integer getPersonalitySizeUsed() {
- return personalitySizeUsed;
- }
-
- /**
- * @return the securityGroupRulesUsed
- */
- public Integer getSecurityGroupRulesUsed() {
- return securityGroupRulesUsed;
- }
-
- /**
- * @return the totalFloatingIpsUsed
- */
- public Integer getTotalFloatingIpsUsed() {
- return totalFloatingIpsUsed;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "AbsoluteLimit [maxServerMeta=" + maxServerMeta
- + ", maxPersonality=" + maxPersonality + ", maxImageMeta="
- + maxImageMeta + ", maxPersonalitySize="
- + maxPersonalitySize + ", maxTotalCores=" + maxTotalCores
- + ", maxTotalInstances=" + maxTotalInstances
- + ", maxTotalRAMSize=" + maxTotalRAMSize + "]";
- }
-
- }
-
- private List<RateLimit> rate;
-
- private AbsoluteLimit absolute;
-
- /**
- * @return the rate
- */
- public List<RateLimit> getRate() {
- return rate;
- }
-
- /**
- * @return the absolute
- */
- public AbsoluteLimit getAbsolute() {
- return absolute;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Limits [rate=" + rate + ", absolute=" + absolute + "]";
- }
+ public static final class RateLimit implements Serializable {
+
+ public static final class LimitEntry implements Serializable {
+
+ @JsonProperty("next-available")
+ private Calendar nextAvailable;
+
+ private String unit;
+
+ private String verb;
+
+ private Integer remaining;
+
+ private Integer available;
+
+ private Integer value;
+
+ /**
+ * @return the nextAvailable
+ */
+ public Calendar getNextAvailable() {
+ return nextAvailable;
+ }
+
+ /**
+ * @return the unit
+ */
+ public String getUnit() {
+ return unit;
+ }
+
+ /**
+ * @return the verb
+ */
+ public String getVerb() {
+ return verb;
+ }
+
+ /**
+ * @return the remaining
+ */
+ public Integer getRemaining() {
+ return remaining;
+ }
+
+ /**
+ * @return the available
+ */
+ public Integer getAvailable() {
+ return available;
+ }
+
+ /**
+ * @return the value
+ */
+ public Integer getValue() {
+ return value;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "LimitEntry [nextAvailable=" + nextAvailable + ", unit="
+ + unit + ", verb=" + verb + ", remaining=" + remaining
+ + ", available=" + available + ", value=" + value + "]";
+ }
+
+ }
+
+ private String regex;
+
+ private String uri;
+
+ private List<LimitEntry> limit;
+
+ /**
+ * @return the regex
+ */
+ public String getRegex() {
+ return regex;
+ }
+
+ /**
+ * @return the uri
+ */
+ public String getUri() {
+ return uri;
+ }
+
+ /**
+ * @return the limit
+ */
+ public List<LimitEntry> getLimit() {
+ return limit;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "RateLimit [regex=" + regex + ", uri=" + uri + ", limit="
+ + limit + "]";
+ }
+
+ }
+
+ public static final class AbsoluteLimit {
+
+ private Integer maxServerMeta;
+ private Integer serverMetaUsed;
+
+ private Integer maxPersonality;
+ private Integer personalityUsed;
+
+ private Integer maxImageMeta;
+ private Integer imageMetaUsed;
+
+ private Integer maxPersonalitySize;
+ private Integer personalitySizeUsed;
+
+ private Integer maxTotalCores;
+ private Integer totalCoresUsed;
+
+ private Integer maxTotalInstances;
+ private Integer totalInstancesUsed;
+
+ private Integer maxTotalRAMSize;
+ private Integer totalRAMUsed;
+
+ private Integer maxSecurityGroupRules;
+ private Integer securityGroupRulesUsed;
+
+ private Integer maxTotalKeypairs;
+ private Integer totalKeyPairsUsed;
+
+ private Integer maxTotalVolumes;
+ private Integer totalVolumesUsed;
+
+ private Integer maxSecurityGroups;
+ private Integer totalSecurityGroupsUsed;
+
+ private Integer maxTotalFloatingIps;
+ private Integer totalFloatingIpsUsed;
+
+ private Integer maxTotalVolumeGigabytes;
+ private Integer totalVolumeGigabytesUsed;
+
+ /**
+ * @return the maxServerMeta
+ */
+ public Integer getMaxServerMeta() {
+ return maxServerMeta;
+ }
+
+ /**
+ * @return the maxPersonality
+ */
+ public Integer getMaxPersonality() {
+ return maxPersonality;
+ }
+
+ /**
+ * @return the maxImageMeta
+ */
+ public Integer getMaxImageMeta() {
+ return maxImageMeta;
+ }
+
+ /**
+ * @return the maxPersonalitySize
+ */
+ public Integer getMaxPersonalitySize() {
+ return maxPersonalitySize;
+ }
+
+ /**
+ * @return the maxTotalCores
+ */
+ public Integer getMaxTotalCores() {
+ return maxTotalCores;
+ }
+
+ /**
+ * @return the maxTotalInstances
+ */
+ public Integer getMaxTotalInstances() {
+ return maxTotalInstances;
+ }
+
+ /**
+ * @return the maxTotalRAMSize
+ */
+ public Integer getMaxTotalRAMSize() {
+ return maxTotalRAMSize;
+ }
+
+ /**
+ * @return the totalVolumesUsed
+ */
+ public Integer getTotalVolumesUsed() {
+ return totalVolumesUsed;
+ }
+
+ /**
+ * @return the maxSecurityGroupRules
+ */
+ public Integer getMaxSecurityGroupRules() {
+ return maxSecurityGroupRules;
+ }
+
+ /**
+ * @return the maxTotalKeypairs
+ */
+ public Integer getMaxTotalKeypairs() {
+ return maxTotalKeypairs;
+ }
+
+ /**
+ * @return the totalCoresUsed
+ */
+ public Integer getTotalCoresUsed() {
+ return totalCoresUsed;
+ }
+
+ /**
+ * @return the maxTotalVolumes
+ */
+ public Integer getMaxTotalVolumes() {
+ return maxTotalVolumes;
+ }
+
+ /**
+ * @return the totalRAMUsed
+ */
+ public Integer getTotalRAMUsed() {
+ return totalRAMUsed;
+ }
+
+ /**
+ * @return the totalInstancesUsed
+ */
+ public Integer getTotalInstancesUsed() {
+ return totalInstancesUsed;
+ }
+
+ /**
+ * @return the maxSecurityGroups
+ */
+ public Integer getMaxSecurityGroups() {
+ return maxSecurityGroups;
+ }
+
+ /**
+ * @return the totalVolumeGigabytesUsed
+ */
+ public Integer getTotalVolumeGigabytesUsed() {
+ return totalVolumeGigabytesUsed;
+ }
+
+ /**
+ * @return the totalSecurityGroupsUsed
+ */
+ public Integer getTotalSecurityGroupsUsed() {
+ return totalSecurityGroupsUsed;
+ }
+
+ /**
+ * @return the maxTotalFloatingIps
+ */
+ public Integer getMaxTotalFloatingIps() {
+ return maxTotalFloatingIps;
+ }
+
+ /**
+ * @return the totalKeyPairsUsed
+ */
+ public Integer getTotalKeyPairsUsed() {
+ return totalKeyPairsUsed;
+ }
+
+ /**
+ * @return the maxTotalVolumeGigabytes
+ */
+ public Integer getMaxTotalVolumeGigabytes() {
+ return maxTotalVolumeGigabytes;
+ }
+
+ /**
+ * @return the serverMetaUsed
+ */
+ public Integer getServerMetaUsed() {
+ return serverMetaUsed;
+ }
+
+ /**
+ * @return the personalityUsed
+ */
+ public Integer getPersonalityUsed() {
+ return personalityUsed;
+ }
+
+ /**
+ * @return the imageMetaUsed
+ */
+ public Integer getImageMetaUsed() {
+ return imageMetaUsed;
+ }
+
+ /**
+ * @return the personalitySizeUsed
+ */
+ public Integer getPersonalitySizeUsed() {
+ return personalitySizeUsed;
+ }
+
+ /**
+ * @return the securityGroupRulesUsed
+ */
+ public Integer getSecurityGroupRulesUsed() {
+ return securityGroupRulesUsed;
+ }
+
+ /**
+ * @return the totalFloatingIpsUsed
+ */
+ public Integer getTotalFloatingIpsUsed() {
+ return totalFloatingIpsUsed;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "AbsoluteLimit [maxServerMeta=" + maxServerMeta
+ + ", maxPersonality=" + maxPersonality + ", maxImageMeta="
+ + maxImageMeta + ", maxPersonalitySize="
+ + maxPersonalitySize + ", maxTotalCores=" + maxTotalCores
+ + ", maxTotalInstances=" + maxTotalInstances
+ + ", maxTotalRAMSize=" + maxTotalRAMSize + "]";
+ }
+
+ }
+
+ private List<RateLimit> rate;
+
+ private AbsoluteLimit absolute;
+
+ /**
+ * @return the rate
+ */
+ public List<RateLimit> getRate() {
+ return rate;
+ }
+
+ /**
+ * @return the absolute
+ */
+ public AbsoluteLimit getAbsolute() {
+ return absolute;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Limits [rate=" + rate + ", absolute=" + absolute + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java
index 9591ab6..129896c 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java
@@ -20,39 +20,39 @@ import java.io.Serializable;
public class Link implements Serializable {
- private String rel;
-
- private String href;
-
- private String type;
-
- /**
- * @return the rel
- */
- public String getRel() {
- return rel;
- }
-
- /**
- * @return the href
- */
- public String getHref() {
- return href;
- }
-
- /**
- * @return the type
- */
- public String getType() {
- return type;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Link [rel=" + rel + ", href=" + href + ", type=" + type + "]";
- }
-
+ private String rel;
+
+ private String href;
+
+ private String type;
+
+ /**
+ * @return the rel
+ */
+ public String getRel() {
+ return rel;
+ }
+
+ /**
+ * @return the href
+ */
+ public String getHref() {
+ return href;
+ }
+
+ /**
+ * @return the type
+ */
+ public String getType() {
+ return type;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Link [rel=" + rel + ", href=" + href + ", type=" + type + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java
index b2e5507..d254e18 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java
@@ -20,23 +20,23 @@ import java.util.Map;
public class Metadata {
- private Map<String, String> metadata;
+ private Map<String, String> metadata;
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
- /**
- * Set the metadata
- * @param metadata
- */
- public void setMetadata(Map<String, String> metadata) {
- this.metadata = metadata;
- }
-
+ /**
+ * Set the metadata
+ * @param metadata
+ */
+ public void setMetadata(Map<String, String> metadata) {
+ this.metadata = metadata;
+ }
+
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java
index 2dfb2c2..2b8ac85 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java
@@ -24,283 +24,283 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("network")
public class Network implements Serializable {
- private String id;
-
- @JsonProperty("vpn_public_address")
- private String vpnPublicAddress;
-
- @JsonProperty("vpn_private_address")
- private String vpnPrivateAddress;
-
- @JsonProperty("vpn_public_port")
- private String vpnPublicPort;
-
- @JsonProperty("dhcp_start")
- private String dhcpStart;
-
- private String bridge;
-
- @JsonProperty("bridge_interface")
- private String bridgeInterface;
-
- @JsonProperty("updated_at")
- private String updatedAt;
-
- private Boolean deleted;
-
- private String vlan;
-
- private String broadcast;
-
- private String netmask;
-
- private Boolean injected;
-
- private String host;
-
- @JsonProperty("multi_host")
- private Boolean multiHost;
-
- @JsonProperty("created_at")
- private String createdAt;
-
- @JsonProperty("deleted_at")
- private String deletedAt;
-
- private String cidr;
-
- @JsonProperty("cidr_v6")
- private String cidrV6;
-
- private String gateway;
-
- @JsonProperty("gateway_v6")
- private String gatewayV6;
-
- @JsonProperty("netmask_v6")
- private String netmaskV6;
-
- @JsonProperty("project_id")
- private String projectId;
-
- @JsonProperty("rxtx_base")
- private String rxtxBase;
-
- private String dns1;
-
- private String dns2;
-
- private String label;
-
- private String priority;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the vpnPublicAddress
- */
- public String getVpnPublicAddress() {
- return vpnPublicAddress;
- }
-
- /**
- * @return the vpnPublicPort
- */
- public String getVpnPublicPort() {
- return vpnPublicPort;
- }
-
- /**
- * @return the dhcpStart
- */
- public String getDhcpStart() {
- return dhcpStart;
- }
-
- /**
- * @return the bridge
- */
- public String getBridge() {
- return bridge;
- }
-
- /**
- * @return the bridgeInterface
- */
- public String getBridgeInterface() {
- return bridgeInterface;
- }
-
- /**
- * @return the updatedAt
- */
- public String getUpdatedAt() {
- return updatedAt;
- }
-
- /**
- * @return the deleted
- */
- public Boolean getDeleted() {
- return deleted;
- }
-
- /**
- * @return the vlan
- */
- public String getVlan() {
- return vlan;
- }
-
- /**
- * @return the broadcast
- */
- public String getBroadcast() {
- return broadcast;
- }
-
- /**
- * @return the netmask
- */
- public String getNetmask() {
- return netmask;
- }
-
- /**
- * @return the injected
- */
- public Boolean getInjected() {
- return injected;
- }
-
- /**
- * @return the host
- */
- public String getHost() {
- return host;
- }
-
- /**
- * @return the multiHost
- */
- public Boolean getMultiHost() {
- return multiHost;
- }
-
- /**
- * @return the createdAt
- */
- public String getCreatedAt() {
- return createdAt;
- }
-
- /**
- * @return the deletedAt
- */
- public String getDeletedAt() {
- return deletedAt;
- }
-
- /**
- * @return the cidr
- */
- public String getCidr() {
- return cidr;
- }
-
- /**
- * @return the cidrV6
- */
- public String getCidrV6() {
- return cidrV6;
- }
-
- /**
- * @return the gateway
- */
- public String getGateway() {
- return gateway;
- }
-
- /**
- * @return the gatewayV6
- */
- public String getGatewayV6() {
- return gatewayV6;
- }
-
- /**
- * @return the netmaskV6
- */
- public String getNetmaskV6() {
- return netmaskV6;
- }
-
- /**
- * @return the projectId
- */
- public String getProjectId() {
- return projectId;
- }
-
- /**
- * @return the rxtxBase
- */
- public String getRxtxBase() {
- return rxtxBase;
- }
-
- /**
- * @return the dns1
- */
- public String getDns1() {
- return dns1;
- }
-
- /**
- * @return the dns2
- */
- public String getDns2() {
- return dns2;
- }
-
- /**
- * @return the label
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * @return the priority
- */
- public String getPriority() {
- return priority;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Network [id=" + id + ", vpnPublicAddress=" + vpnPublicAddress
- + ", vpnPublicPort=" + vpnPublicPort + ", dhcpStart="
- + dhcpStart + ", bridge=" + bridge + ", bridgeInterface="
- + bridgeInterface + ", updatedAt=" + updatedAt + ", deleted="
- + deleted + ", vlan=" + vlan + ", broadcast=" + broadcast
- + ", netmask=" + netmask + ", injected=" + injected + ", host="
- + host + ", multiHost=" + multiHost + ", createdAt="
- + createdAt + ", deletedAt=" + deletedAt + ", cidr=" + cidr
- + ", cidrV6=" + cidrV6 + ", gateway=" + gateway
- + ", gatewayV6=" + gatewayV6 + ", netmaskV6=" + netmaskV6
- + ", projectId=" + projectId + ", rxtxBase=" + rxtxBase
- + ", dns1=" + dns1 + ", dns2=" + dns2 + ", label=" + label
- + ", priority=" + priority + "]";
- }
-
+ private String id;
+
+ @JsonProperty("vpn_public_address")
+ private String vpnPublicAddress;
+
+ @JsonProperty("vpn_private_address")
+ private String vpnPrivateAddress;
+
+ @JsonProperty("vpn_public_port")
+ private String vpnPublicPort;
+
+ @JsonProperty("dhcp_start")
+ private String dhcpStart;
+
+ private String bridge;
+
+ @JsonProperty("bridge_interface")
+ private String bridgeInterface;
+
+ @JsonProperty("updated_at")
+ private String updatedAt;
+
+ private Boolean deleted;
+
+ private String vlan;
+
+ private String broadcast;
+
+ private String netmask;
+
+ private Boolean injected;
+
+ private String host;
+
+ @JsonProperty("multi_host")
+ private Boolean multiHost;
+
+ @JsonProperty("created_at")
+ private String createdAt;
+
+ @JsonProperty("deleted_at")
+ private String deletedAt;
+
+ private String cidr;
+
+ @JsonProperty("cidr_v6")
+ private String cidrV6;
+
+ private String gateway;
+
+ @JsonProperty("gateway_v6")
+ private String gatewayV6;
+
+ @JsonProperty("netmask_v6")
+ private String netmaskV6;
+
+ @JsonProperty("project_id")
+ private String projectId;
+
+ @JsonProperty("rxtx_base")
+ private String rxtxBase;
+
+ private String dns1;
+
+ private String dns2;
+
+ private String label;
+
+ private String priority;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @return the vpnPublicAddress
+ */
+ public String getVpnPublicAddress() {
+ return vpnPublicAddress;
+ }
+
+ /**
+ * @return the vpnPublicPort
+ */
+ public String getVpnPublicPort() {
+ return vpnPublicPort;
+ }
+
+ /**
+ * @return the dhcpStart
+ */
+ public String getDhcpStart() {
+ return dhcpStart;
+ }
+
+ /**
+ * @return the bridge
+ */
+ public String getBridge() {
+ return bridge;
+ }
+
+ /**
+ * @return the bridgeInterface
+ */
+ public String getBridgeInterface() {
+ return bridgeInterface;
+ }
+
+ /**
+ * @return the updatedAt
+ */
+ public String getUpdatedAt() {
+ return updatedAt;
+ }
+
+ /**
+ * @return the deleted
+ */
+ public Boolean getDeleted() {
+ return deleted;
+ }
+
+ /**
+ * @return the vlan
+ */
+ public String getVlan() {
+ return vlan;
+ }
+
+ /**
+ * @return the broadcast
+ */
+ public String getBroadcast() {
+ return broadcast;
+ }
+
+ /**
+ * @return the netmask
+ */
+ public String getNetmask() {
+ return netmask;
+ }
+
+ /**
+ * @return the injected
+ */
+ public Boolean getInjected() {
+ return injected;
+ }
+
+ /**
+ * @return the host
+ */
+ public String getHost() {
+ return host;
+ }
+
+ /**
+ * @return the multiHost
+ */
+ public Boolean getMultiHost() {
+ return multiHost;
+ }
+
+ /**
+ * @return the createdAt
+ */
+ public String getCreatedAt() {
+ return createdAt;
+ }
+
+ /**
+ * @return the deletedAt
+ */
+ public String getDeletedAt() {
+ return deletedAt;
+ }
+
+ /**
+ * @return the cidr
+ */
+ public String getCidr() {
+ return cidr;
+ }
+
+ /**
+ * @return the cidrV6
+ */
+ public String getCidrV6() {
+ return cidrV6;
+ }
+
+ /**
+ * @return the gateway
+ */
+ public String getGateway() {
+ return gateway;
+ }
+
+ /**
+ * @return the gatewayV6
+ */
+ public String getGatewayV6() {
+ return gatewayV6;
+ }
+
+ /**
+ * @return the netmaskV6
+ */
+ public String getNetmaskV6() {
+ return netmaskV6;
+ }
+
+ /**
+ * @return the projectId
+ */
+ public String getProjectId() {
+ return projectId;
+ }
+
+ /**
+ * @return the rxtxBase
+ */
+ public String getRxtxBase() {
+ return rxtxBase;
+ }
+
+ /**
+ * @return the dns1
+ */
+ public String getDns1() {
+ return dns1;
+ }
+
+ /**
+ * @return the dns2
+ */
+ public String getDns2() {
+ return dns2;
+ }
+
+ /**
+ * @return the label
+ */
+ public String getLabel() {
+ return label;
+ }
+
+ /**
+ * @return the priority
+ */
+ public String getPriority() {
+ return priority;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Network [id=" + id + ", vpnPublicAddress=" + vpnPublicAddress
+ + ", vpnPublicPort=" + vpnPublicPort + ", dhcpStart="
+ + dhcpStart + ", bridge=" + bridge + ", bridgeInterface="
+ + bridgeInterface + ", updatedAt=" + updatedAt + ", deleted="
+ + deleted + ", vlan=" + vlan + ", broadcast=" + broadcast
+ + ", netmask=" + netmask + ", injected=" + injected + ", host="
+ + host + ", multiHost=" + multiHost + ", createdAt="
+ + createdAt + ", deletedAt=" + deletedAt + ", cidr=" + cidr
+ + ", cidrV6=" + cidrV6 + ", gateway=" + gateway
+ + ", gatewayV6=" + gatewayV6 + ", netmaskV6=" + netmaskV6
+ + ", projectId=" + projectId + ", rxtxBase=" + rxtxBase
+ + ", dns1=" + dns1 + ", dns2=" + dns2 + ", label=" + label
+ + ", priority=" + priority + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java
index 3cc045b..ea9f23e 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java
@@ -21,25 +21,25 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
public class NetworkForCreate {
- @JsonProperty("uuid")
- private String id;
- @JsonProperty("fixed_ip")
- private String fixedIp;
-
- public String getId() {
- return id;
- }
-
- public String getFixedIp() {
- return fixedIp;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public void setFixedIp(String fixedIp) {
- this.fixedIp = fixedIp;
- }
+ @JsonProperty("uuid")
+ private String id;
+ @JsonProperty("fixed_ip")
+ private String fixedIp;
+
+ public String getId() {
+ return id;
+ }
+
+ public String getFixedIp() {
+ return fixedIp;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public void setFixedIp(String fixedIp) {
+ this.fixedIp = fixedIp;
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java
index 2477e25..7dac2c6 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class Networks implements Iterable<Network>, Serializable {
- @JsonProperty("networks")
- private List<Network> list;
+ @JsonProperty("networks")
+ private List<Network> list;
- /**
- * @return the list
- */
- public List<Network> getList() {
- return list;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Servers [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<Network> getList() {
+ return list;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Servers [list=" + list + "]";
+ }
- @Override
- public Iterator<Network> iterator() {
- return list.iterator();
- }
-
+ @Override
+ public Iterator<Network> iterator() {
+ return list.iterator();
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java
index f5e58ec..0d619df 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java
@@ -19,37 +19,37 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
public final class PersonalityFile implements Serializable {
-
- private String path;
-
- private String contents;
+
+ private String path;
+
+ private String contents;
- /**
- * @return the path
- */
- public String getPath() {
- return path;
- }
+ /**
+ * @return the path
+ */
+ public String getPath() {
+ return path;
+ }
- /**
- * @param path the path to set
- */
- public void setPath(String path) {
- this.path = path;
- }
+ /**
+ * @param path the path to set
+ */
+ public void setPath(String path) {
+ this.path = path;
+ }
- /**
- * @return the contents
- */
- public String getContents() {
- return contents;
- }
+ /**
+ * @return the contents
+ */
+ public String getContents() {
+ return contents;
+ }
- /**
- * @param contents the contents to set
- */
- public void setContents(String contents) {
- this.contents = contents;
- }
-
+ /**
+ * @param contents the contents to set
+ */
+ public void setContents(String contents) {
+ this.contents = contents;
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java
index 8643667..52bc930 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java
@@ -22,151 +22,151 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("quota_set")
public class QuotaSet {
- private String id;
-
- @JsonProperty("metadata_items")
- private Integer metadataItems;
-
- @JsonProperty("injected_file_content_bytes")
- private Integer injectedFileContentBytes;
-
- @JsonProperty("injected_files")
- private Integer injectedFiles;
-
- private Integer gigabytes;
-
- private Integer ram;
-
- @JsonProperty("floating_ips")
- private Integer floatingIps;
-
- private Integer instances;
-
- private Integer volumes;
-
- private Integer cores;
-
- @JsonProperty("security_groups")
- private Integer securityGroups;
-
- @JsonProperty("security_group_rules")
- private Integer securityGroupRules;
-
- @JsonProperty("injected_file_path_bytes")
- private Integer injectedFilePathBytes;
-
- @JsonProperty("key_pairs")
- private Integer keyPairs;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Integer getMetadataItems() {
- return metadataItems;
- }
-
- public void setMetadataItems(Integer metadataItems) {
- this.metadataItems = metadataItems;
- }
-
- public Integer getInjectedFileContentBytes() {
- return injectedFileContentBytes;
- }
-
- public void setInjectedFileContentBytes(Integer injectedFileContentBytes) {
- this.injectedFileContentBytes = injectedFileContentBytes;
- }
-
- public Integer getInjectedFiles() {
- return injectedFiles;
- }
-
- public void setInjectedFiles(Integer injectedFiles) {
- this.injectedFiles = injectedFiles;
- }
-
- public Integer getGigabytes() {
- return gigabytes;
- }
-
- public void setGigabytes(Integer gigabytes) {
- this.gigabytes = gigabytes;
- }
-
- public Integer getRam() {
- return ram;
- }
-
- public void setRam(Integer ram) {
- this.ram = ram;
- }
-
- public Integer getFloatingIps() {
- return floatingIps;
- }
-
- public void setFloatingIps(Integer floatingIps) {
- this.floatingIps = floatingIps;
- }
-
- public Integer getInstances() {
- return instances;
- }
-
- public void setInstances(Integer instances) {
- this.instances = instances;
- }
-
- public Integer getVolumes() {
- return volumes;
- }
-
- public void setVolumes(Integer volumes) {
- this.volumes = volumes;
- }
-
- public Integer getCores() {
- return cores;
- }
-
- public void setCores(Integer cores) {
- this.cores = cores;
- }
-
- public Integer getSecurityGroups() {
- return securityGroups;
- }
-
- public void setSecurityGroups(Integer securityGroups) {
- this.securityGroups = securityGroups;
- }
-
- public Integer getSecurityGroupRules() {
- return securityGroupRules;
- }
+ private String id;
+
+ @JsonProperty("metadata_items")
+ private Integer metadataItems;
+
+ @JsonProperty("injected_file_content_bytes")
+ private Integer injectedFileContentBytes;
+
+ @JsonProperty("injected_files")
+ private Integer injectedFiles;
+
+ private Integer gigabytes;
+
+ private Integer ram;
+
+ @JsonProperty("floating_ips")
+ private Integer floatingIps;
+
+ private Integer instances;
+
+ private Integer volumes;
+
+ private Integer cores;
+
+ @JsonProperty("security_groups")
+ private Integer securityGroups;
+
+ @JsonProperty("security_group_rules")
+ private Integer securityGroupRules;
+
+ @JsonProperty("injected_file_path_bytes")
+ private Integer injectedFilePathBytes;
+
+ @JsonProperty("key_pairs")
+ private Integer keyPairs;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public Integer getMetadataItems() {
+ return metadataItems;
+ }
+
+ public void setMetadataItems(Integer metadataItems) {
+ this.metadataItems = metadataItems;
+ }
+
+ public Integer getInjectedFileContentBytes() {
+ return injectedFileContentBytes;
+ }
+
+ public void setInjectedFileContentBytes(Integer injectedFileContentBytes) {
+ this.injectedFileContentBytes = injectedFileContentBytes;
+ }
+
+ public Integer getInjectedFiles() {
+ return injectedFiles;
+ }
+
+ public void setInjectedFiles(Integer injectedFiles) {
+ this.injectedFiles = injectedFiles;
+ }
+
+ public Integer getGigabytes() {
+ return gigabytes;
+ }
+
+ public void setGigabytes(Integer gigabytes) {
+ this.gigabytes = gigabytes;
+ }
+
+ public Integer getRam() {
+ return ram;
+ }
+
+ public void setRam(Integer ram) {
+ this.ram = ram;
+ }
+
+ public Integer getFloatingIps() {
+ return floatingIps;
+ }
+
+ public void setFloatingIps(Integer floatingIps) {
+ this.floatingIps = floatingIps;
+ }
+
+ public Integer getInstances() {
+ return instances;
+ }
+
+ public void setInstances(Integer instances) {
+ this.instances = instances;
+ }
+
+ public Integer getVolumes() {
+ return volumes;
+ }
+
+ public void setVolumes(Integer volumes) {
+ this.volumes = volumes;
+ }
+
+ public Integer getCores() {
+ return cores;
+ }
+
+ public void setCores(Integer cores) {
+ this.cores = cores;
+ }
+
+ public Integer getSecurityGroups() {
+ return securityGroups;
+ }
+
+ public void setSecurityGroups(Integer securityGroups) {
+ this.securityGroups = securityGroups;
+ }
+
+ public Integer getSecurityGroupRules() {
+ return securityGroupRules;
+ }
- public void setSecurityGroupRules(Integer securityGroupRules) {
- this.securityGroupRules = securityGroupRules;
- }
+ public void setSecurityGroupRules(Integer securityGroupRules) {
+ this.securityGroupRules = securityGroupRules;
+ }
- public Integer getKeyPairs() {
- return keyPairs;
- }
+ public Integer getKeyPairs() {
+ return keyPairs;
+ }
- public void setKeyPairs(Integer keyPairs) {
- this.keyPairs = keyPairs;
- }
+ public void setKeyPairs(Integer keyPairs) {
+ this.keyPairs = keyPairs;
+ }
- public Integer getInjectedFilePathBytes() {
- return injectedFilePathBytes;
- }
+ public Integer getInjectedFilePathBytes() {
+ return injectedFilePathBytes;
+ }
- public void setInjectedFilePathBytes(Integer injectedFilePathBytes) {
- this.injectedFilePathBytes = injectedFilePathBytes;
- }
+ public void setInjectedFilePathBytes(Integer injectedFilePathBytes) {
+ this.injectedFilePathBytes = injectedFilePathBytes;
+ }
} \ No newline at end of file
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java
index b2ab4fa..a57fd69 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java
@@ -24,200 +24,200 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("security_group")
public class SecurityGroup implements Serializable {
-
- @JsonRootName("security_group_rule")
- public static final class Rule implements Serializable {
-
- public static final class Group implements Serializable {
-
- private String name;
-
- @JsonProperty("tenant_id")
- private String tenantId;
-
- public String getName() {
- return name;
- }
-
- public String getTenantId() {
- return tenantId;
- }
-
- @Override
- public String toString() {
- return "Group [name=" + name + ", tenantId=" + tenantId + "]";
- }
-
- }
-
- public static final class IpRange implements Serializable {
-
- private String cidr;
-
- public String getCidr() {
- return cidr;
- }
-
- @Override
- public String toString() {
- return "IpRange [cidr=" + cidr + "]";
- }
-
- }
-
- private String id;
-
- private String name;
-
- @JsonProperty("parent_group_id")
- private String parentGroupId;
-
- @JsonProperty("from_port")
- private Integer fromPort;
-
- @JsonProperty("to_port")
- private Integer toPort;
-
- @JsonProperty("ip_protocol")
- private String ipProtocol;
-
- @JsonProperty("ip_range")
- private IpRange ipRange = new IpRange();
-
- private Group group;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the parentGroupId
- */
- public String getParentGroupId() {
- return parentGroupId;
- }
-
- /**
- * @return the fromPort
- */
- public Integer getFromPort() {
- return fromPort;
- }
-
- /**
- * @return the toPort
- */
- public Integer getToPort() {
- return toPort;
- }
-
- /**
- * @return the ipProtocol
- */
- public String getIpProtocol() {
- return ipProtocol;
- }
-
- /**
- * @return the ipRange
- */
- public IpRange getIpRange() {
- return ipRange;
- }
-
- /**
- * @return the group
- */
- public Group getGroup() {
- return group;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Rule [id=" + id + ", name=" + name + ", parentGroupId="
- + parentGroupId + ", fromPort=" + fromPort + ", toPort="
- + toPort + ", ipProtocol=" + ipProtocol + ", ipRange="
- + ipRange + ", group=" + group + "]";
- }
-
- }
-
- private String id;
-
- private String name;
-
- private String description;
-
- @JsonProperty("tenant_id")
- private String tenantId;
-
- private List<Rule> rules;
-
- private List<Link> links;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @return the tenantId
- */
- public String getTenantId() {
- return tenantId;
- }
-
- /**
- * @return the rules
- */
- public List<Rule> getRules() {
- return rules;
- }
-
- /**
- * @return the links
- */
- public List<Link> getLinks() {
- return links;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "SecurityGroup [id=" + id + ", name=" + name + ", description="
- + description + ", tenantId=" + tenantId + ", rules=" + rules
- + ", links=" + links + "]";
- }
-
+
+ @JsonRootName("security_group_rule")
+ public static final class Rule implements Serializable {
+
+ public static final class Group implements Serializable {
+
+ private String name;
+
+ @JsonProperty("tenant_id")
+ private String tenantId;
+
+ public String getName() {
+ return name;
+ }
+
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @Override
+ public String toString() {
+ return "Group [name=" + name + ", tenantId=" + tenantId + "]";
+ }
+
+ }
+
+ public static final class IpRange implements Serializable {
+
+ private String cidr;
+
+ public String getCidr() {
+ return cidr;
+ }
+
+ @Override
+ public String toString() {
+ return "IpRange [cidr=" + cidr + "]";
+ }
+
+ }
+
+ private String id;
+
+ private String name;
+
+ @JsonProperty("parent_group_id")
+ private String parentGroupId;
+
+ @JsonProperty("from_port")
+ private Integer fromPort;
+
+ @JsonProperty("to_port")
+ private Integer toPort;
+
+ @JsonProperty("ip_protocol")
+ private String ipProtocol;
+
+ @JsonProperty("ip_range")
+ private IpRange ipRange = new IpRange();
+
+ private Group group;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the parentGroupId
+ */
+ public String getParentGroupId() {
+ return parentGroupId;
+ }
+
+ /**
+ * @return the fromPort
+ */
+ public Integer getFromPort() {
+ return fromPort;
+ }
+
+ /**
+ * @return the toPort
+ */
+ public Integer getToPort() {
+ return toPort;
+ }
+
+ /**
+ * @return the ipProtocol
+ */
+ public String getIpProtocol() {
+ return ipProtocol;
+ }
+
+ /**
+ * @return the ipRange
+ */
+ public IpRange getIpRange() {
+ return ipRange;
+ }
+
+ /**
+ * @return the group
+ */
+ public Group getGroup() {
+ return group;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Rule [id=" + id + ", name=" + name + ", parentGroupId="
+ + parentGroupId + ", fromPort=" + fromPort + ", toPort="
+ + toPort + ", ipProtocol=" + ipProtocol + ", ipRange="
+ + ipRange + ", group=" + group + "]";
+ }
+
+ }
+
+ private String id;
+
+ private String name;
+
+ private String description;
+
+ @JsonProperty("tenant_id")
+ private String tenantId;
+
+ private List<Rule> rules;
+
+ private List<Link> links;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @return the tenantId
+ */
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ /**
+ * @return the rules
+ */
+ public List<Rule> getRules() {
+ return rules;
+ }
+
+ /**
+ * @return the links
+ */
+ public List<Link> getLinks() {
+ return links;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "SecurityGroup [id=" + id + ", name=" + name + ", description="
+ + description + ", tenantId=" + tenantId + ", rules=" + rules
+ + ", links=" + links + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java
index 1c39432..2a40173 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java
@@ -22,59 +22,59 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("security_group")
public class SecurityGroupForCreate implements Serializable {
-
- private String name;
-
- private String description;
+
+ private String name;
+
+ private String description;
- public SecurityGroupForCreate() {
- super();
- }
-
- public SecurityGroupForCreate(String name) {
- this.name = name;
- }
+ public SecurityGroupForCreate() {
+ super();
+ }
+
+ public SecurityGroupForCreate(String name) {
+ this.name = name;
+ }
- public SecurityGroupForCreate(String name, String description) {
- this(name);
- this.description = description;
- }
+ public SecurityGroupForCreate(String name, String description) {
+ this(name);
+ this.description = description;
+ }
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
+ /**
+ * @param description the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "SecurityGroupForCreate [name=" + name + ", description="
- + description + "]";
- }
-
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "SecurityGroupForCreate [name=" + name + ", description="
+ + description + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java
index d1a3ec0..fbb3f46 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java
@@ -26,191 +26,191 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("security_group_rule")
public class SecurityGroupRuleForCreate implements Serializable {
- @JsonProperty("parent_group_id")
- private String parentGroupId;
-
- @JsonProperty("ip_protocol")
- private String ipProtocol;
-
- @JsonProperty("from_port")
- private Integer fromPort;
-
- @JsonProperty("to_port")
- private Integer toPort;
-
- @XmlElement
- private String cidr;
-
- @JsonProperty("group_id")
- private String groupId;
-
- public SecurityGroupRuleForCreate() {
-
- }
-
- /**
- *
- * @param parentSecurityGroupId
- * @param ipProtocol
- * @param fromPort
- * @param toPort
- * @param cidr
- * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, Integer, Integer, String)}
- */
- @Deprecated
- public SecurityGroupRuleForCreate(Integer parentSecurityGroupId, String ipProtocol, Integer fromPort,Integer toPort, String cidr) {
- this.parentGroupId = String.valueOf(parentSecurityGroupId);
- this.ipProtocol = ipProtocol;
- this.fromPort = fromPort;
- this.toPort = toPort;
- this.cidr = cidr;
- }
- /**
- *
- * @param parentSecurityGroupId
- * @param ipProtocol
- * @param fromPort
- * @param toPort
- * @param cidr
- * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, String, Integer, Integer)}
- */
- @Deprecated
- public SecurityGroupRuleForCreate(Integer parentGroupId, String ipProtocol, Integer fromPort,Integer toPort, Integer sourceGroupId) {
- this.parentGroupId = String.valueOf(parentGroupId);
- this.ipProtocol = ipProtocol;
- this.fromPort = fromPort;
- this.toPort = toPort;
- this.groupId = String.valueOf(sourceGroupId);
- }
-
- public SecurityGroupRuleForCreate(String parentSecurityGroupId, String ipProtocol, Integer fromPort,Integer toPort, String cidr) {
- this.parentGroupId = parentSecurityGroupId;
- this.ipProtocol = ipProtocol;
- this.fromPort = fromPort;
- this.toPort = toPort;
- this.cidr = cidr;
- }
-
- public SecurityGroupRuleForCreate(String parentGroupId, String sourceGroupId, String ipProtocol, Integer fromPort,Integer toPort) {
- this.parentGroupId = parentGroupId;
- this.ipProtocol = ipProtocol;
- this.fromPort = fromPort;
- this.toPort = toPort;
- this.groupId = sourceGroupId;
- }
-
- /**
- * @return the parentGroupId
- */
- public String getParentGroupId() {
- return parentGroupId;
- }
-
-
- /**
- * @param parentGroupId the parentGroupId to set
- * @deprecated Use {@link #setParentGroupId(String)}
- */
- @Deprecated
- public void setParentGroupId(Integer parentGroupId) {
- this.parentGroupId = String.valueOf(parentGroupId);
- }
-
- /**
- * @param parentGroupId the parentGroupId to set
- */
- public void setParentGroupId(String parentGroupId) {
- this.parentGroupId = parentGroupId;
- }
-
- /**
- * @return the fromPort
- */
- public Integer getFromPort() {
- return fromPort;
- }
-
- /**
- * @param fromPort the fromPort to set
- */
- public void setFromPort(Integer fromPort) {
- this.fromPort = fromPort;
- }
-
- /**
- * @return the toPort
- */
- public Integer getToPort() {
- return toPort;
- }
-
- /**
- * @param toPort the toPort to set
- */
- public void setToPort(Integer toPort) {
- this.toPort = toPort;
- }
-
- /**
- * @return the ipProtocol
- */
- public String getIpProtocol() {
- return ipProtocol;
- }
-
- /**
- * @param ipProtocol the ipProtocol to set
- */
- public void setIpProtocol(String ipProtocol) {
- this.ipProtocol = ipProtocol;
- }
-
- /**
- * @return the cidr
- */
- public String getCidr() {
- return cidr;
- }
-
- /**
- * @param cidr the cidr to set
- */
- public void setCidr(String cidr) {
- this.cidr = cidr;
- }
-
- /**
- * @return the groupId
- */
- public String getGroupId() {
- return groupId;
- }
-
- /**
- * @param groupId the groupId to set
- * @deprecated Use {@link #setGroupId(String)}
- */
- @Deprecated
- public void setGroupId(Integer groupId) {
- this.groupId = String.valueOf(groupId);
- }
-
- /**
- * @param groupId the groupId to set
- */
- public void setGroupId(String groupId) {
- this.groupId = groupId;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "SecurityGroupRuleForCreate [parentGroupId=" + parentGroupId
- + ", fromPort=" + fromPort + ", toPort=" + toPort
- + ", ipProtocol=" + ipProtocol + ", cidr=" + cidr
- + ", groupId=" + groupId + "]";
- }
+ @JsonProperty("parent_group_id")
+ private String parentGroupId;
+
+ @JsonProperty("ip_protocol")
+ private String ipProtocol;
+
+ @JsonProperty("from_port")
+ private Integer fromPort;
+
+ @JsonProperty("to_port")
+ private Integer toPort;
+
+ @XmlElement
+ private String cidr;
+
+ @JsonProperty("group_id")
+ private String groupId;
+
+ public SecurityGroupRuleForCreate() {
+
+ }
+
+ /**
+ *
+ * @param parentSecurityGroupId
+ * @param ipProtocol
+ * @param fromPort
+ * @param toPort
+ * @param cidr
+ * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, Integer, Integer, String)}
+ */
+ @Deprecated
+ public SecurityGroupRuleForCreate(Integer parentSecurityGroupId, String ipProtocol, Integer fromPort,Integer toPort, String cidr) {
+ this.parentGroupId = String.valueOf(parentSecurityGroupId);
+ this.ipProtocol = ipProtocol;
+ this.fromPort = fromPort;
+ this.toPort = toPort;
+ this.cidr = cidr;
+ }
+ /**
+ *
+ * @param parentSecurityGroupId
+ * @param ipProtocol
+ * @param fromPort
+ * @param toPort
+ * @param cidr
+ * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, String, Integer, Integer)}
+ */
+ @Deprecated
+ public SecurityGroupRuleForCreate(Integer parentGroupId, String ipProtocol, Integer fromPort,Integer toPort, Integer sourceGroupId) {
+ this.parentGroupId = String.valueOf(parentGroupId);
+ this.ipProtocol = ipProtocol;
+ this.fromPort = fromPort;
+ this.toPort = toPort;
+ this.groupId = String.valueOf(sourceGroupId);
+ }
+
+ public SecurityGroupRuleForCreate(String parentSecurityGroupId, String ipProtocol, Integer fromPort,Integer toPort, String cidr) {
+ this.parentGroupId = parentSecurityGroupId;
+ this.ipProtocol = ipProtocol;
+ this.fromPort = fromPort;
+ this.toPort = toPort;
+ this.cidr = cidr;
+ }
+
+ public SecurityGroupRuleForCreate(String parentGroupId, String sourceGroupId, String ipProtocol, Integer fromPort,Integer toPort) {
+ this.parentGroupId = parentGroupId;
+ this.ipProtocol = ipProtocol;
+ this.fromPort = fromPort;
+ this.toPort = toPort;
+ this.groupId = sourceGroupId;
+ }
+
+ /**
+ * @return the parentGroupId
+ */
+ public String getParentGroupId() {
+ return parentGroupId;
+ }
+
+
+ /**
+ * @param parentGroupId the parentGroupId to set
+ * @deprecated Use {@link #setParentGroupId(String)}
+ */
+ @Deprecated
+ public void setParentGroupId(Integer parentGroupId) {
+ this.parentGroupId = String.valueOf(parentGroupId);
+ }
+
+ /**
+ * @param parentGroupId the parentGroupId to set
+ */
+ public void setParentGroupId(String parentGroupId) {
+ this.parentGroupId = parentGroupId;
+ }
+
+ /**
+ * @return the fromPort
+ */
+ public Integer getFromPort() {
+ return fromPort;
+ }
+
+ /**
+ * @param fromPort the fromPort to set
+ */
+ public void setFromPort(Integer fromPort) {
+ this.fromPort = fromPort;
+ }
+
+ /**
+ * @return the toPort
+ */
+ public Integer getToPort() {
+ return toPort;
+ }
+
+ /**
+ * @param toPort the toPort to set
+ */
+ public void setToPort(Integer toPort) {
+ this.toPort = toPort;
+ }
+
+ /**
+ * @return the ipProtocol
+ */
+ public String getIpProtocol() {
+ return ipProtocol;
+ }
+
+ /**
+ * @param ipProtocol the ipProtocol to set
+ */
+ public void setIpProtocol(String ipProtocol) {
+ this.ipProtocol = ipProtocol;
+ }
+
+ /**
+ * @return the cidr
+ */
+ public String getCidr() {
+ return cidr;
+ }
+
+ /**
+ * @param cidr the cidr to set
+ */
+ public void setCidr(String cidr) {
+ this.cidr = cidr;
+ }
+
+ /**
+ * @return the groupId
+ */
+ public String getGroupId() {
+ return groupId;
+ }
+
+ /**
+ * @param groupId the groupId to set
+ * @deprecated Use {@link #setGroupId(String)}
+ */
+ @Deprecated
+ public void setGroupId(Integer groupId) {
+ this.groupId = String.valueOf(groupId);
+ }
+
+ /**
+ * @param groupId the groupId to set
+ */
+ public void setGroupId(String groupId) {
+ this.groupId = groupId;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "SecurityGroupRuleForCreate [parentGroupId=" + parentGroupId
+ + ", fromPort=" + fromPort + ", toPort=" + toPort
+ + ", ipProtocol=" + ipProtocol + ", cidr=" + cidr
+ + ", groupId=" + groupId + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java
index a9f05e6..4d3ebbb 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class SecurityGroups implements Iterable<SecurityGroup>, Serializable {
- @JsonProperty("security_groups")
- private List<SecurityGroup> list;
+ @JsonProperty("security_groups")
+ private List<SecurityGroup> list;
- /**
- * @return the list
- */
- public List<SecurityGroup> getList() {
- return list;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "SecurityGroups [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<SecurityGroup> getList() {
+ return list;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "SecurityGroups [list=" + list + "]";
+ }
- @Override
- public Iterator<SecurityGroup> iterator() {
- return list.iterator();
- }
-
+ @Override
+ public Iterator<SecurityGroup> iterator() {
+ return list.iterator();
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java
index 20ab039..63acbc2 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java
@@ -29,221 +29,221 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("server")
public class Server implements Serializable {
-
- public static final class Addresses implements Serializable {
-
- public static final class Address implements Serializable {
-
- @JsonProperty("OS-EXT-IPS-MAC:mac_addr")
- private String macAddr;
-
- private String version;
-
- private String addr;
-
- @JsonProperty("OS-EXT-IPS:type")
- private String type;
+
+ public static final class Addresses implements Serializable {
+
+ public static final class Address implements Serializable {
+
+ @JsonProperty("OS-EXT-IPS-MAC:mac_addr")
+ private String macAddr;
+
+ private String version;
+
+ private String addr;
+
+ @JsonProperty("OS-EXT-IPS:type")
+ private String type;
/**
* @return the macAddr
*/
- public String getMacAddr() {
- return macAddr;
- }
-
- /**
- * @return the version
- */
- public String getVersion() {
- return version;
- }
-
- /**
- * @return the addr
- */
- public String getAddr() {
- return addr;
- }
-
-
- /**
- * @return the type
- */
- public String getType() {
- return type;
- }
-
- /**
- * @param version the version to set
- */
- public void setVersion(String version) {
- this.version = version;
- }
-
- /**
- * @param addr the addr to set
- */
- public void setAddr(String addr) {
- this.addr = addr;
- }
-
- /**
- * @param type the type to set
- */
- public void setType(String type) {
- this.type = type;
- }
-
- /**
- * @param macAddr the mac addr to set
- */
- public void setMacAddr(String macAddr) {
- this.macAddr= macAddr;
- }
- }
-
- private Map<String, List<Address>> addresses = new HashMap<>();
-
- @JsonAnySetter
- public void add(String key, List<Address> value) {
- addresses.put(key, value);
- }
- /**
- * @return the ip address List Map
- */
- public Map<String, List<Address>> getAddresses() {
- return addresses;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Addresses List Map [" + addresses + "]";
- }
-
- }
-
- public static final class Fault {
-
- private Integer code;
-
- private String message;
-
- private String details;
-
- private Calendar created;
-
- /**
- * @return the code
- */
- public Integer getCode() {
- return code;
- }
-
- /**
- * @return the message
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * @return the details
- */
- public String getDetails() {
- return details;
- }
-
- /**
- * @return the created
- */
- public Calendar getCreated() {
- return created;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Fault [code=" + code + ", message=" + message
- + ", details=" + details + ", created=" + created + "]";
- }
-
-
- }
-
-
- private String id;
-
- private String name;
-
- private Addresses addresses;
-
- private List<Link> links;
-
- private Image image;
-
- private Flavor flavor;
-
- private String accessIPv4;
-
- private String accessIPv6;
-
- @JsonProperty("config_drive")
- private String configDrive;
-
- private String status;
-
- private Integer progress;
-
- private Fault fault;
-
- @JsonProperty("tenant_id")
- private String tenantId;
-
- @JsonProperty("user_id")
- private String userId;
-
- @JsonProperty("key_name")
- private String keyName;
-
- private String hostId;
-
- private String updated;
-
- private String created;
-
- private Map<String, String> metadata;
-
- @JsonProperty("security_groups")
- private List<SecurityGroup> securityGroups;
-
- @JsonProperty("OS-EXT-STS:task_state")
- private String taskState;
-
- @JsonProperty("OS-EXT-STS:power_state")
- private String powerState;
-
- @JsonProperty("OS-EXT-STS:vm_state")
- private String vmState;
-
- @JsonProperty("OS-EXT-SRV-ATTR:host")
- private String host;
-
- @JsonProperty("OS-EXT-SRV-ATTR:instance_name")
- private String instanceName;
-
- @JsonProperty("OS-EXT-SRV-ATTR:hypervisor_hostname")
- private String hypervisorHostname;
-
- @JsonProperty("OS-DCF:diskConfig")
- private String diskConfig;
-
- @JsonProperty("OS-EXT-AZ:availability_zone")
- private String availabilityZone;
+ public String getMacAddr() {
+ return macAddr;
+ }
+
+ /**
+ * @return the version
+ */
+ public String getVersion() {
+ return version;
+ }
+
+ /**
+ * @return the addr
+ */
+ public String getAddr() {
+ return addr;
+ }
+
+
+ /**
+ * @return the type
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * @param version the version to set
+ */
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ /**
+ * @param addr the addr to set
+ */
+ public void setAddr(String addr) {
+ this.addr = addr;
+ }
+
+ /**
+ * @param type the type to set
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * @param macAddr the mac addr to set
+ */
+ public void setMacAddr(String macAddr) {
+ this.macAddr= macAddr;
+ }
+ }
+
+ private Map<String, List<Address>> addresses = new HashMap<>();
+
+ @JsonAnySetter
+ public void add(String key, List<Address> value) {
+ addresses.put(key, value);
+ }
+ /**
+ * @return the ip address List Map
+ */
+ public Map<String, List<Address>> getAddresses() {
+ return addresses;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Addresses List Map [" + addresses + "]";
+ }
+
+ }
+
+ public static final class Fault {
+
+ private Integer code;
+
+ private String message;
+
+ private String details;
+
+ private Calendar created;
+
+ /**
+ * @return the code
+ */
+ public Integer getCode() {
+ return code;
+ }
+
+ /**
+ * @return the message
+ */
+ public String getMessage() {
+ return message;
+ }
+
+ /**
+ * @return the details
+ */
+ public String getDetails() {
+ return details;
+ }
+
+ /**
+ * @return the created
+ */
+ public Calendar getCreated() {
+ return created;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Fault [code=" + code + ", message=" + message
+ + ", details=" + details + ", created=" + created + "]";
+ }
+
+
+ }
+
+
+ private String id;
+
+ private String name;
+
+ private Addresses addresses;
+
+ private List<Link> links;
+
+ private Image image;
+
+ private Flavor flavor;
+
+ private String accessIPv4;
+
+ private String accessIPv6;
+
+ @JsonProperty("config_drive")
+ private String configDrive;
+
+ private String status;
+
+ private Integer progress;
+
+ private Fault fault;
+
+ @JsonProperty("tenant_id")
+ private String tenantId;
+
+ @JsonProperty("user_id")
+ private String userId;
+
+ @JsonProperty("key_name")
+ private String keyName;
+
+ private String hostId;
+
+ private String updated;
+
+ private String created;
+
+ private Map<String, String> metadata;
+
+ @JsonProperty("security_groups")
+ private List<SecurityGroup> securityGroups;
+
+ @JsonProperty("OS-EXT-STS:task_state")
+ private String taskState;
+
+ @JsonProperty("OS-EXT-STS:power_state")
+ private String powerState;
+
+ @JsonProperty("OS-EXT-STS:vm_state")
+ private String vmState;
+
+ @JsonProperty("OS-EXT-SRV-ATTR:host")
+ private String host;
+
+ @JsonProperty("OS-EXT-SRV-ATTR:instance_name")
+ private String instanceName;
+
+ @JsonProperty("OS-EXT-SRV-ATTR:hypervisor_hostname")
+ private String hypervisorHostname;
+
+ @JsonProperty("OS-DCF:diskConfig")
+ private String diskConfig;
+
+ @JsonProperty("OS-EXT-AZ:availability_zone")
+ private String availabilityZone;
@JsonProperty("OS-SRV-USG:launched_at")
private String launchedAt;
@@ -253,220 +253,220 @@ public class Server implements Serializable {
@JsonProperty("os-extended-volumes:volumes_attached")
private List<String> osExtendedVolumesAttached;
-
- private String uuid;
-
- private String adminPass;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the addresses
- */
- public Addresses getAddresses() {
- return addresses;
- }
-
- /**
- * @return the links
- */
- public List<Link> getLinks() {
- return links;
- }
-
- /**
- * @return the image
- */
- public Image getImage() {
- return image;
- }
-
- /**
- * @param image the image to set
- */
- public void setImage(Image image) {
- this.image = image;
- }
-
- /**
- * @return the flavor
- */
- public Flavor getFlavor() {
- return flavor;
- }
-
- /**
- * @param flavor the flavor to set
- */
- public void setFlavor(Flavor flavor) {
- this.flavor = flavor;
- }
-
- /**
- * @return the accessIPv4
- */
- public String getAccessIPv4() {
- return accessIPv4;
- }
-
- /**
- * @return the accessIPv6
- */
- public String getAccessIPv6() {
- return accessIPv6;
- }
-
- /**
- * @return the configDrive
- */
- public String getConfigDrive() {
- return configDrive;
- }
-
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @return the progress
- */
- public Integer getProgress() {
- return progress;
- }
-
- /**
- * @return the fault
- */
- public Fault getFault() {
- return fault;
- }
-
- /**
- * @return the tenantId
- */
- public String getTenantId() {
- return tenantId;
- }
-
- /**
- * @return the userId
- */
- public String getUserId() {
- return userId;
- }
-
- /**
- * @return the keyName
- */
- public String getKeyName() {
- return keyName;
- }
-
- /**
- * @return the hostId
- */
- public String getHostId() {
- return hostId;
- }
-
- /**
- * @return the updated
- */
- public String getUpdated() {
- return updated;
- }
-
- /**
- * @return the created
- */
- public String getCreated() {
- return created;
- }
-
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- /**
- * @return the securityGroups
- */
- public List<SecurityGroup> getSecurityGroups() {
- return securityGroups;
- }
-
- /**
- * @return the taskState
- */
- public String getTaskState() {
- return taskState;
- }
-
- /**
- * @return the powerState
- */
- public String getPowerState() {
- return powerState;
- }
-
- /**
- * @return the vmState
- */
- public String getVmState() {
- return vmState;
- }
-
- /**
- * @return the host
- */
- public String getHost() {
- return host;
- }
-
- /**
- * @return the instanceName
- */
- public String getInstanceName() {
- return instanceName;
- }
-
- /**
- * @return the hypervisorHostname
- */
- public String getHypervisorHostname() {
- return hypervisorHostname;
- }
-
- /**
- * @return the diskConfig
- */
- public String getDiskConfig() {
- return diskConfig;
- }
-
- /**
- * @return the availabilityZone
- */
- public String getAvailabilityZone() {
- return availabilityZone;
- }
+
+ private String uuid;
+
+ private String adminPass;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the addresses
+ */
+ public Addresses getAddresses() {
+ return addresses;
+ }
+
+ /**
+ * @return the links
+ */
+ public List<Link> getLinks() {
+ return links;
+ }
+
+ /**
+ * @return the image
+ */
+ public Image getImage() {
+ return image;
+ }
+
+ /**
+ * @param image the image to set
+ */
+ public void setImage(Image image) {
+ this.image = image;
+ }
+
+ /**
+ * @return the flavor
+ */
+ public Flavor getFlavor() {
+ return flavor;
+ }
+
+ /**
+ * @param flavor the flavor to set
+ */
+ public void setFlavor(Flavor flavor) {
+ this.flavor = flavor;
+ }
+
+ /**
+ * @return the accessIPv4
+ */
+ public String getAccessIPv4() {
+ return accessIPv4;
+ }
+
+ /**
+ * @return the accessIPv6
+ */
+ public String getAccessIPv6() {
+ return accessIPv6;
+ }
+
+ /**
+ * @return the configDrive
+ */
+ public String getConfigDrive() {
+ return configDrive;
+ }
+
+ /**
+ * @return the status
+ */
+ public String getStatus() {
+ return status;
+ }
+
+ /**
+ * @return the progress
+ */
+ public Integer getProgress() {
+ return progress;
+ }
+
+ /**
+ * @return the fault
+ */
+ public Fault getFault() {
+ return fault;
+ }
+
+ /**
+ * @return the tenantId
+ */
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ /**
+ * @return the userId
+ */
+ public String getUserId() {
+ return userId;
+ }
+
+ /**
+ * @return the keyName
+ */
+ public String getKeyName() {
+ return keyName;
+ }
+
+ /**
+ * @return the hostId
+ */
+ public String getHostId() {
+ return hostId;
+ }
+
+ /**
+ * @return the updated
+ */
+ public String getUpdated() {
+ return updated;
+ }
+
+ /**
+ * @return the created
+ */
+ public String getCreated() {
+ return created;
+ }
+
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ /**
+ * @return the securityGroups
+ */
+ public List<SecurityGroup> getSecurityGroups() {
+ return securityGroups;
+ }
+
+ /**
+ * @return the taskState
+ */
+ public String getTaskState() {
+ return taskState;
+ }
+
+ /**
+ * @return the powerState
+ */
+ public String getPowerState() {
+ return powerState;
+ }
+
+ /**
+ * @return the vmState
+ */
+ public String getVmState() {
+ return vmState;
+ }
+
+ /**
+ * @return the host
+ */
+ public String getHost() {
+ return host;
+ }
+
+ /**
+ * @return the instanceName
+ */
+ public String getInstanceName() {
+ return instanceName;
+ }
+
+ /**
+ * @return the hypervisorHostname
+ */
+ public String getHypervisorHostname() {
+ return hypervisorHostname;
+ }
+
+ /**
+ * @return the diskConfig
+ */
+ public String getDiskConfig() {
+ return diskConfig;
+ }
+
+ /**
+ * @return the availabilityZone
+ */
+ public String getAvailabilityZone() {
+ return availabilityZone;
+ }
/**
* @return the launchedAt
@@ -490,41 +490,41 @@ public class Server implements Serializable {
}
/**
- * @return the uuid
- */
- public String getUuid() {
- return uuid;
- }
-
- /**
- * @return the adminPass
- */
- public String getAdminPass() {
- return adminPass;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Server [id=" + id + ", name=" + name + ", addresses="
- + addresses + ", links=" + links + ", image=" + image
- + ", flavor=" + flavor + ", accessIPv4=" + accessIPv4
- + ", accessIPv6=" + accessIPv6 + ", configDrive=" + configDrive
- + ", status=" + status + ", progress=" + progress + ", fault="
- + fault + ", tenantId=" + tenantId + ", userId=" + userId
- + ", keyName=" + keyName + ", hostId=" + hostId + ", updated="
- + updated + ", created=" + created + ", metadata=" + metadata
- + ", securityGroups=" + securityGroups + ", taskState="
- + taskState + ", powerState=" + powerState + ", vmState="
- + vmState + ", host=" + host + ", instanceName=" + instanceName
- + ", hypervisorHostname=" + hypervisorHostname
- + ", diskConfig=" + diskConfig + ", availabilityZone="
- + availabilityZone + ", launchedAt=" + launchedAt + ", terminatedAt="
+ * @return the uuid
+ */
+ public String getUuid() {
+ return uuid;
+ }
+
+ /**
+ * @return the adminPass
+ */
+ public String getAdminPass() {
+ return adminPass;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Server [id=" + id + ", name=" + name + ", addresses="
+ + addresses + ", links=" + links + ", image=" + image
+ + ", flavor=" + flavor + ", accessIPv4=" + accessIPv4
+ + ", accessIPv6=" + accessIPv6 + ", configDrive=" + configDrive
+ + ", status=" + status + ", progress=" + progress + ", fault="
+ + fault + ", tenantId=" + tenantId + ", userId=" + userId
+ + ", keyName=" + keyName + ", hostId=" + hostId + ", updated="
+ + updated + ", created=" + created + ", metadata=" + metadata
+ + ", securityGroups=" + securityGroups + ", taskState="
+ + taskState + ", powerState=" + powerState + ", vmState="
+ + vmState + ", host=" + host + ", instanceName=" + instanceName
+ + ", hypervisorHostname=" + hypervisorHostname
+ + ", diskConfig=" + diskConfig + ", availabilityZone="
+ + availabilityZone + ", launchedAt=" + launchedAt + ", terminatedAt="
+ ", " + "osExtendedVolumesAttached=" + osExtendedVolumesAttached
+ ", uuid=" + uuid + ", adminPass="
- + adminPass + "]";
- }
+ + adminPass + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java
index 80793a7..c0289be 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java
@@ -26,601 +26,601 @@ import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonRootName;
public interface ServerAction extends Serializable {
-
- @JsonRootName("changePassword")
- public static final class ChangePassword implements ServerAction {
-
- private String adminPass;
-
- public ChangePassword() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public ChangePassword(String adminPass) {
- this.adminPass = adminPass;
- }
-
- /**
- * @return the adminPass
- */
- public String getAdminPass() {
- return adminPass;
- }
-
- /**
- * @param adminPass the adminPass to set
- */
- public void setAdminPass(String adminPass) {
- this.adminPass = adminPass;
- }
-
- }
-
- @JsonRootName("reboot")
- public static final class Reboot implements ServerAction {
-
- private String type;
-
- /**
- * @return the type
- */
- public String getType() {
- return type;
- }
-
- /**
- * @param type the type to set
- */
- public void setType(String type) {
- this.type = type;
- }
-
- }
-
- @JsonRootName("rebuild")
- public static final class Rebuild implements ServerAction {
-
- private String imageRef;
-
- private String name;
-
- private String adminPass;
-
- private String accessIPv4;
-
- private String accessIPv6;
-
- private Map<String, String> metadata = new HashMap<>();
-
- private List<PersonalityFile> personality = new ArrayList<>();
-
- @JsonProperty("OS-DCF:diskConfig")
- private String diskConfig;
-
- /**
- * @return the imageRef
- */
- public String getImageRef() {
- return imageRef;
- }
-
- /**
- * @param imageRef the imageRef to set
- */
- public void setImageRef(String imageRef) {
- this.imageRef = imageRef;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the adminPass
- */
- public String getAdminPass() {
- return adminPass;
- }
-
- /**
- * @param adminPass the adminPass to set
- */
- public void setAdminPass(String adminPass) {
- this.adminPass = adminPass;
- }
-
- /**
- * @return the accessIPv4
- */
- public String getAccessIPv4() {
- return accessIPv4;
- }
-
- /**
- * @param accessIPv4 the accessIPv4 to set
- */
- public void setAccessIPv4(String accessIPv4) {
- this.accessIPv4 = accessIPv4;
- }
-
- /**
- * @return the accessIPv6
- */
- public String getAccessIPv6() {
- return accessIPv6;
- }
-
- /**
- * @param accessIPv6 the accessIPv6 to set
- */
- public void setAccessIPv6(String accessIPv6) {
- this.accessIPv6 = accessIPv6;
- }
-
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- /**
- * @param metadata the metadata to set
- */
- public void setMetadata(Map<String, String> metadata) {
- this.metadata = metadata;
- }
-
- /**
- * @return the personality
- */
- public List<PersonalityFile> getPersonality() {
- return personality;
- }
-
- /**
- * @param personality the personality to set
- */
- public void setPersonality(List<PersonalityFile> personality) {
- this.personality = personality;
- }
-
- /**
- * @return the diskConfig
- */
- public String getDiskConfig() {
- return diskConfig;
- }
-
- /**
- * @param diskConfig the diskConfig to set
- */
- public void setDiskConfig(String diskConfig) {
- this.diskConfig = diskConfig;
- }
-
- }
-
- @JsonRootName("resize")
- public static final class Resize implements ServerAction {
-
- private String flavorRef;
-
- @JsonProperty("OS-DCF:diskConfig")
- private String diskConfig;
-
- /**
- * @return the flavorRef
- */
- public String getFlavorRef() {
- return flavorRef;
- }
-
- /**
- * @param flavorRef the flavorRef to set
- */
- public void setFlavorRef(String flavorRef) {
- this.flavorRef = flavorRef;
- }
-
- /**
- * @return the diskConfig
- */
- public String getDiskConfig() {
- return diskConfig;
- }
-
- /**
- * @param diskConfig the diskConfig to set
- */
- public void setDiskConfig(String diskConfig) {
- this.diskConfig = diskConfig;
- }
-
- }
-
- @JsonRootName("confirmResize")
- public static final class ConfirmResize implements ServerAction {
-
- }
-
- @JsonRootName("revertResize")
- public static final class RevertResize implements ServerAction {
-
- }
-
- @JsonRootName("createImage")
- public static final class CreateImage implements ServerAction {
-
- private String name;
-
- private Map<String, String> metadata;
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- /**
- * @param metadata the metadata to set
- */
- public void setMetadata(Map<String, String> metadata) {
- this.metadata = metadata;
- }
-
- }
-
- @JsonRootName("rescue")
- public static final class Rescue implements ServerAction {
-
- private String adminPass;
-
- public Rescue() {
-
- }
-
- public Rescue(String adminPass) {
- this.adminPass = adminPass;
- }
-
- /**
- * @return the adminPass
- */
- public String getAdminPass() {
- return adminPass;
- }
-
- /**
- * @param adminPass the adminPass to set
- */
- public void setAdminPass(String adminPass) {
- this.adminPass = adminPass;
- }
-
- }
-
- public static final class RescueResponse implements ServerAction {
-
- private String adminPass;
-
- /**
- * @return the adminPass
- */
- public String getAdminPass() {
- return adminPass;
- }
-
- }
-
- @JsonRootName("unrescue")
- public static final class Unrescue implements ServerAction {
-
- }
-
- @JsonRootName("unpause")
- public static final class Unpause implements ServerAction {
-
- }
-
- @JsonRootName("pause")
- public static final class Pause implements ServerAction {
-
- }
-
- @JsonRootName("suspend")
- public static final class Suspend implements ServerAction {
-
- }
-
- @JsonRootName("resume")
- public static final class Resume implements ServerAction {
-
- }
-
- @JsonRootName("lock")
- public static final class Lock implements ServerAction {
-
- }
-
- @JsonRootName("unlock")
- public static final class Unlock implements ServerAction {
-
- }
-
- @JsonRootName("os-getConsoleOutput")
- public static final class GetConsoleOutput implements ServerAction {
-
- private Integer length;
-
- public GetConsoleOutput() {
-
- }
-
- public GetConsoleOutput(Integer length) {
- this.length = length;
- }
-
- /**
- * @return the length
- */
- public Integer getLength() {
- return length;
- }
-
- /**
- * @param length the length to set
- */
- public void setLength(Integer length) {
- this.length = length;
- }
-
- }
-
- public static final class ConsoleOutput implements ServerAction {
-
- private String output;
-
- /**
- * @return the output
- */
- public String getOutput() {
- return output;
- }
-
- }
-
- @JsonRootName("os-getVNCConsole")
- public static final class GetVncConsole implements ServerAction {
-
- private String type;
-
- public GetVncConsole() {
- super();
- // TODO Auto-generated constructor stub
- }
-
-
- public GetVncConsole(String type) {
- super();
- this.type = type;
- }
-
- /**
- * @return the type
- */
- public String getType() {
- return type;
- }
-
- /**
- * @param type the type to set
- */
- public void setType(String type) {
- this.type = type;
- }
-
- }
-
- @JsonRootName("console")
- public static final class VncConsole implements ServerAction {
-
- private String type;
-
- private String url;
-
- /**
- * @return the type
- */
- public String getType() {
- return type;
- }
-
- /**
- * @return the url
- */
- public String getUrl() {
- return url;
- }
-
- }
-
- @JsonRootName("os-start")
- public static final class Start implements ServerAction {
-
- }
-
- @JsonRootName("os-stop")
- public static final class Stop implements ServerAction {
-
- }
-
- @JsonRootName("forceDelete")
- public static final class ForceDelete implements ServerAction {
-
- }
-
- @JsonRootName("restore")
- public static final class Restore implements ServerAction {
-
- }
-
- @JsonRootName("addFloatingIp")
- public static final class AssociateFloatingIp implements ServerAction {
-
- private String address;
-
- public AssociateFloatingIp() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public AssociateFloatingIp(String address) {
- super();
- this.address = address;
- }
-
- /**
- * @return the address
- */
- public String getAddress() {
- return address;
- }
-
- /**
- * @param address the address to set
- */
- public void setAddress(String address) {
- this.address = address;
- }
-
- }
-
- @JsonRootName("removeFloatingIp")
- public static final class DisassociateFloatingIp implements ServerAction {
-
- private String address;
-
- public DisassociateFloatingIp() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public DisassociateFloatingIp(String address) {
- super();
- this.address = address;
- }
-
- /**
- * @return the address
- */
- public String getAddress() {
- return address;
- }
-
- /**
- * @param address the address to set
- */
- public void setAddress(String address) {
- this.address = address;
- }
-
- }
-
- @JsonRootName("createBackup")
- public static final class CreateBackup implements ServerAction {
-
- private String name;
-
- @JsonProperty("backup_type")
- private String type;
-
- private String rotation;
-
- private Map<String, String> metadata;
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the type
- */
- public String getType() {
- return type;
- }
-
- /**
- * @param type the type to set
- */
- public void setType(String type) {
- this.type = type;
- }
-
- /**
- * @return the rotation
- */
- public String getRotation() {
- return rotation;
- }
-
- /**
- * @param rotation the rotation to set
- */
- public void setRotation(String rotation) {
- this.rotation = rotation;
- }
-
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- /**
- * @param metadata the metadata to set
- */
- public void setMetadata(Map<String, String> metadata) {
- this.metadata = metadata;
- }
-
- }
-
+
+ @JsonRootName("changePassword")
+ public static final class ChangePassword implements ServerAction {
+
+ private String adminPass;
+
+ public ChangePassword() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public ChangePassword(String adminPass) {
+ this.adminPass = adminPass;
+ }
+
+ /**
+ * @return the adminPass
+ */
+ public String getAdminPass() {
+ return adminPass;
+ }
+
+ /**
+ * @param adminPass the adminPass to set
+ */
+ public void setAdminPass(String adminPass) {
+ this.adminPass = adminPass;
+ }
+
+ }
+
+ @JsonRootName("reboot")
+ public static final class Reboot implements ServerAction {
+
+ private String type;
+
+ /**
+ * @return the type
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * @param type the type to set
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ }
+
+ @JsonRootName("rebuild")
+ public static final class Rebuild implements ServerAction {
+
+ private String imageRef;
+
+ private String name;
+
+ private String adminPass;
+
+ private String accessIPv4;
+
+ private String accessIPv6;
+
+ private Map<String, String> metadata = new HashMap<>();
+
+ private List<PersonalityFile> personality = new ArrayList<>();
+
+ @JsonProperty("OS-DCF:diskConfig")
+ private String diskConfig;
+
+ /**
+ * @return the imageRef
+ */
+ public String getImageRef() {
+ return imageRef;
+ }
+
+ /**
+ * @param imageRef the imageRef to set
+ */
+ public void setImageRef(String imageRef) {
+ this.imageRef = imageRef;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the adminPass
+ */
+ public String getAdminPass() {
+ return adminPass;
+ }
+
+ /**
+ * @param adminPass the adminPass to set
+ */
+ public void setAdminPass(String adminPass) {
+ this.adminPass = adminPass;
+ }
+
+ /**
+ * @return the accessIPv4
+ */
+ public String getAccessIPv4() {
+ return accessIPv4;
+ }
+
+ /**
+ * @param accessIPv4 the accessIPv4 to set
+ */
+ public void setAccessIPv4(String accessIPv4) {
+ this.accessIPv4 = accessIPv4;
+ }
+
+ /**
+ * @return the accessIPv6
+ */
+ public String getAccessIPv6() {
+ return accessIPv6;
+ }
+
+ /**
+ * @param accessIPv6 the accessIPv6 to set
+ */
+ public void setAccessIPv6(String accessIPv6) {
+ this.accessIPv6 = accessIPv6;
+ }
+
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ /**
+ * @param metadata the metadata to set
+ */
+ public void setMetadata(Map<String, String> metadata) {
+ this.metadata = metadata;
+ }
+
+ /**
+ * @return the personality
+ */
+ public List<PersonalityFile> getPersonality() {
+ return personality;
+ }
+
+ /**
+ * @param personality the personality to set
+ */
+ public void setPersonality(List<PersonalityFile> personality) {
+ this.personality = personality;
+ }
+
+ /**
+ * @return the diskConfig
+ */
+ public String getDiskConfig() {
+ return diskConfig;
+ }
+
+ /**
+ * @param diskConfig the diskConfig to set
+ */
+ public void setDiskConfig(String diskConfig) {
+ this.diskConfig = diskConfig;
+ }
+
+ }
+
+ @JsonRootName("resize")
+ public static final class Resize implements ServerAction {
+
+ private String flavorRef;
+
+ @JsonProperty("OS-DCF:diskConfig")
+ private String diskConfig;
+
+ /**
+ * @return the flavorRef
+ */
+ public String getFlavorRef() {
+ return flavorRef;
+ }
+
+ /**
+ * @param flavorRef the flavorRef to set
+ */
+ public void setFlavorRef(String flavorRef) {
+ this.flavorRef = flavorRef;
+ }
+
+ /**
+ * @return the diskConfig
+ */
+ public String getDiskConfig() {
+ return diskConfig;
+ }
+
+ /**
+ * @param diskConfig the diskConfig to set
+ */
+ public void setDiskConfig(String diskConfig) {
+ this.diskConfig = diskConfig;
+ }
+
+ }
+
+ @JsonRootName("confirmResize")
+ public static final class ConfirmResize implements ServerAction {
+
+ }
+
+ @JsonRootName("revertResize")
+ public static final class RevertResize implements ServerAction {
+
+ }
+
+ @JsonRootName("createImage")
+ public static final class CreateImage implements ServerAction {
+
+ private String name;
+
+ private Map<String, String> metadata;
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ /**
+ * @param metadata the metadata to set
+ */
+ public void setMetadata(Map<String, String> metadata) {
+ this.metadata = metadata;
+ }
+
+ }
+
+ @JsonRootName("rescue")
+ public static final class Rescue implements ServerAction {
+
+ private String adminPass;
+
+ public Rescue() {
+
+ }
+
+ public Rescue(String adminPass) {
+ this.adminPass = adminPass;
+ }
+
+ /**
+ * @return the adminPass
+ */
+ public String getAdminPass() {
+ return adminPass;
+ }
+
+ /**
+ * @param adminPass the adminPass to set
+ */
+ public void setAdminPass(String adminPass) {
+ this.adminPass = adminPass;
+ }
+
+ }
+
+ public static final class RescueResponse implements ServerAction {
+
+ private String adminPass;
+
+ /**
+ * @return the adminPass
+ */
+ public String getAdminPass() {
+ return adminPass;
+ }
+
+ }
+
+ @JsonRootName("unrescue")
+ public static final class Unrescue implements ServerAction {
+
+ }
+
+ @JsonRootName("unpause")
+ public static final class Unpause implements ServerAction {
+
+ }
+
+ @JsonRootName("pause")
+ public static final class Pause implements ServerAction {
+
+ }
+
+ @JsonRootName("suspend")
+ public static final class Suspend implements ServerAction {
+
+ }
+
+ @JsonRootName("resume")
+ public static final class Resume implements ServerAction {
+
+ }
+
+ @JsonRootName("lock")
+ public static final class Lock implements ServerAction {
+
+ }
+
+ @JsonRootName("unlock")
+ public static final class Unlock implements ServerAction {
+
+ }
+
+ @JsonRootName("os-getConsoleOutput")
+ public static final class GetConsoleOutput implements ServerAction {
+
+ private Integer length;
+
+ public GetConsoleOutput() {
+
+ }
+
+ public GetConsoleOutput(Integer length) {
+ this.length = length;
+ }
+
+ /**
+ * @return the length
+ */
+ public Integer getLength() {
+ return length;
+ }
+
+ /**
+ * @param length the length to set
+ */
+ public void setLength(Integer length) {
+ this.length = length;
+ }
+
+ }
+
+ public static final class ConsoleOutput implements ServerAction {
+
+ private String output;
+
+ /**
+ * @return the output
+ */
+ public String getOutput() {
+ return output;
+ }
+
+ }
+
+ @JsonRootName("os-getVNCConsole")
+ public static final class GetVncConsole implements ServerAction {
+
+ private String type;
+
+ public GetVncConsole() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+
+ public GetVncConsole(String type) {
+ super();
+ this.type = type;
+ }
+
+ /**
+ * @return the type
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * @param type the type to set
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ }
+
+ @JsonRootName("console")
+ public static final class VncConsole implements ServerAction {
+
+ private String type;
+
+ private String url;
+
+ /**
+ * @return the type
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * @return the url
+ */
+ public String getUrl() {
+ return url;
+ }
+
+ }
+
+ @JsonRootName("os-start")
+ public static final class Start implements ServerAction {
+
+ }
+
+ @JsonRootName("os-stop")
+ public static final class Stop implements ServerAction {
+
+ }
+
+ @JsonRootName("forceDelete")
+ public static final class ForceDelete implements ServerAction {
+
+ }
+
+ @JsonRootName("restore")
+ public static final class Restore implements ServerAction {
+
+ }
+
+ @JsonRootName("addFloatingIp")
+ public static final class AssociateFloatingIp implements ServerAction {
+
+ private String address;
+
+ public AssociateFloatingIp() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public AssociateFloatingIp(String address) {
+ super();
+ this.address = address;
+ }
+
+ /**
+ * @return the address
+ */
+ public String getAddress() {
+ return address;
+ }
+
+ /**
+ * @param address the address to set
+ */
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ }
+
+ @JsonRootName("removeFloatingIp")
+ public static final class DisassociateFloatingIp implements ServerAction {
+
+ private String address;
+
+ public DisassociateFloatingIp() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public DisassociateFloatingIp(String address) {
+ super();
+ this.address = address;
+ }
+
+ /**
+ * @return the address
+ */
+ public String getAddress() {
+ return address;
+ }
+
+ /**
+ * @param address the address to set
+ */
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ }
+
+ @JsonRootName("createBackup")
+ public static final class CreateBackup implements ServerAction {
+
+ private String name;
+
+ @JsonProperty("backup_type")
+ private String type;
+
+ private String rotation;
+
+ private Map<String, String> metadata;
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the type
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * @param type the type to set
+ */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /**
+ * @return the rotation
+ */
+ public String getRotation() {
+ return rotation;
+ }
+
+ /**
+ * @param rotation the rotation to set
+ */
+ public void setRotation(String rotation) {
+ this.rotation = rotation;
+ }
+
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ /**
+ * @param metadata the metadata to set
+ */
+ public void setMetadata(Map<String, String> metadata) {
+ this.metadata = metadata;
+ }
+
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java
index ce981f7..4858e01 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java
@@ -28,315 +28,315 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("server")
public class ServerForCreate implements Serializable {
- public static final class SecurityGroup implements Serializable {
+ public static final class SecurityGroup implements Serializable {
- private String name;
+ private String name;
- public SecurityGroup() {
- }
+ public SecurityGroup() {
+ }
- public SecurityGroup(String name) {
- this.name = name;
- }
+ public SecurityGroup(String name) {
+ this.name = name;
+ }
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * @param name
- * the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
+ /**
+ * @param name
+ * the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
- }
+ }
- private String name;
+ private String name;
- private String adminPass;
-
- private String imageRef;
-
- private String flavorRef;
-
- private String accessIPv4;
-
- private String accessIPv6;
-
- private Integer min;
-
- private Integer max;
-
- private String diskConfig;
-
- @JsonProperty("key_name")
- private String keyName;
-
- private List<PersonalityFile> personality = new ArrayList<PersonalityFile>();
-
- private Map<String, String> metadata = new HashMap<String, String>();
-
- @JsonProperty("security_groups")
- private List<SecurityGroup> securityGroups;
-
- @JsonProperty("user_data")
- private String userData;
-
- @JsonProperty("availability_zone")
- private String availabilityZone;
-
- @JsonProperty("config_drive")
- private boolean configDrive;
-
- @JsonProperty("networks")
- private List<NetworkForCreate> networks = new ArrayList<NetworkForCreate>();
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name
- * the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the adminPass
- */
- public String getAdminPass() {
- return adminPass;
- }
-
- /**
- * @param adminPass
- * the adminPass to set
- */
- public void setAdminPass(String adminPass) {
- this.adminPass = adminPass;
- }
-
- /**
- * @return the imageRef
- */
- public String getImageRef() {
- return imageRef;
- }
-
- /**
- * @param imageRef
- * the imageRef to set
- */
- public void setImageRef(String imageRef) {
- this.imageRef = imageRef;
- }
-
- /**
- * @return the flavorRef
- */
- public String getFlavorRef() {
- return flavorRef;
- }
-
- /**
- * @param flavorRef
- * the flavorRef to set
- */
- public void setFlavorRef(String flavorRef) {
- this.flavorRef = flavorRef;
- }
-
- /**
- * @return the accessIPv4
- */
- public String getAccessIPv4() {
- return accessIPv4;
- }
-
- /**
- * @param accessIPv4
- * the accessIPv4 to set
- */
- public void setAccessIPv4(String accessIPv4) {
- this.accessIPv4 = accessIPv4;
- }
-
- /**
- * @return the accessIPv6
- */
- public String getAccessIPv6() {
- return accessIPv6;
- }
-
- /**
- * @param accessIPv6
- * the accessIPv6 to set
- */
- public void setAccessIPv6(String accessIPv6) {
- this.accessIPv6 = accessIPv6;
- }
-
- /**
- * @return the min
- */
- public Integer getMin() {
- return min;
- }
-
- /**
- * @param min
- * the min to set
- */
- public void setMin(Integer min) {
- this.min = min;
- }
-
- /**
- * @return the max
- */
- public Integer getMax() {
- return max;
- }
-
- /**
- * @param max
- * the max to set
- */
- public void setMax(Integer max) {
- this.max = max;
- }
-
- /**
- * @return the diskConfig
- */
- public String getDiskConfig() {
- return diskConfig;
- }
-
- /**
- * @param diskConfig
- * the diskConfig to set
- */
- public void setDiskConfig(String diskConfig) {
- this.diskConfig = diskConfig;
- }
-
- /**
- * @return the keyName
- */
- public String getKeyName() {
- return keyName;
- }
-
- /**
- * @param keyName
- * the keyName to set
- */
- public void setKeyName(String keyName) {
- this.keyName = keyName;
- }
-
- /**
- * @return the personality
- */
- public List<PersonalityFile> getPersonality() {
- return personality;
- }
-
- /**
- * @param personality
- * the personality to set
- */
- public void setPersonality(List<PersonalityFile> personality) {
- this.personality = personality;
- }
-
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- /**
- * @param metadata
- * the metadata to set
- */
- public void setMetadata(Map<String, String> metadata) {
- this.metadata = metadata;
- }
-
- /**
- * @return the securityGroups
- */
- public List<SecurityGroup> getSecurityGroups() {
- if (securityGroups == null) {
- securityGroups = new ArrayList<SecurityGroup>();
- }
- return securityGroups;
- }
-
- /**
- * @return the userData
- */
- public String getUserData() {
- return userData;
- }
-
- /**
- * @param userData
- * the userData to set
- */
- public void setUserData(String userData) {
- this.userData = userData;
- }
-
- /**
- * @return the availabilityZone
- */
- public String getAvailabilityZone() {
- return availabilityZone;
- }
-
- /**
- * @param availabilityZone
- * the availabilityZone to set
- */
- public void setAvailabilityZone(String availabilityZone) {
- this.availabilityZone = availabilityZone;
- }
-
- public boolean isConfigDrive() {
- return configDrive;
- }
-
- public void setConfigDrive(boolean configDrive) {
- this.configDrive = configDrive;
- }
-
- public List<NetworkForCreate> getNetworks() {
- return networks;
- }
-
- public void setNetworks(List<NetworkForCreate> networks) {
- this.networks = networks;
- }
-
- public void addNetworks(String id, String fixedIp) {
- NetworkForCreate net = new NetworkForCreate();
- net.setId(id);
- net.setFixedIp(fixedIp);
- this.networks.add(net);
- }
+ private String adminPass;
+
+ private String imageRef;
+
+ private String flavorRef;
+
+ private String accessIPv4;
+
+ private String accessIPv6;
+
+ private Integer min;
+
+ private Integer max;
+
+ private String diskConfig;
+
+ @JsonProperty("key_name")
+ private String keyName;
+
+ private List<PersonalityFile> personality = new ArrayList<PersonalityFile>();
+
+ private Map<String, String> metadata = new HashMap<String, String>();
+
+ @JsonProperty("security_groups")
+ private List<SecurityGroup> securityGroups;
+
+ @JsonProperty("user_data")
+ private String userData;
+
+ @JsonProperty("availability_zone")
+ private String availabilityZone;
+
+ @JsonProperty("config_drive")
+ private boolean configDrive;
+
+ @JsonProperty("networks")
+ private List<NetworkForCreate> networks = new ArrayList<NetworkForCreate>();
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name
+ * the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the adminPass
+ */
+ public String getAdminPass() {
+ return adminPass;
+ }
+
+ /**
+ * @param adminPass
+ * the adminPass to set
+ */
+ public void setAdminPass(String adminPass) {
+ this.adminPass = adminPass;
+ }
+
+ /**
+ * @return the imageRef
+ */
+ public String getImageRef() {
+ return imageRef;
+ }
+
+ /**
+ * @param imageRef
+ * the imageRef to set
+ */
+ public void setImageRef(String imageRef) {
+ this.imageRef = imageRef;
+ }
+
+ /**
+ * @return the flavorRef
+ */
+ public String getFlavorRef() {
+ return flavorRef;
+ }
+
+ /**
+ * @param flavorRef
+ * the flavorRef to set
+ */
+ public void setFlavorRef(String flavorRef) {
+ this.flavorRef = flavorRef;
+ }
+
+ /**
+ * @return the accessIPv4
+ */
+ public String getAccessIPv4() {
+ return accessIPv4;
+ }
+
+ /**
+ * @param accessIPv4
+ * the accessIPv4 to set
+ */
+ public void setAccessIPv4(String accessIPv4) {
+ this.accessIPv4 = accessIPv4;
+ }
+
+ /**
+ * @return the accessIPv6
+ */
+ public String getAccessIPv6() {
+ return accessIPv6;
+ }
+
+ /**
+ * @param accessIPv6
+ * the accessIPv6 to set
+ */
+ public void setAccessIPv6(String accessIPv6) {
+ this.accessIPv6 = accessIPv6;
+ }
+
+ /**
+ * @return the min
+ */
+ public Integer getMin() {
+ return min;
+ }
+
+ /**
+ * @param min
+ * the min to set
+ */
+ public void setMin(Integer min) {
+ this.min = min;
+ }
+
+ /**
+ * @return the max
+ */
+ public Integer getMax() {
+ return max;
+ }
+
+ /**
+ * @param max
+ * the max to set
+ */
+ public void setMax(Integer max) {
+ this.max = max;
+ }
+
+ /**
+ * @return the diskConfig
+ */
+ public String getDiskConfig() {
+ return diskConfig;
+ }
+
+ /**
+ * @param diskConfig
+ * the diskConfig to set
+ */
+ public void setDiskConfig(String diskConfig) {
+ this.diskConfig = diskConfig;
+ }
+
+ /**
+ * @return the keyName
+ */
+ public String getKeyName() {
+ return keyName;
+ }
+
+ /**
+ * @param keyName
+ * the keyName to set
+ */
+ public void setKeyName(String keyName) {
+ this.keyName = keyName;
+ }
+
+ /**
+ * @return the personality
+ */
+ public List<PersonalityFile> getPersonality() {
+ return personality;
+ }
+
+ /**
+ * @param personality
+ * the personality to set
+ */
+ public void setPersonality(List<PersonalityFile> personality) {
+ this.personality = personality;
+ }
+
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ /**
+ * @param metadata
+ * the metadata to set
+ */
+ public void setMetadata(Map<String, String> metadata) {
+ this.metadata = metadata;
+ }
+
+ /**
+ * @return the securityGroups
+ */
+ public List<SecurityGroup> getSecurityGroups() {
+ if (securityGroups == null) {
+ securityGroups = new ArrayList<SecurityGroup>();
+ }
+ return securityGroups;
+ }
+
+ /**
+ * @return the userData
+ */
+ public String getUserData() {
+ return userData;
+ }
+
+ /**
+ * @param userData
+ * the userData to set
+ */
+ public void setUserData(String userData) {
+ this.userData = userData;
+ }
+
+ /**
+ * @return the availabilityZone
+ */
+ public String getAvailabilityZone() {
+ return availabilityZone;
+ }
+
+ /**
+ * @param availabilityZone
+ * the availabilityZone to set
+ */
+ public void setAvailabilityZone(String availabilityZone) {
+ this.availabilityZone = availabilityZone;
+ }
+
+ public boolean isConfigDrive() {
+ return configDrive;
+ }
+
+ public void setConfigDrive(boolean configDrive) {
+ this.configDrive = configDrive;
+ }
+
+ public List<NetworkForCreate> getNetworks() {
+ return networks;
+ }
+
+ public void setNetworks(List<NetworkForCreate> networks) {
+ this.networks = networks;
+ }
+
+ public void addNetworks(String id, String fixedIp) {
+ NetworkForCreate net = new NetworkForCreate();
+ net.setId(id);
+ net.setFixedIp(fixedIp);
+ this.networks.add(net);
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java
index 3cc908e..92643b9 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class Servers implements Iterable<Server>, Serializable {
- @JsonProperty("servers")
- private List<Server> list;
+ @JsonProperty("servers")
+ private List<Server> list;
- /**
- * @return the list
- */
- public List<Server> getList() {
- return list;
- }
-
- @Override
- public Iterator<Server> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Servers [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<Server> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<Server> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Servers [list=" + list + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java
index 463cc98..ea6f77e 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java
@@ -25,224 +25,224 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("tenant_usage")
public class SimpleTenantUsage implements Serializable {
-
- @JsonProperty("total_memory_mb_usage")
- private BigDecimal totalMemoryMbUsage;
-
- @JsonProperty("total_vcpus_usage")
- private BigDecimal totalVcpusUsage;
-
- @JsonProperty("total_local_gb_usage")
- private BigDecimal totalLocalGbUsage;
-
- private String start;
-
- private String stop;
-
- @JsonProperty("tenant_id")
- private String tenantId;
-
- @JsonProperty("total_hours")
- private String totalHours;
-
- @JsonProperty("server_usages")
- private List<ServerUsage> serverUsages;
-
- /**
- * @return the totalMemoryMbUsage
- */
- public BigDecimal getTotalMemoryMbUsage() {
- return totalMemoryMbUsage;
- }
-
- /**
- * @param totalMemoryMbUsage the totalMemoryMbUsage to set
- */
- public void setTotalMemoryMbUsage(BigDecimal totalMemoryMbUsage) {
- this.totalMemoryMbUsage = totalMemoryMbUsage;
- }
-
- /**
- * @return the totalVcpusUsage
- */
- public BigDecimal getTotalVcpusUsage() {
- return totalVcpusUsage;
- }
-
- /**
- * @param totalVcpusUsage the totalVcpusUsage to set
- */
- public void setTotalVcpusUsage(BigDecimal totalVcpusUsage) {
- this.totalVcpusUsage = totalVcpusUsage;
- }
-
- /**
- * @return the totalLocalGbUsage
- */
- public BigDecimal getTotalLocalGbUsage() {
- return totalLocalGbUsage;
- }
-
- /**
- * @param totalLocalGbUsage the totalLocalGbUsage to set
- */
- public void setTotalLocalGbUsage(BigDecimal totalLocalGbUsage) {
- this.totalLocalGbUsage = totalLocalGbUsage;
- }
-
- /**
- * @return the start
- */
- public String getStart() {
- return start;
- }
-
- /**
- * @param start the start to set
- */
- public void setStart(String start) {
- this.start = start;
- }
-
- /**
- * @return the stop
- */
- public String getStop() {
- return stop;
- }
-
- /**
- * @param stop the stop to set
- */
- public void setStop(String stop) {
- this.stop = stop;
- }
-
- /**
- * @return the tenantId
- */
- public String getTenantId() {
- return tenantId;
- }
-
- /**
- * @param tenantId the tenantId to set
- */
- public void setTenantId(String tenantId) {
- this.tenantId = tenantId;
- }
-
- /**
- * @return the totalHours
- */
- public String getTotalHours() {
- return totalHours;
- }
-
- /**
- * @param totalHours the totalHours to set
- */
- public void setTotalHours(String totalHours) {
- this.totalHours = totalHours;
- }
-
- public List<ServerUsage> getServerUsages() {
- return serverUsages;
- }
-
- public void setServerUsages(List<ServerUsage> serverUsages) {
- this.serverUsages = serverUsages;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "SimpleTenantUsage [totalMemoryMbUsage=" + totalMemoryMbUsage
- + ", totalVcpusUsage=" + totalVcpusUsage
- + ", totalLocalGbUsage=" + totalLocalGbUsage + ", start="
- + start + ", stop=" + stop + ", tenantId=" + tenantId
- + ", totalHours=" + totalHours + "]";
- }
-
- public static final class ServerUsage implements Serializable {
- @JsonProperty("instance_id")
- private String instanceId;
-
- private Integer uptime;
-
- @JsonProperty("started_at")
- private String startedAt;
-
- @JsonProperty("ended_at")
- private String endedAt;
-
- @JsonProperty("memory_mb")
- private Integer memoryMb;
-
- @JsonProperty("tenant_id")
- private String tenantId;
-
- private String state;
-
- private Double hours;
-
- private Integer vcpus;
-
- private String flavor;
-
- @JsonProperty("local_gb")
- private Integer localDiskSize;
-
- private String name;
-
- public String getInstanceId() {
- return instanceId;
- }
-
- public Integer getUptime() {
- return uptime;
- }
-
- public String getStartedAt() {
- return startedAt;
- }
-
- public String getEndedAt() {
- return endedAt;
- }
-
- public Integer getMemoryMb() {
- return memoryMb;
- }
-
- public String getTenantId() {
- return tenantId;
- }
-
- public String getState() {
- return state;
- }
-
- public Double getHours() {
- return hours;
- }
-
- public Integer getVcpus() {
- return vcpus;
- }
-
- public String getFlavor() {
- return flavor;
- }
+
+ @JsonProperty("total_memory_mb_usage")
+ private BigDecimal totalMemoryMbUsage;
+
+ @JsonProperty("total_vcpus_usage")
+ private BigDecimal totalVcpusUsage;
+
+ @JsonProperty("total_local_gb_usage")
+ private BigDecimal totalLocalGbUsage;
+
+ private String start;
+
+ private String stop;
+
+ @JsonProperty("tenant_id")
+ private String tenantId;
+
+ @JsonProperty("total_hours")
+ private String totalHours;
+
+ @JsonProperty("server_usages")
+ private List<ServerUsage> serverUsages;
+
+ /**
+ * @return the totalMemoryMbUsage
+ */
+ public BigDecimal getTotalMemoryMbUsage() {
+ return totalMemoryMbUsage;
+ }
+
+ /**
+ * @param totalMemoryMbUsage the totalMemoryMbUsage to set
+ */
+ public void setTotalMemoryMbUsage(BigDecimal totalMemoryMbUsage) {
+ this.totalMemoryMbUsage = totalMemoryMbUsage;
+ }
+
+ /**
+ * @return the totalVcpusUsage
+ */
+ public BigDecimal getTotalVcpusUsage() {
+ return totalVcpusUsage;
+ }
+
+ /**
+ * @param totalVcpusUsage the totalVcpusUsage to set
+ */
+ public void setTotalVcpusUsage(BigDecimal totalVcpusUsage) {
+ this.totalVcpusUsage = totalVcpusUsage;
+ }
+
+ /**
+ * @return the totalLocalGbUsage
+ */
+ public BigDecimal getTotalLocalGbUsage() {
+ return totalLocalGbUsage;
+ }
+
+ /**
+ * @param totalLocalGbUsage the totalLocalGbUsage to set
+ */
+ public void setTotalLocalGbUsage(BigDecimal totalLocalGbUsage) {
+ this.totalLocalGbUsage = totalLocalGbUsage;
+ }
+
+ /**
+ * @return the start
+ */
+ public String getStart() {
+ return start;
+ }
+
+ /**
+ * @param start the start to set
+ */
+ public void setStart(String start) {
+ this.start = start;
+ }
+
+ /**
+ * @return the stop
+ */
+ public String getStop() {
+ return stop;
+ }
+
+ /**
+ * @param stop the stop to set
+ */
+ public void setStop(String stop) {
+ this.stop = stop;
+ }
+
+ /**
+ * @return the tenantId
+ */
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ /**
+ * @param tenantId the tenantId to set
+ */
+ public void setTenantId(String tenantId) {
+ this.tenantId = tenantId;
+ }
+
+ /**
+ * @return the totalHours
+ */
+ public String getTotalHours() {
+ return totalHours;
+ }
+
+ /**
+ * @param totalHours the totalHours to set
+ */
+ public void setTotalHours(String totalHours) {
+ this.totalHours = totalHours;
+ }
+
+ public List<ServerUsage> getServerUsages() {
+ return serverUsages;
+ }
+
+ public void setServerUsages(List<ServerUsage> serverUsages) {
+ this.serverUsages = serverUsages;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "SimpleTenantUsage [totalMemoryMbUsage=" + totalMemoryMbUsage
+ + ", totalVcpusUsage=" + totalVcpusUsage
+ + ", totalLocalGbUsage=" + totalLocalGbUsage + ", start="
+ + start + ", stop=" + stop + ", tenantId=" + tenantId
+ + ", totalHours=" + totalHours + "]";
+ }
+
+ public static final class ServerUsage implements Serializable {
+ @JsonProperty("instance_id")
+ private String instanceId;
+
+ private Integer uptime;
+
+ @JsonProperty("started_at")
+ private String startedAt;
+
+ @JsonProperty("ended_at")
+ private String endedAt;
+
+ @JsonProperty("memory_mb")
+ private Integer memoryMb;
+
+ @JsonProperty("tenant_id")
+ private String tenantId;
+
+ private String state;
+
+ private Double hours;
+
+ private Integer vcpus;
+
+ private String flavor;
+
+ @JsonProperty("local_gb")
+ private Integer localDiskSize;
+
+ private String name;
+
+ public String getInstanceId() {
+ return instanceId;
+ }
+
+ public Integer getUptime() {
+ return uptime;
+ }
+
+ public String getStartedAt() {
+ return startedAt;
+ }
+
+ public String getEndedAt() {
+ return endedAt;
+ }
+
+ public Integer getMemoryMb() {
+ return memoryMb;
+ }
+
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public Double getHours() {
+ return hours;
+ }
+
+ public Integer getVcpus() {
+ return vcpus;
+ }
+
+ public String getFlavor() {
+ return flavor;
+ }
- public Integer getLocalDiskSize() {
- return localDiskSize;
- }
+ public Integer getLocalDiskSize() {
+ return localDiskSize;
+ }
- public String getName() {
- return name;
- }
- }
+ public String getName() {
+ return name;
+ }
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java
index 087d616..313e5eb 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class SimpleTenantUsages implements Iterable<SimpleTenantUsage>, Serializable {
- @JsonProperty("tenant_usages")
- private List<SimpleTenantUsage> list;
-
- /**
- * @return the list
- */
- public List<SimpleTenantUsage> getList() {
- return list;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "SimpleTenantUsage [list=" + list + "]";
- }
-
- @Override
- public Iterator<SimpleTenantUsage> iterator() {
- return list.iterator();
- }
-
+ @JsonProperty("tenant_usages")
+ private List<SimpleTenantUsage> list;
+
+ /**
+ * @return the list
+ */
+ public List<SimpleTenantUsage> getList() {
+ return list;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "SimpleTenantUsage [list=" + list + "]";
+ }
+
+ @Override
+ public Iterator<SimpleTenantUsage> iterator() {
+ return list.iterator();
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java
index 2fb547b..c51ab62 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java
@@ -24,80 +24,80 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("snapshot")
public class Snapshot implements Serializable {
- private String id;
-
- private String status;
-
- @JsonProperty("displayName")
- private String name;
-
- @JsonProperty("displayDescription")
- private String description;
-
- private String volumeId;
-
- private Integer size;
-
- private String createdAt;
+ private String id;
+
+ private String status;
+
+ @JsonProperty("displayName")
+ private String name;
+
+ @JsonProperty("displayDescription")
+ private String description;
+
+ private String volumeId;
+
+ private Integer size;
+
+ private String createdAt;
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
+ /**
+ * @return the status
+ */
+ public String getStatus() {
+ return status;
+ }
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
- /**
- * @return the volumeId
- */
- public String getVolumeId() {
- return volumeId;
- }
+ /**
+ * @return the volumeId
+ */
+ public String getVolumeId() {
+ return volumeId;
+ }
- /**
- * @return the size
- */
- public Integer getSize() {
- return size;
- }
+ /**
+ * @return the size
+ */
+ public Integer getSize() {
+ return size;
+ }
- /**
- * @return the createdAt
- */
- public String getCreatedAt() {
- return createdAt;
- }
+ /**
+ * @return the createdAt
+ */
+ public String getCreatedAt() {
+ return createdAt;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Snapshot [id=" + id + ", status=" + status + ", displayName="
- + name + ", displayDescription=" + description
- + ", volumeId=" + volumeId + ", size=" + size + ", createdAt="
- + createdAt + "]";
- }
-
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Snapshot [id=" + id + ", status=" + status + ", displayName="
+ + name + ", displayDescription=" + description
+ + ", volumeId=" + volumeId + ", size=" + size + ", createdAt="
+ + createdAt + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java
index 4fa37c0..752eb59 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java
@@ -23,81 +23,81 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("snapshot")
public class SnapshotForCreate implements Serializable {
-
- @JsonProperty("volume_id")
- private String volumeId;
-
- private Boolean force;
-
- @JsonProperty("display_name")
- private String name;
+
+ @JsonProperty("volume_id")
+ private String volumeId;
+
+ private Boolean force;
+
+ @JsonProperty("display_name")
+ private String name;
- @JsonProperty("display_description")
- private String description;
+ @JsonProperty("display_description")
+ private String description;
- /**
- * @return the volumeId
- */
- public String getVolumeId() {
- return volumeId;
- }
+ /**
+ * @return the volumeId
+ */
+ public String getVolumeId() {
+ return volumeId;
+ }
- /**
- * @param volumeId the volumeId to set
- */
- public void setVolumeId(String volumeId) {
- this.volumeId = volumeId;
- }
+ /**
+ * @param volumeId the volumeId to set
+ */
+ public void setVolumeId(String volumeId) {
+ this.volumeId = volumeId;
+ }
- /**
- * @return the force
- */
- public Boolean getForce() {
- return force;
- }
+ /**
+ * @return the force
+ */
+ public Boolean getForce() {
+ return force;
+ }
- /**
- * @param force the force to set
- */
- public void setForce(Boolean force) {
- this.force = force;
- }
+ /**
+ * @param force the force to set
+ */
+ public void setForce(Boolean force) {
+ this.force = force;
+ }
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
+ /**
+ * @param description the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "SnapshotForCreate [volumeId=" + volumeId + ", force=" + force
- + ", name=" + name + ", description=" + description + "]";
- }
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "SnapshotForCreate [volumeId=" + volumeId + ", force=" + force
+ + ", name=" + name + ", description=" + description + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java
index c71c8cf..238a173 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class Snapshots implements Iterable<Snapshot>, Serializable {
- @JsonProperty("snapshots")
- private List<Snapshot> list;
+ @JsonProperty("snapshots")
+ private List<Snapshot> list;
- /**
- * @return the list
- */
- public List<Snapshot> getList() {
- return list;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Snapshots [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<Snapshot> getList() {
+ return list;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Snapshots [list=" + list + "]";
+ }
- @Override
- public Iterator<Snapshot> iterator() {
- return list.iterator();
- }
-
+ @Override
+ public Iterator<Snapshot> iterator() {
+ return list.iterator();
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java
index 50d1c91..453bf24 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java
@@ -26,107 +26,107 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("volume")
public class Volume implements Serializable {
- private String id;
-
- private String status;
-
- @JsonProperty("displayName")
- private String name;
-
- @JsonProperty("displayDescription")
- private String description;
-
- private String availabilityZone;
-
- private String volumeType;
-
- private String snapshotId;
-
- private List<Map<String, Object>> attachments;
-
- private Map<String, String> metadata;
-
- private String createdAt;
-
- private Integer size;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @return the availabilityZone
- */
- public String getAvailabilityZone() {
- return availabilityZone;
- }
-
- /**
- * @return the volumeType
- */
- public String getVolumeType() {
- return volumeType;
- }
-
- /**
- * @return the snapshotId
- */
- public String getSnapshotId() {
- return snapshotId;
- }
-
- /**
- * @return the attachments
- */
- public List<Map<String, Object>> getAttachments() {
- return attachments;
- }
-
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- /**
- * @return the createdAt
- */
- public String getCreatedAt() {
- return createdAt;
- }
-
- /**
- * @return the size
- */
- public Integer getSize() {
- return size;
- }
-
-
-
+ private String id;
+
+ private String status;
+
+ @JsonProperty("displayName")
+ private String name;
+
+ @JsonProperty("displayDescription")
+ private String description;
+
+ private String availabilityZone;
+
+ private String volumeType;
+
+ private String snapshotId;
+
+ private List<Map<String, Object>> attachments;
+
+ private Map<String, String> metadata;
+
+ private String createdAt;
+
+ private Integer size;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @return the status
+ */
+ public String getStatus() {
+ return status;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @return the availabilityZone
+ */
+ public String getAvailabilityZone() {
+ return availabilityZone;
+ }
+
+ /**
+ * @return the volumeType
+ */
+ public String getVolumeType() {
+ return volumeType;
+ }
+
+ /**
+ * @return the snapshotId
+ */
+ public String getSnapshotId() {
+ return snapshotId;
+ }
+
+ /**
+ * @return the attachments
+ */
+ public List<Map<String, Object>> getAttachments() {
+ return attachments;
+ }
+
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ /**
+ * @return the createdAt
+ */
+ public String getCreatedAt() {
+ return createdAt;
+ }
+
+ /**
+ * @return the size
+ */
+ public Integer getSize() {
+ return size;
+ }
+
+
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java
index 1dd7c2a..3a62cca 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java
@@ -23,53 +23,53 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("volumeAttachment")
public class VolumeAttachment implements Serializable {
- private String id;
+ private String id;
- private String volumeId;
+ private String volumeId;
- private String serverId;
+ private String serverId;
- private String device;
+ private String device;
- public String getId() {
- return id;
- }
+ public String getId() {
+ return id;
+ }
- public void setId(String id) {
- this.id = id;
- }
+ public void setId(String id) {
+ this.id = id;
+ }
- public String getVolumeId() {
- return volumeId;
- }
+ public String getVolumeId() {
+ return volumeId;
+ }
- public void setVolumeId(String volumeId) {
- this.volumeId = volumeId;
- }
+ public void setVolumeId(String volumeId) {
+ this.volumeId = volumeId;
+ }
- public String getServerId() {
- return serverId;
- }
+ public String getServerId() {
+ return serverId;
+ }
- public void setServerId(String serverId) {
- this.serverId = serverId;
- }
+ public void setServerId(String serverId) {
+ this.serverId = serverId;
+ }
- public String getDevice() {
- return device;
- }
+ public String getDevice() {
+ return device;
+ }
- public void setDevice(String device) {
- this.device = device;
- }
+ public void setDevice(String device) {
+ this.device = device;
+ }
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "VolumeAttachment [id=" + id + ", volumeId=" + volumeId
- + ", serverId=" + serverId + ", device=" + device + "]";
- }
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "VolumeAttachment [id=" + id + ", volumeId=" + volumeId
+ + ", serverId=" + serverId + ", device=" + device + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java
index 54e870c..2a5ecba 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class VolumeAttachments implements Iterable<VolumeAttachment>, Serializable {
- @JsonProperty("volumeAttachments")
- private List<VolumeAttachment> list;
-
- /**
- * @return the list
- */
- public List<VolumeAttachment> getList() {
- return list;
- }
-
- @Override
- public Iterator<VolumeAttachment> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "VolumeAttachments [list=" + list + "]";
- }
+ @JsonProperty("volumeAttachments")
+ private List<VolumeAttachment> list;
+
+ /**
+ * @return the list
+ */
+ public List<VolumeAttachment> getList() {
+ return list;
+ }
+
+ @Override
+ public Iterator<VolumeAttachment> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "VolumeAttachments [list=" + list + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java
index 13e7932..c06d692 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java
@@ -25,115 +25,115 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("volume")
public class VolumeForCreate implements Serializable {
- private Integer size;
-
- @JsonProperty("availability_zone")
- private String availabilityZone;
-
- @JsonProperty("display_name")
- private String name;
-
- @JsonProperty("display_description")
- private String description;
-
- @JsonProperty("snapshot_id")
- private Integer snapshotId;
-
- private Map<String, String> metadata;
-
- /**
- * @return the size
- */
- public Integer getSize() {
- return size;
- }
-
- /**
- * @param size the size to set
- */
- public void setSize(Integer size) {
- this.size = size;
- }
-
- /**
- * @return the availabilityZone
- */
- public String getAvailabilityZone() {
- return availabilityZone;
- }
-
- /**
- * @param availabilityZone the availabilityZone to set
- */
- public void setAvailabilityZone(String availabilityZone) {
- this.availabilityZone = availabilityZone;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * @return the snapshotId
- */
- public Integer getSnapshotId() {
- return snapshotId;
- }
-
- /**
- * @param snapshotId the snapshotId to set
- */
- public void setSnapshotId(Integer snapshotId) {
- this.snapshotId = snapshotId;
- }
-
- /**
- * @return the metadata
- */
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- /**
- * @param metadata the metadata to set
- */
- public void setMetadata(Map<String, String> metadata) {
- this.metadata = metadata;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "VolumeForCreate [size=" + size + ", availabilityZone="
- + availabilityZone + ", name=" + name + ", description="
- + description + ", snapshotId=" + snapshotId + ", metadata="
- + metadata + "]";
- }
+ private Integer size;
+
+ @JsonProperty("availability_zone")
+ private String availabilityZone;
+
+ @JsonProperty("display_name")
+ private String name;
+
+ @JsonProperty("display_description")
+ private String description;
+
+ @JsonProperty("snapshot_id")
+ private Integer snapshotId;
+
+ private Map<String, String> metadata;
+
+ /**
+ * @return the size
+ */
+ public Integer getSize() {
+ return size;
+ }
+
+ /**
+ * @param size the size to set
+ */
+ public void setSize(Integer size) {
+ this.size = size;
+ }
+
+ /**
+ * @return the availabilityZone
+ */
+ public String getAvailabilityZone() {
+ return availabilityZone;
+ }
+
+ /**
+ * @param availabilityZone the availabilityZone to set
+ */
+ public void setAvailabilityZone(String availabilityZone) {
+ this.availabilityZone = availabilityZone;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @param description the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * @return the snapshotId
+ */
+ public Integer getSnapshotId() {
+ return snapshotId;
+ }
+
+ /**
+ * @param snapshotId the snapshotId to set
+ */
+ public void setSnapshotId(Integer snapshotId) {
+ this.snapshotId = snapshotId;
+ }
+
+ /**
+ * @return the metadata
+ */
+ public Map<String, String> getMetadata() {
+ return metadata;
+ }
+
+ /**
+ * @param metadata the metadata to set
+ */
+ public void setMetadata(Map<String, String> metadata) {
+ this.metadata = metadata;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "VolumeForCreate [size=" + size + ", availabilityZone="
+ + availabilityZone + ", name=" + name + ", description="
+ + description + ", snapshotId=" + snapshotId + ", metadata="
+ + metadata + "]";
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java
index 3b5df21..f368f5c 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java
@@ -23,65 +23,65 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonRootName("os-volume_upload_image")
public class VolumeForImageCreate implements Serializable {
- String volumeId;
- String tenantId;
-
- public String getTenantId() {
- return tenantId;
- }
-
- public void setTenantId(String tenantId) {
- this.tenantId = tenantId;
- }
-
- @JsonProperty("force")
- private Boolean force;
-
- public Boolean getForce() {
- return force;
- }
-
- public void setForce(Boolean force) {
- this.force = force;
- }
-
- @JsonProperty("container_format")
- String container_format;
- @JsonProperty("disk_format")
- String disk_format;
- @JsonProperty("image_name")
- String image_name;
-
- public String getVolumeId() {
- return volumeId;
- }
-
- public void setVolumeId(String volumeId) {
- this.volumeId = volumeId;
- }
-
- public String getContainer_format() {
- return container_format;
- }
-
- public void setContainer_format(String container_format) {
- this.container_format = container_format;
- }
-
- public String getDisk_format() {
- return disk_format;
- }
-
- public void setDisk_format(String disk_format) {
- this.disk_format = disk_format;
- }
-
- public String getImage_name() {
- return image_name;
- }
-
- public void setImage_name(String image_name) {
- this.image_name = image_name;
- }
+ String volumeId;
+ String tenantId;
+
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(String tenantId) {
+ this.tenantId = tenantId;
+ }
+
+ @JsonProperty("force")
+ private Boolean force;
+
+ public Boolean getForce() {
+ return force;
+ }
+
+ public void setForce(Boolean force) {
+ this.force = force;
+ }
+
+ @JsonProperty("container_format")
+ String container_format;
+ @JsonProperty("disk_format")
+ String disk_format;
+ @JsonProperty("image_name")
+ String image_name;
+
+ public String getVolumeId() {
+ return volumeId;
+ }
+
+ public void setVolumeId(String volumeId) {
+ this.volumeId = volumeId;
+ }
+
+ public String getContainer_format() {
+ return container_format;
+ }
+
+ public void setContainer_format(String container_format) {
+ this.container_format = container_format;
+ }
+
+ public String getDisk_format() {
+ return disk_format;
+ }
+
+ public void setDisk_format(String disk_format) {
+ this.disk_format = disk_format;
+ }
+
+ public String getImage_name() {
+ return image_name;
+ }
+
+ public void setImage_name(String image_name) {
+ this.image_name = image_name;
+ }
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java
index fd7149c..96fc6c5 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class VolumeTypes implements Iterable<VolumeType>, Serializable {
- @JsonProperty("volume-types")
- private List<VolumeType> list;
+ @JsonProperty("volume-types")
+ private List<VolumeType> list;
- /**
- * @return the list
- */
- public List<VolumeType> getList() {
- return list;
- }
+ /**
+ * @return the list
+ */
+ public List<VolumeType> getList() {
+ return list;
+ }
- @Override
- public Iterator<VolumeType> iterator() {
- return list.iterator();
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "VolumeTypes [list=" + list + "]";
- }
-
+ @Override
+ public Iterator<VolumeType> iterator() {
+ return list.iterator();
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "VolumeTypes [list=" + list + "]";
+ }
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java
index d71dcd6..1dc5bde 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java
@@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty;
public class Volumes implements Iterable<Volume>, Serializable {
- @JsonProperty("volumes")
- private List<Volume> list;
+ @JsonProperty("volumes")
+ private List<Volume> list;
- /**
- * @return the list
- */
- public List<Volume> getList() {
- return list;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Volumes [list=" + list + "]";
- }
+ /**
+ * @return the list
+ */
+ public List<Volume> getList() {
+ return list;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "Volumes [list=" + list + "]";
+ }
- @Override
- public Iterator<Volume> iterator() {
- return list.iterator();
- }
-
+ @Override
+ public Iterator<Volume> iterator() {
+ return list.iterator();
+ }
+
}