summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java651
-rw-r--r--heat-client/src/main/java/com/woorea/openstack/heat/StackResource.java21
-rw-r--r--heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java41
3 files changed, 361 insertions, 352 deletions
diff --git a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
index 70be797..59eb6eb 100644
--- a/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
+++ b/glance-model/src/main/java/com/woorea/openstack/glance/model/Image.java
@@ -20,7 +20,6 @@ import java.io.Serializable;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
-
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonRootName;
@@ -29,331 +28,327 @@ import org.codehaus.jackson.map.annotate.JsonRootName;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Image implements Serializable {
- private String id;
-
- private String uri;
-
- private String name;
-
- @JsonProperty("disk_format")
- private String diskFormat;
-
- @JsonProperty("container_format")
- private String containerFormat;
-
- private Long size;
-
- @JsonProperty("virtual_size")
- private Long virtualSize;
-
- private String checksum;
-
- @JsonProperty("created_at")
- private Calendar createdAt;
-
- @JsonProperty("updated_at")
- private Calendar updatedAt;
-
- @JsonProperty("deleted_at")
- private Calendar deletedAt;
-
- private String status;
-
- @JsonProperty("is_public")
- private boolean isPublic;
-
- @JsonProperty("min_ram")
- private Integer minRam;
-
- @JsonProperty("min_disk")
- private Integer minDisk;
-
- private String owner;
-
- @JsonProperty("deleted")
- private boolean isDeleted;
-
- @JsonProperty("protected")
- private boolean isProtected;
-
- private Map<String, Object> properties;
-
- /**
- * @return the id
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id the id to set
- */
- public void setId(String id) {
- this.id = id;
- }
-
- /**
- * @return the uri
- */
- public String getUri() {
- return uri;
- }
-
- /**
- * @param uri the uri to set
- */
- public void setUri(String uri) {
- this.uri = uri;
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * @return the diskFormat
- */
- public String getDiskFormat() {
- return diskFormat;
- }
-
- /**
- * @param diskFormat the diskFormat to set
- */
- public void setDiskFormat(String diskFormat) {
- this.diskFormat = diskFormat;
- }
-
- /**
- * @return the containerFormat
- */
- public String getContainerFormat() {
- return containerFormat;
- }
-
- /**
- * @param containerFormat the containerFormat to set
- */
- public void setContainerFormat(String containerFormat) {
- this.containerFormat = containerFormat;
- }
-
- /**
- * @return the size
- */
- public Long getSize() {
- return size;
- }
-
- /**
- * @param size the size to set
- */
- public void setSize(Long size) {
- this.size = size;
- }
-
- /**
- * @return the virtual size
- */
- public Long getVirtualSize() {
- return virtualSize;
- }
-
- /**
- * @param size the virtual size to set
- */
- public void setVirtualSize(Long virtualSize) {
- this.virtualSize = virtualSize;
- }
-
- /**
- * @return the checksum
- */
- public String getChecksum() {
- return checksum;
- }
-
- /**
- * @param checksum the checksum to set
- */
- public void setChecksum(String checksum) {
- this.checksum = checksum;
- }
-
- /**
- * @return the createdAt
- */
- public Calendar getCreatedAt() {
- return createdAt;
- }
-
- /**
- * @param createdAt the createdAt to set
- */
- public void setCreatedAt(Calendar createdAt) {
- this.createdAt = createdAt;
- }
-
- /**
- * @return the updatedAt
- */
- public Calendar getUpdatedAt() {
- return updatedAt;
- }
-
- /**
- * @param updatedAt the updatedAt to set
- */
- public void setUpdatedAt(Calendar updatedAt) {
- this.updatedAt = updatedAt;
- }
-
- /**
- * @return the deletedAt
- */
- public Calendar getDeletedAt() {
- return deletedAt;
- }
-
- /**
- * @param deletedAt the deletedAt to set
- */
- public void setDeletedAt(Calendar deletedAt) {
- this.deletedAt = deletedAt;
- }
-
- /**
- * @return the status
- */
- public String getStatus() {
- return status;
- }
-
- /**
- * @param status the status to set
- */
- public void setStatus(String status) {
- this.status = status;
- }
-
- /**
- * @return the isPublic
- */
- public boolean isPublic() {
- return isPublic;
- }
-
- /**
- * @param isPublic the isPublic to set
- */
- public void setPublic(boolean isPublic) {
- this.isPublic = isPublic;
- }
-
- /**
- * @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 owner
- */
- public String getOwner() {
- return owner;
- }
-
- /**
- * @param owner the owner to set
- */
- public void setOwner(String owner) {
- this.owner = owner;
- }
-
- /**
- * @return the isDeleted
- */
- public boolean isDeleted() {
- return isDeleted;
- }
-
- /**
- * @param isDeleted the isDeleted to set
- */
- public void setDeleted(boolean isDeleted) {
- this.isDeleted = isDeleted;
- }
-
- /**
- * @return the isProtected
- */
- public boolean isProtected() {
- return isProtected;
- }
-
- /**
- * @param isProtected the isProtected to set
- */
- public void setProtected(boolean isProtected) {
- this.isProtected = isProtected;
- }
-
- /**
- * @return the properties
- */
- public Map<String, Object> getProperties() {
- if(properties == null) {
- properties = new HashMap<String, Object>();
- }
- return properties;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "Image [id=" + id + ", uri=" + uri + ", name=" + name
- + ", diskFormat=" + diskFormat + ", containerFormat="
- + containerFormat + ", size=" + size + ", checksum=" + checksum
- + ", createdAt=" + createdAt + ", updatedAt=" + updatedAt
- + ", deletedAt=" + deletedAt + ", status=" + status
- + ", isPublic=" + isPublic + ", minRam=" + minRam
- + ", minDisk=" + minDisk + ", owner=" + owner + ", isDeleted="
- + isDeleted + ", isProtected=" + isProtected + ", properties="
- + properties + "]";
- }
-
+ private String id;
+
+ private String uri;
+
+ private String name;
+
+ @JsonProperty("disk_format")
+ private String diskFormat;
+
+ @JsonProperty("container_format")
+ private String containerFormat;
+
+ private Long size;
+
+ @JsonProperty("virtual_size")
+ private Long virtualSize;
+
+ private String checksum;
+
+ @JsonProperty("created_at")
+ private Calendar createdAt;
+
+ @JsonProperty("updated_at")
+ private Calendar updatedAt;
+
+ @JsonProperty("deleted_at")
+ private Calendar deletedAt;
+
+ private String status;
+
+ @JsonProperty("is_public")
+ private boolean isPublic;
+
+ @JsonProperty("min_ram")
+ private Integer minRam;
+
+ @JsonProperty("min_disk")
+ private Integer minDisk;
+
+ private String owner;
+
+ @JsonProperty("deleted")
+ private boolean isDeleted;
+
+ @JsonProperty("protected")
+ private boolean isProtected;
+
+ private Map<String, Object> properties;
+
+ /**
+ * @return the id
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * @param id the id to set
+ */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /**
+ * @return the uri
+ */
+ public String getUri() {
+ return uri;
+ }
+
+ /**
+ * @param uri the uri to set
+ */
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the diskFormat
+ */
+ public String getDiskFormat() {
+ return diskFormat;
+ }
+
+ /**
+ * @param diskFormat the diskFormat to set
+ */
+ public void setDiskFormat(String diskFormat) {
+ this.diskFormat = diskFormat;
+ }
+
+ /**
+ * @return the containerFormat
+ */
+ public String getContainerFormat() {
+ return containerFormat;
+ }
+
+ /**
+ * @param containerFormat the containerFormat to set
+ */
+ public void setContainerFormat(String containerFormat) {
+ this.containerFormat = containerFormat;
+ }
+
+ /**
+ * @return the size
+ */
+ public Long getSize() {
+ return size;
+ }
+
+ /**
+ * @param size the size to set
+ */
+ public void setSize(Long size) {
+ this.size = size;
+ }
+
+ /**
+ * @return the virtual size
+ */
+ public Long getVirtualSize() {
+ return virtualSize;
+ }
+
+ /**
+ * @param virtualSize the virtual size to set
+ */
+ public void setVirtualSize(Long virtualSize) {
+ this.virtualSize = virtualSize;
+ }
+
+ /**
+ * @return the checksum
+ */
+ public String getChecksum() {
+ return checksum;
+ }
+
+ /**
+ * @param checksum the checksum to set
+ */
+ public void setChecksum(String checksum) {
+ this.checksum = checksum;
+ }
+
+ /**
+ * @return the createdAt
+ */
+ public Calendar getCreatedAt() {
+ return createdAt;
+ }
+
+ /**
+ * @param createdAt the createdAt to set
+ */
+ public void setCreatedAt(Calendar createdAt) {
+ this.createdAt = createdAt;
+ }
+
+ /**
+ * @return the updatedAt
+ */
+ public Calendar getUpdatedAt() {
+ return updatedAt;
+ }
+
+ /**
+ * @param updatedAt the updatedAt to set
+ */
+ public void setUpdatedAt(Calendar updatedAt) {
+ this.updatedAt = updatedAt;
+ }
+
+ /**
+ * @return the deletedAt
+ */
+ public Calendar getDeletedAt() {
+ return deletedAt;
+ }
+
+ /**
+ * @param deletedAt the deletedAt to set
+ */
+ public void setDeletedAt(Calendar deletedAt) {
+ this.deletedAt = deletedAt;
+ }
+
+ /**
+ * @return the status
+ */
+ public String getStatus() {
+ return status;
+ }
+
+ /**
+ * @param status the status to set
+ */
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ /**
+ * @return the isPublic
+ */
+ public boolean isPublic() {
+ return isPublic;
+ }
+
+ /**
+ * @param isPublic the isPublic to set
+ */
+ public void setPublic(boolean isPublic) {
+ this.isPublic = isPublic;
+ }
+
+ /**
+ * @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 owner
+ */
+ public String getOwner() {
+ return owner;
+ }
+
+ /**
+ * @param owner the owner to set
+ */
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ /**
+ * @return the isDeleted
+ */
+ public boolean isDeleted() {
+ return isDeleted;
+ }
+
+ /**
+ * @param isDeleted the isDeleted to set
+ */
+ public void setDeleted(boolean isDeleted) {
+ this.isDeleted = isDeleted;
+ }
+
+ /**
+ * @return the isProtected
+ */
+ public boolean isProtected() {
+ return isProtected;
+ }
+
+ /**
+ * @param isProtected the isProtected to set
+ */
+ public void setProtected(boolean isProtected) {
+ this.isProtected = isProtected;
+ }
+
+ /**
+ * @return the properties
+ */
+ public Map<String, Object> getProperties() {
+ if (properties == null) {
+ properties = new HashMap<>();
+ }
+ return properties;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return String.format("Image [id=%s, uri=%s, name=%s, diskFormat=%s containerFormat=%s, size=%d, checksum=%s,"
+ + " createdAt=%s, updatedAt=%s, deletedAt=%s, status=%s, isPublic=%s, minRam=%d, minDisk=%d, owner=%s,"
+ + " isDeleted=%s, isProtected=%s, properties=%s]",
+ id, uri, name, diskFormat, containerFormat, size, checksum,
+ createdAt, updatedAt, deletedAt, status, isPublic, minRam, minDisk, owner,
+ isDeleted, isProtected, properties);
+ }
}
diff --git a/heat-client/src/main/java/com/woorea/openstack/heat/StackResource.java b/heat-client/src/main/java/com/woorea/openstack/heat/StackResource.java
index 716df9d..3af56dd 100644
--- a/heat-client/src/main/java/com/woorea/openstack/heat/StackResource.java
+++ b/heat-client/src/main/java/com/woorea/openstack/heat/StackResource.java
@@ -25,12 +25,14 @@ import com.woorea.openstack.base.client.HttpMethod;
import com.woorea.openstack.base.client.OpenStackClient;
import com.woorea.openstack.base.client.OpenStackRequest;
import com.woorea.openstack.heat.model.CreateStackParam;
-import com.woorea.openstack.heat.model.UpdateStackParam;
import com.woorea.openstack.heat.model.Stack;
import com.woorea.openstack.heat.model.Stacks;
+import com.woorea.openstack.heat.model.UpdateStackParam;
public class StackResource {
+ private static final String STACKS = "/stacks/";
+ private static final String STACK = "/stacks";
private final OpenStackClient client;
public StackResource(OpenStackClient client) {
@@ -58,35 +60,38 @@ public class StackResource {
}
public class CreateStack extends OpenStackRequest<Stack> {
+
public CreateStack(CreateStackParam params) {
- super(client, HttpMethod.POST, "/stacks", Entity.json(params), Stack.class);
+ super(client, HttpMethod.POST, STACK, Entity.json(params), Stack.class);
}
}
public class UpdateStack extends OpenStackRequest<Void> {
+
public UpdateStack(String name, UpdateStackParam params) {
- super(client, HttpMethod.PUT, "/stacks/" + name, Entity.json(params), Void.class);
+ super(client, HttpMethod.PUT, STACKS + name, Entity.json(params), Void.class);
}
}
public class DeleteStack extends OpenStackRequest<Void> {
+
public DeleteStack(String name) {
- super(client, HttpMethod.DELETE, "/stacks/" + name, null, Void.class);
+ super(client, HttpMethod.DELETE, STACKS + name, null, Void.class);
}
}
public class GetStack extends OpenStackRequest<Stack> {
+
public GetStack(String name) {
- super(client, HttpMethod.GET, "/stacks/" + name, null, Stack.class);
+ super(client, HttpMethod.GET, STACKS + name, null, Stack.class);
}
}
public class List extends OpenStackRequest<Stacks> {
+
public List() {
- super(client, HttpMethod.GET, "/stacks", null, Stacks.class);
+ super(client, HttpMethod.GET, STACK, null, Stacks.class);
}
}
-
-
}
diff --git a/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java b/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java
index 9ef0198..19808e3 100644
--- a/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java
+++ b/heat-model/src/main/java/com/woorea/openstack/heat/model/CreateStackParam.java
@@ -20,11 +20,11 @@ package com.woorea.openstack.heat.model;
* Modifications copyright (c) 2017 AT&T Intellectual Property
*/
-import org.codehaus.jackson.annotate.JsonProperty;
-
import java.util.Map;
+import org.codehaus.jackson.annotate.JsonProperty;
public class CreateStackParam {
+
@JsonProperty("stack_name")
private String stackName;
@@ -45,7 +45,7 @@ public class CreateStackParam {
@JsonProperty("disable_rollback")
private boolean disableRollback = true;
-
+
@JsonProperty("files")
private Map<String, Object> files;
@@ -119,25 +119,34 @@ public class CreateStackParam {
public void setDisableRollback(boolean disableRollback) {
this.disableRollback = disableRollback;
}
-
+
public void setFiles(Map<String, Object> files) {
- this.files = files;
+ this.files = files;
}
+
public Map<String, Object> getFiles() {
- return this.files;
+ return files;
}
@Override
public String toString() {
- return "CreateStackParam{" +
- "stackName='" + stackName + '\'' +
- ", templateUrl='" + templateUrl + '\'' +
- ", template='" + template + '\'' +
- ", parameters=" + parameters +
- ", timeoutMinutes=" + timeoutMinutes +
- ", environment='" + environment + '\'' +
- ", disableRollback='" + disableRollback + '\'' +
- ", files=" + files +
- '}';
+ return String.format("CreateStackParam{"
+ + "stackName='%s',"
+ + " templateUrl='%s',"
+ + " template='%s',"
+ + " parameters=%s,"
+ + " timeoutMinutes=%d,"
+ + " environment='%s',"
+ + " disableRollback='%s',"
+ + " files=%s"
+ + "}",
+ stackName,
+ templateUrl,
+ template,
+ parameters,
+ timeoutMinutes,
+ environment,
+ disableRollback,
+ files);
}
}