more on hpcloud

woorea · woorea · commit ee184be82447 · 2012-05-13T04:13:17.000+02:00
diff --git a/src/main/java/org/openstack/api/compute/ServerResource.java b/src/main/java/org/openstack/api/compute/ServerResource.java
@@ -16,11 +16,12 @@
 import org.openstack.model.compute.Server;
 import org.openstack.model.compute.nova.NovaServer;
 import org.openstack.model.compute.nova.server.actions.AddFixedIpAction;
-import org.openstack.model.compute.nova.server.actions.AddFloatingIpAction;
+import org.openstack.model.compute.nova.server.actions.AssociateFloatingIpAction;
 import org.openstack.model.compute.nova.server.actions.ChangePasswordAction;
 import org.openstack.model.compute.nova.server.actions.ConfirmResizeAction;
 import org.openstack.model.compute.nova.server.actions.Console;
 import org.openstack.model.compute.nova.server.actions.CreateBackupAction;
+import org.openstack.model.compute.nova.server.actions.DisassociateFloatingIpAction;
 import org.openstack.model.compute.nova.server.actions.ForceDeleteAction;
 import org.openstack.model.compute.nova.server.actions.GetConsoleOutputAction;
 import org.openstack.model.compute.nova.server.actions.GetVncConsoleAction;
@@ -32,7 +33,6 @@
 import org.openstack.model.compute.nova.server.actions.RebootAction;
 import org.openstack.model.compute.nova.server.actions.RebuildAction;
 import org.openstack.model.compute.nova.server.actions.RemoveFixedIpAction;
-import org.openstack.model.compute.nova.server.actions.RemoveFloatingIpAction;
 import org.openstack.model.compute.nova.server.actions.ResetNetworkAction;
 import org.openstack.model.compute.nova.server.actions.ResizeAction;
 import org.openstack.model.compute.nova.server.actions.RestoreAction;
