etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more changes to testclient

This commit is contained in:
prachi 2012-05-02 13:48:35 -07:00
parent 62bee3ddf3
commit 3d44b2dfa6
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/src/com/cloud/test/demo/CloudStackHttpClient.java
View File

@ -57,14 +57,12 @@ public class CloudStackHttpClient {
if(followToAsyncResult) {
long startMs = System.currentTimeMillis();
String queryJobResult = "http://localhost:8096/client/api?command=queryAsyncJobResult&response=json&jobId=";
JsonElement response = getChildElement(jsonElement, responseName);
JsonElement jobIdEle = getChildElement(response, "jobid");
String jobId = jobIdEle.getAsString();
queryJobResult = queryJobResult+jobId;
String queryJobResult = Demo.getQueryAsyncCommandString(jobId);
while(System.currentTimeMillis() - startMs < _pollTimeoutMs) {
@ -77,9 +75,10 @@ public class CloudStackHttpClient {
int jobStatus = jobStatusEle.getAsInt();
switch(jobStatus) {
case 2:
throw new Exception();//queryAsyncJobResponse.getAsString("queryasyncjobresultresponse.jobresult.errorcode") + " " +
//queryAsyncJobResponse.getAsString("queryasyncjobresultresponse.jobresult.errortext"));
JsonElement joberrorObj = getChildElement(response2,"jobresult");
JsonElement errorCodeObj = getChildElement(joberrorObj,"errorcode");
JsonElement errorTextObj = getChildElement(joberrorObj,"errortext");
throw new Exception("Error: "+errorCodeObj.getAsString() + " " + errorTextObj.getAsString());
case 0 :
try {
Thread.sleep( _pollIntervalMs );
@ -120,6 +119,7 @@ public class CloudStackHttpClient {
}
}
private JsonElement execute(String request) throws Exception {
JsonParser parser = new JsonParser();
URL url = new URL(request);

8
test/src/com/cloud/test/demo/Demo.java
View File

@ -341,5 +341,13 @@ public class Demo {
return url;
}
public static String getQueryAsyncCommandString(String jobId){
String req = "command=queryAsyncJobResult&response=json&jobId=" + jobId;
String url = signUrl(req, properties.getProperty("apikey"),
properties.getProperty("secretkey"));
String requestUrl = _host + url;
return requestUrl;
}
}