From 0d4bde1f33803d48c40345ae7b3dfe626752becb Mon Sep 17 00:00:00 2001 From: seshukm Date: Wed, 25 Jul 2018 18:27:32 +0800 Subject: basic code Issues of nova model Issue-ID: SO-729 Change-Id: Ib2081aedf0fd9686977f44be9a94af5215e3394f Signed-off-by: seshukm --- .../com/woorea/openstack/nova/model/Network.java | 558 ++++----- .../openstack/nova/model/NetworkForCreate.java | 40 +- .../com/woorea/openstack/nova/model/Networks.java | 42 +- .../openstack/nova/model/PersonalityFile.java | 58 +- .../com/woorea/openstack/nova/model/QuotaSet.java | 284 ++--- .../woorea/openstack/nova/model/SecurityGroup.java | 392 +++---- .../nova/model/SecurityGroupForCreate.java | 96 +- .../nova/model/SecurityGroupRuleForCreate.java | 372 +++--- .../openstack/nova/model/SecurityGroups.java | 42 +- .../com/woorea/openstack/nova/model/Server.java | 918 +++++++-------- .../woorea/openstack/nova/model/ServerAction.java | 1194 ++++++++++---------- .../openstack/nova/model/ServerForCreate.java | 604 +++++----- .../com/woorea/openstack/nova/model/Servers.java | 42 +- .../openstack/nova/model/SimpleTenantUsage.java | 436 +++---- .../openstack/nova/model/SimpleTenantUsages.java | 46 +- .../com/woorea/openstack/nova/model/Snapshot.java | 136 +-- .../openstack/nova/model/SnapshotForCreate.java | 132 +-- .../com/woorea/openstack/nova/model/Snapshots.java | 42 +- .../com/woorea/openstack/nova/model/Volume.java | 206 ++-- .../openstack/nova/model/VolumeAttachment.java | 72 +- .../openstack/nova/model/VolumeAttachments.java | 44 +- .../openstack/nova/model/VolumeForCreate.java | 220 ++-- .../openstack/nova/model/VolumeForImageCreate.java | 120 +- .../woorea/openstack/nova/model/VolumeTypes.java | 42 +- .../com/woorea/openstack/nova/model/Volumes.java | 42 +- 25 files changed, 3090 insertions(+), 3090 deletions(-) diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java index 2dfb2c2..2b8ac85 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java @@ -24,283 +24,283 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("network") public class Network implements Serializable { - private String id; - - @JsonProperty("vpn_public_address") - private String vpnPublicAddress; - - @JsonProperty("vpn_private_address") - private String vpnPrivateAddress; - - @JsonProperty("vpn_public_port") - private String vpnPublicPort; - - @JsonProperty("dhcp_start") - private String dhcpStart; - - private String bridge; - - @JsonProperty("bridge_interface") - private String bridgeInterface; - - @JsonProperty("updated_at") - private String updatedAt; - - private Boolean deleted; - - private String vlan; - - private String broadcast; - - private String netmask; - - private Boolean injected; - - private String host; - - @JsonProperty("multi_host") - private Boolean multiHost; - - @JsonProperty("created_at") - private String createdAt; - - @JsonProperty("deleted_at") - private String deletedAt; - - private String cidr; - - @JsonProperty("cidr_v6") - private String cidrV6; - - private String gateway; - - @JsonProperty("gateway_v6") - private String gatewayV6; - - @JsonProperty("netmask_v6") - private String netmaskV6; - - @JsonProperty("project_id") - private String projectId; - - @JsonProperty("rxtx_base") - private String rxtxBase; - - private String dns1; - - private String dns2; - - private String label; - - private String priority; - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @return the vpnPublicAddress - */ - public String getVpnPublicAddress() { - return vpnPublicAddress; - } - - /** - * @return the vpnPublicPort - */ - public String getVpnPublicPort() { - return vpnPublicPort; - } - - /** - * @return the dhcpStart - */ - public String getDhcpStart() { - return dhcpStart; - } - - /** - * @return the bridge - */ - public String getBridge() { - return bridge; - } - - /** - * @return the bridgeInterface - */ - public String getBridgeInterface() { - return bridgeInterface; - } - - /** - * @return the updatedAt - */ - public String getUpdatedAt() { - return updatedAt; - } - - /** - * @return the deleted - */ - public Boolean getDeleted() { - return deleted; - } - - /** - * @return the vlan - */ - public String getVlan() { - return vlan; - } - - /** - * @return the broadcast - */ - public String getBroadcast() { - return broadcast; - } - - /** - * @return the netmask - */ - public String getNetmask() { - return netmask; - } - - /** - * @return the injected - */ - public Boolean getInjected() { - return injected; - } - - /** - * @return the host - */ - public String getHost() { - return host; - } - - /** - * @return the multiHost - */ - public Boolean getMultiHost() { - return multiHost; - } - - /** - * @return the createdAt - */ - public String getCreatedAt() { - return createdAt; - } - - /** - * @return the deletedAt - */ - public String getDeletedAt() { - return deletedAt; - } - - /** - * @return the cidr - */ - public String getCidr() { - return cidr; - } - - /** - * @return the cidrV6 - */ - public String getCidrV6() { - return cidrV6; - } - - /** - * @return the gateway - */ - public String getGateway() { - return gateway; - } - - /** - * @return the gatewayV6 - */ - public String getGatewayV6() { - return gatewayV6; - } - - /** - * @return the netmaskV6 - */ - public String getNetmaskV6() { - return netmaskV6; - } - - /** - * @return the projectId - */ - public String getProjectId() { - return projectId; - } - - /** - * @return the rxtxBase - */ - public String getRxtxBase() { - return rxtxBase; - } - - /** - * @return the dns1 - */ - public String getDns1() { - return dns1; - } - - /** - * @return the dns2 - */ - public String getDns2() { - return dns2; - } - - /** - * @return the label - */ - public String getLabel() { - return label; - } - - /** - * @return the priority - */ - public String getPriority() { - return priority; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Network [id=" + id + ", vpnPublicAddress=" + vpnPublicAddress - + ", vpnPublicPort=" + vpnPublicPort + ", dhcpStart=" - + dhcpStart + ", bridge=" + bridge + ", bridgeInterface=" - + bridgeInterface + ", updatedAt=" + updatedAt + ", deleted=" - + deleted + ", vlan=" + vlan + ", broadcast=" + broadcast - + ", netmask=" + netmask + ", injected=" + injected + ", host=" - + host + ", multiHost=" + multiHost + ", createdAt=" - + createdAt + ", deletedAt=" + deletedAt + ", cidr=" + cidr - + ", cidrV6=" + cidrV6 + ", gateway=" + gateway - + ", gatewayV6=" + gatewayV6 + ", netmaskV6=" + netmaskV6 - + ", projectId=" + projectId + ", rxtxBase=" + rxtxBase - + ", dns1=" + dns1 + ", dns2=" + dns2 + ", label=" + label - + ", priority=" + priority + "]"; - } - + private String id; + + @JsonProperty("vpn_public_address") + private String vpnPublicAddress; + + @JsonProperty("vpn_private_address") + private String vpnPrivateAddress; + + @JsonProperty("vpn_public_port") + private String vpnPublicPort; + + @JsonProperty("dhcp_start") + private String dhcpStart; + + private String bridge; + + @JsonProperty("bridge_interface") + private String bridgeInterface; + + @JsonProperty("updated_at") + private String updatedAt; + + private Boolean deleted; + + private String vlan; + + private String broadcast; + + private String netmask; + + private Boolean injected; + + private String host; + + @JsonProperty("multi_host") + private Boolean multiHost; + + @JsonProperty("created_at") + private String createdAt; + + @JsonProperty("deleted_at") + private String deletedAt; + + private String cidr; + + @JsonProperty("cidr_v6") + private String cidrV6; + + private String gateway; + + @JsonProperty("gateway_v6") + private String gatewayV6; + + @JsonProperty("netmask_v6") + private String netmaskV6; + + @JsonProperty("project_id") + private String projectId; + + @JsonProperty("rxtx_base") + private String rxtxBase; + + private String dns1; + + private String dns2; + + private String label; + + private String priority; + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @return the vpnPublicAddress + */ + public String getVpnPublicAddress() { + return vpnPublicAddress; + } + + /** + * @return the vpnPublicPort + */ + public String getVpnPublicPort() { + return vpnPublicPort; + } + + /** + * @return the dhcpStart + */ + public String getDhcpStart() { + return dhcpStart; + } + + /** + * @return the bridge + */ + public String getBridge() { + return bridge; + } + + /** + * @return the bridgeInterface + */ + public String getBridgeInterface() { + return bridgeInterface; + } + + /** + * @return the updatedAt + */ + public String getUpdatedAt() { + return updatedAt; + } + + /** + * @return the deleted + */ + public Boolean getDeleted() { + return deleted; + } + + /** + * @return the vlan + */ + public String getVlan() { + return vlan; + } + + /** + * @return the broadcast + */ + public String getBroadcast() { + return broadcast; + } + + /** + * @return the netmask + */ + public String getNetmask() { + return netmask; + } + + /** + * @return the injected + */ + public Boolean getInjected() { + return injected; + } + + /** + * @return the host + */ + public String getHost() { + return host; + } + + /** + * @return the multiHost + */ + public Boolean getMultiHost() { + return multiHost; + } + + /** + * @return the createdAt + */ + public String getCreatedAt() { + return createdAt; + } + + /** + * @return the deletedAt + */ + public String getDeletedAt() { + return deletedAt; + } + + /** + * @return the cidr + */ + public String getCidr() { + return cidr; + } + + /** + * @return the cidrV6 + */ + public String getCidrV6() { + return cidrV6; + } + + /** + * @return the gateway + */ + public String getGateway() { + return gateway; + } + + /** + * @return the gatewayV6 + */ + public String getGatewayV6() { + return gatewayV6; + } + + /** + * @return the netmaskV6 + */ + public String getNetmaskV6() { + return netmaskV6; + } + + /** + * @return the projectId + */ + public String getProjectId() { + return projectId; + } + + /** + * @return the rxtxBase + */ + public String getRxtxBase() { + return rxtxBase; + } + + /** + * @return the dns1 + */ + public String getDns1() { + return dns1; + } + + /** + * @return the dns2 + */ + public String getDns2() { + return dns2; + } + + /** + * @return the label + */ + public String getLabel() { + return label; + } + + /** + * @return the priority + */ + public String getPriority() { + return priority; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Network [id=" + id + ", vpnPublicAddress=" + vpnPublicAddress + + ", vpnPublicPort=" + vpnPublicPort + ", dhcpStart=" + + dhcpStart + ", bridge=" + bridge + ", bridgeInterface=" + + bridgeInterface + ", updatedAt=" + updatedAt + ", deleted=" + + deleted + ", vlan=" + vlan + ", broadcast=" + broadcast + + ", netmask=" + netmask + ", injected=" + injected + ", host=" + + host + ", multiHost=" + multiHost + ", createdAt=" + + createdAt + ", deletedAt=" + deletedAt + ", cidr=" + cidr + + ", cidrV6=" + cidrV6 + ", gateway=" + gateway + + ", gatewayV6=" + gatewayV6 + ", netmaskV6=" + netmaskV6 + + ", projectId=" + projectId + ", rxtxBase=" + rxtxBase + + ", dns1=" + dns1 + ", dns2=" + dns2 + ", label=" + label + + ", priority=" + priority + "]"; + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java index 3cc045b..ea9f23e 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/NetworkForCreate.java @@ -21,25 +21,25 @@ import org.codehaus.jackson.map.annotate.JsonRootName; public class NetworkForCreate { - @JsonProperty("uuid") - private String id; - @JsonProperty("fixed_ip") - private String fixedIp; - - public String getId() { - return id; - } - - public String getFixedIp() { - return fixedIp; - } - - public void setId(String id) { - this.id = id; - } - - public void setFixedIp(String fixedIp) { - this.fixedIp = fixedIp; - } + @JsonProperty("uuid") + private String id; + @JsonProperty("fixed_ip") + private String fixedIp; + + public String getId() { + return id; + } + + public String getFixedIp() { + return fixedIp; + } + + public void setId(String id) { + this.id = id; + } + + public void setFixedIp(String fixedIp) { + this.fixedIp = fixedIp; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java index 2477e25..7dac2c6 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Networks implements Iterable, Serializable { - @JsonProperty("networks") - private List list; + @JsonProperty("networks") + private List list; - /** - * @return the list - */ - public List getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Servers [list=" + list + "]"; - } + /** + * @return the list + */ + public List getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Servers [list=" + list + "]"; + } - @Override - public Iterator iterator() { - return list.iterator(); - } - + @Override + public Iterator iterator() { + return list.iterator(); + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java index f5e58ec..0d619df 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java @@ -19,37 +19,37 @@ package com.woorea.openstack.nova.model; import java.io.Serializable; public final class PersonalityFile implements Serializable { - - private String path; - - private String contents; + + private String path; + + private String contents; - /** - * @return the path - */ - public String getPath() { - return path; - } + /** + * @return the path + */ + public String getPath() { + return path; + } - /** - * @param path the path to set - */ - public void setPath(String path) { - this.path = path; - } + /** + * @param path the path to set + */ + public void setPath(String path) { + this.path = path; + } - /** - * @return the contents - */ - public String getContents() { - return contents; - } + /** + * @return the contents + */ + public String getContents() { + return contents; + } - /** - * @param contents the contents to set - */ - public void setContents(String contents) { - this.contents = contents; - } - + /** + * @param contents the contents to set + */ + public void setContents(String contents) { + this.contents = contents; + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java index 8643667..52bc930 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java @@ -22,151 +22,151 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("quota_set") public class QuotaSet { - private String id; - - @JsonProperty("metadata_items") - private Integer metadataItems; - - @JsonProperty("injected_file_content_bytes") - private Integer injectedFileContentBytes; - - @JsonProperty("injected_files") - private Integer injectedFiles; - - private Integer gigabytes; - - private Integer ram; - - @JsonProperty("floating_ips") - private Integer floatingIps; - - private Integer instances; - - private Integer volumes; - - private Integer cores; - - @JsonProperty("security_groups") - private Integer securityGroups; - - @JsonProperty("security_group_rules") - private Integer securityGroupRules; - - @JsonProperty("injected_file_path_bytes") - private Integer injectedFilePathBytes; - - @JsonProperty("key_pairs") - private Integer keyPairs; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public Integer getMetadataItems() { - return metadataItems; - } - - public void setMetadataItems(Integer metadataItems) { - this.metadataItems = metadataItems; - } - - public Integer getInjectedFileContentBytes() { - return injectedFileContentBytes; - } - - public void setInjectedFileContentBytes(Integer injectedFileContentBytes) { - this.injectedFileContentBytes = injectedFileContentBytes; - } - - public Integer getInjectedFiles() { - return injectedFiles; - } - - public void setInjectedFiles(Integer injectedFiles) { - this.injectedFiles = injectedFiles; - } - - public Integer getGigabytes() { - return gigabytes; - } - - public void setGigabytes(Integer gigabytes) { - this.gigabytes = gigabytes; - } - - public Integer getRam() { - return ram; - } - - public void setRam(Integer ram) { - this.ram = ram; - } - - public Integer getFloatingIps() { - return floatingIps; - } - - public void setFloatingIps(Integer floatingIps) { - this.floatingIps = floatingIps; - } - - public Integer getInstances() { - return instances; - } - - public void setInstances(Integer instances) { - this.instances = instances; - } - - public Integer getVolumes() { - return volumes; - } - - public void setVolumes(Integer volumes) { - this.volumes = volumes; - } - - public Integer getCores() { - return cores; - } - - public void setCores(Integer cores) { - this.cores = cores; - } - - public Integer getSecurityGroups() { - return securityGroups; - } - - public void setSecurityGroups(Integer securityGroups) { - this.securityGroups = securityGroups; - } - - public Integer getSecurityGroupRules() { - return securityGroupRules; - } + private String id; + + @JsonProperty("metadata_items") + private Integer metadataItems; + + @JsonProperty("injected_file_content_bytes") + private Integer injectedFileContentBytes; + + @JsonProperty("injected_files") + private Integer injectedFiles; + + private Integer gigabytes; + + private Integer ram; + + @JsonProperty("floating_ips") + private Integer floatingIps; + + private Integer instances; + + private Integer volumes; + + private Integer cores; + + @JsonProperty("security_groups") + private Integer securityGroups; + + @JsonProperty("security_group_rules") + private Integer securityGroupRules; + + @JsonProperty("injected_file_path_bytes") + private Integer injectedFilePathBytes; + + @JsonProperty("key_pairs") + private Integer keyPairs; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getMetadataItems() { + return metadataItems; + } + + public void setMetadataItems(Integer metadataItems) { + this.metadataItems = metadataItems; + } + + public Integer getInjectedFileContentBytes() { + return injectedFileContentBytes; + } + + public void setInjectedFileContentBytes(Integer injectedFileContentBytes) { + this.injectedFileContentBytes = injectedFileContentBytes; + } + + public Integer getInjectedFiles() { + return injectedFiles; + } + + public void setInjectedFiles(Integer injectedFiles) { + this.injectedFiles = injectedFiles; + } + + public Integer getGigabytes() { + return gigabytes; + } + + public void setGigabytes(Integer gigabytes) { + this.gigabytes = gigabytes; + } + + public Integer getRam() { + return ram; + } + + public void setRam(Integer ram) { + this.ram = ram; + } + + public Integer getFloatingIps() { + return floatingIps; + } + + public void setFloatingIps(Integer floatingIps) { + this.floatingIps = floatingIps; + } + + public Integer getInstances() { + return instances; + } + + public void setInstances(Integer instances) { + this.instances = instances; + } + + public Integer getVolumes() { + return volumes; + } + + public void setVolumes(Integer volumes) { + this.volumes = volumes; + } + + public Integer getCores() { + return cores; + } + + public void setCores(Integer cores) { + this.cores = cores; + } + + public Integer getSecurityGroups() { + return securityGroups; + } + + public void setSecurityGroups(Integer securityGroups) { + this.securityGroups = securityGroups; + } + + public Integer getSecurityGroupRules() { + return securityGroupRules; + } - public void setSecurityGroupRules(Integer securityGroupRules) { - this.securityGroupRules = securityGroupRules; - } + public void setSecurityGroupRules(Integer securityGroupRules) { + this.securityGroupRules = securityGroupRules; + } - public Integer getKeyPairs() { - return keyPairs; - } + public Integer getKeyPairs() { + return keyPairs; + } - public void setKeyPairs(Integer keyPairs) { - this.keyPairs = keyPairs; - } + public void setKeyPairs(Integer keyPairs) { + this.keyPairs = keyPairs; + } - public Integer getInjectedFilePathBytes() { - return injectedFilePathBytes; - } + public Integer getInjectedFilePathBytes() { + return injectedFilePathBytes; + } - public void setInjectedFilePathBytes(Integer injectedFilePathBytes) { - this.injectedFilePathBytes = injectedFilePathBytes; - } + public void setInjectedFilePathBytes(Integer injectedFilePathBytes) { + this.injectedFilePathBytes = injectedFilePathBytes; + } } \ No newline at end of file diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java index b2ab4fa..a57fd69 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java @@ -24,200 +24,200 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("security_group") public class SecurityGroup implements Serializable { - - @JsonRootName("security_group_rule") - public static final class Rule implements Serializable { - - public static final class Group implements Serializable { - - private String name; - - @JsonProperty("tenant_id") - private String tenantId; - - public String getName() { - return name; - } - - public String getTenantId() { - return tenantId; - } - - @Override - public String toString() { - return "Group [name=" + name + ", tenantId=" + tenantId + "]"; - } - - } - - public static final class IpRange implements Serializable { - - private String cidr; - - public String getCidr() { - return cidr; - } - - @Override - public String toString() { - return "IpRange [cidr=" + cidr + "]"; - } - - } - - private String id; - - private String name; - - @JsonProperty("parent_group_id") - private String parentGroupId; - - @JsonProperty("from_port") - private Integer fromPort; - - @JsonProperty("to_port") - private Integer toPort; - - @JsonProperty("ip_protocol") - private String ipProtocol; - - @JsonProperty("ip_range") - private IpRange ipRange = new IpRange(); - - private Group group; - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @return the parentGroupId - */ - public String getParentGroupId() { - return parentGroupId; - } - - /** - * @return the fromPort - */ - public Integer getFromPort() { - return fromPort; - } - - /** - * @return the toPort - */ - public Integer getToPort() { - return toPort; - } - - /** - * @return the ipProtocol - */ - public String getIpProtocol() { - return ipProtocol; - } - - /** - * @return the ipRange - */ - public IpRange getIpRange() { - return ipRange; - } - - /** - * @return the group - */ - public Group getGroup() { - return group; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Rule [id=" + id + ", name=" + name + ", parentGroupId=" - + parentGroupId + ", fromPort=" + fromPort + ", toPort=" - + toPort + ", ipProtocol=" + ipProtocol + ", ipRange=" - + ipRange + ", group=" + group + "]"; - } - - } - - private String id; - - private String name; - - private String description; - - @JsonProperty("tenant_id") - private String tenantId; - - private List rules; - - private List links; - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @return the description - */ - public String getDescription() { - return description; - } - - /** - * @return the tenantId - */ - public String getTenantId() { - return tenantId; - } - - /** - * @return the rules - */ - public List getRules() { - return rules; - } - - /** - * @return the links - */ - public List getLinks() { - return links; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "SecurityGroup [id=" + id + ", name=" + name + ", description=" - + description + ", tenantId=" + tenantId + ", rules=" + rules - + ", links=" + links + "]"; - } - + + @JsonRootName("security_group_rule") + public static final class Rule implements Serializable { + + public static final class Group implements Serializable { + + private String name; + + @JsonProperty("tenant_id") + private String tenantId; + + public String getName() { + return name; + } + + public String getTenantId() { + return tenantId; + } + + @Override + public String toString() { + return "Group [name=" + name + ", tenantId=" + tenantId + "]"; + } + + } + + public static final class IpRange implements Serializable { + + private String cidr; + + public String getCidr() { + return cidr; + } + + @Override + public String toString() { + return "IpRange [cidr=" + cidr + "]"; + } + + } + + private String id; + + private String name; + + @JsonProperty("parent_group_id") + private String parentGroupId; + + @JsonProperty("from_port") + private Integer fromPort; + + @JsonProperty("to_port") + private Integer toPort; + + @JsonProperty("ip_protocol") + private String ipProtocol; + + @JsonProperty("ip_range") + private IpRange ipRange = new IpRange(); + + private Group group; + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @return the parentGroupId + */ + public String getParentGroupId() { + return parentGroupId; + } + + /** + * @return the fromPort + */ + public Integer getFromPort() { + return fromPort; + } + + /** + * @return the toPort + */ + public Integer getToPort() { + return toPort; + } + + /** + * @return the ipProtocol + */ + public String getIpProtocol() { + return ipProtocol; + } + + /** + * @return the ipRange + */ + public IpRange getIpRange() { + return ipRange; + } + + /** + * @return the group + */ + public Group getGroup() { + return group; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Rule [id=" + id + ", name=" + name + ", parentGroupId=" + + parentGroupId + ", fromPort=" + fromPort + ", toPort=" + + toPort + ", ipProtocol=" + ipProtocol + ", ipRange=" + + ipRange + ", group=" + group + "]"; + } + + } + + private String id; + + private String name; + + private String description; + + @JsonProperty("tenant_id") + private String tenantId; + + private List rules; + + private List links; + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * @return the tenantId + */ + public String getTenantId() { + return tenantId; + } + + /** + * @return the rules + */ + public List getRules() { + return rules; + } + + /** + * @return the links + */ + public List getLinks() { + return links; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "SecurityGroup [id=" + id + ", name=" + name + ", description=" + + description + ", tenantId=" + tenantId + ", rules=" + rules + + ", links=" + links + "]"; + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java index 1c39432..2a40173 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java @@ -22,59 +22,59 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("security_group") public class SecurityGroupForCreate implements Serializable { - - private String name; - - private String description; + + private String name; + + private String description; - public SecurityGroupForCreate() { - super(); - } - - public SecurityGroupForCreate(String name) { - this.name = name; - } + public SecurityGroupForCreate() { + super(); + } + + public SecurityGroupForCreate(String name) { + this.name = name; + } - public SecurityGroupForCreate(String name, String description) { - this(name); - this.description = description; - } + public SecurityGroupForCreate(String name, String description) { + this(name); + this.description = description; + } - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } - /** - * @return the description - */ - public String getDescription() { - return description; - } + /** + * @return the description + */ + public String getDescription() { + return description; + } - /** - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } + /** + * @param description the description to set + */ + public void setDescription(String description) { + this.description = description; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "SecurityGroupForCreate [name=" + name + ", description=" - + description + "]"; - } - + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "SecurityGroupForCreate [name=" + name + ", description=" + + description + "]"; + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java index d1a3ec0..fbb3f46 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java @@ -26,191 +26,191 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("security_group_rule") public class SecurityGroupRuleForCreate implements Serializable { - @JsonProperty("parent_group_id") - private String parentGroupId; - - @JsonProperty("ip_protocol") - private String ipProtocol; - - @JsonProperty("from_port") - private Integer fromPort; - - @JsonProperty("to_port") - private Integer toPort; - - @XmlElement - private String cidr; - - @JsonProperty("group_id") - private String groupId; - - public SecurityGroupRuleForCreate() { - - } - - /** - * - * @param parentSecurityGroupId - * @param ipProtocol - * @param fromPort - * @param toPort - * @param cidr - * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, Integer, Integer, String)} - */ - @Deprecated - public SecurityGroupRuleForCreate(Integer parentSecurityGroupId, String ipProtocol, Integer fromPort,Integer toPort, String cidr) { - this.parentGroupId = String.valueOf(parentSecurityGroupId); - this.ipProtocol = ipProtocol; - this.fromPort = fromPort; - this.toPort = toPort; - this.cidr = cidr; - } - /** - * - * @param parentSecurityGroupId - * @param ipProtocol - * @param fromPort - * @param toPort - * @param cidr - * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, String, Integer, Integer)} - */ - @Deprecated - public SecurityGroupRuleForCreate(Integer parentGroupId, String ipProtocol, Integer fromPort,Integer toPort, Integer sourceGroupId) { - this.parentGroupId = String.valueOf(parentGroupId); - this.ipProtocol = ipProtocol; - this.fromPort = fromPort; - this.toPort = toPort; - this.groupId = String.valueOf(sourceGroupId); - } - - public SecurityGroupRuleForCreate(String parentSecurityGroupId, String ipProtocol, Integer fromPort,Integer toPort, String cidr) { - this.parentGroupId = parentSecurityGroupId; - this.ipProtocol = ipProtocol; - this.fromPort = fromPort; - this.toPort = toPort; - this.cidr = cidr; - } - - public SecurityGroupRuleForCreate(String parentGroupId, String sourceGroupId, String ipProtocol, Integer fromPort,Integer toPort) { - this.parentGroupId = parentGroupId; - this.ipProtocol = ipProtocol; - this.fromPort = fromPort; - this.toPort = toPort; - this.groupId = sourceGroupId; - } - - /** - * @return the parentGroupId - */ - public String getParentGroupId() { - return parentGroupId; - } - - - /** - * @param parentGroupId the parentGroupId to set - * @deprecated Use {@link #setParentGroupId(String)} - */ - @Deprecated - public void setParentGroupId(Integer parentGroupId) { - this.parentGroupId = String.valueOf(parentGroupId); - } - - /** - * @param parentGroupId the parentGroupId to set - */ - public void setParentGroupId(String parentGroupId) { - this.parentGroupId = parentGroupId; - } - - /** - * @return the fromPort - */ - public Integer getFromPort() { - return fromPort; - } - - /** - * @param fromPort the fromPort to set - */ - public void setFromPort(Integer fromPort) { - this.fromPort = fromPort; - } - - /** - * @return the toPort - */ - public Integer getToPort() { - return toPort; - } - - /** - * @param toPort the toPort to set - */ - public void setToPort(Integer toPort) { - this.toPort = toPort; - } - - /** - * @return the ipProtocol - */ - public String getIpProtocol() { - return ipProtocol; - } - - /** - * @param ipProtocol the ipProtocol to set - */ - public void setIpProtocol(String ipProtocol) { - this.ipProtocol = ipProtocol; - } - - /** - * @return the cidr - */ - public String getCidr() { - return cidr; - } - - /** - * @param cidr the cidr to set - */ - public void setCidr(String cidr) { - this.cidr = cidr; - } - - /** - * @return the groupId - */ - public String getGroupId() { - return groupId; - } - - /** - * @param groupId the groupId to set - * @deprecated Use {@link #setGroupId(String)} - */ - @Deprecated - public void setGroupId(Integer groupId) { - this.groupId = String.valueOf(groupId); - } - - /** - * @param groupId the groupId to set - */ - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "SecurityGroupRuleForCreate [parentGroupId=" + parentGroupId - + ", fromPort=" + fromPort + ", toPort=" + toPort - + ", ipProtocol=" + ipProtocol + ", cidr=" + cidr - + ", groupId=" + groupId + "]"; - } + @JsonProperty("parent_group_id") + private String parentGroupId; + + @JsonProperty("ip_protocol") + private String ipProtocol; + + @JsonProperty("from_port") + private Integer fromPort; + + @JsonProperty("to_port") + private Integer toPort; + + @XmlElement + private String cidr; + + @JsonProperty("group_id") + private String groupId; + + public SecurityGroupRuleForCreate() { + + } + + /** + * + * @param parentSecurityGroupId + * @param ipProtocol + * @param fromPort + * @param toPort + * @param cidr + * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, Integer, Integer, String)} + */ + @Deprecated + public SecurityGroupRuleForCreate(Integer parentSecurityGroupId, String ipProtocol, Integer fromPort,Integer toPort, String cidr) { + this.parentGroupId = String.valueOf(parentSecurityGroupId); + this.ipProtocol = ipProtocol; + this.fromPort = fromPort; + this.toPort = toPort; + this.cidr = cidr; + } + /** + * + * @param parentSecurityGroupId + * @param ipProtocol + * @param fromPort + * @param toPort + * @param cidr + * @deprecated Ids in some installs have shown to use strings .Use {@link #SecurityGroupRuleForCreate(String, String, String, Integer, Integer)} + */ + @Deprecated + public SecurityGroupRuleForCreate(Integer parentGroupId, String ipProtocol, Integer fromPort,Integer toPort, Integer sourceGroupId) { + this.parentGroupId = String.valueOf(parentGroupId); + this.ipProtocol = ipProtocol; + this.fromPort = fromPort; + this.toPort = toPort; + this.groupId = String.valueOf(sourceGroupId); + } + + public SecurityGroupRuleForCreate(String parentSecurityGroupId, String ipProtocol, Integer fromPort,Integer toPort, String cidr) { + this.parentGroupId = parentSecurityGroupId; + this.ipProtocol = ipProtocol; + this.fromPort = fromPort; + this.toPort = toPort; + this.cidr = cidr; + } + + public SecurityGroupRuleForCreate(String parentGroupId, String sourceGroupId, String ipProtocol, Integer fromPort,Integer toPort) { + this.parentGroupId = parentGroupId; + this.ipProtocol = ipProtocol; + this.fromPort = fromPort; + this.toPort = toPort; + this.groupId = sourceGroupId; + } + + /** + * @return the parentGroupId + */ + public String getParentGroupId() { + return parentGroupId; + } + + + /** + * @param parentGroupId the parentGroupId to set + * @deprecated Use {@link #setParentGroupId(String)} + */ + @Deprecated + public void setParentGroupId(Integer parentGroupId) { + this.parentGroupId = String.valueOf(parentGroupId); + } + + /** + * @param parentGroupId the parentGroupId to set + */ + public void setParentGroupId(String parentGroupId) { + this.parentGroupId = parentGroupId; + } + + /** + * @return the fromPort + */ + public Integer getFromPort() { + return fromPort; + } + + /** + * @param fromPort the fromPort to set + */ + public void setFromPort(Integer fromPort) { + this.fromPort = fromPort; + } + + /** + * @return the toPort + */ + public Integer getToPort() { + return toPort; + } + + /** + * @param toPort the toPort to set + */ + public void setToPort(Integer toPort) { + this.toPort = toPort; + } + + /** + * @return the ipProtocol + */ + public String getIpProtocol() { + return ipProtocol; + } + + /** + * @param ipProtocol the ipProtocol to set + */ + public void setIpProtocol(String ipProtocol) { + this.ipProtocol = ipProtocol; + } + + /** + * @return the cidr + */ + public String getCidr() { + return cidr; + } + + /** + * @param cidr the cidr to set + */ + public void setCidr(String cidr) { + this.cidr = cidr; + } + + /** + * @return the groupId + */ + public String getGroupId() { + return groupId; + } + + /** + * @param groupId the groupId to set + * @deprecated Use {@link #setGroupId(String)} + */ + @Deprecated + public void setGroupId(Integer groupId) { + this.groupId = String.valueOf(groupId); + } + + /** + * @param groupId the groupId to set + */ + public void setGroupId(String groupId) { + this.groupId = groupId; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "SecurityGroupRuleForCreate [parentGroupId=" + parentGroupId + + ", fromPort=" + fromPort + ", toPort=" + toPort + + ", ipProtocol=" + ipProtocol + ", cidr=" + cidr + + ", groupId=" + groupId + "]"; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java index a9f05e6..4d3ebbb 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class SecurityGroups implements Iterable, Serializable { - @JsonProperty("security_groups") - private List list; + @JsonProperty("security_groups") + private List list; - /** - * @return the list - */ - public List getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "SecurityGroups [list=" + list + "]"; - } + /** + * @return the list + */ + public List getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "SecurityGroups [list=" + list + "]"; + } - @Override - public Iterator iterator() { - return list.iterator(); - } - + @Override + public Iterator iterator() { + return list.iterator(); + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java index 20ab039..63acbc2 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java @@ -29,221 +29,221 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("server") public class Server implements Serializable { - - public static final class Addresses implements Serializable { - - public static final class Address implements Serializable { - - @JsonProperty("OS-EXT-IPS-MAC:mac_addr") - private String macAddr; - - private String version; - - private String addr; - - @JsonProperty("OS-EXT-IPS:type") - private String type; + + public static final class Addresses implements Serializable { + + public static final class Address implements Serializable { + + @JsonProperty("OS-EXT-IPS-MAC:mac_addr") + private String macAddr; + + private String version; + + private String addr; + + @JsonProperty("OS-EXT-IPS:type") + private String type; /** * @return the macAddr */ - public String getMacAddr() { - return macAddr; - } - - /** - * @return the version - */ - public String getVersion() { - return version; - } - - /** - * @return the addr - */ - public String getAddr() { - return addr; - } - - - /** - * @return the type - */ - public String getType() { - return type; - } - - /** - * @param version the version to set - */ - public void setVersion(String version) { - this.version = version; - } - - /** - * @param addr the addr to set - */ - public void setAddr(String addr) { - this.addr = addr; - } - - /** - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - - /** - * @param macAddr the mac addr to set - */ - public void setMacAddr(String macAddr) { - this.macAddr= macAddr; - } - } - - private Map> addresses = new HashMap<>(); - - @JsonAnySetter - public void add(String key, List
value) { - addresses.put(key, value); - } - /** - * @return the ip address List Map - */ - public Map> getAddresses() { - return addresses; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Addresses List Map [" + addresses + "]"; - } - - } - - public static final class Fault { - - private Integer code; - - private String message; - - private String details; - - private Calendar created; - - /** - * @return the code - */ - public Integer getCode() { - return code; - } - - /** - * @return the message - */ - public String getMessage() { - return message; - } - - /** - * @return the details - */ - public String getDetails() { - return details; - } - - /** - * @return the created - */ - public Calendar getCreated() { - return created; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Fault [code=" + code + ", message=" + message - + ", details=" + details + ", created=" + created + "]"; - } - - - } - - - private String id; - - private String name; - - private Addresses addresses; - - private List links; - - private Image image; - - private Flavor flavor; - - private String accessIPv4; - - private String accessIPv6; - - @JsonProperty("config_drive") - private String configDrive; - - private String status; - - private Integer progress; - - private Fault fault; - - @JsonProperty("tenant_id") - private String tenantId; - - @JsonProperty("user_id") - private String userId; - - @JsonProperty("key_name") - private String keyName; - - private String hostId; - - private String updated; - - private String created; - - private Map metadata; - - @JsonProperty("security_groups") - private List securityGroups; - - @JsonProperty("OS-EXT-STS:task_state") - private String taskState; - - @JsonProperty("OS-EXT-STS:power_state") - private String powerState; - - @JsonProperty("OS-EXT-STS:vm_state") - private String vmState; - - @JsonProperty("OS-EXT-SRV-ATTR:host") - private String host; - - @JsonProperty("OS-EXT-SRV-ATTR:instance_name") - private String instanceName; - - @JsonProperty("OS-EXT-SRV-ATTR:hypervisor_hostname") - private String hypervisorHostname; - - @JsonProperty("OS-DCF:diskConfig") - private String diskConfig; - - @JsonProperty("OS-EXT-AZ:availability_zone") - private String availabilityZone; + public String getMacAddr() { + return macAddr; + } + + /** + * @return the version + */ + public String getVersion() { + return version; + } + + /** + * @return the addr + */ + public String getAddr() { + return addr; + } + + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @param version the version to set + */ + public void setVersion(String version) { + this.version = version; + } + + /** + * @param addr the addr to set + */ + public void setAddr(String addr) { + this.addr = addr; + } + + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + + /** + * @param macAddr the mac addr to set + */ + public void setMacAddr(String macAddr) { + this.macAddr= macAddr; + } + } + + private Map> addresses = new HashMap<>(); + + @JsonAnySetter + public void add(String key, List
value) { + addresses.put(key, value); + } + /** + * @return the ip address List Map + */ + public Map> getAddresses() { + return addresses; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Addresses List Map [" + addresses + "]"; + } + + } + + public static final class Fault { + + private Integer code; + + private String message; + + private String details; + + private Calendar created; + + /** + * @return the code + */ + public Integer getCode() { + return code; + } + + /** + * @return the message + */ + public String getMessage() { + return message; + } + + /** + * @return the details + */ + public String getDetails() { + return details; + } + + /** + * @return the created + */ + public Calendar getCreated() { + return created; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Fault [code=" + code + ", message=" + message + + ", details=" + details + ", created=" + created + "]"; + } + + + } + + + private String id; + + private String name; + + private Addresses addresses; + + private List links; + + private Image image; + + private Flavor flavor; + + private String accessIPv4; + + private String accessIPv6; + + @JsonProperty("config_drive") + private String configDrive; + + private String status; + + private Integer progress; + + private Fault fault; + + @JsonProperty("tenant_id") + private String tenantId; + + @JsonProperty("user_id") + private String userId; + + @JsonProperty("key_name") + private String keyName; + + private String hostId; + + private String updated; + + private String created; + + private Map metadata; + + @JsonProperty("security_groups") + private List securityGroups; + + @JsonProperty("OS-EXT-STS:task_state") + private String taskState; + + @JsonProperty("OS-EXT-STS:power_state") + private String powerState; + + @JsonProperty("OS-EXT-STS:vm_state") + private String vmState; + + @JsonProperty("OS-EXT-SRV-ATTR:host") + private String host; + + @JsonProperty("OS-EXT-SRV-ATTR:instance_name") + private String instanceName; + + @JsonProperty("OS-EXT-SRV-ATTR:hypervisor_hostname") + private String hypervisorHostname; + + @JsonProperty("OS-DCF:diskConfig") + private String diskConfig; + + @JsonProperty("OS-EXT-AZ:availability_zone") + private String availabilityZone; @JsonProperty("OS-SRV-USG:launched_at") private String launchedAt; @@ -253,220 +253,220 @@ public class Server implements Serializable { @JsonProperty("os-extended-volumes:volumes_attached") private List osExtendedVolumesAttached; - - private String uuid; - - private String adminPass; - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @return the addresses - */ - public Addresses getAddresses() { - return addresses; - } - - /** - * @return the links - */ - public List getLinks() { - return links; - } - - /** - * @return the image - */ - public Image getImage() { - return image; - } - - /** - * @param image the image to set - */ - public void setImage(Image image) { - this.image = image; - } - - /** - * @return the flavor - */ - public Flavor getFlavor() { - return flavor; - } - - /** - * @param flavor the flavor to set - */ - public void setFlavor(Flavor flavor) { - this.flavor = flavor; - } - - /** - * @return the accessIPv4 - */ - public String getAccessIPv4() { - return accessIPv4; - } - - /** - * @return the accessIPv6 - */ - public String getAccessIPv6() { - return accessIPv6; - } - - /** - * @return the configDrive - */ - public String getConfigDrive() { - return configDrive; - } - - /** - * @return the status - */ - public String getStatus() { - return status; - } - - /** - * @return the progress - */ - public Integer getProgress() { - return progress; - } - - /** - * @return the fault - */ - public Fault getFault() { - return fault; - } - - /** - * @return the tenantId - */ - public String getTenantId() { - return tenantId; - } - - /** - * @return the userId - */ - public String getUserId() { - return userId; - } - - /** - * @return the keyName - */ - public String getKeyName() { - return keyName; - } - - /** - * @return the hostId - */ - public String getHostId() { - return hostId; - } - - /** - * @return the updated - */ - public String getUpdated() { - return updated; - } - - /** - * @return the created - */ - public String getCreated() { - return created; - } - - /** - * @return the metadata - */ - public Map getMetadata() { - return metadata; - } - - /** - * @return the securityGroups - */ - public List getSecurityGroups() { - return securityGroups; - } - - /** - * @return the taskState - */ - public String getTaskState() { - return taskState; - } - - /** - * @return the powerState - */ - public String getPowerState() { - return powerState; - } - - /** - * @return the vmState - */ - public String getVmState() { - return vmState; - } - - /** - * @return the host - */ - public String getHost() { - return host; - } - - /** - * @return the instanceName - */ - public String getInstanceName() { - return instanceName; - } - - /** - * @return the hypervisorHostname - */ - public String getHypervisorHostname() { - return hypervisorHostname; - } - - /** - * @return the diskConfig - */ - public String getDiskConfig() { - return diskConfig; - } - - /** - * @return the availabilityZone - */ - public String getAvailabilityZone() { - return availabilityZone; - } + + private String uuid; + + private String adminPass; + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @return the addresses + */ + public Addresses getAddresses() { + return addresses; + } + + /** + * @return the links + */ + public List getLinks() { + return links; + } + + /** + * @return the image + */ + public Image getImage() { + return image; + } + + /** + * @param image the image to set + */ + public void setImage(Image image) { + this.image = image; + } + + /** + * @return the flavor + */ + public Flavor getFlavor() { + return flavor; + } + + /** + * @param flavor the flavor to set + */ + public void setFlavor(Flavor flavor) { + this.flavor = flavor; + } + + /** + * @return the accessIPv4 + */ + public String getAccessIPv4() { + return accessIPv4; + } + + /** + * @return the accessIPv6 + */ + public String getAccessIPv6() { + return accessIPv6; + } + + /** + * @return the configDrive + */ + public String getConfigDrive() { + return configDrive; + } + + /** + * @return the status + */ + public String getStatus() { + return status; + } + + /** + * @return the progress + */ + public Integer getProgress() { + return progress; + } + + /** + * @return the fault + */ + public Fault getFault() { + return fault; + } + + /** + * @return the tenantId + */ + public String getTenantId() { + return tenantId; + } + + /** + * @return the userId + */ + public String getUserId() { + return userId; + } + + /** + * @return the keyName + */ + public String getKeyName() { + return keyName; + } + + /** + * @return the hostId + */ + public String getHostId() { + return hostId; + } + + /** + * @return the updated + */ + public String getUpdated() { + return updated; + } + + /** + * @return the created + */ + public String getCreated() { + return created; + } + + /** + * @return the metadata + */ + public Map getMetadata() { + return metadata; + } + + /** + * @return the securityGroups + */ + public List getSecurityGroups() { + return securityGroups; + } + + /** + * @return the taskState + */ + public String getTaskState() { + return taskState; + } + + /** + * @return the powerState + */ + public String getPowerState() { + return powerState; + } + + /** + * @return the vmState + */ + public String getVmState() { + return vmState; + } + + /** + * @return the host + */ + public String getHost() { + return host; + } + + /** + * @return the instanceName + */ + public String getInstanceName() { + return instanceName; + } + + /** + * @return the hypervisorHostname + */ + public String getHypervisorHostname() { + return hypervisorHostname; + } + + /** + * @return the diskConfig + */ + public String getDiskConfig() { + return diskConfig; + } + + /** + * @return the availabilityZone + */ + public String getAvailabilityZone() { + return availabilityZone; + } /** * @return the launchedAt @@ -490,41 +490,41 @@ public class Server implements Serializable { } /** - * @return the uuid - */ - public String getUuid() { - return uuid; - } - - /** - * @return the adminPass - */ - public String getAdminPass() { - return adminPass; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Server [id=" + id + ", name=" + name + ", addresses=" - + addresses + ", links=" + links + ", image=" + image - + ", flavor=" + flavor + ", accessIPv4=" + accessIPv4 - + ", accessIPv6=" + accessIPv6 + ", configDrive=" + configDrive - + ", status=" + status + ", progress=" + progress + ", fault=" - + fault + ", tenantId=" + tenantId + ", userId=" + userId - + ", keyName=" + keyName + ", hostId=" + hostId + ", updated=" - + updated + ", created=" + created + ", metadata=" + metadata - + ", securityGroups=" + securityGroups + ", taskState=" - + taskState + ", powerState=" + powerState + ", vmState=" - + vmState + ", host=" + host + ", instanceName=" + instanceName - + ", hypervisorHostname=" + hypervisorHostname - + ", diskConfig=" + diskConfig + ", availabilityZone=" - + availabilityZone + ", launchedAt=" + launchedAt + ", terminatedAt=" + * @return the uuid + */ + public String getUuid() { + return uuid; + } + + /** + * @return the adminPass + */ + public String getAdminPass() { + return adminPass; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Server [id=" + id + ", name=" + name + ", addresses=" + + addresses + ", links=" + links + ", image=" + image + + ", flavor=" + flavor + ", accessIPv4=" + accessIPv4 + + ", accessIPv6=" + accessIPv6 + ", configDrive=" + configDrive + + ", status=" + status + ", progress=" + progress + ", fault=" + + fault + ", tenantId=" + tenantId + ", userId=" + userId + + ", keyName=" + keyName + ", hostId=" + hostId + ", updated=" + + updated + ", created=" + created + ", metadata=" + metadata + + ", securityGroups=" + securityGroups + ", taskState=" + + taskState + ", powerState=" + powerState + ", vmState=" + + vmState + ", host=" + host + ", instanceName=" + instanceName + + ", hypervisorHostname=" + hypervisorHostname + + ", diskConfig=" + diskConfig + ", availabilityZone=" + + availabilityZone + ", launchedAt=" + launchedAt + ", terminatedAt=" + ", " + "osExtendedVolumesAttached=" + osExtendedVolumesAttached + ", uuid=" + uuid + ", adminPass=" - + adminPass + "]"; - } + + adminPass + "]"; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java index 80793a7..c0289be 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java @@ -26,601 +26,601 @@ import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.map.annotate.JsonRootName; public interface ServerAction extends Serializable { - - @JsonRootName("changePassword") - public static final class ChangePassword implements ServerAction { - - private String adminPass; - - public ChangePassword() { - super(); - // TODO Auto-generated constructor stub - } - - public ChangePassword(String adminPass) { - this.adminPass = adminPass; - } - - /** - * @return the adminPass - */ - public String getAdminPass() { - return adminPass; - } - - /** - * @param adminPass the adminPass to set - */ - public void setAdminPass(String adminPass) { - this.adminPass = adminPass; - } - - } - - @JsonRootName("reboot") - public static final class Reboot implements ServerAction { - - private String type; - - /** - * @return the type - */ - public String getType() { - return type; - } - - /** - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - - } - - @JsonRootName("rebuild") - public static final class Rebuild implements ServerAction { - - private String imageRef; - - private String name; - - private String adminPass; - - private String accessIPv4; - - private String accessIPv6; - - private Map metadata = new HashMap<>(); - - private List personality = new ArrayList<>(); - - @JsonProperty("OS-DCF:diskConfig") - private String diskConfig; - - /** - * @return the imageRef - */ - public String getImageRef() { - return imageRef; - } - - /** - * @param imageRef the imageRef to set - */ - public void setImageRef(String imageRef) { - this.imageRef = imageRef; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the adminPass - */ - public String getAdminPass() { - return adminPass; - } - - /** - * @param adminPass the adminPass to set - */ - public void setAdminPass(String adminPass) { - this.adminPass = adminPass; - } - - /** - * @return the accessIPv4 - */ - public String getAccessIPv4() { - return accessIPv4; - } - - /** - * @param accessIPv4 the accessIPv4 to set - */ - public void setAccessIPv4(String accessIPv4) { - this.accessIPv4 = accessIPv4; - } - - /** - * @return the accessIPv6 - */ - public String getAccessIPv6() { - return accessIPv6; - } - - /** - * @param accessIPv6 the accessIPv6 to set - */ - public void setAccessIPv6(String accessIPv6) { - this.accessIPv6 = accessIPv6; - } - - /** - * @return the metadata - */ - public Map getMetadata() { - return metadata; - } - - /** - * @param metadata the metadata to set - */ - public void setMetadata(Map metadata) { - this.metadata = metadata; - } - - /** - * @return the personality - */ - public List getPersonality() { - return personality; - } - - /** - * @param personality the personality to set - */ - public void setPersonality(List personality) { - this.personality = personality; - } - - /** - * @return the diskConfig - */ - public String getDiskConfig() { - return diskConfig; - } - - /** - * @param diskConfig the diskConfig to set - */ - public void setDiskConfig(String diskConfig) { - this.diskConfig = diskConfig; - } - - } - - @JsonRootName("resize") - public static final class Resize implements ServerAction { - - private String flavorRef; - - @JsonProperty("OS-DCF:diskConfig") - private String diskConfig; - - /** - * @return the flavorRef - */ - public String getFlavorRef() { - return flavorRef; - } - - /** - * @param flavorRef the flavorRef to set - */ - public void setFlavorRef(String flavorRef) { - this.flavorRef = flavorRef; - } - - /** - * @return the diskConfig - */ - public String getDiskConfig() { - return diskConfig; - } - - /** - * @param diskConfig the diskConfig to set - */ - public void setDiskConfig(String diskConfig) { - this.diskConfig = diskConfig; - } - - } - - @JsonRootName("confirmResize") - public static final class ConfirmResize implements ServerAction { - - } - - @JsonRootName("revertResize") - public static final class RevertResize implements ServerAction { - - } - - @JsonRootName("createImage") - public static final class CreateImage implements ServerAction { - - private String name; - - private Map metadata; - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the metadata - */ - public Map getMetadata() { - return metadata; - } - - /** - * @param metadata the metadata to set - */ - public void setMetadata(Map metadata) { - this.metadata = metadata; - } - - } - - @JsonRootName("rescue") - public static final class Rescue implements ServerAction { - - private String adminPass; - - public Rescue() { - - } - - public Rescue(String adminPass) { - this.adminPass = adminPass; - } - - /** - * @return the adminPass - */ - public String getAdminPass() { - return adminPass; - } - - /** - * @param adminPass the adminPass to set - */ - public void setAdminPass(String adminPass) { - this.adminPass = adminPass; - } - - } - - public static final class RescueResponse implements ServerAction { - - private String adminPass; - - /** - * @return the adminPass - */ - public String getAdminPass() { - return adminPass; - } - - } - - @JsonRootName("unrescue") - public static final class Unrescue implements ServerAction { - - } - - @JsonRootName("unpause") - public static final class Unpause implements ServerAction { - - } - - @JsonRootName("pause") - public static final class Pause implements ServerAction { - - } - - @JsonRootName("suspend") - public static final class Suspend implements ServerAction { - - } - - @JsonRootName("resume") - public static final class Resume implements ServerAction { - - } - - @JsonRootName("lock") - public static final class Lock implements ServerAction { - - } - - @JsonRootName("unlock") - public static final class Unlock implements ServerAction { - - } - - @JsonRootName("os-getConsoleOutput") - public static final class GetConsoleOutput implements ServerAction { - - private Integer length; - - public GetConsoleOutput() { - - } - - public GetConsoleOutput(Integer length) { - this.length = length; - } - - /** - * @return the length - */ - public Integer getLength() { - return length; - } - - /** - * @param length the length to set - */ - public void setLength(Integer length) { - this.length = length; - } - - } - - public static final class ConsoleOutput implements ServerAction { - - private String output; - - /** - * @return the output - */ - public String getOutput() { - return output; - } - - } - - @JsonRootName("os-getVNCConsole") - public static final class GetVncConsole implements ServerAction { - - private String type; - - public GetVncConsole() { - super(); - // TODO Auto-generated constructor stub - } - - - public GetVncConsole(String type) { - super(); - this.type = type; - } - - /** - * @return the type - */ - public String getType() { - return type; - } - - /** - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - - } - - @JsonRootName("console") - public static final class VncConsole implements ServerAction { - - private String type; - - private String url; - - /** - * @return the type - */ - public String getType() { - return type; - } - - /** - * @return the url - */ - public String getUrl() { - return url; - } - - } - - @JsonRootName("os-start") - public static final class Start implements ServerAction { - - } - - @JsonRootName("os-stop") - public static final class Stop implements ServerAction { - - } - - @JsonRootName("forceDelete") - public static final class ForceDelete implements ServerAction { - - } - - @JsonRootName("restore") - public static final class Restore implements ServerAction { - - } - - @JsonRootName("addFloatingIp") - public static final class AssociateFloatingIp implements ServerAction { - - private String address; - - public AssociateFloatingIp() { - super(); - // TODO Auto-generated constructor stub - } - - public AssociateFloatingIp(String address) { - super(); - this.address = address; - } - - /** - * @return the address - */ - public String getAddress() { - return address; - } - - /** - * @param address the address to set - */ - public void setAddress(String address) { - this.address = address; - } - - } - - @JsonRootName("removeFloatingIp") - public static final class DisassociateFloatingIp implements ServerAction { - - private String address; - - public DisassociateFloatingIp() { - super(); - // TODO Auto-generated constructor stub - } - - public DisassociateFloatingIp(String address) { - super(); - this.address = address; - } - - /** - * @return the address - */ - public String getAddress() { - return address; - } - - /** - * @param address the address to set - */ - public void setAddress(String address) { - this.address = address; - } - - } - - @JsonRootName("createBackup") - public static final class CreateBackup implements ServerAction { - - private String name; - - @JsonProperty("backup_type") - private String type; - - private String rotation; - - private Map metadata; - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the type - */ - public String getType() { - return type; - } - - /** - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } - - /** - * @return the rotation - */ - public String getRotation() { - return rotation; - } - - /** - * @param rotation the rotation to set - */ - public void setRotation(String rotation) { - this.rotation = rotation; - } - - /** - * @return the metadata - */ - public Map getMetadata() { - return metadata; - } - - /** - * @param metadata the metadata to set - */ - public void setMetadata(Map metadata) { - this.metadata = metadata; - } - - } - + + @JsonRootName("changePassword") + public static final class ChangePassword implements ServerAction { + + private String adminPass; + + public ChangePassword() { + super(); + // TODO Auto-generated constructor stub + } + + public ChangePassword(String adminPass) { + this.adminPass = adminPass; + } + + /** + * @return the adminPass + */ + public String getAdminPass() { + return adminPass; + } + + /** + * @param adminPass the adminPass to set + */ + public void setAdminPass(String adminPass) { + this.adminPass = adminPass; + } + + } + + @JsonRootName("reboot") + public static final class Reboot implements ServerAction { + + private String type; + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + + } + + @JsonRootName("rebuild") + public static final class Rebuild implements ServerAction { + + private String imageRef; + + private String name; + + private String adminPass; + + private String accessIPv4; + + private String accessIPv6; + + private Map metadata = new HashMap<>(); + + private List personality = new ArrayList<>(); + + @JsonProperty("OS-DCF:diskConfig") + private String diskConfig; + + /** + * @return the imageRef + */ + public String getImageRef() { + return imageRef; + } + + /** + * @param imageRef the imageRef to set + */ + public void setImageRef(String imageRef) { + this.imageRef = imageRef; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the adminPass + */ + public String getAdminPass() { + return adminPass; + } + + /** + * @param adminPass the adminPass to set + */ + public void setAdminPass(String adminPass) { + this.adminPass = adminPass; + } + + /** + * @return the accessIPv4 + */ + public String getAccessIPv4() { + return accessIPv4; + } + + /** + * @param accessIPv4 the accessIPv4 to set + */ + public void setAccessIPv4(String accessIPv4) { + this.accessIPv4 = accessIPv4; + } + + /** + * @return the accessIPv6 + */ + public String getAccessIPv6() { + return accessIPv6; + } + + /** + * @param accessIPv6 the accessIPv6 to set + */ + public void setAccessIPv6(String accessIPv6) { + this.accessIPv6 = accessIPv6; + } + + /** + * @return the metadata + */ + public Map getMetadata() { + return metadata; + } + + /** + * @param metadata the metadata to set + */ + public void setMetadata(Map metadata) { + this.metadata = metadata; + } + + /** + * @return the personality + */ + public List getPersonality() { + return personality; + } + + /** + * @param personality the personality to set + */ + public void setPersonality(List personality) { + this.personality = personality; + } + + /** + * @return the diskConfig + */ + public String getDiskConfig() { + return diskConfig; + } + + /** + * @param diskConfig the diskConfig to set + */ + public void setDiskConfig(String diskConfig) { + this.diskConfig = diskConfig; + } + + } + + @JsonRootName("resize") + public static final class Resize implements ServerAction { + + private String flavorRef; + + @JsonProperty("OS-DCF:diskConfig") + private String diskConfig; + + /** + * @return the flavorRef + */ + public String getFlavorRef() { + return flavorRef; + } + + /** + * @param flavorRef the flavorRef to set + */ + public void setFlavorRef(String flavorRef) { + this.flavorRef = flavorRef; + } + + /** + * @return the diskConfig + */ + public String getDiskConfig() { + return diskConfig; + } + + /** + * @param diskConfig the diskConfig to set + */ + public void setDiskConfig(String diskConfig) { + this.diskConfig = diskConfig; + } + + } + + @JsonRootName("confirmResize") + public static final class ConfirmResize implements ServerAction { + + } + + @JsonRootName("revertResize") + public static final class RevertResize implements ServerAction { + + } + + @JsonRootName("createImage") + public static final class CreateImage implements ServerAction { + + private String name; + + private Map metadata; + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the metadata + */ + public Map getMetadata() { + return metadata; + } + + /** + * @param metadata the metadata to set + */ + public void setMetadata(Map metadata) { + this.metadata = metadata; + } + + } + + @JsonRootName("rescue") + public static final class Rescue implements ServerAction { + + private String adminPass; + + public Rescue() { + + } + + public Rescue(String adminPass) { + this.adminPass = adminPass; + } + + /** + * @return the adminPass + */ + public String getAdminPass() { + return adminPass; + } + + /** + * @param adminPass the adminPass to set + */ + public void setAdminPass(String adminPass) { + this.adminPass = adminPass; + } + + } + + public static final class RescueResponse implements ServerAction { + + private String adminPass; + + /** + * @return the adminPass + */ + public String getAdminPass() { + return adminPass; + } + + } + + @JsonRootName("unrescue") + public static final class Unrescue implements ServerAction { + + } + + @JsonRootName("unpause") + public static final class Unpause implements ServerAction { + + } + + @JsonRootName("pause") + public static final class Pause implements ServerAction { + + } + + @JsonRootName("suspend") + public static final class Suspend implements ServerAction { + + } + + @JsonRootName("resume") + public static final class Resume implements ServerAction { + + } + + @JsonRootName("lock") + public static final class Lock implements ServerAction { + + } + + @JsonRootName("unlock") + public static final class Unlock implements ServerAction { + + } + + @JsonRootName("os-getConsoleOutput") + public static final class GetConsoleOutput implements ServerAction { + + private Integer length; + + public GetConsoleOutput() { + + } + + public GetConsoleOutput(Integer length) { + this.length = length; + } + + /** + * @return the length + */ + public Integer getLength() { + return length; + } + + /** + * @param length the length to set + */ + public void setLength(Integer length) { + this.length = length; + } + + } + + public static final class ConsoleOutput implements ServerAction { + + private String output; + + /** + * @return the output + */ + public String getOutput() { + return output; + } + + } + + @JsonRootName("os-getVNCConsole") + public static final class GetVncConsole implements ServerAction { + + private String type; + + public GetVncConsole() { + super(); + // TODO Auto-generated constructor stub + } + + + public GetVncConsole(String type) { + super(); + this.type = type; + } + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + + } + + @JsonRootName("console") + public static final class VncConsole implements ServerAction { + + private String type; + + private String url; + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @return the url + */ + public String getUrl() { + return url; + } + + } + + @JsonRootName("os-start") + public static final class Start implements ServerAction { + + } + + @JsonRootName("os-stop") + public static final class Stop implements ServerAction { + + } + + @JsonRootName("forceDelete") + public static final class ForceDelete implements ServerAction { + + } + + @JsonRootName("restore") + public static final class Restore implements ServerAction { + + } + + @JsonRootName("addFloatingIp") + public static final class AssociateFloatingIp implements ServerAction { + + private String address; + + public AssociateFloatingIp() { + super(); + // TODO Auto-generated constructor stub + } + + public AssociateFloatingIp(String address) { + super(); + this.address = address; + } + + /** + * @return the address + */ + public String getAddress() { + return address; + } + + /** + * @param address the address to set + */ + public void setAddress(String address) { + this.address = address; + } + + } + + @JsonRootName("removeFloatingIp") + public static final class DisassociateFloatingIp implements ServerAction { + + private String address; + + public DisassociateFloatingIp() { + super(); + // TODO Auto-generated constructor stub + } + + public DisassociateFloatingIp(String address) { + super(); + this.address = address; + } + + /** + * @return the address + */ + public String getAddress() { + return address; + } + + /** + * @param address the address to set + */ + public void setAddress(String address) { + this.address = address; + } + + } + + @JsonRootName("createBackup") + public static final class CreateBackup implements ServerAction { + + private String name; + + @JsonProperty("backup_type") + private String type; + + private String rotation; + + private Map metadata; + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } + + /** + * @return the rotation + */ + public String getRotation() { + return rotation; + } + + /** + * @param rotation the rotation to set + */ + public void setRotation(String rotation) { + this.rotation = rotation; + } + + /** + * @return the metadata + */ + public Map getMetadata() { + return metadata; + } + + /** + * @param metadata the metadata to set + */ + public void setMetadata(Map metadata) { + this.metadata = metadata; + } + + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java index ce981f7..4858e01 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java @@ -28,315 +28,315 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("server") public class ServerForCreate implements Serializable { - public static final class SecurityGroup implements Serializable { + public static final class SecurityGroup implements Serializable { - private String name; + private String name; - public SecurityGroup() { - } + public SecurityGroup() { + } - public SecurityGroup(String name) { - this.name = name; - } + public SecurityGroup(String name) { + this.name = name; + } - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @param name - * the name to set - */ - public void setName(String name) { - this.name = name; - } + /** + * @param name + * the name to set + */ + public void setName(String name) { + this.name = name; + } - } + } - private String name; + private String name; - private String adminPass; - - private String imageRef; - - private String flavorRef; - - private String accessIPv4; - - private String accessIPv6; - - private Integer min; - - private Integer max; - - private String diskConfig; - - @JsonProperty("key_name") - private String keyName; - - private List personality = new ArrayList(); - - private Map metadata = new HashMap(); - - @JsonProperty("security_groups") - private List securityGroups; - - @JsonProperty("user_data") - private String userData; - - @JsonProperty("availability_zone") - private String availabilityZone; - - @JsonProperty("config_drive") - private boolean configDrive; - - @JsonProperty("networks") - private List networks = new ArrayList(); - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name - * the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the adminPass - */ - public String getAdminPass() { - return adminPass; - } - - /** - * @param adminPass - * the adminPass to set - */ - public void setAdminPass(String adminPass) { - this.adminPass = adminPass; - } - - /** - * @return the imageRef - */ - public String getImageRef() { - return imageRef; - } - - /** - * @param imageRef - * the imageRef to set - */ - public void setImageRef(String imageRef) { - this.imageRef = imageRef; - } - - /** - * @return the flavorRef - */ - public String getFlavorRef() { - return flavorRef; - } - - /** - * @param flavorRef - * the flavorRef to set - */ - public void setFlavorRef(String flavorRef) { - this.flavorRef = flavorRef; - } - - /** - * @return the accessIPv4 - */ - public String getAccessIPv4() { - return accessIPv4; - } - - /** - * @param accessIPv4 - * the accessIPv4 to set - */ - public void setAccessIPv4(String accessIPv4) { - this.accessIPv4 = accessIPv4; - } - - /** - * @return the accessIPv6 - */ - public String getAccessIPv6() { - return accessIPv6; - } - - /** - * @param accessIPv6 - * the accessIPv6 to set - */ - public void setAccessIPv6(String accessIPv6) { - this.accessIPv6 = accessIPv6; - } - - /** - * @return the min - */ - public Integer getMin() { - return min; - } - - /** - * @param min - * the min to set - */ - public void setMin(Integer min) { - this.min = min; - } - - /** - * @return the max - */ - public Integer getMax() { - return max; - } - - /** - * @param max - * the max to set - */ - public void setMax(Integer max) { - this.max = max; - } - - /** - * @return the diskConfig - */ - public String getDiskConfig() { - return diskConfig; - } - - /** - * @param diskConfig - * the diskConfig to set - */ - public void setDiskConfig(String diskConfig) { - this.diskConfig = diskConfig; - } - - /** - * @return the keyName - */ - public String getKeyName() { - return keyName; - } - - /** - * @param keyName - * the keyName to set - */ - public void setKeyName(String keyName) { - this.keyName = keyName; - } - - /** - * @return the personality - */ - public List getPersonality() { - return personality; - } - - /** - * @param personality - * the personality to set - */ - public void setPersonality(List personality) { - this.personality = personality; - } - - /** - * @return the metadata - */ - public Map getMetadata() { - return metadata; - } - - /** - * @param metadata - * the metadata to set - */ - public void setMetadata(Map metadata) { - this.metadata = metadata; - } - - /** - * @return the securityGroups - */ - public List getSecurityGroups() { - if (securityGroups == null) { - securityGroups = new ArrayList(); - } - return securityGroups; - } - - /** - * @return the userData - */ - public String getUserData() { - return userData; - } - - /** - * @param userData - * the userData to set - */ - public void setUserData(String userData) { - this.userData = userData; - } - - /** - * @return the availabilityZone - */ - public String getAvailabilityZone() { - return availabilityZone; - } - - /** - * @param availabilityZone - * the availabilityZone to set - */ - public void setAvailabilityZone(String availabilityZone) { - this.availabilityZone = availabilityZone; - } - - public boolean isConfigDrive() { - return configDrive; - } - - public void setConfigDrive(boolean configDrive) { - this.configDrive = configDrive; - } - - public List getNetworks() { - return networks; - } - - public void setNetworks(List networks) { - this.networks = networks; - } - - public void addNetworks(String id, String fixedIp) { - NetworkForCreate net = new NetworkForCreate(); - net.setId(id); - net.setFixedIp(fixedIp); - this.networks.add(net); - } + private String adminPass; + + private String imageRef; + + private String flavorRef; + + private String accessIPv4; + + private String accessIPv6; + + private Integer min; + + private Integer max; + + private String diskConfig; + + @JsonProperty("key_name") + private String keyName; + + private List personality = new ArrayList(); + + private Map metadata = new HashMap(); + + @JsonProperty("security_groups") + private List securityGroups; + + @JsonProperty("user_data") + private String userData; + + @JsonProperty("availability_zone") + private String availabilityZone; + + @JsonProperty("config_drive") + private boolean configDrive; + + @JsonProperty("networks") + private List networks = new ArrayList(); + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name + * the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the adminPass + */ + public String getAdminPass() { + return adminPass; + } + + /** + * @param adminPass + * the adminPass to set + */ + public void setAdminPass(String adminPass) { + this.adminPass = adminPass; + } + + /** + * @return the imageRef + */ + public String getImageRef() { + return imageRef; + } + + /** + * @param imageRef + * the imageRef to set + */ + public void setImageRef(String imageRef) { + this.imageRef = imageRef; + } + + /** + * @return the flavorRef + */ + public String getFlavorRef() { + return flavorRef; + } + + /** + * @param flavorRef + * the flavorRef to set + */ + public void setFlavorRef(String flavorRef) { + this.flavorRef = flavorRef; + } + + /** + * @return the accessIPv4 + */ + public String getAccessIPv4() { + return accessIPv4; + } + + /** + * @param accessIPv4 + * the accessIPv4 to set + */ + public void setAccessIPv4(String accessIPv4) { + this.accessIPv4 = accessIPv4; + } + + /** + * @return the accessIPv6 + */ + public String getAccessIPv6() { + return accessIPv6; + } + + /** + * @param accessIPv6 + * the accessIPv6 to set + */ + public void setAccessIPv6(String accessIPv6) { + this.accessIPv6 = accessIPv6; + } + + /** + * @return the min + */ + public Integer getMin() { + return min; + } + + /** + * @param min + * the min to set + */ + public void setMin(Integer min) { + this.min = min; + } + + /** + * @return the max + */ + public Integer getMax() { + return max; + } + + /** + * @param max + * the max to set + */ + public void setMax(Integer max) { + this.max = max; + } + + /** + * @return the diskConfig + */ + public String getDiskConfig() { + return diskConfig; + } + + /** + * @param diskConfig + * the diskConfig to set + */ + public void setDiskConfig(String diskConfig) { + this.diskConfig = diskConfig; + } + + /** + * @return the keyName + */ + public String getKeyName() { + return keyName; + } + + /** + * @param keyName + * the keyName to set + */ + public void setKeyName(String keyName) { + this.keyName = keyName; + } + + /** + * @return the personality + */ + public List getPersonality() { + return personality; + } + + /** + * @param personality + * the personality to set + */ + public void setPersonality(List personality) { + this.personality = personality; + } + + /** + * @return the metadata + */ + public Map getMetadata() { + return metadata; + } + + /** + * @param metadata + * the metadata to set + */ + public void setMetadata(Map metadata) { + this.metadata = metadata; + } + + /** + * @return the securityGroups + */ + public List getSecurityGroups() { + if (securityGroups == null) { + securityGroups = new ArrayList(); + } + return securityGroups; + } + + /** + * @return the userData + */ + public String getUserData() { + return userData; + } + + /** + * @param userData + * the userData to set + */ + public void setUserData(String userData) { + this.userData = userData; + } + + /** + * @return the availabilityZone + */ + public String getAvailabilityZone() { + return availabilityZone; + } + + /** + * @param availabilityZone + * the availabilityZone to set + */ + public void setAvailabilityZone(String availabilityZone) { + this.availabilityZone = availabilityZone; + } + + public boolean isConfigDrive() { + return configDrive; + } + + public void setConfigDrive(boolean configDrive) { + this.configDrive = configDrive; + } + + public List getNetworks() { + return networks; + } + + public void setNetworks(List networks) { + this.networks = networks; + } + + public void addNetworks(String id, String fixedIp) { + NetworkForCreate net = new NetworkForCreate(); + net.setId(id); + net.setFixedIp(fixedIp); + this.networks.add(net); + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java index 3cc908e..92643b9 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Servers implements Iterable, Serializable { - @JsonProperty("servers") - private List list; + @JsonProperty("servers") + private List list; - /** - * @return the list - */ - public List getList() { - return list; - } - - @Override - public Iterator iterator() { - return list.iterator(); - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Servers [list=" + list + "]"; - } + /** + * @return the list + */ + public List getList() { + return list; + } + + @Override + public Iterator iterator() { + return list.iterator(); + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Servers [list=" + list + "]"; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java index 463cc98..ea6f77e 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java @@ -25,224 +25,224 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("tenant_usage") public class SimpleTenantUsage implements Serializable { - - @JsonProperty("total_memory_mb_usage") - private BigDecimal totalMemoryMbUsage; - - @JsonProperty("total_vcpus_usage") - private BigDecimal totalVcpusUsage; - - @JsonProperty("total_local_gb_usage") - private BigDecimal totalLocalGbUsage; - - private String start; - - private String stop; - - @JsonProperty("tenant_id") - private String tenantId; - - @JsonProperty("total_hours") - private String totalHours; - - @JsonProperty("server_usages") - private List serverUsages; - - /** - * @return the totalMemoryMbUsage - */ - public BigDecimal getTotalMemoryMbUsage() { - return totalMemoryMbUsage; - } - - /** - * @param totalMemoryMbUsage the totalMemoryMbUsage to set - */ - public void setTotalMemoryMbUsage(BigDecimal totalMemoryMbUsage) { - this.totalMemoryMbUsage = totalMemoryMbUsage; - } - - /** - * @return the totalVcpusUsage - */ - public BigDecimal getTotalVcpusUsage() { - return totalVcpusUsage; - } - - /** - * @param totalVcpusUsage the totalVcpusUsage to set - */ - public void setTotalVcpusUsage(BigDecimal totalVcpusUsage) { - this.totalVcpusUsage = totalVcpusUsage; - } - - /** - * @return the totalLocalGbUsage - */ - public BigDecimal getTotalLocalGbUsage() { - return totalLocalGbUsage; - } - - /** - * @param totalLocalGbUsage the totalLocalGbUsage to set - */ - public void setTotalLocalGbUsage(BigDecimal totalLocalGbUsage) { - this.totalLocalGbUsage = totalLocalGbUsage; - } - - /** - * @return the start - */ - public String getStart() { - return start; - } - - /** - * @param start the start to set - */ - public void setStart(String start) { - this.start = start; - } - - /** - * @return the stop - */ - public String getStop() { - return stop; - } - - /** - * @param stop the stop to set - */ - public void setStop(String stop) { - this.stop = stop; - } - - /** - * @return the tenantId - */ - public String getTenantId() { - return tenantId; - } - - /** - * @param tenantId the tenantId to set - */ - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - /** - * @return the totalHours - */ - public String getTotalHours() { - return totalHours; - } - - /** - * @param totalHours the totalHours to set - */ - public void setTotalHours(String totalHours) { - this.totalHours = totalHours; - } - - public List getServerUsages() { - return serverUsages; - } - - public void setServerUsages(List serverUsages) { - this.serverUsages = serverUsages; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "SimpleTenantUsage [totalMemoryMbUsage=" + totalMemoryMbUsage - + ", totalVcpusUsage=" + totalVcpusUsage - + ", totalLocalGbUsage=" + totalLocalGbUsage + ", start=" - + start + ", stop=" + stop + ", tenantId=" + tenantId - + ", totalHours=" + totalHours + "]"; - } - - public static final class ServerUsage implements Serializable { - @JsonProperty("instance_id") - private String instanceId; - - private Integer uptime; - - @JsonProperty("started_at") - private String startedAt; - - @JsonProperty("ended_at") - private String endedAt; - - @JsonProperty("memory_mb") - private Integer memoryMb; - - @JsonProperty("tenant_id") - private String tenantId; - - private String state; - - private Double hours; - - private Integer vcpus; - - private String flavor; - - @JsonProperty("local_gb") - private Integer localDiskSize; - - private String name; - - public String getInstanceId() { - return instanceId; - } - - public Integer getUptime() { - return uptime; - } - - public String getStartedAt() { - return startedAt; - } - - public String getEndedAt() { - return endedAt; - } - - public Integer getMemoryMb() { - return memoryMb; - } - - public String getTenantId() { - return tenantId; - } - - public String getState() { - return state; - } - - public Double getHours() { - return hours; - } - - public Integer getVcpus() { - return vcpus; - } - - public String getFlavor() { - return flavor; - } + + @JsonProperty("total_memory_mb_usage") + private BigDecimal totalMemoryMbUsage; + + @JsonProperty("total_vcpus_usage") + private BigDecimal totalVcpusUsage; + + @JsonProperty("total_local_gb_usage") + private BigDecimal totalLocalGbUsage; + + private String start; + + private String stop; + + @JsonProperty("tenant_id") + private String tenantId; + + @JsonProperty("total_hours") + private String totalHours; + + @JsonProperty("server_usages") + private List serverUsages; + + /** + * @return the totalMemoryMbUsage + */ + public BigDecimal getTotalMemoryMbUsage() { + return totalMemoryMbUsage; + } + + /** + * @param totalMemoryMbUsage the totalMemoryMbUsage to set + */ + public void setTotalMemoryMbUsage(BigDecimal totalMemoryMbUsage) { + this.totalMemoryMbUsage = totalMemoryMbUsage; + } + + /** + * @return the totalVcpusUsage + */ + public BigDecimal getTotalVcpusUsage() { + return totalVcpusUsage; + } + + /** + * @param totalVcpusUsage the totalVcpusUsage to set + */ + public void setTotalVcpusUsage(BigDecimal totalVcpusUsage) { + this.totalVcpusUsage = totalVcpusUsage; + } + + /** + * @return the totalLocalGbUsage + */ + public BigDecimal getTotalLocalGbUsage() { + return totalLocalGbUsage; + } + + /** + * @param totalLocalGbUsage the totalLocalGbUsage to set + */ + public void setTotalLocalGbUsage(BigDecimal totalLocalGbUsage) { + this.totalLocalGbUsage = totalLocalGbUsage; + } + + /** + * @return the start + */ + public String getStart() { + return start; + } + + /** + * @param start the start to set + */ + public void setStart(String start) { + this.start = start; + } + + /** + * @return the stop + */ + public String getStop() { + return stop; + } + + /** + * @param stop the stop to set + */ + public void setStop(String stop) { + this.stop = stop; + } + + /** + * @return the tenantId + */ + public String getTenantId() { + return tenantId; + } + + /** + * @param tenantId the tenantId to set + */ + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + /** + * @return the totalHours + */ + public String getTotalHours() { + return totalHours; + } + + /** + * @param totalHours the totalHours to set + */ + public void setTotalHours(String totalHours) { + this.totalHours = totalHours; + } + + public List getServerUsages() { + return serverUsages; + } + + public void setServerUsages(List serverUsages) { + this.serverUsages = serverUsages; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "SimpleTenantUsage [totalMemoryMbUsage=" + totalMemoryMbUsage + + ", totalVcpusUsage=" + totalVcpusUsage + + ", totalLocalGbUsage=" + totalLocalGbUsage + ", start=" + + start + ", stop=" + stop + ", tenantId=" + tenantId + + ", totalHours=" + totalHours + "]"; + } + + public static final class ServerUsage implements Serializable { + @JsonProperty("instance_id") + private String instanceId; + + private Integer uptime; + + @JsonProperty("started_at") + private String startedAt; + + @JsonProperty("ended_at") + private String endedAt; + + @JsonProperty("memory_mb") + private Integer memoryMb; + + @JsonProperty("tenant_id") + private String tenantId; + + private String state; + + private Double hours; + + private Integer vcpus; + + private String flavor; + + @JsonProperty("local_gb") + private Integer localDiskSize; + + private String name; + + public String getInstanceId() { + return instanceId; + } + + public Integer getUptime() { + return uptime; + } + + public String getStartedAt() { + return startedAt; + } + + public String getEndedAt() { + return endedAt; + } + + public Integer getMemoryMb() { + return memoryMb; + } + + public String getTenantId() { + return tenantId; + } + + public String getState() { + return state; + } + + public Double getHours() { + return hours; + } + + public Integer getVcpus() { + return vcpus; + } + + public String getFlavor() { + return flavor; + } - public Integer getLocalDiskSize() { - return localDiskSize; - } + public Integer getLocalDiskSize() { + return localDiskSize; + } - public String getName() { - return name; - } - } + public String getName() { + return name; + } + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java index 087d616..313e5eb 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class SimpleTenantUsages implements Iterable, Serializable { - @JsonProperty("tenant_usages") - private List list; - - /** - * @return the list - */ - public List getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "SimpleTenantUsage [list=" + list + "]"; - } - - @Override - public Iterator iterator() { - return list.iterator(); - } - + @JsonProperty("tenant_usages") + private List list; + + /** + * @return the list + */ + public List getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "SimpleTenantUsage [list=" + list + "]"; + } + + @Override + public Iterator iterator() { + return list.iterator(); + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java index 2fb547b..c51ab62 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java @@ -24,80 +24,80 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("snapshot") public class Snapshot implements Serializable { - private String id; - - private String status; - - @JsonProperty("displayName") - private String name; - - @JsonProperty("displayDescription") - private String description; - - private String volumeId; - - private Integer size; - - private String createdAt; + private String id; + + private String status; + + @JsonProperty("displayName") + private String name; + + @JsonProperty("displayDescription") + private String description; + + private String volumeId; + + private Integer size; + + private String createdAt; - /** - * @return the id - */ - public String getId() { - return id; - } + /** + * @return the id + */ + public String getId() { + return id; + } - /** - * @return the status - */ - public String getStatus() { - return status; - } + /** + * @return the status + */ + public String getStatus() { + return status; + } - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @return the description - */ - public String getDescription() { - return description; - } + /** + * @return the description + */ + public String getDescription() { + return description; + } - /** - * @return the volumeId - */ - public String getVolumeId() { - return volumeId; - } + /** + * @return the volumeId + */ + public String getVolumeId() { + return volumeId; + } - /** - * @return the size - */ - public Integer getSize() { - return size; - } + /** + * @return the size + */ + public Integer getSize() { + return size; + } - /** - * @return the createdAt - */ - public String getCreatedAt() { - return createdAt; - } + /** + * @return the createdAt + */ + public String getCreatedAt() { + return createdAt; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Snapshot [id=" + id + ", status=" + status + ", displayName=" - + name + ", displayDescription=" + description - + ", volumeId=" + volumeId + ", size=" + size + ", createdAt=" - + createdAt + "]"; - } - + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Snapshot [id=" + id + ", status=" + status + ", displayName=" + + name + ", displayDescription=" + description + + ", volumeId=" + volumeId + ", size=" + size + ", createdAt=" + + createdAt + "]"; + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java index 4fa37c0..752eb59 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java @@ -23,81 +23,81 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("snapshot") public class SnapshotForCreate implements Serializable { - - @JsonProperty("volume_id") - private String volumeId; - - private Boolean force; - - @JsonProperty("display_name") - private String name; + + @JsonProperty("volume_id") + private String volumeId; + + private Boolean force; + + @JsonProperty("display_name") + private String name; - @JsonProperty("display_description") - private String description; + @JsonProperty("display_description") + private String description; - /** - * @return the volumeId - */ - public String getVolumeId() { - return volumeId; - } + /** + * @return the volumeId + */ + public String getVolumeId() { + return volumeId; + } - /** - * @param volumeId the volumeId to set - */ - public void setVolumeId(String volumeId) { - this.volumeId = volumeId; - } + /** + * @param volumeId the volumeId to set + */ + public void setVolumeId(String volumeId) { + this.volumeId = volumeId; + } - /** - * @return the force - */ - public Boolean getForce() { - return force; - } + /** + * @return the force + */ + public Boolean getForce() { + return force; + } - /** - * @param force the force to set - */ - public void setForce(Boolean force) { - this.force = force; - } + /** + * @param force the force to set + */ + public void setForce(Boolean force) { + this.force = force; + } - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } - /** - * @return the description - */ - public String getDescription() { - return description; - } + /** + * @return the description + */ + public String getDescription() { + return description; + } - /** - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } + /** + * @param description the description to set + */ + public void setDescription(String description) { + this.description = description; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "SnapshotForCreate [volumeId=" + volumeId + ", force=" + force - + ", name=" + name + ", description=" + description + "]"; - } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "SnapshotForCreate [volumeId=" + volumeId + ", force=" + force + + ", name=" + name + ", description=" + description + "]"; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java index c71c8cf..238a173 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Snapshots implements Iterable, Serializable { - @JsonProperty("snapshots") - private List list; + @JsonProperty("snapshots") + private List list; - /** - * @return the list - */ - public List getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Snapshots [list=" + list + "]"; - } + /** + * @return the list + */ + public List getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Snapshots [list=" + list + "]"; + } - @Override - public Iterator iterator() { - return list.iterator(); - } - + @Override + public Iterator iterator() { + return list.iterator(); + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java index 50d1c91..453bf24 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java @@ -26,107 +26,107 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("volume") public class Volume implements Serializable { - private String id; - - private String status; - - @JsonProperty("displayName") - private String name; - - @JsonProperty("displayDescription") - private String description; - - private String availabilityZone; - - private String volumeType; - - private String snapshotId; - - private List> attachments; - - private Map metadata; - - private String createdAt; - - private Integer size; - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @return the status - */ - public String getStatus() { - return status; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @return the description - */ - public String getDescription() { - return description; - } - - /** - * @return the availabilityZone - */ - public String getAvailabilityZone() { - return availabilityZone; - } - - /** - * @return the volumeType - */ - public String getVolumeType() { - return volumeType; - } - - /** - * @return the snapshotId - */ - public String getSnapshotId() { - return snapshotId; - } - - /** - * @return the attachments - */ - public List> getAttachments() { - return attachments; - } - - /** - * @return the metadata - */ - public Map getMetadata() { - return metadata; - } - - /** - * @return the createdAt - */ - public String getCreatedAt() { - return createdAt; - } - - /** - * @return the size - */ - public Integer getSize() { - return size; - } - - - + private String id; + + private String status; + + @JsonProperty("displayName") + private String name; + + @JsonProperty("displayDescription") + private String description; + + private String availabilityZone; + + private String volumeType; + + private String snapshotId; + + private List> attachments; + + private Map metadata; + + private String createdAt; + + private Integer size; + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @return the status + */ + public String getStatus() { + return status; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * @return the availabilityZone + */ + public String getAvailabilityZone() { + return availabilityZone; + } + + /** + * @return the volumeType + */ + public String getVolumeType() { + return volumeType; + } + + /** + * @return the snapshotId + */ + public String getSnapshotId() { + return snapshotId; + } + + /** + * @return the attachments + */ + public List> getAttachments() { + return attachments; + } + + /** + * @return the metadata + */ + public Map getMetadata() { + return metadata; + } + + /** + * @return the createdAt + */ + public String getCreatedAt() { + return createdAt; + } + + /** + * @return the size + */ + public Integer getSize() { + return size; + } + + + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java index 1dd7c2a..3a62cca 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java @@ -23,53 +23,53 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("volumeAttachment") public class VolumeAttachment implements Serializable { - private String id; + private String id; - private String volumeId; + private String volumeId; - private String serverId; + private String serverId; - private String device; + private String device; - public String getId() { - return id; - } + public String getId() { + return id; + } - public void setId(String id) { - this.id = id; - } + public void setId(String id) { + this.id = id; + } - public String getVolumeId() { - return volumeId; - } + public String getVolumeId() { + return volumeId; + } - public void setVolumeId(String volumeId) { - this.volumeId = volumeId; - } + public void setVolumeId(String volumeId) { + this.volumeId = volumeId; + } - public String getServerId() { - return serverId; - } + public String getServerId() { + return serverId; + } - public void setServerId(String serverId) { - this.serverId = serverId; - } + public void setServerId(String serverId) { + this.serverId = serverId; + } - public String getDevice() { - return device; - } + public String getDevice() { + return device; + } - public void setDevice(String device) { - this.device = device; - } + public void setDevice(String device) { + this.device = device; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "VolumeAttachment [id=" + id + ", volumeId=" + volumeId - + ", serverId=" + serverId + ", device=" + device + "]"; - } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "VolumeAttachment [id=" + id + ", volumeId=" + volumeId + + ", serverId=" + serverId + ", device=" + device + "]"; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java index 54e870c..2a5ecba 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class VolumeAttachments implements Iterable, Serializable { - @JsonProperty("volumeAttachments") - private List list; - - /** - * @return the list - */ - public List getList() { - return list; - } - - @Override - public Iterator iterator() { - return list.iterator(); - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "VolumeAttachments [list=" + list + "]"; - } + @JsonProperty("volumeAttachments") + private List list; + + /** + * @return the list + */ + public List getList() { + return list; + } + + @Override + public Iterator iterator() { + return list.iterator(); + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "VolumeAttachments [list=" + list + "]"; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java index 13e7932..c06d692 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java @@ -25,115 +25,115 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("volume") public class VolumeForCreate implements Serializable { - private Integer size; - - @JsonProperty("availability_zone") - private String availabilityZone; - - @JsonProperty("display_name") - private String name; - - @JsonProperty("display_description") - private String description; - - @JsonProperty("snapshot_id") - private Integer snapshotId; - - private Map metadata; - - /** - * @return the size - */ - public Integer getSize() { - return size; - } - - /** - * @param size the size to set - */ - public void setSize(Integer size) { - this.size = size; - } - - /** - * @return the availabilityZone - */ - public String getAvailabilityZone() { - return availabilityZone; - } - - /** - * @param availabilityZone the availabilityZone to set - */ - public void setAvailabilityZone(String availabilityZone) { - this.availabilityZone = availabilityZone; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the description - */ - public String getDescription() { - return description; - } - - /** - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * @return the snapshotId - */ - public Integer getSnapshotId() { - return snapshotId; - } - - /** - * @param snapshotId the snapshotId to set - */ - public void setSnapshotId(Integer snapshotId) { - this.snapshotId = snapshotId; - } - - /** - * @return the metadata - */ - public Map getMetadata() { - return metadata; - } - - /** - * @param metadata the metadata to set - */ - public void setMetadata(Map metadata) { - this.metadata = metadata; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "VolumeForCreate [size=" + size + ", availabilityZone=" - + availabilityZone + ", name=" + name + ", description=" - + description + ", snapshotId=" + snapshotId + ", metadata=" - + metadata + "]"; - } + private Integer size; + + @JsonProperty("availability_zone") + private String availabilityZone; + + @JsonProperty("display_name") + private String name; + + @JsonProperty("display_description") + private String description; + + @JsonProperty("snapshot_id") + private Integer snapshotId; + + private Map metadata; + + /** + * @return the size + */ + public Integer getSize() { + return size; + } + + /** + * @param size the size to set + */ + public void setSize(Integer size) { + this.size = size; + } + + /** + * @return the availabilityZone + */ + public String getAvailabilityZone() { + return availabilityZone; + } + + /** + * @param availabilityZone the availabilityZone to set + */ + public void setAvailabilityZone(String availabilityZone) { + this.availabilityZone = availabilityZone; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * @param description the description to set + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * @return the snapshotId + */ + public Integer getSnapshotId() { + return snapshotId; + } + + /** + * @param snapshotId the snapshotId to set + */ + public void setSnapshotId(Integer snapshotId) { + this.snapshotId = snapshotId; + } + + /** + * @return the metadata + */ + public Map getMetadata() { + return metadata; + } + + /** + * @param metadata the metadata to set + */ + public void setMetadata(Map metadata) { + this.metadata = metadata; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "VolumeForCreate [size=" + size + ", availabilityZone=" + + availabilityZone + ", name=" + name + ", description=" + + description + ", snapshotId=" + snapshotId + ", metadata=" + + metadata + "]"; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java index 3b5df21..f368f5c 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java @@ -23,65 +23,65 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("os-volume_upload_image") public class VolumeForImageCreate implements Serializable { - String volumeId; - String tenantId; - - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - @JsonProperty("force") - private Boolean force; - - public Boolean getForce() { - return force; - } - - public void setForce(Boolean force) { - this.force = force; - } - - @JsonProperty("container_format") - String container_format; - @JsonProperty("disk_format") - String disk_format; - @JsonProperty("image_name") - String image_name; - - public String getVolumeId() { - return volumeId; - } - - public void setVolumeId(String volumeId) { - this.volumeId = volumeId; - } - - public String getContainer_format() { - return container_format; - } - - public void setContainer_format(String container_format) { - this.container_format = container_format; - } - - public String getDisk_format() { - return disk_format; - } - - public void setDisk_format(String disk_format) { - this.disk_format = disk_format; - } - - public String getImage_name() { - return image_name; - } - - public void setImage_name(String image_name) { - this.image_name = image_name; - } + String volumeId; + String tenantId; + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + @JsonProperty("force") + private Boolean force; + + public Boolean getForce() { + return force; + } + + public void setForce(Boolean force) { + this.force = force; + } + + @JsonProperty("container_format") + String container_format; + @JsonProperty("disk_format") + String disk_format; + @JsonProperty("image_name") + String image_name; + + public String getVolumeId() { + return volumeId; + } + + public void setVolumeId(String volumeId) { + this.volumeId = volumeId; + } + + public String getContainer_format() { + return container_format; + } + + public void setContainer_format(String container_format) { + this.container_format = container_format; + } + + public String getDisk_format() { + return disk_format; + } + + public void setDisk_format(String disk_format) { + this.disk_format = disk_format; + } + + public String getImage_name() { + return image_name; + } + + public void setImage_name(String image_name) { + this.image_name = image_name; + } } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java index fd7149c..96fc6c5 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class VolumeTypes implements Iterable, Serializable { - @JsonProperty("volume-types") - private List list; + @JsonProperty("volume-types") + private List list; - /** - * @return the list - */ - public List getList() { - return list; - } + /** + * @return the list + */ + public List getList() { + return list; + } - @Override - public Iterator iterator() { - return list.iterator(); - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "VolumeTypes [list=" + list + "]"; - } - + @Override + public Iterator iterator() { + return list.iterator(); + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "VolumeTypes [list=" + list + "]"; + } + } diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java index d71dcd6..1dc5bde 100644 --- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java +++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Volumes implements Iterable, Serializable { - @JsonProperty("volumes") - private List list; + @JsonProperty("volumes") + private List list; - /** - * @return the list - */ - public List getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Volumes [list=" + list + "]"; - } + /** + * @return the list + */ + public List getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Volumes [list=" + list + "]"; + } - @Override - public Iterator iterator() { - return list.iterator(); - } - + @Override + public Iterator iterator() { + return list.iterator(); + } + } -- cgit 1.2.3-korg