added mock for extensions testing

woorea · woorea · commit 8c8afca3fa38 · 2012-05-15T02:46:01.000+02:00
diff --git a/src/main/java/org/openstack/api/compute/ext/QuotasResource.java b/src/main/java/org/openstack/api/compute/ext/QuotasResource.java
@@ -3,6 +3,7 @@
 import java.util.Properties;
 
 import javax.ws.rs.client.Target;
+import javax.ws.rs.core.MediaType;
 
 import org.openstack.api.common.Resource;
 
@@ -14,12 +15,12 @@
  */
 public class QuotasResource extends Resource {
 
-	protected QuotasResource(Target target, Properties properties) {
+	public QuotasResource(Target target, Properties properties) {
 		super(target, properties);
 	}
 
-	public String show() {
-		return null;
+	public String get() {
+		return target.request(MediaType.APPLICATION_JSON).get(String.class);
 	}
 	
 	public String update() {
diff --git a/src/main/java/org/openstack/api/compute/ext/SimpleTenantUsageResource.java b/src/main/java/org/openstack/api/compute/ext/SimpleTenantUsageResource.java
@@ -3,6 +3,7 @@
 import java.util.Properties;
 
 import javax.ws.rs.client.Target;
+import javax.ws.rs.core.MediaType;
 
 import org.openstack.api.common.Resource;
 
@@ -17,5 +18,9 @@ public class SimpleTenantUsageResource extends Resource {
 	public SimpleTenantUsageResource(Target target, Properties properties) {
 		super(target, properties);
 	}
+	
+	public String get() {
+		return target.request(MediaType.APPLICATION_JSON).get(String.class);
+	}
 
 }
diff --git a/src/main/java/org/openstack/api/compute/notavailable/FloatingIpDnsResource.java b/src/main/java/org/openstack/api/compute/notavailable/FloatingIpDnsResource.java
@@ -3,14 +3,18 @@
 import java.util.Properties;
 
 import javax.ws.rs.client.Target;
+import javax.ws.rs.core.MediaType;
 
 import org.openstack.api.common.Resource;
 
 public class FloatingIpDnsResource extends Resource {
 
-	protected FloatingIpDnsResource(Target target, Properties properties) {
+	public FloatingIpDnsResource(Target target, Properties properties) {
 		super(target, properties);
 	}
 
-
+	public String get() {
+		return target.request(MediaType.APPLICATION_JSON).get(String.class);
+	}
+	
 }
diff --git a/src/main/java/org/openstack/api/compute/notavailable/VolumeTypeResource.java b/src/main/java/org/openstack/api/compute/notavailable/VolumeTypeResource.java
@@ -3,6 +3,7 @@
 import java.util.Properties;
 
 import javax.ws.rs.client.Target;
+import javax.ws.rs.core.MediaType;
 
 import org.openstack.api.common.Resource;
 
@@ -19,9 +20,14 @@ public class VolumeTypeResource extends Resource {
     // return new FlavorsRepresentation(client, list);
     // }
 
-    protected VolumeTypeResource(Target target, Properties properties) {
+    public VolumeTypeResource(Target target, Properties properties) {
 		super(target, properties);
 	}
+    
+    public String get() {
+		return target.request(MediaType.APPLICATION_JSON).get(String.class);
+	}
+    
 	public void delete() {
     }
 
diff --git a/src/main/java/org/openstack/model/compute/nova/NovaServerForCreate.java b/src/main/java/org/openstack/model/compute/nova/NovaServerForCreate.java
@@ -1,6 +1,7 @@
 package org.openstack.model.compute.nova;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -124,15 +125,15 @@ public void setContents(String contents) {
 
 	@XmlElementWrapper(name = "personality")
 	@XmlElement(name="file")
-	private List<File> personality;
+	private List<File> personality = new ArrayList<NovaServerForCreate.File>();
 
 	/**
 	 * This security groups are not created on the fly. They must be exist in
 	 * the tenant.
 	 */
 	@XmlElementWrapper(name = "security_groups")
 	@XmlElement(name = "security_group")
-	private List<SecurityGroup> securityGroups;
+	private List<SecurityGroup> securityGroups = new ArrayList<NovaServerForCreate.SecurityGroup>();
 
 	/* (non-Javadoc)
 	 * @see org.openstack.model.compute.nova.ServerForCreate#getName()

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import java.util.Properties;`
`4`	`4`
`5`	`5`	`import javax.ws.rs.client.Target;`
	`6`	`+import javax.ws.rs.core.MediaType;`
`6`	`7`
`7`	`8`	`import org.openstack.api.common.Resource;`
`8`	`9`
`@@ -17,5 +18,9 @@ public class SimpleTenantUsageResource extends Resource {`
`17`	`18`	`public SimpleTenantUsageResource(Target target, Properties properties) {`
`18`	`19`	`super(target, properties);`
`19`	`20`	`}`
	`21`	`+`
	`22`	`+ public String get() {`
	`23`	`+ return target.request(MediaType.APPLICATION_JSON).get(String.class);`
	`24`	`+ }`
`20`	`25`
`21`	`26`	`}`