diff options
Diffstat (limited to 'cinder-model/src/main/java')
23 files changed, 521 insertions, 406 deletions
diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java index 16be17b..bc35c69 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/BaseConnection.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,12 +13,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.HashMap; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonProperty; public abstract class BaseConnection implements Serializable { @@ -32,8 +33,7 @@ public abstract class BaseConnection implements Serializable { } /** - * @param connector - * the connector to set + * @param connector the connector to set */ public void setConnector(Map<String, Object> connector) { this.connector = connector; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Capabilities.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Capabilities.java index 7a1609c..1140a24 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Capabilities.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Capabilities.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +13,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; @@ -56,98 +58,114 @@ public class Capabilities implements Serializable { public String getPoolName() { return poolName; } + public void setPoolName(String poolName) { this.poolName = poolName; } + public boolean isQosSupport() { return qosSupport; } + public void setQosSupport(boolean qosSupport) { this.qosSupport = qosSupport; } + public Long getAllocatedCapacityGb() { return allocatedCapacityGb; } + public void setAllocatedCapacityGb(Long allocatedCapacityGb) { this.allocatedCapacityGb = allocatedCapacityGb; } + public String getDriverVersion() { return driverVersion; } + public void setDriverVersion(String driverVersion) { this.driverVersion = driverVersion; } + public Long getFreeCapacityGb() { return freeCapacityGb; } + public void setFreeCapacityGb(Long freeCapacityGb) { this.freeCapacityGb = freeCapacityGb; } + public String getLocationInfo() { return locationInfo; } + public void setLocationInfo(String locationInfo) { this.locationInfo = locationInfo; } + public String getTimestamp() { return timestamp; } + public void setTimestamp(String timestamp) { this.timestamp = timestamp; } + public String getVolumeBackendName() { return volumeBackendName; } + public void setVolumeBackendName(String volumeBackendName) { this.volumeBackendName = volumeBackendName; } + public Long getTotalCapacityGb() { return totalCapacityGb; } + public void setTotalCapacityGb(Long totalCapacityGb) { this.totalCapacityGb = totalCapacityGb; } + public Integer getReservedPercentage() { return reservedPercentage; } + public void setReservedPercentage(Integer reservedPercentage) { this.reservedPercentage = reservedPercentage; } + public String getVendorName() { return vendorName; } + public void setVendorName(String vendorName) { this.vendorName = vendorName; } + public String getStorageProtocol() { return storageProtocol; } + public void setStorageProtocol(String storageProtocol) { this.storageProtocol = storageProtocol; } + public Map<String, String> getExtraSpecs() { return extraSpecs; } + public void setExtraSpecs(Map<String, String> extraSpecs) { this.extraSpecs = extraSpecs; } @Override public String toString() { - return "Capabilities{" - + "poolName='" + poolName - + ", qosSupport='" + qosSupport - + ", allocatedCapacityGb='" + allocatedCapacityGb - + ", driverVersion='" + driverVersion - + ", freeCapacityGb='" + freeCapacityGb - + ", locationInfo='" + locationInfo - + ", timestamp='" + timestamp - + ", volumeBackendName='" + volumeBackendName - + ", totalCapacityGb='" + totalCapacityGb - + ", reservedPercentage='" + reservedPercentage - + ", vendorName='" + vendorName - + ", storageProtocol='" + storageProtocol - + ", extraSpecs='" + extraSpecs - + '}'; + return "Capabilities{" + "poolName='" + poolName + ", qosSupport='" + qosSupport + ", allocatedCapacityGb='" + + allocatedCapacityGb + ", driverVersion='" + driverVersion + ", freeCapacityGb='" + freeCapacityGb + + ", locationInfo='" + locationInfo + ", timestamp='" + timestamp + ", volumeBackendName='" + + volumeBackendName + ", totalCapacityGb='" + totalCapacityGb + ", reservedPercentage='" + + reservedPercentage + ", vendorName='" + vendorName + ", storageProtocol='" + storageProtocol + + ", extraSpecs='" + extraSpecs + '}'; } } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java index 7406eea..85ca34b 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForInitialize.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +13,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import com.fasterxml.jackson.annotation.JsonRootName; - import java.io.Serializable; @JsonRootName("os-initialize_connection") diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java index 208fc54..83ad8f5 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionForTerminate.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +13,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import com.fasterxml.jackson.annotation.JsonRootName; - import java.io.Serializable; @JsonRootName("os-terminate_connection") diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionInfo.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionInfo.java index 1bf9677..3a6502f 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionInfo.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/ConnectionInfo.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,11 +13,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; @@ -36,8 +37,7 @@ public class ConnectionInfo implements Serializable { } /** - * @param driverVolumeType - * the driverVolumeType to set + * @param driverVolumeType the driverVolumeType to set */ public void setDriverVolumeType(String driverVolumeType) { this.driverVolumeType = driverVolumeType; @@ -51,8 +51,7 @@ public class ConnectionInfo implements Serializable { } /** - * @param data - * the data to set + * @param data the data to set */ public void setData(Map<String, Object> data) { this.data = data; @@ -65,8 +64,7 @@ public class ConnectionInfo implements Serializable { */ @Override public String toString() { - return "ConnectionInfo [driverVolumeType=" + driverVolumeType + "," + - " data=" + data + "]"; + return "ConnectionInfo [driverVolumeType=" + driverVolumeType + "," + " data=" + data + "]"; } } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Limits.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Limits.java index 6c83845..cffe0c7 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Limits.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Limits.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,11 +13,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; - import java.io.Serializable; import java.util.Calendar; import java.util.List; @@ -24,237 +25,232 @@ import java.util.List; @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 maxTotalVolumes; - private Integer totalVolumesUsed; - - private Integer maxTotalSnapshots; - private Integer totalSnapshotsUsed; - - private Integer maxTotalVolumeGigabytes; - private Integer totalGigabytesUsed; - - private Integer maxTotalBackups; - private Integer totalBackupsUsed; - - private Integer maxTotalBackupGigabytes; - private Integer totalBackupGigabytesUsed; - - /** - * @return the maxTotalVolumes - */ - public Integer getMaxTotalVolumes() { - return maxTotalVolumes; - } - - /** - * @return the totalVolumesUsed - */ - public Integer getTotalVolumesUsed() { - return totalVolumesUsed; - } - - /** - * @return the maxTotalSnapshots - */ - public Integer getMaxTotalSnapshots() { - return maxTotalSnapshots; - } - - /** - * @return the totalSnapshotsUsed - */ - public Integer getTotalSnapshotsUsed() { - return totalSnapshotsUsed; - } - - /** - * @return the maxTotalVolumeGigabytes - */ - public Integer getMaxTotalVolumeGigabytes() { - return maxTotalVolumeGigabytes; - } - - /** - * @return the totalGigabytesUsed - */ - public Integer getTotalGigabytesUsed() { - return totalGigabytesUsed; - } - - /** - * @return the maxTotalBackupGigabytes - */ - public Integer getMaxTotalBackupGigabytes() { - return maxTotalBackupGigabytes; - } - - /** - * @return the totalBackupGigabytesUsed - */ - public Integer getTotalBackupGigabytesUsed() { - return totalBackupGigabytesUsed; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "AbsoluteLimit [maxTotalVolumes=" + maxTotalVolumes + - ", totalVolumesUsed=" + totalVolumesUsed + - ", maxTotalSnapshots=" + maxTotalSnapshots + - ", totalSnapshotsUsed=" + totalSnapshotsUsed + - ", maxTotalVolumeGigabytes=" + maxTotalVolumeGigabytes + - ", totalGigabytesUsed=" + totalGigabytesUsed + - ", maxTotalBackupGigabytes=" + maxTotalBackupGigabytes + - ", totalBackupGigabytesUsed=" + totalBackupGigabytesUsed +"]"; - } - - } - - 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 maxTotalVolumes; + private Integer totalVolumesUsed; + + private Integer maxTotalSnapshots; + private Integer totalSnapshotsUsed; + + private Integer maxTotalVolumeGigabytes; + private Integer totalGigabytesUsed; + + private Integer maxTotalBackups; + private Integer totalBackupsUsed; + + private Integer maxTotalBackupGigabytes; + private Integer totalBackupGigabytesUsed; + + /** + * @return the maxTotalVolumes + */ + public Integer getMaxTotalVolumes() { + return maxTotalVolumes; + } + + /** + * @return the totalVolumesUsed + */ + public Integer getTotalVolumesUsed() { + return totalVolumesUsed; + } + + /** + * @return the maxTotalSnapshots + */ + public Integer getMaxTotalSnapshots() { + return maxTotalSnapshots; + } + + /** + * @return the totalSnapshotsUsed + */ + public Integer getTotalSnapshotsUsed() { + return totalSnapshotsUsed; + } + + /** + * @return the maxTotalVolumeGigabytes + */ + public Integer getMaxTotalVolumeGigabytes() { + return maxTotalVolumeGigabytes; + } + + /** + * @return the totalGigabytesUsed + */ + public Integer getTotalGigabytesUsed() { + return totalGigabytesUsed; + } + + /** + * @return the maxTotalBackupGigabytes + */ + public Integer getMaxTotalBackupGigabytes() { + return maxTotalBackupGigabytes; + } + + /** + * @return the totalBackupGigabytesUsed + */ + public Integer getTotalBackupGigabytesUsed() { + return totalBackupGigabytesUsed; + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "AbsoluteLimit [maxTotalVolumes=" + maxTotalVolumes + ", totalVolumesUsed=" + totalVolumesUsed + + ", maxTotalSnapshots=" + maxTotalSnapshots + ", totalSnapshotsUsed=" + totalSnapshotsUsed + + ", maxTotalVolumeGigabytes=" + maxTotalVolumeGigabytes + ", totalGigabytesUsed=" + + totalGigabytesUsed + ", maxTotalBackupGigabytes=" + maxTotalBackupGigabytes + + ", totalBackupGigabytesUsed=" + totalBackupGigabytesUsed + "]"; + } + + } + + 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/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Link.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Link.java new file mode 100644 index 0000000..7bfab0c --- /dev/null +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Link.java @@ -0,0 +1,48 @@ +/*- + * ============LICENSE_START======================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.cinder.model; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class Link { + @JsonProperty("href") + private String href; + + @JsonProperty("rel") + private String rel; + + public String getHref() { + return href; + } + + public void setHref(String href) { + this.href = href; + } + + public String getRel() { + return rel; + } + + public void setRel(String rel) { + this.rel = rel; + } + + @Override + public String toString() { + return "Link{" + "href='" + href + '\'' + ", rel='" + rel + '\'' + '}'; + } +} diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Metadata.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Metadata.java index b8ed1df..e20f8b2 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Metadata.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Metadata.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +13,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.util.Map; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pool.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pool.java index 4f292c4..e1b5c14 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pool.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pool.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +13,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; @@ -48,9 +50,6 @@ public class Pool implements Serializable { @Override public String toString() { - return "Pool{" - + "name='" + name - + ", capabilities='" + capabilities - + '}'; + return "Pool{" + "name='" + name + ", capabilities='" + capabilities + '}'; } } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pools.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pools.java index 771b0ac..72c934b 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pools.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Pools.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,6 +13,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshot.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshot.java index 6f78c8f..49fd15d 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshot.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshot.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,11 +13,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; @@ -104,10 +105,9 @@ public class Snapshot implements Serializable { */ @Override public String toString() { - return "Snapshot [id=" + id + ", status=" + status + - ", name=" + name + ", description=" + description + - ", volumeId=" + volumeId + ", size=" + size + - ", createdAt=" + createdAt + ", metadata=" + metadata + "]"; + return "Snapshot [id=" + id + ", status=" + status + ", name=" + name + ", description=" + description + + ", volumeId=" + volumeId + ", size=" + size + ", createdAt=" + createdAt + ", metadata=" + metadata + + "]"; } } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForCreate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForCreate.java index e2896b8..4e343b1 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForCreate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForCreate.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +13,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; @@ -39,8 +40,7 @@ public class SnapshotForCreate implements Serializable { } /** - * @param volumeId - * the volumeId to set + * @param volumeId the volumeId to set */ public void setVolumeId(String volumeId) { this.volumeId = volumeId; @@ -54,8 +54,7 @@ public class SnapshotForCreate implements Serializable { } /** - * @param force - * the force to set + * @param force the force to set */ public void setForce(Boolean force) { this.force = force; @@ -69,8 +68,7 @@ public class SnapshotForCreate implements Serializable { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -84,8 +82,7 @@ public class SnapshotForCreate implements Serializable { } /** - * @param description - * the description to set + * @param description the description to set */ public void setDescription(String description) { this.description = description; @@ -98,8 +95,8 @@ public class SnapshotForCreate implements Serializable { */ @Override public String toString() { - return "SnapshotForCreate [volumeId=" + volumeId + ", force=" + force - + ", name=" + name + ", description=" + description + "]"; + return "SnapshotForCreate [volumeId=" + volumeId + ", force=" + force + ", name=" + name + ", description=" + + description + "]"; } } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForUpdate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForUpdate.java index dd16b55..dfb3dc8 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForUpdate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/SnapshotForUpdate.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +13,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("snapshot") @@ -33,8 +34,7 @@ public class SnapshotForUpdate implements Serializable { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -48,8 +48,7 @@ public class SnapshotForUpdate implements Serializable { } /** - * @param description - * the description to set + * @param description the description to set */ public void setDescription(String description) { this.description = description; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshots.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshots.java index aec991a..6cf465e 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshots.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Snapshots.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,12 +13,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; public class Snapshots implements Iterable<Snapshot>, Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volume.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volume.java index 6d0068c..c7f6382 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volume.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volume.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,14 +13,16 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package com.woorea.openstack.cinder.model; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonRootName; + +package com.woorea.openstack.cinder.model; import java.io.Serializable; +import java.util.Date; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume") public class Volume implements Serializable { @@ -28,8 +31,10 @@ public class Volume implements Serializable { private String status; + @JsonProperty("name") private String name; + @JsonProperty("description") private String description; @JsonProperty("availability_zone") @@ -38,24 +43,116 @@ public class Volume implements Serializable { @JsonProperty("volume_type") private String volumeType; + @JsonProperty("bootable") + private String bootable; + + @JsonProperty("os-vol-host-attr:host") + private String osVolhostAttribute; + + @JsonProperty("os-vol-tenant-attr:tenant_id") + private String tenantId; + @JsonProperty("snapshot_id") private String snapshotId; @JsonProperty("source_volid") private String sourceVolid; - @JsonProperty("bootable") - private Boolean bootable; + private List<Link> links; private List<Map<String, Object>> attachments; private Map<String, String> metadata; @JsonProperty("created_at") - private String createdAt; + private Date createdAt; private Integer size; + public String getBootable() { + return bootable; + } + + public void setBootable(String bootable) { + this.bootable = bootable; + } + + public String getOsVolhostAttribute() { + return osVolhostAttribute; + } + + public void setOsVolhostAttribute(String osVolhostAttribute) { + this.osVolhostAttribute = osVolhostAttribute; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getSourceVolid() { + return sourceVolid; + } + + public void setSourceVolid(String sourceVolid) { + this.sourceVolid = sourceVolid; + } + + public List<Link> getLinks() { + return links; + } + + public void setLinks(List<Link> links) { + this.links = links; + } + + public void setId(String id) { + this.id = id; + } + + public void setStatus(String status) { + this.status = status; + } + + public void setName(String name) { + this.name = name; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setAvailabilityZone(String availabilityZone) { + this.availabilityZone = availabilityZone; + } + + public void setVolumeType(String volumeType) { + this.volumeType = volumeType; + } + + public void setSnapshotId(String snapshotId) { + this.snapshotId = snapshotId; + } + + public void setAttachments(List<Map<String, Object>> attachments) { + this.attachments = attachments; + } + + public void setMetadata(Map<String, String> metadata) { + this.metadata = metadata; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public void setSize(Integer size) { + this.size = size; + } + /** * @return the id */ @@ -106,36 +203,6 @@ public class Volume implements Serializable { } /** - * @return the ID of an existing volume (specify in order to create a volume from an existing volume) - */ - public String getSourceVolid() { - return sourceVolid; - } - - /** - * @param sourceVolid - * to set - */ - public void setSourceVolid(String sourceVolid) { - this.sourceVolid = sourceVolid; - } - - /** - * @param volumeType - * to set - */ - public void setVolumeType(String volumeType) { - this.volumeType = volumeType; - } - - /** - * @return the bootable flag to set - */ - public Boolean getBootable() { - return bootable; - } - - /** * @return the attachments */ public List<Map<String, Object>> getAttachments() { @@ -152,7 +219,7 @@ public class Volume implements Serializable { /** * @return the createdAt */ - public String getCreatedAt() { + public Date getCreatedAt() { return createdAt; } @@ -163,18 +230,6 @@ public class Volume implements Serializable { return size; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Volume [id=" + id + ", status=" + status + - ", name=" + name + ", description=" + description + - ", availabilityZone=" + availabilityZone + ", volumeType=" + volumeType + - ", snapshotId=" + snapshotId + ", attachments=" + attachments + - ", metadata=" + metadata + ", createdAt=" + createdAt + ", size=" + size + "]"; - } + } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForCreate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForCreate.java index dd70820..b6a65b9 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForCreate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForCreate.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,11 +13,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; @@ -59,8 +60,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param size - * the size to set + * @param size the size to set */ public void setSize(Integer size) { this.size = size; @@ -74,8 +74,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param availabilityZone - * the availabilityZone to set + * @param availabilityZone the availabilityZone to set */ public void setAvailabilityZone(String availabilityZone) { this.availabilityZone = availabilityZone; @@ -89,8 +88,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -104,8 +102,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param description - * the description to set + * @param description the description to set */ public void setDescription(String description) { this.description = description; @@ -119,8 +116,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param snapshotId - * the snapshotId to set + * @param snapshotId the snapshotId to set */ public void setSnapshotId(String snapshotId) { this.snapshotId = snapshotId; @@ -134,8 +130,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param sourceVolid - * to set + * @param sourceVolid to set */ public void setSourceVolid(String sourceVolid) { this.sourceVolid = sourceVolid; @@ -149,8 +144,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param imageRef - * to set + * @param imageRef to set */ public void setImageRef(String imageRef) { this.imageRef = imageRef; @@ -164,8 +158,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param volumeType - * to set + * @param volumeType to set */ public void setVolumeType(String volumeType) { this.volumeType = volumeType; @@ -181,8 +174,7 @@ public class VolumeForCreate implements Serializable { /** * Enables or disables the bootable attribute. You can boot an instance from a bootable volume. * - * @param bootable - * flag + * @param bootable flag */ public void setBootable(Boolean bootable) { this.bootable = bootable; @@ -196,8 +188,7 @@ public class VolumeForCreate implements Serializable { } /** - * @param metadata - * the metadata to set + * @param metadata the metadata to set */ public void setMetadata(Map<String, String> metadata) { this.metadata = metadata; @@ -210,16 +201,10 @@ public class VolumeForCreate implements Serializable { */ @Override public String toString() { - return "VolumeForCreate [size=" + size + - ", availabilityZone=" + availabilityZone + - ", name=" + name + - ", description=" + description + - ", snapshotId=" + snapshotId + - ", source_volid=" + sourceVolid + - ", imageRef=" + imageRef + - ", volume_type=" + volumeType + - ", bootable=" + bootable + - ", metadata=" + metadata + "]"; + return "VolumeForCreate [size=" + size + ", availabilityZone=" + availabilityZone + ", name=" + name + + ", description=" + description + ", snapshotId=" + snapshotId + ", source_volid=" + sourceVolid + + ", imageRef=" + imageRef + ", volume_type=" + volumeType + ", bootable=" + bootable + ", metadata=" + + metadata + "]"; } } diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForExtend.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForExtend.java index 75eee2d..f8c9a3c 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForExtend.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForExtend.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +13,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; @@ -33,8 +34,7 @@ public class VolumeForExtend implements Serializable { } /** - * @param size - * the size to set + * @param size the size to set */ public void setSize(Integer size) { this.size = size; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForImageCreate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForImageCreate.java index 916892f..46bb034 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForImageCreate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForImageCreate.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +13,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForUpdate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForUpdate.java index 5746f49..8553148 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForUpdate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeForUpdate.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,10 +13,10 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("volume") @@ -33,8 +34,7 @@ public class VolumeForUpdate implements Serializable { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -48,8 +48,7 @@ public class VolumeForUpdate implements Serializable { } /** - * @param description - * the description to set + * @param description the description to set */ public void setDescription(String description) { this.description = description; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeType.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeType.java index 73fdfe1..ade7191 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeType.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeType.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,11 +13,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypeForCreate.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypeForCreate.java index e228c27..5be1c8f 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypeForCreate.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypeForCreate.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,11 +13,11 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; @@ -36,8 +37,7 @@ public class VolumeTypeForCreate implements Serializable { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -51,8 +51,7 @@ public class VolumeTypeForCreate implements Serializable { } /** - * @param extraSpecs - * the extra_specs to set + * @param extraSpecs the extra_specs to set */ public void setExtraSpecs(Map<String, String> extraSpecs) { this.extraSpecs = extraSpecs; diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypes.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypes.java index 761a702..76b950b 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypes.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/VolumeTypes.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,12 +13,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; public class VolumeTypes implements Iterable<VolumeType>, Serializable { diff --git a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volumes.java b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volumes.java index 096bf9a..937b28f 100755 --- a/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volumes.java +++ b/cinder-model/src/main/java/com/woorea/openstack/cinder/model/Volumes.java @@ -1,4 +1,5 @@ -/* ============LICENSE_START======================================================= +/*- + * ============LICENSE_START======================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -12,12 +13,12 @@ * limitations under the License. * ============LICENSE_END========================================================= */ + package com.woorea.openstack.cinder.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; public class Volumes implements Iterable<Volume>, Serializable { @@ -32,6 +33,17 @@ public class Volumes implements Iterable<Volume>, Serializable { return list; } + @JsonProperty("volumes_links") + private List<Link> links; + + public List<Link> getLinks() { + return links; + } + + public void setLinks(List<Link> links) { + this.links = links; + } + /* * (non-Javadoc) * |