Revision f3633a16 src/com/rackspace/cloud/servers/api/client/Account.java

b/src/com/rackspace/cloud/servers/api/client/Account.java
20 20
	private static final long serialVersionUID = 2180740077014156769L;
21 21
	private String username;
22 22
	private String apiKey;
23
	private String password;
23 24
	private String accountId;
24 25
	private String authServer;
26
	private String authServerV2;
25 27
	private String loadBalancerUKUrl;
26 28
	private String[] loadBalancerRegions;
27 29
	private static String loadBalancerDFWUrl;
......
131 133
		}
132 134
	}
133 135
	
136
	/**
137
	 * @return the authToken
138
	 */
139
	public String getAuthServerV2() {
140
		return authServerV2;
141
	}
142

  
143
	/**
144
	 * @param authToken the authToken to set
145
	 */
146
	public void setAuthServerV2(String authServerV2) {
147
		this.authServerV2 = authServerV2;
148
		
149
		/*
150
		 * the auth server used determines which regions
151
		 * can be used for load balancers, so set available
152
		 * regions here.
153
		 */
154
		if(authServerV2.equals(Preferences.COUNTRY_UK_AUTH_SERVER_V2)){
155
			setLoadBalancerRegions(Preferences.UK_REGIONS);
156
		} else if (authServerV2.equals(Preferences.COUNTRY_US_AUTH_SERVER_V2)){
157
			setLoadBalancerRegions(Preferences.US_REGIONS);
158
		} else {
159
			setLoadBalancerRegions(new String[0]);
160
		}
161
	}
162
	
134 163
	//auth v1.1 should return loadbalancer endpoints and return account id ....
135 164
	public String getAccountId() {
136 165
		String delemiter = "v1.0/";
......
221 250
	}
222 251
	
223 252
	/**
253
	 * @param password the password to set
254
	 */
255
	public void setPassword(String password) {
256
		this.password = password;
257
	}
258
	
259
	/**
260
	 * @return the password
261
	 */
262
	public String getPassword() {
263
		return password;
264
	}
265
	
266
	/**
224 267
	 * @param apiKey the apiKey to set
225 268
	 */
226 269
	public void setApiKey(String apiKey) {
227 270
		this.apiKey = apiKey;
228 271
	}
272
	
229 273
   /**
230 274
    */
231 275
	public void setStorageToken(String storageToken) {

Also available in: Unified diff