Revision a597c658 src/com/rackspace/cloud/servers/api/client/ServerManager.java
b/src/com/rackspace/cloud/servers/api/client/ServerManager.java | ||
---|---|---|
26 | 26 |
import org.xml.sax.SAXException; |
27 | 27 |
import org.xml.sax.XMLReader; |
28 | 28 |
|
29 |
import android.content.Context; |
|
30 |
|
|
31 |
import com.rackspace.cloud.files.api.client.CustomHttpClient; |
|
29 | 32 |
import com.rackspace.cloud.servers.api.client.parsers.CloudServersFaultXMLParser; |
30 | 33 |
import com.rackspace.cloud.servers.api.client.parsers.ServersXMLParser; |
31 | 34 |
|
... | ... | |
38 | 41 |
public static final String SOFT_REBOOT = "SOFT"; |
39 | 42 |
public static final String HARD_REBOOT = "HARD"; |
40 | 43 |
|
41 |
public void create(Server entity) throws CloudServersException { |
|
44 |
public void create(Server entity, Context context) throws CloudServersException {
|
|
42 | 45 |
|
43 |
DefaultHttpClient httpclient = new DefaultHttpClient();
|
|
46 |
CustomHttpClient httpclient = new CustomHttpClient(context);
|
|
44 | 47 |
HttpPost post = new HttpPost(Account.getServerUrl() + "/servers.xml"); |
45 | 48 |
|
46 | 49 |
post.addHeader("X-Auth-Token", Account.getAuthToken()); |
... | ... | |
102 | 105 |
} |
103 | 106 |
} |
104 | 107 |
|
105 |
public ArrayList<Server> createList(boolean detail) throws CloudServersException { |
|
108 |
public ArrayList<Server> createList(boolean detail, Context context) throws CloudServersException {
|
|
106 | 109 |
|
107 |
DefaultHttpClient httpclient = new DefaultHttpClient();
|
|
110 |
CustomHttpClient httpclient = new CustomHttpClient(context);
|
|
108 | 111 |
HttpGet get = new HttpGet(Account.getServerUrl() + "/servers/detail.xml" + cacheBuster()); |
109 | 112 |
ArrayList<Server> servers = new ArrayList<Server>(); |
110 | 113 |
|
... | ... | |
157 | 160 |
return servers; |
158 | 161 |
} |
159 | 162 |
|
160 |
public Server find(long id) throws CloudServersException { |
|
163 |
public Server find(long id, Context context) throws CloudServersException {
|
|
161 | 164 |
Server server = null; |
162 |
DefaultHttpClient httpclient = new DefaultHttpClient();
|
|
165 |
CustomHttpClient httpclient = new CustomHttpClient(context);
|
|
163 | 166 |
HttpGet get = new HttpGet(Account.getServerUrl() + "/servers/" + id + ".xml" + cacheBuster()); |
164 | 167 |
|
165 | 168 |
get.addHeader("X-Auth-Token", Account.getAuthToken()); |
... | ... | |
210 | 213 |
return server; |
211 | 214 |
} |
212 | 215 |
|
213 |
public HttpResponse reboot(Server server, String rebootType) throws CloudServersException { |
|
216 |
public HttpResponse reboot(Server server, String rebootType, Context context) throws CloudServersException {
|
|
214 | 217 |
HttpResponse resp = null; |
215 |
DefaultHttpClient httpclient = new DefaultHttpClient();
|
|
218 |
CustomHttpClient httpclient = new CustomHttpClient(context);
|
|
216 | 219 |
HttpPost post = new HttpPost(Account.getServerUrl() + "/servers/" + server.getId() + "/action.xml"); |
217 | 220 |
|
218 | 221 |
post.addHeader("X-Auth-Token", Account.getAuthToken()); |
... | ... | |
248 | 251 |
return resp; |
249 | 252 |
} |
250 | 253 |
|
251 |
public HttpResponse resize(Server server, int flavorId) throws CloudServersException { |
|
254 |
public HttpResponse resize(Server server, int flavorId, Context context) throws CloudServersException {
|
|
252 | 255 |
HttpResponse resp = null; |
253 |
DefaultHttpClient httpclient = new DefaultHttpClient();
|
|
256 |
CustomHttpClient httpclient = new CustomHttpClient(context);
|
|
254 | 257 |
HttpPost post = new HttpPost(Account.getServerUrl() + "/servers/" + server.getId() + "/action.xml"); |
255 | 258 |
|
256 | 259 |
post.addHeader("X-Auth-Token", Account.getAuthToken()); |
... | ... | |
286 | 289 |
} |
287 | 290 |
|
288 | 291 |
|
289 |
public HttpResponse delete(Server server) throws CloudServersException { |
|
292 |
public HttpResponse delete(Server server, Context context) throws CloudServersException {
|
|
290 | 293 |
HttpResponse resp = null; |
291 |
DefaultHttpClient httpclient = new DefaultHttpClient();
|
|
294 |
CustomHttpClient httpclient = new CustomHttpClient(context);
|
|
292 | 295 |
HttpDelete delete = new HttpDelete(Account.getServerUrl() + "/servers/" + server.getId() + ".xml"); |
293 | 296 |
|
294 | 297 |
delete.addHeader("X-Auth-Token", Account.getAuthToken()); |
Also available in: Unified diff