You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/08/25 17:22:28 UTC
[4/5] git commit: Using register sample instead of document creator -
AIRAVATA-1415
Using register sample instead of document creator - AIRAVATA-1415
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5901e082
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5901e082
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5901e082
Branch: refs/heads/master
Commit: 5901e082633354b34be51374709b8110785c32e1
Parents: 84cabd3
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Aug 25 10:58:17 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Aug 25 10:58:17 2014 -0400
----------------------------------------------------------------------
.../java-client-samples/pom.xml | 26 -----
.../client/samples/CancelExperiments.java | 2 -
.../client/samples/CreateLaunchExperiment.java | 115 +++++++++++--------
.../samples/CreateLaunchExperimentUS3.java | 2 -
.../samples/TestCreateLaunchExperiment.java | 2 -
.../tools/RegisterSampleApplications.java | 36 +++---
.../integration/AbstractIntegrationTest.java | 11 +-
.../airavata/integration/DataRetrievalIT.java | 2 +-
.../airavata/integration/ForEachCaseIT.java | 8 +-
.../SingleAppIntegrationTestBase.java | 2 +-
10 files changed, 94 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
index a475b29..5f12ace 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
+++ b/airavata-api/airavata-client-sdks/java-client-samples/pom.xml
@@ -26,7 +26,6 @@
<url>http://airavata.apache.org/</url>
<dependencies>
-
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
@@ -39,21 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-common-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-schema-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-jpa-registry</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
<artifactId>airavata-api-stubs</artifactId>
<version>${project.version}</version>
</dependency>
@@ -68,20 +52,10 @@
<version>${org.slf4j.version}</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-client-configuration</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-client-api</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
index d3b7e46..29eec9e 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
@@ -24,7 +24,6 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.model.error.*;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +44,6 @@ public class CancelExperiments {
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsClient();
client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
String expeId = "echoExperiment_31c132fd-87ea-4781-803c-ae5f04a79baf";
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 7c03ce0..ec29dc1 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -23,10 +23,7 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.tools.DocumentCreatorNew;
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.common.utils.AiravataUtils;
+import org.apache.airavata.client.tools.RegisterSampleApplications;
import org.apache.airavata.model.error.*;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.util.ProjectModelUtil;
@@ -47,7 +44,7 @@ public class CreateLaunchExperiment {
private final static Logger logger = LoggerFactory.getLogger(CreateLaunchExperiment.class);
private static final String DEFAULT_USER = "default.registry.user";
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
- private static Airavata.Client client;
+ private static Airavata.Client airavataClient;
private static String localHostAppId = "localhost_3b5962d3-5e7e-4a97-9d1f-25c5ec436ba5,SimpleEcho0_44c34394-ca27-4fa9-bb2d-87f95a02352a";
private static String sshHostAppId;
private static String pbsEchoAppId = "trestles.sdsc.edu_b67c9b6a-3940-4ba1-ac67-4f5c42e60fb8,SimpleEcho2_4c9e76f3-eab0-4ccb-8630-b53f22646ebd";
@@ -64,27 +61,26 @@ public class CreateLaunchExperiment {
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsClient();
- client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + client.getAPIVersion());
+ airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
+ System.out.println("API version is " + airavataClient.getAPIVersion());
// getExperiment(client, "WRFExperiment_2a2de26c-7f74-47c9-8e14-40e50dedfe0f");
-// addDescriptors();
+// registerApplications();
//// final String expId = createExperimentForSSHHost(airavata);
-// final String expId = createExperimentForTrestles(client);
-//// final String expId = createExperimentForStampede(client);
-// final String expId = createExperimentForLocalHost(client);
+// final String expId = createExperimentForTrestles(airavataClient);
+//// final String expId = createExperimentForStampede(airavataClient);
+// final String expId = createExperimentForLocalHost(airavataClient);
// final String expId = createExperimentForLonestar(airavata);
- final String expId = createExperimentWRFTrestles(client);
-// final String expId = createExperimentForBR2(client);
-// final String expId = createExperimentForBR2Amber(client);
-// final String expId = createExperimentWRFStampede(client);
-// final String expId = createExperimentForStampedeAmber(client);
-// final String expId = createExperimentForTrestlesAmber(client);
+ final String expId = createExperimentWRFTrestles(airavataClient);
+// final String expId = createExperimentForBR2(airavataClient);
+// final String expId = createExperimentForBR2Amber(airavataClient);
+// final String expId = createExperimentWRFStampede(airavataClient);
+// final String expId = createExperimentForStampedeAmber(airavataClient);
+// final String expId = createExperimentForTrestlesAmber(airavataClient);
System.out.println("Experiment ID : " + expId);
// updateExperiment(airavata, expId);
- launchExperiment(client, expId);
+ launchExperiment(airavataClient, expId);
// System.out.println("retrieved exp id : " + experiment.getExperimentID());
} catch (Exception e) {
@@ -93,39 +89,58 @@ public class CreateLaunchExperiment {
}
}
- public static void addDescriptors() throws AiravataAPIInvocationException, ApplicationSettingsException {
- try {
- DocumentCreatorNew documentCreator = new DocumentCreatorNew(client);
-// DocumentCreator documentCreator = new DocumentCreator(getAiravataAPI());
- localHostAppId = documentCreator.createLocalHostDocs();
- sshHostAppId = documentCreator.createSSHHostDocs();
-// documentCreator.createGramDocs();
- pbsEchoAppId =documentCreator.createPBSDocsForOGCE_Echo();
- pbsWRFAppId =documentCreator.createPBSDocsForOGCE_WRF();
- slurmAppId = documentCreator.createSlurmDocs();
- sgeAppId = documentCreator.createSGEDocs();
-// documentCreator.createEchoHostDocs();
- br2EchoAppId = documentCreator.createBigRedDocs();
- slurmWRFAppId = documentCreator.createSlumWRFDocs();
- br2AmberAppId = documentCreator.createBigRedAmberDocs();
- slurmAmberAppId = documentCreator.createStampedeAmberDocs();
- trestlesAmberAppId = documentCreator.createTrestlesAmberDocs();
- System.out.printf(localHostAppId);
- System.out.println(sshHostAppId);
- System.out.println(pbsEchoAppId);
- System.out.println(pbsWRFAppId);
- System.out.println(slurmAppId);
- System.out.println(sgeAppId);
- System.out.println(br2EchoAppId);
- System.out.println(slurmWRFAppId);
- System.out.println(br2AmberAppId);
- System.out.println(trestlesAmberAppId);
- } catch (Exception e) {
- logger.error("Unable to create documents", e.getMessage());
- throw new ApplicationSettingsException(e.getMessage());
- }
+ public static void registerApplications() {
+ RegisterSampleApplications registerSampleApplications = new RegisterSampleApplications(airavataClient);
+
+ //Register all compute hosts
+ registerSampleApplications.registerXSEDEHosts();
+
+ //Register Gateway Resource Preferences
+ registerSampleApplications.registerGatewayResourceProfile();
+
+ //Register all application modules
+ registerSampleApplications.registerAppModules();
+
+ //Register all application deployments
+ registerSampleApplications.registerAppDeployments();
+
+ //Register all application interfaces
+ registerSampleApplications.registerAppInterfaces();
}
+// public static void addDescriptors() throws AiravataAPIInvocationException, ApplicationSettingsException {
+// try {
+// DocumentCreatorNew documentCreator = new DocumentCreatorNew(client);
+//// DocumentCreator documentCreator = new DocumentCreator(getAiravataAPI());
+// localHostAppId = documentCreator.createLocalHostDocs();
+// sshHostAppId = documentCreator.createSSHHostDocs();
+//// documentCreator.createGramDocs();
+// pbsEchoAppId =documentCreator.createPBSDocsForOGCE_Echo();
+// pbsWRFAppId =documentCreator.createPBSDocsForOGCE_WRF();
+// slurmAppId = documentCreator.createSlurmDocs();
+// sgeAppId = documentCreator.createSGEDocs();
+//// documentCreator.createEchoHostDocs();
+// br2EchoAppId = documentCreator.createBigRedDocs();
+// slurmWRFAppId = documentCreator.createSlumWRFDocs();
+// br2AmberAppId = documentCreator.createBigRedAmberDocs();
+// slurmAmberAppId = documentCreator.createStampedeAmberDocs();
+// trestlesAmberAppId = documentCreator.createTrestlesAmberDocs();
+// System.out.printf(localHostAppId);
+// System.out.println(sshHostAppId);
+// System.out.println(pbsEchoAppId);
+// System.out.println(pbsWRFAppId);
+// System.out.println(slurmAppId);
+// System.out.println(sgeAppId);
+// System.out.println(br2EchoAppId);
+// System.out.println(slurmWRFAppId);
+// System.out.println(br2AmberAppId);
+// System.out.println(trestlesAmberAppId);
+// } catch (Exception e) {
+// logger.error("Unable to create documents", e.getMessage());
+// throw new ApplicationSettingsException(e.getMessage());
+// }
+// }
+
public static String createExperimentForTrestles(Airavata.Client client) throws TException {
try {
List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
index 43d21f5..be232c2 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
@@ -21,7 +21,6 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.error.AiravataClientException;
import org.apache.airavata.model.error.AiravataSystemException;
import org.apache.airavata.model.error.ExperimentNotFoundException;
@@ -49,7 +48,6 @@ public class CreateLaunchExperimentUS3 {
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsClient();
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavata.getAPIVersion());
// addDescriptors();
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
index 63c473c..84c053d 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
@@ -23,7 +23,6 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
import org.apache.airavata.model.error.AiravataClientException;
import org.apache.airavata.model.error.AiravataSystemException;
@@ -48,7 +47,6 @@ public class TestCreateLaunchExperiment {
public static void main(String[] args) {
try {
- AiravataUtils.setExecutionAsClient();
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavata.getAPIVersion());
Calendar cal1 = Calendar.getInstance();
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index b3b0024..5ee7128 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -109,28 +109,33 @@ public class RegisterSampleApplications {
private static String trinityInterfaceId = "";
private static String wrfInterfaceId;
+ public RegisterSampleApplications(Airavata.Client airavataClient) {
+ this.airavataClient = airavataClient;
+ }
public static void main(String[] args) {
try {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavataClient.getAPIVersion());
+ RegisterSampleApplications registerSampleApplications = new RegisterSampleApplications(airavataClient);
+
//Register all compute hosts
- registerXSEDEHosts();
+ registerSampleApplications.registerXSEDEHosts();
//Register Gateway Resource Preferences
-// registerGatewayResourceProfile();
+ registerSampleApplications.registerGatewayResourceProfile();
//Register all application modules
- registerAppModules();
+ registerSampleApplications.registerAppModules();
//Register all application deployments
-// registerAppDeployments();
+ registerSampleApplications.registerAppDeployments();
//Register all application interfaces
- registerAppInterfaces();
+ registerSampleApplications.registerAppInterfaces();
//write output into propertiesFile
-// writeIdPropertyFile();
+ registerSampleApplications.writeIdPropertyFile();
} catch (Exception e) {
logger.error("Error while connecting with server", e.getMessage());
@@ -138,7 +143,7 @@ public class RegisterSampleApplications {
}
}
- public static void registerXSEDEHosts() {
+ public void registerXSEDEHosts() {
try {
System.out.println("\n #### Registering XSEDE Computational Resources #### \n");
@@ -163,7 +168,7 @@ public class RegisterSampleApplications {
}
- public static void registerAppModules() {
+ public void registerAppModules() {
try {
System.out.println("\n #### Registering Application Modules #### \n");
@@ -227,7 +232,7 @@ public class RegisterSampleApplications {
}
- public static void registerAppDeployments() {
+ public void registerAppDeployments() {
System.out.println("\n #### Registering Application Deployments #### \n");
//Registering Stampede Apps
@@ -240,18 +245,18 @@ public class RegisterSampleApplications {
registerBigRedApps();
}
- public static void registerAppInterfaces() {
+ public void registerAppInterfaces() {
System.out.println("\n #### Registering Application Interfaces #### \n");
registerGromaxWorkflowInterfaces();
//Registering Echo
-// registerEchoInterface();
+ registerEchoInterface();
//Registering Amber
-// registerAmberInterface();
+ registerAmberInterface();
//Registering AutoDock
-// registerAutoDockInterface();
+ registerAutoDockInterface();
//Registering Espresso
registerEspressoInterface();
@@ -269,7 +274,7 @@ public class RegisterSampleApplications {
registerTrinityInterface();
//Registering WRF
-// registerWRFInterface();
+ registerWRFInterface();
}
@@ -364,7 +369,6 @@ public class RegisterSampleApplications {
applicationOutputs = new ArrayList<OutputDataObjectType>();
applicationOutputs.add(RegisterSampleApplicationsUtils.createAppOutput("struct_topoogy",
"", DataType.URI));
-
echoInterfaceId = airavataClient.registerApplicationInterface(
RegisterSampleApplicationsUtils.createApplicationInterfaceDescription("grompp", "grompp",
@@ -908,7 +912,7 @@ public class RegisterSampleApplications {
return computeResourceId;
}
- public static void registerGatewayResourceProfile() {
+ public void registerGatewayResourceProfile() {
try {
System.out.println("#### Registering Application Deployments on BigRed II #### \n");
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
index 7a90789..d9fc74b 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/AbstractIntegrationTest.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
import org.apache.airavata.common.utils.ClientSettings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +33,7 @@ public class AbstractIntegrationTest {
private static String THRIFT_SERVER_HOST;
private static int THRIFT_SERVER_PORT;
- protected Airavata.Client client;
+ protected Airavata.Client airavataClient;
private final int TRIES = 20;
private final int TIME_OUT = 10000;
final static Logger log = LoggerFactory.getLogger(AbstractIntegrationTest.class);
@@ -55,8 +54,6 @@ public class AbstractIntegrationTest {
//getting the Airavata API ( to add the descriptors
} catch (IOException e) {
log.error("Error loading client-properties ..." + e.getMessage());
- } catch (AiravataAPIInvocationException e) {
- log.error("Error initializing the Airavata API ... " + e.getMessage());
} catch (Exception e) {
log.error(e.getMessage());
}
@@ -64,10 +61,10 @@ public class AbstractIntegrationTest {
protected void initClient() throws Exception {
int tries = 0;
- while (client==null) {
+ while (airavataClient==null) {
log.info("Waiting till server initializes ........[try "+ (++tries) + " of "+TRIES+"]");
try {
- client = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
+ airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
} catch (Exception e) {
if (tries == TRIES) {
log("Server not responding. Cannot continue with integration tests ...");
@@ -80,7 +77,7 @@ public class AbstractIntegrationTest {
}
protected Airavata.Client getClient() {
- return client;
+ return airavataClient;
}
public void log(String message) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
index 777aee1..ec7707a 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/DataRetrievalIT.java
@@ -215,7 +215,7 @@ public class DataRetrievalIT extends AbstractIntegrationTest {
}
private void addApplications() throws AppCatalogException, TException {
- DocumentCreatorNew documentCreator = new DocumentCreatorNew(client);
+ DocumentCreatorNew documentCreator = new DocumentCreatorNew(airavataClient);
documentCreator.createLocalHostDocs();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java
index 6a76dbb..4f5b871 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/ForEachCaseIT.java
@@ -21,8 +21,6 @@
package org.apache.airavata.integration;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.client.api.exception.DescriptorAlreadyExistsException;
import org.testng.annotations.BeforeTest;
import java.io.IOException;
@@ -52,8 +50,8 @@ public class ForEachCaseIT extends WorkflowIntegrationTestBase {
// executeExperiment("src/test/resources/ForEachEchoWorkflow.xwf", Arrays.asList("10,20", "30,40"), Arrays.asList("10,30", "20,40"));
// }
- private void setupDescriptors() throws AiravataAPIInvocationException,
- DescriptorAlreadyExistsException, IOException {
+// private void setupDescriptors() throws AiravataAPIInvocationException,
+// DescriptorAlreadyExistsException, IOException {
// DescriptorBuilder descriptorBuilder = airavataAPI.getDescriptorBuilder();
// HostDescription hostDescription = descriptorBuilder.buildHostDescription(HostDescriptionType.type, "localhost2",
// "127.0.0.1");
@@ -109,5 +107,5 @@ public class ForEachCaseIT extends WorkflowIntegrationTestBase {
// Assert.assertTrue(airavataAPI.getApplicationManager().isApplicationDescriptorExists(
// serviceDescription2.getType().getName(), hostDescription.getType().getHostName(),
// applicationDeploymentDescription2.getType().getApplicationName().getStringValue()));
- }
+// }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/5901e082/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
----------------------------------------------------------------------
diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
index 84bd528..bd2593a 100644
--- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
+++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/SingleAppIntegrationTestBase.java
@@ -52,7 +52,7 @@ public class SingleAppIntegrationTestBase extends AbstractIntegrationTest {
ExperimentStatus experimentStatus = null;
do {
try {
- experimentStatus = client.getExperimentStatus(expId);
+ experimentStatus = airavataClient.getExperimentStatus(expId);
if (previousUpdateTime!=experimentStatus.getTimeOfStateChange()) {
previousUpdateTime=experimentStatus.getTimeOfStateChange();
log.info(expId