summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseshukm <seshu.kumar.m@huawei.com>2018-07-25 19:09:19 +0800
committerseshukm <seshu.kumar.m@huawei.com>2018-07-25 19:09:19 +0800
commit92253f30556016a54e03c0476e94f234b362c6b2 (patch)
tree8cf4a1d88a052afa3bd6b827aaacb1a0683ab189
parent22fbe41ad4e5360248af984496c3b1dd4b945f56 (diff)
Nova model code basic issue fix
Issue-ID: SO-729 Change-Id: I35d181b0dd32995f5ce286d38b5b17fcbcd24e9e Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
-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
9 files changed, 941 insertions, 941 deletions
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;
+ }
+
-
+
}