Homogenize names of openstack authentication properties

justinsb · justinsb · commit d5bbfd188f43 · 2012-04-03T16:28:27.000-07:00
diff --git a/openstack-api/src/main/java/org/openstack/client/OpenstackCredentials.java b/openstack-api/src/main/java/org/openstack/client/OpenstackCredentials.java
@@ -1,32 +1,38 @@
 package org.openstack.client;
 
 import java.io.Serializable;
+import java.util.Properties;
 
 public class OpenstackCredentials implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	final String authUrl;
 	final String username;
-	final String password;
+	final String secret;
 	final String tenant;
 
-	public OpenstackCredentials(String authUrl, String username, String password, String tenant) {
+	public OpenstackCredentials(String authUrl, String username, String secret, String tenant) {
 		this.authUrl = authUrl;
 		this.username = username;
-		this.password = password;
+		this.secret = secret;
 		this.tenant = tenant;
 	}
 
-//	public OpenstackCredentials(String authUrl, String username, String password) {
-//		this(authUrl, username, password, null);
-//	}
+	public static OpenstackCredentials loadFromProperties(Properties properties) {
+		String authUrl = properties.getProperty(OpenstackProperties.AUTH_URL);
+		String username = properties.getProperty(OpenstackProperties.AUTH_USER);
+		String password = properties.getProperty(OpenstackProperties.AUTH_SECRET);
+		String tenant = properties.getProperty(OpenstackProperties.AUTH_TENANT);
+
+		return new OpenstackCredentials(authUrl, username, password, tenant);
+	}
 
 	public String getUsername() {
 		return username;
 	}
 
-	public String getPassword() {
-		return password;
+	public String getSecret() {
+		return secret;
 	}
 
 	public String getTenant() {
@@ -36,8 +42,8 @@ public String getTenant() {
 	public String getAuthUrl() {
 		return authUrl;
 	}
-	
+
 	public OpenstackCredentials withTenant(String tenant) {
-		return new OpenstackCredentials(tenant, username, password, tenant);
+		return new OpenstackCredentials(tenant, username, secret, tenant);
 	}
 }
diff --git a/openstack-api/src/main/java/org/openstack/client/OpenstackProperties.java b/openstack-api/src/main/java/org/openstack/client/OpenstackProperties.java
@@ -0,0 +1,8 @@
+package org.openstack.client;
+
+public class OpenstackProperties {
+	public static final String AUTH_URL = "openstack.auth.url";
+	public static final String AUTH_USER = "openstack.auth.user";
+	public static final String AUTH_SECRET = "openstack.auth.secret";
+	public static final String AUTH_TENANT = "openstack.auth.tenant";
+}
diff --git a/openstack-api/src/main/java/org/openstack/client/common/OpenstackAuthenticationClient.java b/openstack-api/src/main/java/org/openstack/client/common/OpenstackAuthenticationClient.java
@@ -29,7 +29,7 @@ public Access authenticate(OpenstackCredentials credentials) throws OpenstackExc
 		Authentication authentication = new Authentication();
 		Authentication.PasswordCredentials passwordCredentials = new Authentication.PasswordCredentials();
 		passwordCredentials.setUsername(credentials.getUsername());
-		passwordCredentials.setPassword(credentials.getPassword());
+		passwordCredentials.setPassword(credentials.getSecret());
 		if (!Strings.isNullOrEmpty(credentials.getTenant())) {
 			authentication.tenantName = credentials.getTenant();
 		} else {
diff --git a/openstack-api/src/test/java/org/openstack/client/OpenstackTestContext.java b/openstack-api/src/test/java/org/openstack/client/OpenstackTestContext.java
@@ -60,10 +60,10 @@ public static OpenstackTestContext buildFromProperties() {
 
 		boolean verbose = Boolean.parseBoolean(properties.getProperty("openstack.debug", "true"));
 
-		String url = properties.getProperty("openstack.auth.url", "http://127.0.0.1:5000/v2.0");
-		String username = properties.getProperty("openstack.auth.user", "demo");
-		String secret = properties.getProperty("openstack.auth.secret", "supersecret");
-		String tenant = properties.getProperty("openstack.auth.tenant", "demo");
+		String url = properties.getProperty(OpenstackProperties.AUTH_URL, "http://127.0.0.1:5000/v2.0");
+		String username = properties.getProperty(OpenstackProperties.AUTH_USER, "demo");
+		String secret = properties.getProperty(OpenstackProperties.AUTH_SECRET, "supersecret");
+		String tenant = properties.getProperty(OpenstackProperties.AUTH_TENANT, "demo");
 
 		String format = properties.getProperty("openstack.format", null);
 
diff --git a/openstack-cli/src/main/java/org/openstack/client/cli/ConfigurationOptions.java b/openstack-cli/src/main/java/org/openstack/client/cli/ConfigurationOptions.java
@@ -8,6 +8,7 @@
 import java.util.Properties;
 
 import org.kohsuke.args4j.Option;
+import org.openstack.client.OpenstackProperties;
 import org.openstack.client.OpenstackService;
 import org.openstack.client.common.DirectOpenstackService;
 import org.openstack.client.common.OpenstackSession;
@@ -71,10 +72,10 @@ public OpenstackService getOpenstackService() {
 					} catch (IOException e) {
 						throw new IOException("Error reading configuration file", e);
 					}
-					String server = properties.getProperty("openstack.auth");
-					String username = properties.getProperty("openstack.username");
-					String password = properties.getProperty("openstack.password");
-					String tenantId = properties.getProperty("openstack.tenant");
+					String server = properties.getProperty(OpenstackProperties.AUTH_URL);
+					String username = properties.getProperty(OpenstackProperties.AUTH_USER);
+					String password = properties.getProperty(OpenstackProperties.AUTH_SECRET);
+					String tenantId = properties.getProperty(OpenstackProperties.AUTH_TENANT);
 
 					OpenstackSessionInfo sessionInfo = new OpenstackSessionInfo(server, username, password, tenantId,
 							debug);