@@ -69,7 +69,7 @@ public Server put(Server server) {
 	}
 
 	public Response delete() {
-		return target.request().delete();
+		return target.request(MediaType.WILDCARD).delete();
 	}
 	
 	public ServerActionResource action() {
@@ -313,17 +313,15 @@ public String removeFixedIp(String address) {
 	 * Attaches a floating IP to the instance.
 	 */
 	public void addFloatingIp(String ip) {
-		AddFloatingIpAction action = new AddFloatingIpAction();
-		action.setAddress(ip);
+		AssociateFloatingIpAction action = new AssociateFloatingIpAction(ip);
 		executeAction(String.class, action);
 	}
 
 	/**
 	 * Detaches a floating IP from the instance
 	 */
 	public void removeFloatingIp(String ip) {
-		RemoveFloatingIpAction action = new RemoveFloatingIpAction();
-		action.setAddress(ip);
+		DisassociateFloatingIpAction action = new DisassociateFloatingIpAction(ip);
 		executeAction(String.class, action);
 	}
 
diff --git a/src/main/java/org/openstack/api/compute/TenantResource.java b/src/main/java/org/openstack/api/compute/TenantResource.java
@@ -8,6 +8,7 @@
 
 import org.glassfish.jersey.filter.LoggingFilter;
 import org.openstack.api.common.Resource;
+import org.openstack.api.compute.ext.FloatingIpPoolsResource;
 import org.openstack.api.compute.ext.FloatingIpsResource;
 import org.openstack.api.compute.ext.KeyPairsResource;
 import org.openstack.api.compute.ext.QuotasResource;
@@ -20,7 +21,6 @@
 import org.openstack.api.compute.notavailable.AccountsResource;
 import org.openstack.api.compute.notavailable.CloudPipeResource;
 import org.openstack.api.compute.notavailable.FloatingIpDnsResource;
-import org.openstack.api.compute.notavailable.FloatingIpPoolsResource;
 import org.openstack.api.compute.notavailable.NetworksResource;
 
 public class TenantResource extends Resource {
diff --git a/src/main/java/org/openstack/api/compute/ext/FloatingIpPoolsResource.java b/src/main/java/org/openstack/api/compute/ext/FloatingIpPoolsResource.java
@@ -0,0 +1,34 @@
+package org.openstack.api.compute.ext;
+
+import java.util.Properties;
+
+import javax.ws.rs.client.Target;
+import javax.ws.rs.core.MediaType;
+
+import org.openstack.api.common.Resource;
+import org.openstack.model.compute.FloatingIpList;
+import org.openstack.model.compute.nova.floatingip.NovaFloatingIpList;
+
+/**
+ * Floating IPs support
+ * 
+ * @author sp
+ *
+ */
+public class FloatingIpPoolsResource extends Resource {
+	
+	public FloatingIpPoolsResource(Target target, Properties properties) {
+		super(target, properties);
+	}
+	
+	/**
+	 * Return a list of floating ips allocated to a project.
+	 * 
+	 * @return
+	 */
+	public String get() {
+		return target.request(MediaType.APPLICATION_JSON).get(String.class);
+	}
+
+
+}
diff --git a/src/main/java/org/openstack/api/compute/ext/FloatingIpResource.java b/src/main/java/org/openstack/api/compute/ext/FloatingIpResource.java
@@ -26,7 +26,7 @@ public FloatingIp get() {
 	}
 	
 	public void delete() {
-		 target.request().delete();	
+		 target.request(MediaType.WILDCARD).delete();	
 	}
 
 }
diff --git a/src/main/java/org/openstack/api/compute/ext/FloatingIpsResource.java b/src/main/java/org/openstack/api/compute/ext/FloatingIpsResource.java
@@ -1,7 +1,10 @@
 package org.openstack.api.compute.ext;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
+import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Target;
 import javax.ws.rs.core.MediaType;
 
@@ -35,7 +38,11 @@ public FloatingIpList get() {
 	}
 	
 	public FloatingIp post(String pool) {
-		return target.request(MediaType.APPLICATION_JSON).post(null,NovaFloatingIp.class);
+		Map<String, String> body = new HashMap<String, String>();
+		if(pool != null) {
+			body.put("pool", pool);
+		}
+		return target.request(MediaType.APPLICATION_JSON).post(Entity.json(body), NovaFloatingIp.class);
 	}
 	
 	public FloatingIpResource floatingIp(Integer id) {
diff --git a/src/main/java/org/openstack/api/compute/ext/KeyPairResource.java b/src/main/java/org/openstack/api/compute/ext/KeyPairResource.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;
 
@@ -20,7 +21,7 @@ public KeyPairResource(Target target, Properties properties) {
 
 
 	public void delete() {
-		target.request().delete();
+		target.request(MediaType.WILDCARD).delete();
 	}
 
 	// OSAPI-BUG: This function is missing from the OS API
diff --git a/src/main/java/org/openstack/api/compute/ext/SecurityGroupResource.java b/src/main/java/org/openstack/api/compute/ext/SecurityGroupResource.java
@@ -26,7 +26,7 @@ public SecurityGroup get(HashMap<String, Object> properties) {
 	}
 
 	public void delete() {
-		target.request().delete();
+		target.request(MediaType.WILDCARD).delete();
 	}
 
 	
diff --git a/src/main/java/org/openstack/api/compute/ext/SecurityGroupRuleResource.java b/src/main/java/org/openstack/api/compute/ext/SecurityGroupRuleResource.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;
 
@@ -13,7 +14,7 @@ public SecurityGroupRuleResource(Target target, Properties properties) {
 	}
 
 	public void delete() {
-		 target.request().delete();
+		 target.request(MediaType.WILDCARD).delete();
 	}
 
 	// This function is "missing" from the OpenStack API
diff --git a/src/main/java/org/openstack/api/compute/ext/SnapshotResource.java b/src/main/java/org/openstack/api/compute/ext/SnapshotResource.java
@@ -25,7 +25,7 @@ public Snapshot get() {
 	}
 
 	public void delete() {
-		target.request().delete();
+		target.request(MediaType.WILDCARD).delete();
 	}
 	
 }
diff --git a/src/main/java/org/openstack/api/compute/ext/VolumeResource.java b/src/main/java/org/openstack/api/compute/ext/VolumeResource.java
@@ -25,7 +25,7 @@ public Volume get() {
 	}
 
 	public void delete() {
-		target.request().delete();
+		target.request(MediaType.WILDCARD).delete();
 	}
 	
 }
diff --git a/src/main/java/org/openstack/api/compute/notavailable/FloatingIpPoolsResource.java b/src/main/java/org/openstack/api/compute/notavailable/FloatingIpPoolsResource.java
diff --git a/src/main/java/org/openstack/client/ComputeClient.java b/src/main/java/org/openstack/client/ComputeClient.java
@@ -24,6 +24,7 @@
 import org.openstack.model.compute.Snapshot;
 import org.openstack.model.compute.SnapshotForCreate;
 import org.openstack.model.compute.Volume;
+import org.openstack.model.compute.nova.floatingip.NovaFloatingIpPool;
 import org.openstack.model.compute.nova.keypair.NovaKeyPair;
 import org.openstack.model.compute.nova.volume.VolumeForCreate;
 
@@ -62,6 +63,11 @@ public void deleteServer(String id) {
 		resource.servers().server(id).delete();
 	}
 	
+	public Serializable executeServerAction(String id, ServerAction action) {
+		return resource.servers().server(id).action().post(action, action.getReturnType());
+		
+	}
+	
 	public FlavorList listFlavors() {
 		return resource.flavors().get();
 	}
@@ -94,15 +100,24 @@ public ImageList listImages(Map<String, Object> params) {
 		return resource.images().get();
 	}
 	
+	public Image showImage(String id) {
+		return resource.images().image(id).get();
+	}
+	
+	public List<NovaFloatingIpPool> listFloatingIpPools() {
+		resource.floatingIpPools().get();
+		return new ArrayList<NovaFloatingIpPool>();
+	}
+	
 	public List<FloatingIp> listFloatingIps() {
 		return resource.floatingIps().get().getList();
 	}
 	
-	public FloatingIp createFloatingIp(String pool) {
+	public FloatingIp allocateFloatingIp(String pool) {
 		return resource.floatingIps().post(pool);
 	}
 	
-	public void deleteFloatingIp(Integer id) {
+	public void deallocateFloatingIp(Integer id) {
 		resource.floatingIps().floatingIp(id).delete();
 	}
 	
@@ -140,6 +155,14 @@ public void deleteSecurityGroup(Integer id) {
 		resource.securityGroups().securityGroup(id).delete();
 	}
 	
+	public SecurityGroupRule addSecurityGroupRule(SecurityGroupRuleForCreate rule) {
+		return resource.securityGroupRules().post(rule);
+	}
+	
+	public void removeSecurityGroupRule(Integer id) {
+		resource.securityGroupRules().rule(id).delete();
+	}
+	
 	public List<Volume> listVolumes() {
 		return resource.volumes().get().getList();
 	}
@@ -172,17 +195,4 @@ public void deleteSnapshot(Integer id) {
 		resource.snapshots().snapshot(id).delete();
 	}
 
-	public SecurityGroupRule createSecurityGroupRule(SecurityGroupRuleForCreate rule) {
-		return resource.securityGroupRules().post(rule);
-	}
-
-	public Image showImage(String id) {
-		return resource.images().image(id).get();
-	}
-
-	public Serializable executeServerAction(String id, ServerAction action) {
-		return resource.servers().server(id).action().post(action, action.getReturnType());
-		
-	}
-
 }
diff --git a/src/main/java/org/openstack/model/compute/nova/floatingip/NovaFloatingIpPool.java b/src/main/java/org/openstack/model/compute/nova/floatingip/NovaFloatingIpPool.java
@@ -0,0 +1,10 @@
+package org.openstack.model.compute.nova.floatingip;
+
+import org.codehaus.jackson.map.annotate.JsonRootName;
+
+@JsonRootName("floating_ip_pool")
+public class NovaFloatingIpPool {
+
+	private String value;
+	
+}
diff --git a/src/main/java/org/openstack/model/compute/nova/floatingip/NovaFloatingIpPoolList.java b/src/main/java/org/openstack/model/compute/nova/floatingip/NovaFloatingIpPoolList.java
@@ -0,0 +1,21 @@
+package org.openstack.model.compute.nova.floatingip;
+
+import java.util.List;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+public class NovaFloatingIpPoolList {
+
+	@JsonProperty("floating_ip_pools")
+	//@JsonDeserialize(as=List.class, contentAs=NovaFloatingIp.class)
+	private List<NovaFloatingIpPool> list;
+
+	public List<NovaFloatingIpPool> getList() {
+		return list;
+	}
+
+	public void setList(List<NovaFloatingIpPool> list) {
+		this.list = list;
+	}
+	
+}
diff --git a/src/main/java/org/openstack/model/compute/nova/server/actions/AddFloatingIpAction.java b/src/main/java/org/openstack/model/compute/nova/server/actions/AddFloatingIpAction.java
diff --git a/src/main/java/org/openstack/model/compute/nova/server/actions/AssociateFloatingIpAction.java b/src/main/java/org/openstack/model/compute/nova/server/actions/AssociateFloatingIpAction.java
@@ -1,4 +1,4 @@
-package org.openstack.model.compute.nova.floatingip;
+package org.openstack.model.compute.nova.server.actions;
 
 import java.io.Serializable;
 
@@ -10,6 +10,10 @@
 public class AssociateFloatingIpAction implements Serializable, ServerAction {
 
 	private String address;
+	
+	public AssociateFloatingIpAction(String address) {
+		this.address = address;
+	}
 
 	public String getAddress() {
 		return address;
diff --git a/src/main/java/org/openstack/model/compute/nova/server/actions/CreateImageAction.java b/src/main/java/org/openstack/model/compute/nova/server/actions/CreateImageAction.java
@@ -17,8 +17,8 @@
  * @author luis@woorea.es
  *
  */
-@XmlRootElement(name="confirmResize")
-@JsonRootName("confirmResize")
+@XmlRootElement(name="createImage")
+@JsonRootName("createImage")
 public class CreateImageAction implements Serializable, ServerAction {
 	
 	private String name;
diff --git a/src/main/java/org/openstack/model/compute/nova/server/actions/DisassociateFloatingIpAction.java b/src/main/java/org/openstack/model/compute/nova/server/actions/DisassociateFloatingIpAction.java
diff --git a/src/main/java/org/openstack/model/compute/nova/server/actions/RemoveFloatingIpAction.java b/src/main/java/org/openstack/model/compute/nova/server/actions/RemoveFloatingIpAction.java

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public FloatingIp get() {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public void delete() {`
`29`		`- target.request().delete();`
	`29`	`+ target.request(MediaType.WILDCARD).delete();`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public SecurityGroup get(HashMap<String, Object> properties) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public void delete() {`
`29`		`- target.request().delete();`
	`29`	`+ target.request(MediaType.WILDCARD).delete();`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
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`
`@@ -13,7 +14,7 @@ public SecurityGroupRuleResource(Target target, Properties properties) {`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`public void delete() {`
`16`		`- target.request().delete();`
	`17`	`+ target.request(MediaType.WILDCARD).delete();`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`// This function is "missing" from the OpenStack API`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public Snapshot get() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public void delete() {`
`28`		`- target.request().delete();`
	`28`	`+ target.request(MediaType.WILDCARD).delete();`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public Volume get() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public void delete() {`
`28`		`- target.request().delete();`
	`28`	`+ target.request(MediaType.WILDCARD).delete();`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`}`