summaryrefslogtreecommitdiffstats
path: root/nova-model/src/main/java/com/woorea
diff options
context:
space:
mode:
Diffstat (limited to 'nova-model/src/main/java/com/woorea')
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java8
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java28
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java21
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java47
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java18
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java13
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java19
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java18
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java7
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java17
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java38
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java37
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java29
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java52
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java1
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java11
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java26
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java17
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java21
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java10
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java5
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java78
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java6
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/QuotaSet.java55
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroup.java41
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupForCreate.java16
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreate.java53
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SecurityGroups.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java143
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/ServerAction.java159
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java49
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Servers.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsage.java27
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SimpleTenantUsages.java7
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java25
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/SnapshotForCreate.java15
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshots.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java23
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachment.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeAttachments.java7
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForCreate.java11
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeForImageCreate.java1
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java1
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeTypes.java9
-rw-r--r--nova-model/src/main/java/com/woorea/openstack/nova/model/Volumes.java9
50 files changed, 654 insertions, 605 deletions
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
index 5ff1a2b..41a1d81 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Certificate.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
public class Certificate {
private String data;
-
+
@JsonProperty("private_key")
private String privateKey;
@@ -41,12 +41,14 @@ public class Certificate {
return privateKey;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "Certificate [data=" + data + ", privateKey=" + privateKey + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
index 205816f..5da3ffb 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipe.java
@@ -18,24 +18,23 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Calendar;
-
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("cloudpipe")
public class Cloudpipe implements Serializable {
-
+
private String projectId;
-
+
private String internalIp;
-
+
private String publicIp;
-
+
private String publicPort;
-
+
private String state;
-
+
private String instanceId;
-
+
private Calendar createdAt;
/**
@@ -136,15 +135,16 @@ public class Cloudpipe implements Serializable {
this.createdAt = createdAt;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "CloudPipe [projectId=" + projectId + ", internalIp="
- + internalIp + ", publicIp=" + publicIp + ", publicPort="
- + publicPort + ", state=" + state + ", instanceId="
- + instanceId + ", createdAt=" + createdAt + "]";
+ return "CloudPipe [projectId=" + projectId + ", internalIp=" + internalIp + ", publicIp=" + publicIp
+ + ", publicPort=" + publicPort + ", state=" + state + ", instanceId=" + instanceId + ", createdAt="
+ + createdAt + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
index 09e02e0..4218a88 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Cloudpipes.java
@@ -18,7 +18,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Cloudpipes implements Serializable {
@@ -32,13 +31,15 @@ public class Cloudpipes implements Serializable {
public List<Cloudpipe> getList() {
return list;
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "Flavors [list=" + list + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
index 89b1121..8f9b653 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extension.java
@@ -19,22 +19,21 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Calendar;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("extension")
public class Extension implements Serializable {
private String alias;
-
+
private String description;
-
+
private String name;
-
+
private String namespace;
-
+
private Calendar updated;
-
+
private List<Link> links;
/**
@@ -79,13 +78,15 @@ public class Extension implements Serializable {
return links;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "Extension [alias=" + alias + ", description=" + description
- + ", name=" + name + ", namespace=" + namespace + "]";
+ return "Extension [alias=" + alias + ", description=" + description + ", name=" + name + ", namespace="
+ + namespace + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
index ce13b14..d904ad3 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Extensions.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Extensions implements Iterable<Extension>, Serializable {
@@ -33,13 +32,15 @@ public class Extensions implements Iterable<Extension>, Serializable {
public List<Extension> getList() {
return list;
}
-
+
@Override
public Iterator<Extension> iterator() {
return list.iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
index 00740f4..4b42d62 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavor.java
@@ -18,42 +18,47 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("flavor")
public class Flavor implements Serializable {
+ @JsonProperty("id")
private String id;
-
+
+ @JsonProperty("name")
private String name;
-
+
+ @JsonProperty("vcpus")
private Integer vcpus;
-
+
+ @JsonProperty("ram")
private Integer ram;
-
+
+ @JsonProperty("disk")
private Integer disk;
-
+
@JsonProperty("OS-FLV-EXT-DATA:ephemeral")
private Integer ephemeral;
-
+
+ @JsonProperty("swap")
private String swap;
-
+
@JsonProperty("rxtx_factor")
private Float rxtxFactor;
-
+
@JsonProperty("OS-FLV-DISABLED:disabled")
private Boolean disabled;
-
+
@JsonProperty("rxtx_quota")
private Integer rxtxQuota;
-
+
@JsonProperty("rxtx_cap")
private Integer rxtxCap;
-
+
private List<Link> links;
-
+
@JsonProperty("os-flavor-access:is_public")
private Boolean isPublic;
@@ -210,7 +215,7 @@ public class Flavor implements Serializable {
public void setDisabled(Boolean disabled) {
this.disabled = disabled;
}
-
+
/**
* @return the isPublic
*/
@@ -239,17 +244,17 @@ public class Flavor implements Serializable {
this.links = links;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "Flavor [id=" + id + ", name=" + name + ", vcpus=" + vcpus
- + ", ram=" + ram + ", disk=" + disk + ", ephemeral="
- + ephemeral + ", swap=" + swap + ", rxtxFactor=" + rxtxFactor
- + ", disabled=" + disabled + ", rxtxQuota=" + rxtxQuota
- + ", rxtxCap=" + rxtxCap + ", links=" + links + ", isPublic="
+ return "Flavor [id=" + id + ", name=" + name + ", vcpus=" + vcpus + ", ram=" + ram + ", disk=" + disk
+ + ", ephemeral=" + ephemeral + ", swap=" + swap + ", rxtxFactor=" + rxtxFactor + ", disabled="
+ + disabled + ", rxtxQuota=" + rxtxQuota + ", rxtxCap=" + rxtxCap + ", links=" + links + ", isPublic="
+ isPublic + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
index a971f6f..b0fd8a1 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FlavorForCreate.java
@@ -22,22 +22,22 @@ import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("flavor")
public class FlavorForCreate implements Serializable {
-
+
private String id;
-
+
private String name;
-
+
private String vcpus;
-
+
private Integer ram;
-
+
private String disk;
-
+
@JsonProperty("OS-FLV-EXT-DATA:ephemeral")
private Integer ephemeral;
-
+
private String swap;
-
+
@JsonProperty("rxtx_factor")
private Float rxtxFactor;
@@ -152,5 +152,5 @@ public class FlavorForCreate implements Serializable {
public void setRxtxFactor(Float rxtxFactor) {
this.rxtxFactor = rxtxFactor;
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
index 95decf4..e02a0d5 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Flavors.java
@@ -19,27 +19,32 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
+
public class Flavors implements Iterable<Flavor>, Serializable {
@JsonProperty("flavors")
private List<Flavor> list;
+ @JsonProperty("flavors_links")
+ private List<Link> links;
+
/**
* @return the list
*/
public List<Flavor> getList() {
return list;
}
-
+
@Override
public Iterator<Flavor> iterator() {
return list.iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
index 990b980..d319385 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIp.java
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -25,14 +24,14 @@ import com.fasterxml.jackson.annotation.JsonRootName;
public class FloatingIp implements Serializable {
private String id;
-
+
private String pool;
-
+
private String ip;
-
+
@JsonProperty("fixed_ip")
private String fixedIp;
-
+
@JsonProperty("instance_id")
private String instanceId;
@@ -71,13 +70,15 @@ public class FloatingIp implements Serializable {
return instanceId;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "FloatingIp [id=" + id + ", pool=" + pool + ", ip=" + ip
- + ", fixedIp=" + fixedIp + ", instanceId=" + instanceId + "]";
+ return "FloatingIp [id=" + id + ", pool=" + pool + ", ip=" + ip + ", fixedIp=" + fixedIp + ", instanceId="
+ + instanceId + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
index 5f134c2..71f1860 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomain.java
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -25,11 +24,11 @@ import com.fasterxml.jackson.annotation.JsonRootName;
public class FloatingIpDomain implements Serializable {
private String domain;
-
+
private String scope;
-
+
private String project;
-
+
@JsonProperty("availabilityZone")
private String availabilityZone;
@@ -61,14 +60,15 @@ public class FloatingIpDomain implements Serializable {
return availabilityZone;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "FloatingIpDomain [domain=" + domain + ", scope=" + scope
- + ", project=" + project + ", availabilityZone="
- + availabilityZone + "]";
+ return "FloatingIpDomain [domain=" + domain + ", scope=" + scope + ", project=" + project
+ + ", availabilityZone=" + availabilityZone + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
index 45c7f6e..d156dd0 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpDomains.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class FloatingIpDomains implements Iterable<FloatingIpDomain>, Serializable {
@@ -39,12 +38,14 @@ public class FloatingIpDomains implements Iterable<FloatingIpDomain>, Serializab
return list.iterator();
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "FloatingIpDomains [list=" + list + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
index 451bd03..9a0eb90 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIpPools.java
@@ -19,12 +19,11 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.woorea.openstack.nova.model.FloatingIpPools.FloatingIpPool;
public class FloatingIpPools implements Iterable<FloatingIpPool>, Serializable {
-
+
public static class FloatingIpPool implements Serializable {
private String name;
@@ -36,14 +35,16 @@ public class FloatingIpPools implements Iterable<FloatingIpPool>, Serializable {
return name;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "FloatingIpPool [name=" + name + "]";
}
-
+
}
@JsonProperty("floating_ip_pools")
@@ -55,13 +56,15 @@ public class FloatingIpPools implements Iterable<FloatingIpPool>, Serializable {
public List<FloatingIpPool> getList() {
return list;
}
-
+
@Override
public Iterator<FloatingIpPool> iterator() {
return list.iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
index 58eb173..6ac0c71 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/FloatingIps.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class FloatingIps implements Iterable<FloatingIp>, Serializable {
@@ -33,8 +32,10 @@ public class FloatingIps implements Iterable<FloatingIp>, Serializable {
public List<FloatingIp> getList() {
return list;
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -46,5 +47,5 @@ public class FloatingIps implements Iterable<FloatingIp>, Serializable {
public Iterator<FloatingIp> iterator() {
return list.iterator();
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
index c41eb65..812d02e 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Host.java
@@ -18,24 +18,23 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Host implements Serializable {
-
+
public static final class ResourceWrapper implements Serializable {
-
+
public static final class Resource implements Serializable {
-
+
private String project;
-
+
@JsonProperty("memory_mb")
private Integer memoryMb;
-
+
private String host;
-
+
private Integer cpu;
-
+
@JsonProperty("disk_gb")
private Integer diskGb;
@@ -74,18 +73,19 @@ public class Host implements Serializable {
return diskGb;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "Resource [project=" + project + ", memoryMb="
- + memoryMb + ", host=" + host + ", cpu=" + cpu
+ return "Resource [project=" + project + ", memoryMb=" + memoryMb + ", host=" + host + ", cpu=" + cpu
+ ", diskGb=" + diskGb + "]";
}
-
+
}
-
+
private Resource resource;
/**
@@ -95,14 +95,16 @@ public class Host implements Serializable {
return resource;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "ResourceWrapper [resource=" + resource + "]";
}
-
+
}
private List<ResourceWrapper> host;
@@ -114,12 +116,14 @@ public class Host implements Serializable {
return host;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "Host [host=" + host + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
index d08c7f0..341f283 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregate.java
@@ -19,39 +19,40 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("aggregate")
public class HostAggregate implements Serializable {
-
- private String id;
+ @JsonProperty("id")
+ private Integer id;
+
+ @JsonProperty("name")
private String name;
-
+
@JsonProperty("availability_zone")
private String availabilityZone;
-
+
@JsonProperty("created_at")
private String createdAt;
-
+
@JsonProperty("updated_at")
private String updatedAt;
-
+
@JsonProperty("deleted_at")
private String deletedAt;
-
+
private Boolean deleted;
-
+
private List<String> hosts;
-
+
private Map<String, String> metadata;
/**
* @return the id
*/
- public String getId() {
+ public Integer getId() {
return id;
}
@@ -111,16 +112,16 @@ public class HostAggregate implements Serializable {
return metadata;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "HostAggregate [id=" + id + ", name=" + name
- + ", availabilityZone=" + availabilityZone + ", createdAt="
- + createdAt + ", updatedAt=" + updatedAt + ", deletedAt="
- + deletedAt + ", deleted=" + deleted + ", hosts=" + hosts
- + ", metadata=" + metadata + "]";
+ return "HostAggregate [id=" + id + ", name=" + name + ", availabilityZone=" + availabilityZone + ", createdAt="
+ + createdAt + ", updatedAt=" + updatedAt + ", deletedAt=" + deletedAt + ", deleted=" + deleted
+ + ", hosts=" + hosts + ", metadata=" + metadata + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
index fd83d16..5dc88b3 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/HostAggregates.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class HostAggregates implements Iterable<HostAggregate>, Serializable {
@@ -33,13 +32,15 @@ public class HostAggregates implements Iterable<HostAggregate>, Serializable {
public List<HostAggregate> getList() {
return list;
}
-
+
@Override
public Iterator<HostAggregate> iterator() {
return list.iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
index 1cdf0ae..67d78c8 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Hosts.java
@@ -19,18 +19,17 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Hosts implements Iterable<Hosts.Host>, Serializable {
-
+
public static final class Host {
-
+
private String zone;
-
+
@JsonProperty("host_name")
private String hostName;
-
+
private String service;
/**
@@ -46,7 +45,7 @@ public class Hosts implements Iterable<Hosts.Host>, Serializable {
public String getService() {
return service;
}
-
+
public String getZone() {
return zone;
}
@@ -55,14 +54,16 @@ public class Hosts implements Iterable<Hosts.Host>, Serializable {
this.zone = zone;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "Host [hostName=" + hostName + ", service=" + service + "]";
}
-
+
}
@JsonProperty("hosts")
@@ -74,13 +75,15 @@ public class Hosts implements Iterable<Hosts.Host>, Serializable {
public List<Host> getList() {
return list;
}
-
+
@Override
public Iterator<Hosts.Host> iterator() {
return list.iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -88,6 +91,6 @@ public class Hosts implements Iterable<Hosts.Host>, Serializable {
return "Hosts [list=" + list + "]";
}
-
-
+
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
index e29f961..7aac87c 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Image.java
@@ -20,63 +20,62 @@ import java.io.Serializable;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("image")
public class Image implements Serializable {
-
+
public static final class Server implements Serializable {
-
+
private String id;
-
+
private List<Link> links;
-
+
/**
* @return the id
*/
public String getId() {
return id;
}
-
+
/**
* @return the links
*/
public List<Link> getLinks() {
return links;
}
-
+
@Override
public String toString() {
return "Server [id=" + id + ", links=" + links + "]";
}
-
+
}
private String id;
-
+
private String status;
-
+
private String name;
-
+
private Integer progress;
-
+
private Integer minRam;
-
+
private Integer minDisk;
-
+
private Calendar created;
-
+
private Calendar updated;
-
+
@JsonProperty("OS-EXT-IMG-SIZE:size")
private Long size;
-
+
private Map<String, String> metadata;
-
+
private Server server;
-
+
private List<Link> links;
/**
@@ -211,7 +210,7 @@ public class Image implements Serializable {
public void setMetadata(Map<String, String> metadata) {
this.metadata = metadata;
}
-
+
/**
* @return the server
*/
@@ -233,16 +232,17 @@ public class Image implements Serializable {
this.links = links;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "Image [id=" + id + ", status=" + status + ", name=" + name
- + ", progress=" + progress + ", minRam=" + minRam
- + ", minDisk=" + minDisk + ", created=" + (created != null ? created.getTime() : null)
+ return "Image [id=" + id + ", status=" + status + ", name=" + name + ", progress=" + progress + ", minRam="
+ + minRam + ", minDisk=" + minDisk + ", created=" + (created != null ? created.getTime() : null)
+ ", updated=" + (updated != null ? updated.getTime() : null) + ", size=" + size + ", metadata="
- + metadata + ", server="+server+", links=" + links + "]";
+ + metadata + ", server=" + server + ", links=" + links + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
index 9191fa3..38cba08 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/ImageFromVolume.java
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
index 2d2ec5d..912f9d7 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Images.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Images implements Iterable<Image>, Serializable {
@@ -33,14 +32,16 @@ public class Images implements Iterable<Image>, Serializable {
public List<Image> getList() {
return list;
}
-
+
@Override
public Iterator<Image> iterator() {
return list.iterator();
}
-
-
- /* (non-Javadoc)
+
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
index fb1a1e1..2824850 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPair.java
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -25,26 +24,26 @@ import com.fasterxml.jackson.annotation.JsonRootName;
public class KeyPair implements Serializable {
private String name;
-
+
@JsonProperty("user_id")
private String userId;
-
+
@JsonProperty("public_key")
private String publicKey;
-
+
@JsonProperty("private_key")
private String privateKey;
-
+
private String fingerprint;
public KeyPair() {
super();
}
-
+
public KeyPair(String name) {
this.name = name;
}
-
+
public KeyPair(String name, String publicKey) {
this(name);
this.publicKey = publicKey;
@@ -99,16 +98,17 @@ public class KeyPair implements Serializable {
return fingerprint;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "KeyPair [name=" + name + ", userId=" + userId + ", publicKey="
- + publicKey + ", privateKey=" + privateKey + ", fingerprint="
- + fingerprint + "]";
+ return "KeyPair [name=" + name + ", userId=" + userId + ", publicKey=" + publicKey + ", privateKey="
+ + privateKey + ", fingerprint=" + fingerprint + "]";
}
-
-
+
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
index 2095a73..a6e78f2 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/KeyPairs.java
@@ -20,16 +20,15 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class KeyPairs implements Iterable<KeyPair>, Serializable {
-
+
public static final class KeyPairWrapper implements Serializable {
-
+
@JsonProperty
private KeyPair keypair;
-
+
}
@JsonProperty("keypairs")
@@ -40,18 +39,20 @@ public class KeyPairs implements Iterable<KeyPair>, Serializable {
*/
public List<KeyPair> getList() {
List<KeyPair> keyPairList = new ArrayList<>();
- for(KeyPairWrapper wrapper : this.list) {
+ for (KeyPairWrapper wrapper : this.list) {
keyPairList.add(wrapper.keypair);
}
return keyPairList;
}
-
+
@Override
public Iterator<KeyPair> iterator() {
return getList().iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
index fd1d113..a5177c4 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Limits.java
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Calendar;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -92,9 +91,8 @@ public class Limits implements Serializable {
*/
@Override
public String toString() {
- return "LimitEntry [nextAvailable=" + nextAvailable + ", unit="
- + unit + ", verb=" + verb + ", remaining=" + remaining
- + ", available=" + available + ", value=" + value + "]";
+ return "LimitEntry [nextAvailable=" + nextAvailable + ", unit=" + unit + ", verb=" + verb
+ + ", remaining=" + remaining + ", available=" + available + ", value=" + value + "]";
}
}
@@ -133,8 +131,7 @@ public class Limits implements Serializable {
*/
@Override
public String toString() {
- return "RateLimit [regex=" + regex + ", uri=" + uri + ", limit="
- + limit + "]";
+ return "RateLimit [regex=" + regex + ", uri=" + uri + ", limit=" + limit + "]";
}
}
@@ -242,7 +239,7 @@ public class Limits implements Serializable {
public Integer getMaxSecurityGroupRules() {
return maxSecurityGroupRules;
}
-
+
/**
* @return the maxTotalKeypairs
*/
@@ -284,7 +281,7 @@ public class Limits implements Serializable {
public Integer getMaxSecurityGroups() {
return maxSecurityGroups;
}
-
+
/**
* @return the totalVolumeGigabytesUsed
*/
@@ -369,11 +366,9 @@ public class Limits implements Serializable {
*/
@Override
public String toString() {
- return "AbsoluteLimit [maxServerMeta=" + maxServerMeta
- + ", maxPersonality=" + maxPersonality + ", maxImageMeta="
- + maxImageMeta + ", maxPersonalitySize="
- + maxPersonalitySize + ", maxTotalCores=" + maxTotalCores
- + ", maxTotalInstances=" + maxTotalInstances
+ return "AbsoluteLimit [maxServerMeta=" + maxServerMeta + ", maxPersonality=" + maxPersonality
+ + ", maxImageMeta=" + maxImageMeta + ", maxPersonalitySize=" + maxPersonalitySize
+ + ", maxTotalCores=" + maxTotalCores + ", maxTotalInstances=" + maxTotalInstances
+ ", maxTotalRAMSize=" + maxTotalRAMSize + "]";
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java
index 129896c..48bf500 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Link.java
@@ -21,9 +21,9 @@ import java.io.Serializable;
public class Link implements Serializable {
private String rel;
-
+
private String href;
-
+
private String type;
/**
@@ -47,12 +47,14 @@ public class Link implements Serializable {
return type;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "Link [rel=" + rel + ", href=" + href + ", type=" + type + "]";
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java
index d254e18..59c117d 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/Metadata.java
@@ -31,12 +31,13 @@ public class Metadata {
/**
* Set the metadata
+ *
* @param metadata
*/
public void setMetadata(Map<String, String> metadata) {
this.metadata = metadata;
}
-
-
+
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Network.java
index 67bfba6..9fdf5e1 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
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -25,73 +24,73 @@ import com.fasterxml.jackson.annotation.JsonRootName;
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;
/**
@@ -283,24 +282,21 @@ public class Network implements Serializable {
return priority;
}
- /* (non-Javadoc)
+ /*
+ * (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
+ 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/Networks.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Networks.java
index 3f86d4f..6011c73 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Networks implements Iterable<Network>, Serializable {
@@ -33,8 +32,10 @@ public class Networks implements Iterable<Network>, Serializable {
public List<Network> getList() {
return list;
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -46,5 +47,5 @@ public class Networks implements Iterable<Network>, Serializable {
public Iterator<Network> iterator() {
return list.iterator();
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/PersonalityFile.java
index 0d619df..a9e9826 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,9 +19,9 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
public final class PersonalityFile implements Serializable {
-
+
private String path;
-
+
private String contents;
/**
@@ -51,5 +51,5 @@ public final class PersonalityFile implements Serializable {
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 d03bea0..2ee31c3 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
@@ -23,32 +23,32 @@ import com.fasterxml.jackson.annotation.JsonRootName;
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;
@@ -58,6 +58,15 @@ public class QuotaSet {
@JsonProperty("key_pairs")
private Integer keyPairs;
+ @JsonProperty("fixed_ips")
+ private Integer fixedIps;
+
+ @JsonProperty("server_group_members")
+ private Integer serverGroupMembers;
+
+ @JsonProperty("server_groups")
+ private Integer serverGroups;
+
public String getId() {
return id;
}
@@ -66,6 +75,30 @@ public class QuotaSet {
this.id = id;
}
+ public Integer getFixedIps() {
+ return fixedIps;
+ }
+
+ public void setFixedIps(Integer fixedIps) {
+ this.fixedIps = fixedIps;
+ }
+
+ public Integer getServerGroupMembers() {
+ return serverGroupMembers;
+ }
+
+ public void setServerGroupMembers(Integer serverGroupMembers) {
+ this.serverGroupMembers = serverGroupMembers;
+ }
+
+ public Integer getServerGroups() {
+ return serverGroups;
+ }
+
+ public void setServerGroups(Integer serverGroups) {
+ this.serverGroups = serverGroups;
+ }
+
public Integer getMetadataItems() {
return metadataItems;
}
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 de1ac85..eb359ac 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
@@ -18,16 +18,15 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.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;
@@ -38,7 +37,7 @@ public class SecurityGroup implements Serializable {
public String getName() {
return name;
}
-
+
public String getTenantId() {
return tenantId;
}
@@ -142,30 +141,31 @@ public class SecurityGroup implements Serializable {
return group;
}
- /* (non-Javadoc)
+ /*
+ * (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 + "]";
+ return "Rule [id=" + id + ", name=" + name + ", parentGroupId=" + parentGroupId + ", fromPort=" + fromPort
+ + ", toPort=" + toPort + ", ipProtocol=" + ipProtocol + ", ipRange=" + ipRange + ", group=" + group
+ + "]";
}
-
+
}
private String id;
-
+
private String name;
-
+
private String description;
-
+
@JsonProperty("tenant_id")
private String tenantId;
-
+
private List<Rule> rules;
-
+
private List<Link> links;
/**
@@ -210,14 +210,15 @@ public class SecurityGroup implements Serializable {
return links;
}
- /* (non-Javadoc)
+ /*
+ * (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 + "]";
+ 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 ca4ebbe..f99d070 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
@@ -17,20 +17,19 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("security_group")
public class SecurityGroupForCreate implements Serializable {
-
+
private String name;
-
+
private String description;
public SecurityGroupForCreate() {
super();
}
-
+
public SecurityGroupForCreate(String name) {
this.name = name;
}
@@ -68,13 +67,14 @@ public class SecurityGroupForCreate implements Serializable {
this.description = description;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "SecurityGroupForCreate [name=" + name + ", description="
- + description + "]";
+ 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 6ddba5f..f998114 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
@@ -17,9 +17,7 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import javax.xml.bind.annotation.XmlElement;
-
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -29,7 +27,7 @@ public class SecurityGroupRuleForCreate implements Serializable {
@JsonProperty("parent_group_id")
private String parentGroupId;
-
+
@JsonProperty("ip_protocol")
private String ipProtocol;
@@ -38,17 +36,17 @@ public class SecurityGroupRuleForCreate implements Serializable {
@JsonProperty("to_port")
private Integer toPort;
-
+
@XmlElement
private String cidr;
@JsonProperty("group_id")
private String groupId;
-
+
public SecurityGroupRuleForCreate() {
-
+
}
-
+
/**
*
* @param parentSecurityGroupId
@@ -56,16 +54,19 @@ public class SecurityGroupRuleForCreate implements Serializable {
* @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 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) {
+ 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
@@ -73,26 +74,30 @@ public class SecurityGroupRuleForCreate implements Serializable {
* @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 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) {
+ 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) {
+
+ 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) {
+
+ public SecurityGroupRuleForCreate(String parentGroupId, String sourceGroupId, String ipProtocol, Integer fromPort,
+ Integer toPort) {
this.parentGroupId = parentGroupId;
this.ipProtocol = ipProtocol;
this.fromPort = fromPort;
@@ -106,8 +111,8 @@ public class SecurityGroupRuleForCreate implements Serializable {
public String getParentGroupId() {
return parentGroupId;
}
-
-
+
+
/**
* @param parentGroupId the parentGroupId to set
* @deprecated Use {@link #setParentGroupId(String)}
@@ -117,7 +122,7 @@ public class SecurityGroupRuleForCreate implements Serializable {
public void setParentGroupId(Integer parentGroupId) {
this.parentGroupId = String.valueOf(parentGroupId);
}
-
+
/**
* @param parentGroupId the parentGroupId to set
*/
@@ -197,7 +202,7 @@ public class SecurityGroupRuleForCreate implements Serializable {
public void setGroupId(Integer groupId) {
this.groupId = String.valueOf(groupId);
}
-
+
/**
* @param groupId the groupId to set
*/
@@ -205,15 +210,15 @@ public class SecurityGroupRuleForCreate implements Serializable {
this.groupId = groupId;
}
- /* (non-Javadoc)
+ /*
+ * (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 + "]";
+ 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 705432b..10a70c2 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class SecurityGroups implements Iterable<SecurityGroup>, Serializable {
@@ -33,8 +32,10 @@ public class SecurityGroups implements Iterable<SecurityGroup>, Serializable {
public List<SecurityGroup> getList() {
return list;
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -46,5 +47,5 @@ public class SecurityGroups implements Iterable<SecurityGroup>, Serializable {
public Iterator<SecurityGroup> iterator() {
return list.iterator();
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Server.java
index 4dd6dfa..70b7f88 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
@@ -21,31 +21,30 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.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;
- /**
- * @return the macAddr
- */
+ /**
+ * @return the macAddr
+ */
public String getMacAddr() {
return macAddr;
}
@@ -63,7 +62,7 @@ public class Server implements Serializable {
public String getAddr() {
return addr;
}
-
+
/**
* @return the type
@@ -97,7 +96,7 @@ public class Server implements Serializable {
* @param macAddr the mac addr to set
*/
public void setMacAddr(String macAddr) {
- this.macAddr= macAddr;
+ this.macAddr = macAddr;
}
}
@@ -107,6 +106,7 @@ public class Server implements Serializable {
public void add(String key, List<Address> value) {
addresses.put(key, value);
}
+
/**
* @return the ip address List Map
*/
@@ -114,24 +114,26 @@ public class Server implements Serializable {
return addresses;
}
- /* (non-Javadoc)
+ /*
+ * (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;
/**
@@ -162,85 +164,87 @@ public class Server implements Serializable {
return created;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "Fault [code=" + code + ", message=" + message
- + ", details=" + details + ", created=" + created + "]";
+ return "Fault [code=" + code + ", message=" + message + ", details=" + details + ", created=" + created
+ + "]";
}
-
-
+
+
}
-
+
private String id;
-
+
private String name;
-
+
private Addresses addresses;
-
+
private List<Link> links;
-
+
private Image image;
-
+
private Flavor flavor;
-
+
private String accessIPv4;
-
+
private String accessIPv6;
-
+
@JsonProperty("config_drive")
private String configDrive;
-
+
private String status;
-
+
private Integer progress;
-
+
private Fault fault;
-
+
@JsonProperty("tenant_id")
private String tenantId;
-
+
@JsonProperty("user_id")
private String userId;
-
+
@JsonProperty("key_name")
private String keyName;
-
+
private String hostId;
-
+
private String updated;
-
+
private String created;
-
+
private Map<String, String> metadata;
-
+
@JsonProperty("security_groups")
private List<SecurityGroup> securityGroups;
-
+
@JsonProperty("OS-EXT-STS:task_state")
private String taskState;
-
+
@JsonProperty("OS-EXT-STS:power_state")
private String powerState;
-
+
@JsonProperty("OS-EXT-STS:vm_state")
private String vmState;
-
+
@JsonProperty("OS-EXT-SRV-ATTR:host")
private String host;
-
+
@JsonProperty("OS-EXT-SRV-ATTR:instance_name")
private String instanceName;
-
+
@JsonProperty("OS-EXT-SRV-ATTR:hypervisor_hostname")
private String hypervisorHostname;
-
+
@JsonProperty("OS-DCF:diskConfig")
private String diskConfig;
-
+
@JsonProperty("OS-EXT-AZ:availability_zone")
private String availabilityZone;
@@ -252,9 +256,9 @@ public class Server implements Serializable {
@JsonProperty("os-extended-volumes:volumes_attached")
private List<String> osExtendedVolumesAttached;
-
+
private String uuid;
-
+
private String adminPass;
/**
@@ -305,7 +309,7 @@ public class Server implements Serializable {
public Flavor getFlavor() {
return flavor;
}
-
+
/**
* @param flavor the flavor to set
*/
@@ -502,28 +506,23 @@ public class Server implements Serializable {
return adminPass;
}
- /* (non-Javadoc)
+ /*
+ * (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 + "]";
+ 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 + "]";
}
}
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 c536372..80f31ee 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
@@ -21,15 +21,14 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
public interface ServerAction extends Serializable {
-
+
@JsonRootName("changePassword")
public static final class ChangePassword implements ServerAction {
-
+
private String adminPass;
public ChangePassword() {
@@ -53,12 +52,12 @@ public interface ServerAction extends Serializable {
public void setAdminPass(String adminPass) {
this.adminPass = adminPass;
}
-
+
}
-
+
@JsonRootName("reboot")
public static final class Reboot implements ServerAction {
-
+
private String type;
/**
@@ -74,26 +73,26 @@ public interface ServerAction extends Serializable {
public void setType(String type) {
this.type = type;
}
-
+
}
-
+
@JsonRootName("rebuild")
public static final class Rebuild implements ServerAction {
-
+
private String imageRef;
-
+
private String name;
-
+
private String adminPass;
-
+
private String accessIPv4;
-
+
private String accessIPv6;
-
+
private Map<String, String> metadata = new HashMap<>();
-
+
private List<PersonalityFile> personality = new ArrayList<>();
-
+
@JsonProperty("OS-DCF:diskConfig")
private String diskConfig;
@@ -208,14 +207,14 @@ public interface ServerAction extends Serializable {
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;
@@ -246,24 +245,24 @@ public interface ServerAction extends Serializable {
public void setDiskConfig(String diskConfig) {
this.diskConfig = diskConfig;
}
-
+
}
-
+
@JsonRootName("confirmResize")
public static final class ConfirmResize implements ServerAction {
-
+
}
-
+
@JsonRootName("revertResize")
public static final class RevertResize implements ServerAction {
-
+
}
-
+
@JsonRootName("createImage")
public static final class CreateImage implements ServerAction {
-
+
private String name;
-
+
private Map<String, String> metadata;
/**
@@ -293,18 +292,18 @@ public interface ServerAction extends Serializable {
public void setMetadata(Map<String, String> metadata) {
this.metadata = metadata;
}
-
+
}
-
+
@JsonRootName("rescue")
public static final class Rescue implements ServerAction {
-
+
private String adminPass;
public Rescue() {
-
+
}
-
+
public Rescue(String adminPass) {
this.adminPass = adminPass;
}
@@ -322,11 +321,11 @@ public interface ServerAction extends Serializable {
public void setAdminPass(String adminPass) {
this.adminPass = adminPass;
}
-
+
}
-
+
public static final class RescueResponse implements ServerAction {
-
+
private String adminPass;
/**
@@ -335,51 +334,51 @@ public interface ServerAction extends Serializable {
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) {
@@ -399,11 +398,11 @@ public interface ServerAction extends Serializable {
public void setLength(Integer length) {
this.length = length;
}
-
+
}
-
+
public static final class ConsoleOutput implements ServerAction {
-
+
private String output;
/**
@@ -412,18 +411,18 @@ public interface ServerAction extends Serializable {
public String getOutput() {
return output;
}
-
+
}
-
+
@JsonRootName("os-getVNCConsole")
public static final class GetVncConsole implements ServerAction {
-
+
private String type;
public GetVncConsole() {
super();
}
-
+
public GetVncConsole(String type) {
super();
@@ -443,14 +442,14 @@ public interface ServerAction extends Serializable {
public void setType(String type) {
this.type = type;
}
-
+
}
-
+
@JsonRootName("console")
public static final class VncConsole implements ServerAction {
-
+
private String type;
-
+
private String url;
/**
@@ -466,32 +465,32 @@ public interface ServerAction extends Serializable {
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() {
@@ -516,14 +515,14 @@ public interface ServerAction extends Serializable {
public void setAddress(String address) {
this.address = address;
}
-
+
}
-
+
@JsonRootName("removeFloatingIp")
public static final class DisassociateFloatingIp implements ServerAction {
-
+
private String address;
-
+
public DisassociateFloatingIp() {
super();
}
@@ -546,12 +545,12 @@ public interface ServerAction extends Serializable {
public void setAddress(String address) {
this.address = address;
}
-
+
}
-
+
@JsonRootName("createBackup")
public static final class CreateBackup implements ServerAction {
-
+
private String name;
@JsonProperty("backup_type")
@@ -616,7 +615,7 @@ public interface ServerAction extends Serializable {
public void setMetadata(Map<String, String> metadata) {
this.metadata = metadata;
}
-
+
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/ServerForCreate.java
index f5fe889..97feed9 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
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -32,8 +31,7 @@ public class ServerForCreate implements Serializable {
private String name;
- public SecurityGroup() {
- }
+ public SecurityGroup() {}
public SecurityGroup(String name) {
this.name = name;
@@ -47,8 +45,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param name
- * the name to set
+ * @param name the name to set
*/
public void setName(String name) {
this.name = name;
@@ -104,8 +101,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param name
- * the name to set
+ * @param name the name to set
*/
public void setName(String name) {
this.name = name;
@@ -119,8 +115,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param adminPass
- * the adminPass to set
+ * @param adminPass the adminPass to set
*/
public void setAdminPass(String adminPass) {
this.adminPass = adminPass;
@@ -134,8 +129,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param imageRef
- * the imageRef to set
+ * @param imageRef the imageRef to set
*/
public void setImageRef(String imageRef) {
this.imageRef = imageRef;
@@ -149,8 +143,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param flavorRef
- * the flavorRef to set
+ * @param flavorRef the flavorRef to set
*/
public void setFlavorRef(String flavorRef) {
this.flavorRef = flavorRef;
@@ -164,8 +157,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param accessIPv4
- * the accessIPv4 to set
+ * @param accessIPv4 the accessIPv4 to set
*/
public void setAccessIPv4(String accessIPv4) {
this.accessIPv4 = accessIPv4;
@@ -179,8 +171,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param accessIPv6
- * the accessIPv6 to set
+ * @param accessIPv6 the accessIPv6 to set
*/
public void setAccessIPv6(String accessIPv6) {
this.accessIPv6 = accessIPv6;
@@ -194,8 +185,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param min
- * the min to set
+ * @param min the min to set
*/
public void setMin(Integer min) {
this.min = min;
@@ -209,8 +199,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param max
- * the max to set
+ * @param max the max to set
*/
public void setMax(Integer max) {
this.max = max;
@@ -224,8 +213,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param diskConfig
- * the diskConfig to set
+ * @param diskConfig the diskConfig to set
*/
public void setDiskConfig(String diskConfig) {
this.diskConfig = diskConfig;
@@ -239,8 +227,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param keyName
- * the keyName to set
+ * @param keyName the keyName to set
*/
public void setKeyName(String keyName) {
this.keyName = keyName;
@@ -254,8 +241,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param personality
- * the personality to set
+ * @param personality the personality to set
*/
public void setPersonality(List<PersonalityFile> personality) {
this.personality = personality;
@@ -269,8 +255,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param metadata
- * the metadata to set
+ * @param metadata the metadata to set
*/
public void setMetadata(Map<String, String> metadata) {
this.metadata = metadata;
@@ -294,8 +279,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param userData
- * the userData to set
+ * @param userData the userData to set
*/
public void setUserData(String userData) {
this.userData = userData;
@@ -309,8 +293,7 @@ public class ServerForCreate implements Serializable {
}
/**
- * @param availabilityZone
- * the availabilityZone to set
+ * @param availabilityZone the availabilityZone to set
*/
public void setAvailabilityZone(String availabilityZone) {
this.availabilityZone = availabilityZone;
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 772c1fb..fd0b1f2 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Servers implements Iterable<Server>, Serializable {
@@ -33,13 +32,15 @@ public class Servers implements Iterable<Server>, Serializable {
public List<Server> getList() {
return list;
}
-
+
@Override
public Iterator<Server> iterator() {
return list.iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
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 bed84dc..8eca842 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
@@ -19,29 +19,28 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.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;
@@ -154,16 +153,16 @@ public class SimpleTenantUsage implements Serializable {
this.serverUsages = serverUsages;
}
- /* (non-Javadoc)
+ /*
+ * (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 + "]";
+ return "SimpleTenantUsage [totalMemoryMbUsage=" + totalMemoryMbUsage + ", totalVcpusUsage=" + totalVcpusUsage
+ + ", totalLocalGbUsage=" + totalLocalGbUsage + ", start=" + start + ", stop=" + stop + ", tenantId="
+ + tenantId + ", totalHours=" + totalHours + "]";
}
public static final class ServerUsage implements Serializable {
@@ -174,7 +173,7 @@ public class SimpleTenantUsage implements Serializable {
@JsonProperty("started_at")
private String startedAt;
-
+
@JsonProperty("ended_at")
private String endedAt;
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 20db05e..aa5d844 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class SimpleTenantUsages implements Iterable<SimpleTenantUsage>, Serializable {
@@ -34,7 +33,9 @@ public class SimpleTenantUsages implements Iterable<SimpleTenantUsage>, Serializ
return list;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -46,5 +47,5 @@ public class SimpleTenantUsages implements Iterable<SimpleTenantUsage>, Serializ
public Iterator<SimpleTenantUsage> iterator() {
return list.iterator();
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Snapshot.java
index 9216854..066c381 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
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -25,19 +24,19 @@ import com.fasterxml.jackson.annotation.JsonRootName;
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;
/**
@@ -89,15 +88,15 @@ public class Snapshot implements Serializable {
return createdAt;
}
- /* (non-Javadoc)
+ /*
+ * (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 + "]";
+ 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 5fcd76e..00f3137 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
@@ -17,18 +17,17 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("snapshot")
public class SnapshotForCreate implements Serializable {
-
+
@JsonProperty("volume_id")
private String volumeId;
-
+
private Boolean force;
-
+
@JsonProperty("display_name")
private String name;
@@ -91,13 +90,15 @@ public class SnapshotForCreate implements Serializable {
this.description = description;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "SnapshotForCreate [volumeId=" + volumeId + ", force=" + force
- + ", name=" + name + ", description=" + description + "]";
+ return "SnapshotForCreate [volumeId=" + volumeId + ", force=" + force + ", name=" + name + ", description="
+ + description + "]";
}
}
diff --git a/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 060ca48..21cc297 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Snapshots implements Iterable<Snapshot>, Serializable {
@@ -33,8 +32,10 @@ public class Snapshots implements Iterable<Snapshot>, Serializable {
public List<Snapshot> getList() {
return list;
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -46,5 +47,5 @@ public class Snapshots implements Iterable<Snapshot>, Serializable {
public Iterator<Snapshot> iterator() {
return list.iterator();
}
-
+
}
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/Volume.java
index 841d5b5..fdb934d 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -27,27 +26,27 @@ import com.fasterxml.jackson.annotation.JsonRootName;
public class Volume implements Serializable {
private String id;
-
+
private String status;
-
+
@JsonProperty("displayName")
private String name;
-
+
@JsonProperty("displayDescription")
private String description;
-
+
private String availabilityZone;
private String volumeType;
-
+
private String snapshotId;
-
+
private List<Map<String, Object>> attachments;
-
+
private Map<String, String> metadata;
-
+
private String createdAt;
-
+
private Integer size;
/**
@@ -127,6 +126,6 @@ public class Volume implements Serializable {
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 76b0d31..db91e7a 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
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("volumeAttachment")
@@ -63,13 +62,15 @@ public class VolumeAttachment implements Serializable {
this.device = device;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
- return "VolumeAttachment [id=" + id + ", volumeId=" + volumeId
- + ", serverId=" + serverId + ", device=" + device + "]";
+ 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 7c8355c..f80d60d 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class VolumeAttachments implements Iterable<VolumeAttachment>, Serializable {
@@ -38,8 +37,10 @@ public class VolumeAttachments implements Iterable<VolumeAttachment>, Serializab
public Iterator<VolumeAttachment> iterator() {
return list.iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
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 49feab7..2c2055e 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
@@ -18,7 +18,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
@@ -125,15 +124,15 @@ public class VolumeForCreate implements Serializable {
this.metadata = metadata;
}
- /* (non-Javadoc)
+ /*
+ * (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 + "]";
+ 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 95abf39..d003285 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
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
diff --git a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java
index 28390d3..2aabef7 100644
--- a/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java
+++ b/nova-model/src/main/java/com/woorea/openstack/nova/model/VolumeType.java
@@ -17,7 +17,6 @@
package com.woorea.openstack.nova.model;
import java.io.Serializable;
-
import com.fasterxml.jackson.annotation.JsonRootName;
@JsonRootName("volume-type")
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 351a92a..3b1f71a 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class VolumeTypes implements Iterable<VolumeType>, Serializable {
@@ -38,13 +37,15 @@ public class VolumeTypes implements Iterable<VolumeType>, Serializable {
public Iterator<VolumeType> iterator() {
return list.iterator();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (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 4266e63..5a31968 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
@@ -19,7 +19,6 @@ package com.woorea.openstack.nova.model;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
-
import com.fasterxml.jackson.annotation.JsonProperty;
public class Volumes implements Iterable<Volume>, Serializable {
@@ -33,8 +32,10 @@ public class Volumes implements Iterable<Volume>, Serializable {
public List<Volume> getList() {
return list;
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
@Override
@@ -46,5 +47,5 @@ public class Volumes implements Iterable<Volume>, Serializable {
public Iterator<Volume> iterator() {
return list.iterator();
}
-
+
}