hpcloud support

woorea · woorea · commit 3e8af64c487c · 2012-05-11T19:26:40.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -80,12 +80,12 @@
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
 			<artifactId>jersey-client</artifactId>
-			<version>2.0-m03</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json</artifactId>
-			<version>2.0-m03</version>
+			<version>2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/src/main/java/org/openstack/api/common/RestClient.java b/src/main/java/org/openstack/api/common/RestClient.java
@@ -14,7 +14,7 @@
 import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector;
 import org.glassfish.jersey.client.JerseyClient;
 import org.glassfish.jersey.client.JerseyClientFactory;
-import org.glassfish.jersey.media.json.JsonFeature;
+import org.glassfish.jersey.media.json.JsonJacksonFeature;
 
 public enum RestClient {
 
@@ -28,7 +28,7 @@ private RestClient() {
 		
 		client = (JerseyClient) JerseyClientFactory.newClient();
 		
-		client.configuration().enable(new JsonFeature());
+		client.configuration().enable(new JsonJacksonFeature());
 		
 		client.configuration().register(OpenStackObjectMapperProvider.class);
 		
diff --git a/src/main/java/org/openstack/api/compute/FlavorsResource.java b/src/main/java/org/openstack/api/compute/FlavorsResource.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;
 import org.openstack.model.compute.FlavorList;
@@ -15,7 +16,7 @@ public FlavorsResource(Target target, Properties properties) {
 	}
 
     public FlavorList get() {
-		return target.path("/detail").request().get(NovaFlavorList.class);
+		return target.path("/detail").request(MediaType.APPLICATION_JSON).get(NovaFlavorList.class);
     }
 
     public FlavorResource flavor(String id) {
diff --git a/src/main/java/org/openstack/api/compute/ServersResource.java b/src/main/java/org/openstack/api/compute/ServersResource.java
@@ -32,7 +32,7 @@ public ServersResource(Target target, Properties properties) {
 	 * @return
 	 */
 	public ServerList get() {
-		return target.path("/detail").request().get(NovaServerList.class);
+		return target.path("/detail").request(MediaType.APPLICATION_JSON).get(NovaServerList.class);
 	}
 
 	public Server post(ServerForCreate serverForCreate) {
diff --git a/src/main/java/org/openstack/api/identity/resources/TokensResource.java b/src/main/java/org/openstack/api/identity/resources/TokensResource.java
@@ -20,5 +20,9 @@ public TokensResource(Target target, Properties properties) {
     public Access post(Authentication authentication) {	
     	return target.request(MediaType.APPLICATION_JSON).post(Entity.json(authentication), KeystoneAccess.class);
     }
+    
+    public <T> T post(Authentication authentication, Class<T> type) {	
+    	return target.request(MediaType.APPLICATION_JSON).post(Entity.json(authentication), type);
+    }
 
 }
diff --git a/src/main/java/org/openstack/client/OpenStackClient.java b/src/main/java/org/openstack/client/OpenStackClient.java
@@ -2,11 +2,9 @@
 
 import java.io.IOException;
 import java.util.Properties;
-import java.util.logging.Logger;
 
 import javax.ws.rs.client.Target;
 
-import org.glassfish.jersey.filter.LoggingFilter;
 import org.openstack.api.common.Resource;
 import org.openstack.api.common.RestClient;
 import org.openstack.api.compute.TenantResource;
@@ -52,17 +50,31 @@ public static OpenStackClient authenticate(Properties properties, Access access)
 	public static OpenStackClient authenticate(Properties properties) {
 		OpenStackClient client = new OpenStackClient();
 		client.properties = properties;
-		String username = properties.getProperty("auth.username");
-		String password = properties.getProperty("auth.password");
-		String tenantId = properties.getProperty("auth.tenant.id");
-		String tenantName = properties.getProperty("auth.tenant.name");
-		KeystoneAuthentication authentication = new KeystoneAuthentication().withPasswordCredentials(username, password);
+		
+		String credentials = properties.getProperty("auth.credentials");
+		
+		KeystoneAuthentication authentication = null;
+		
+		if("apiAccessKeyCredentials".equals(credentials)) {
+			String accessKey = properties.getProperty("auth.accessKey");
+			String secretKey = properties.getProperty("auth.secretKey");
+			authentication = KeystoneAuthentication.withApiAccessKeyCredentials(accessKey, secretKey);
+		} else {
+			String username = properties.getProperty("auth.username");
+			String password = properties.getProperty("auth.password");
+			authentication = KeystoneAuthentication.withPasswordCredentials(username, password);
+		}
+		
+		String tenantId = properties.getProperty("auth.tenantId");
+		String tenantName = properties.getProperty("auth.tenantName");
+		
 		if(tenantId != null) {
 			authentication.setTenantId(tenantId);
 		} else if(tenantName != null) {
 			authentication.setTenantName(tenantName);
 		}
 		Access access = client.getIdentityEndpoint().tokens().post(authentication);
+		System.out.println(access);
 		return authenticate(properties, access);
 	}
 	
@@ -83,7 +95,7 @@ public void reauthenticateOnTenant(String tenantName) {
 
 	public void exchangeTokenForTenant(String tenantId) {
 		String endpoint = properties.getProperty("identity.endpoint.publicURL");
-		Authentication authentication = new KeystoneAuthentication().withTokenAndTenant(access.getToken().getId(), tenantId);
+		Authentication authentication = KeystoneAuthentication.withTokenAndTenant(access.getToken().getId(), tenantId);
 		this.access = target(endpoint, IdentityPublicEndpoint.class).tokens().post(authentication);
 		System.out.println("EX " + this.access);
 	}
diff --git a/src/main/java/org/openstack/model/compute/nova/securitygroup/NovaSecurityGroupRule.java b/src/main/java/org/openstack/model/compute/nova/securitygroup/NovaSecurityGroupRule.java
@@ -24,6 +24,7 @@ public static final class Group implements Serializable {
         private String name;
 
         @XmlElement(name = "tenant_id")
+        @JsonProperty("tenant_id")
         private String tenantId;
 
         public String getName() {
diff --git a/src/main/java/org/openstack/model/identity/Authentication.java b/src/main/java/org/openstack/model/identity/Authentication.java
@@ -1,14 +1,12 @@
 package org.openstack.model.identity;
 
-import org.openstack.model.identity.keystone.KeystoneAuthentication.PasswordCredentials;
-
 public interface Authentication {
 
 	Token getToken();
 
 	//void setToken(Token token);
 
-	PasswordCredentials getPasswordCredentials();
+	Credentials getCredentials();
 
 	//void setPasswordCredentials(PasswordCredentials passwordCredentials);
 
diff --git a/src/main/java/org/openstack/model/identity/Credentials.java b/src/main/java/org/openstack/model/identity/Credentials.java
@@ -0,0 +1,5 @@
+package org.openstack.model.identity;
+
+public interface Credentials {
+
+}
diff --git a/src/main/java/org/openstack/model/identity/Endpoint.java b/src/main/java/org/openstack/model/identity/Endpoint.java
@@ -26,6 +26,4 @@ public interface Endpoint {
 	
 	void setInternalURL(String internalURL);
 
-	
-
 }
diff --git a/src/main/java/org/openstack/model/identity/keystone/KeystoneApiAccessKeyCredentials.java b/src/main/java/org/openstack/model/identity/keystone/KeystoneApiAccessKeyCredentials.java
@@ -0,0 +1,33 @@
+package org.openstack.model.identity.keystone;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+import org.openstack.model.identity.Credentials;
+
+public class KeystoneApiAccessKeyCredentials implements Credentials, Serializable {
+
+    @XmlAttribute
+    private String accessKey;
+
+    @XmlAttribute
+    private String secretKey;
+
+	public String getAccessKey() {
+		return accessKey;
+	}
+
+	public void setAccessKey(String accessKey) {
+		this.accessKey = accessKey;
+	}
+
+	public String getSecretKey() {
+		return secretKey;
+	}
+
+	public void setSecretKey(String secretKey) {
+		this.secretKey = secretKey;
+	}
+
+}
diff --git a/src/main/java/org/openstack/model/identity/keystone/KeystoneAuthentication.java b/src/main/java/org/openstack/model/identity/keystone/KeystoneAuthentication.java
@@ -9,55 +9,61 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonRootName;
 import org.openstack.api.Namespaces;
 import org.openstack.model.identity.Authentication;
+import org.openstack.model.identity.Credentials;
 import org.openstack.model.identity.Token;
 
 @XmlType(namespace= Namespaces.NS_OPENSTACK_IDENTITY_2_0)
 @XmlRootElement(name = "auth", namespace= "")
 @XmlAccessorType(XmlAccessType.NONE)
 @JsonRootName("auth")
 public class KeystoneAuthentication implements Serializable, Authentication {
-
-    @XmlAccessorType(XmlAccessType.NONE)
-    public static class PasswordCredentials implements Serializable {
-
-        @XmlAttribute
-        private String username;
-
-        @XmlAttribute
-        private String password;
-
-        public String getUsername() {
-            return username;
-        }
-
-        public void setUsername(String username) {
-            this.username = username;
-        }
-
-        public String getPassword() {
-            return password;
-        }
-
-        public void setPassword(String password) {
-            this.password = password;
-        }
-
-    }
     
     @XmlElement(type = KeystoneToken.class)
     private KeystoneToken token;
 
-    @XmlElement(namespace= "")
-    private PasswordCredentials passwordCredentials;
+    @XmlElement(namespace= "", name="passwordCredentials")
+    @JsonProperty
+    private KeystonePasswordCredentials passwordCredentials;
+    
+    @XmlElement(namespace= "", name="apiAccessKeyCredentials")
+    @JsonProperty
+    private KeystoneApiAccessKeyCredentials apiAccessKeyCredentials;
 
     @XmlAttribute
     private String tenantId;
     
     @XmlAttribute
     private String tenantName;
+    
+    private KeystoneAuthentication() { }
+    
+    public static KeystoneAuthentication withPasswordCredentials(String username, String password) {
+    	KeystoneAuthentication auth = new KeystoneAuthentication();
+    	auth.passwordCredentials = new KeystonePasswordCredentials();
+    	auth.passwordCredentials.setUsername(username);
+    	auth.passwordCredentials.setPassword(password);
+		return auth;
+	}
+	
+	public static KeystoneAuthentication withApiAccessKeyCredentials(String accessKey, String secretKey) {
+		KeystoneAuthentication auth = new KeystoneAuthentication();
+		auth.apiAccessKeyCredentials = new KeystoneApiAccessKeyCredentials();
+		auth.apiAccessKeyCredentials.setAccessKey(accessKey);
+		auth.apiAccessKeyCredentials.setSecretKey(secretKey);
+		return auth;
+	}
+	
+	public static KeystoneAuthentication withTokenAndTenant(String tokenId, String tenantId) {
+		KeystoneAuthentication auth = new KeystoneAuthentication();
+		auth.token = new KeystoneToken();
+		auth.token.setId(tokenId);
+		auth.tenantId = tenantId;
+		return auth;
+	}
 
     /* (non-Javadoc)
 	 * @see org.openstack.model.identity.glance.Authentication#getToken()
@@ -75,14 +81,10 @@ public void setToken(KeystoneToken token) {
 	 * @see org.openstack.model.identity.glance.Authentication#getPasswordCredentials()
 	 */
 	@Override
-	public PasswordCredentials getPasswordCredentials() {
+	public Credentials getCredentials() {
         return passwordCredentials;
     }
 
-	public void setPasswordCredentials(PasswordCredentials passwordCredentials) {
-        this.passwordCredentials = passwordCredentials;
-    }
-
 	/* (non-Javadoc)
 	 * @see org.openstack.model.identity.glance.Authentication#getTenantId()
 	 */
@@ -107,20 +109,9 @@ public void setTenantName(String tenantName) {
 		this.tenantName = tenantName;
 	}
 	
-	public KeystoneAuthentication withPasswordCredentials(String username, String password) {
-		passwordCredentials = new PasswordCredentials();
-		passwordCredentials.username = username;
-		passwordCredentials.password = password;
-		return this;
-	}
 	
-	public KeystoneAuthentication withTokenAndTenant(String tokenId, String tenantId) {
-		KeystoneToken token = new KeystoneToken();
-		token.setId(tokenId);
-		this.token = token;
-		this.tenantId = tenantId;
-		return this;
-	}
+	
+	
 
 	@Override
 	public String toString() {
diff --git a/src/main/java/org/openstack/model/identity/keystone/KeystonePasswordCredentials.java b/src/main/java/org/openstack/model/identity/keystone/KeystonePasswordCredentials.java
@@ -0,0 +1,33 @@
+package org.openstack.model.identity.keystone;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAttribute;
+
+import org.openstack.model.identity.Credentials;
+
+public class KeystonePasswordCredentials implements Credentials, Serializable {
+
+    @XmlAttribute
+    private String username;
+
+    @XmlAttribute
+    private String password;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+}
diff --git a/src/main/java/org/openstack/model/identity/keystone/KeystoneRole.java b/src/main/java/org/openstack/model/identity/keystone/KeystoneRole.java
@@ -59,6 +59,24 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
+	
+	//serviceId and tenantId are only in access/user/roles
+
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public String getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(String tenantId) {
+		this.tenantId = tenantId;
+	}
 
 	@Override
 	public String toString() {
diff --git a/src/main/java/org/openstack/model/identity/keystone/KeystoneServiceEndpoint.java b/src/main/java/org/openstack/model/identity/keystone/KeystoneServiceEndpoint.java
diff --git a/src/main/java/org/openstack/model/identity/keystone/KeystoneTenant.java b/src/main/java/org/openstack/model/identity/keystone/KeystoneTenant.java
diff --git a/src/test/java/org/openstack/client/Test.java b/src/test/java/org/openstack/client/Test.java

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`	`import org.openstack.model.compute.FlavorList;`
`@@ -15,7 +16,7 @@ public FlavorsResource(Target target, Properties properties) {`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`public FlavorList get() {`
`18`		`- return target.path("/detail").request().get(NovaFlavorList.class);`
	`19`	`+ return target.path("/detail").request(MediaType.APPLICATION_JSON).get(NovaFlavorList.class);`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`public FlavorResource flavor(String id) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public ServersResource(Target target, Properties properties) {`
`32`	`32`	`* @return`
`33`	`33`	`*/`
`34`	`34`	`public ServerList get() {`
`35`		`- return target.path("/detail").request().get(NovaServerList.class);`
	`35`	`+ return target.path("/detail").request(MediaType.APPLICATION_JSON).get(NovaServerList.class);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public Server post(ServerForCreate serverForCreate) {`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,9 @@ public TokensResource(Target target, Properties properties) {`
`20`	`20`	`public Access post(Authentication authentication) {`
`21`	`21`	`return target.request(MediaType.APPLICATION_JSON).post(Entity.json(authentication), KeystoneAccess.class);`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ public <T> T post(Authentication authentication, Class<T> type) {`
	`25`	`+ return target.request(MediaType.APPLICATION_JSON).post(Entity.json(authentication), type);`
	`26`	`+ }`
`23`	`27`
`24`	`28`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +package org.openstack.model.identity;
++
 +public interface Credentials {
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,4 @@ public interface Endpoint {`
`26`	`26`
`27`	`27`	`void setInternalURL(String internalURL);`
`28`	`28`
`29`		`-`
`30`		`-`
`31`	`29`	`}`