You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/07/02 20:49:20 UTC
git commit: adding more test functions - AIRAVATA-1305
Repository: airavata
Updated Branches:
refs/heads/master c60ba81c0 -> ab566e1b6
adding more test functions - AIRAVATA-1305
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ab566e1b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ab566e1b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ab566e1b
Branch: refs/heads/master
Commit: ab566e1b66c769b8721823d3e2ca522b96396d82
Parents: c60ba81
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Wed Jul 2 14:49:14 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Jul 2 14:49:14 2014 -0400
----------------------------------------------------------------------
.../catalog/data/impl/ComputeResourceImpl.java | 2 +-
.../data/resources/AbstractResource.java | 4 +-
.../resources/AppModuleMappingResource.java | 4 +-
.../resources/DataMovementProtocolResource.java | 14 +++----
.../app/catalog/test/AppDeploymentTest.java | 1 -
.../app/catalog/test/AppInterfaceTest.java | 22 ++++++++++-
.../app/catalog/test/ComputeResourceTest.java | 39 ++++++++++++++++++++
7 files changed, 71 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab566e1b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
index ffe2857..fc2f30a 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
@@ -166,7 +166,7 @@ public class ComputeResourceImpl implements ComputeResource {
Map<String, String> ids = new HashMap<String, String>();
ids.put(AbstractResource.DataMoveProtocolConstants.RESOURCE_ID, computeResourceId);
ids.put(AbstractResource.DataMoveProtocolConstants.DATA_MOVE_ID, dataMoveId);
- ids.put(AbstractResource.DataMoveProtocolConstants.JOB_TYPE, dataMovementProtocol.toString());
+ ids.put(AbstractResource.DataMoveProtocolConstants.DATA_MOVE_TYPE, dataMovementProtocol.toString());
DataMovementProtocolResource existingDMP = (DataMovementProtocolResource)resource.get(ids);
existingDMP.setResourceID(computeResourceId);
existingDMP.setComputeHostResource(existingComputeResouce);
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab566e1b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
index 0aebb79..059aba6 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
@@ -142,8 +142,8 @@ public abstract class AbstractResource implements Resource {
public final class DataMoveProtocolConstants {
public static final String RESOURCE_ID = "resourceID";
- public static final String DATA_MOVE_ID = "submissionID";
- public static final String JOB_TYPE = "jobType";
+ public static final String DATA_MOVE_ID = "dataMoveID";
+ public static final String DATA_MOVE_TYPE = "dataMoveType";
}
public final class ApplicationModuleConstants {
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab566e1b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleMappingResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleMappingResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleMappingResource.java
index 610350b..9cd66ee 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleMappingResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppModuleMappingResource.java
@@ -131,8 +131,8 @@ public class AppModuleMappingResource extends AbstractResource {
generator.setParameter(AppModuleMappingConstants.MODULE_ID, ids.get(AppModuleMappingConstants.MODULE_ID));
Query q = generator.selectQuery(em);
AppModuleMapping result = (AppModuleMapping) q.getSingleResult();
- AppModuleResource resource =
- (AppModuleResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APP_MODULE_MAPPING, result);
+ AppModuleMappingResource resource =
+ (AppModuleMappingResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.APP_MODULE_MAPPING, result);
em.getTransaction().commit();
em.close();
return resource;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab566e1b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementProtocolResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementProtocolResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementProtocolResource.java
index 0ed1980..0244b39 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementProtocolResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/DataMovementProtocolResource.java
@@ -41,7 +41,7 @@ public class DataMovementProtocolResource extends AbstractResource {
em = AppCatalogJPAUtils.getEntityManager();
em.getTransaction().begin();
AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_MOVEMENT_PROTOCOL);
- generator.setParameter(DataMoveProtocolConstants.JOB_TYPE, ids.get(DataMoveProtocolConstants.JOB_TYPE));
+ generator.setParameter(DataMoveProtocolConstants.DATA_MOVE_TYPE, ids.get(DataMoveProtocolConstants.DATA_MOVE_TYPE));
generator.setParameter(DataMoveProtocolConstants.RESOURCE_ID, ids.get(DataMoveProtocolConstants.RESOURCE_ID));
generator.setParameter(DataMoveProtocolConstants.DATA_MOVE_ID, ids.get(DataMoveProtocolConstants.DATA_MOVE_ID));
Query q = generator.deleteQuery(em);
@@ -75,7 +75,7 @@ public class DataMovementProtocolResource extends AbstractResource {
em = AppCatalogJPAUtils.getEntityManager();
em.getTransaction().begin();
AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_MOVEMENT_PROTOCOL);
- generator.setParameter(DataMoveProtocolConstants.JOB_TYPE, ids.get(DataMoveProtocolConstants.JOB_TYPE));
+ generator.setParameter(DataMoveProtocolConstants.DATA_MOVE_TYPE, ids.get(DataMoveProtocolConstants.DATA_MOVE_TYPE));
generator.setParameter(DataMoveProtocolConstants.RESOURCE_ID, ids.get(DataMoveProtocolConstants.RESOURCE_ID));
generator.setParameter(DataMoveProtocolConstants.DATA_MOVE_ID, ids.get(DataMoveProtocolConstants.DATA_MOVE_ID));
Query q = generator.selectQuery(em);
@@ -119,8 +119,8 @@ public class DataMovementProtocolResource extends AbstractResource {
dataMoveProtocolResourcesList.add(dataMovementProtocolResource);
}
}
- } else if (fieldName.equals(DataMoveProtocolConstants.JOB_TYPE)) {
- generator.setParameter(DataMoveProtocolConstants.JOB_TYPE, value);
+ } else if (fieldName.equals(DataMoveProtocolConstants.DATA_MOVE_TYPE)) {
+ generator.setParameter(DataMoveProtocolConstants.DATA_MOVE_TYPE, value);
q = generator.selectQuery(em);
results = q.getResultList();
if (results.size() != 0) {
@@ -194,8 +194,8 @@ public class DataMovementProtocolResource extends AbstractResource {
dataMovementProtocolIDs.add(dataMovementProtocol.getDataMoveID());
}
}
- } else if (fieldName.equals(DataMoveProtocolConstants.JOB_TYPE)) {
- generator.setParameter(DataMoveProtocolConstants.JOB_TYPE, value);
+ } else if (fieldName.equals(DataMoveProtocolConstants.DATA_MOVE_TYPE)) {
+ generator.setParameter(DataMoveProtocolConstants.DATA_MOVE_TYPE, value);
q = generator.selectQuery(em);
results = q.getResultList();
if (results.size() != 0) {
@@ -280,7 +280,7 @@ public class DataMovementProtocolResource extends AbstractResource {
em = AppCatalogJPAUtils.getEntityManager();
DataMovementProtocol dataMovementProtocol = em.find(DataMovementProtocol.class, new DataMovementProtocolPK(
ids.get(DataMoveProtocolConstants.RESOURCE_ID),
- ids.get(DataMoveProtocolConstants.DATA_MOVE_ID), ids.get(DataMoveProtocolConstants.JOB_TYPE)));
+ ids.get(DataMoveProtocolConstants.DATA_MOVE_ID), ids.get(DataMoveProtocolConstants.DATA_MOVE_TYPE)));
em.close();
return dataMovementProtocol != null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab566e1b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
index 68e344c..d0d84c6 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppDeploymentTest.java
@@ -61,7 +61,6 @@ public class AppDeploymentTest {
public void tearDown() throws Exception {
System.out.println("********** TEAR DOWN ************");
initialize.stopDerbyServer();
-
}
@Test
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab566e1b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
index 6bf67ca..4f9a52d 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/AppInterfaceTest.java
@@ -25,6 +25,7 @@ import org.airavata.appcatalog.cpi.AppCatalog;
import org.airavata.appcatalog.cpi.AppCatalogException;
import org.airavata.appcatalog.cpi.ApplicationInterface;
import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
+import org.apache.aiaravata.application.catalog.data.resources.AbstractResource;
import org.apache.airavata.app.catalog.test.util.Initialize;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
@@ -37,7 +38,9 @@ import org.junit.Before;
import org.junit.Test;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertTrue;
@@ -68,7 +71,6 @@ public class AppInterfaceTest {
public void testAppInterface(){
try {
ApplicationInterface appInterface = appcatalog.getApplicationInterface();
-
ApplicationInterfaceDescription description = new ApplicationInterfaceDescription();
String wrfModuleId = addAppModule("WRF");
String amberModuleId = addAppModule("AMBER");
@@ -107,8 +109,24 @@ public class AppInterfaceTest {
List<OutputDataObjectType> applicationOutputs = appInterface.getApplicationOutputs(appID);
System.out.println("********** App output size ************* : " + applicationOutputs.size());
- assertTrue("App interface saved successfully", ainterface != null);
+ description.setApplicationName("testApplication2");
+ appInterface.updateApplicationInterface(appID, description);
+ if (appInterface.isApplicationInterfaceExists(appID)){
+ ainterface = appInterface.getApplicationInterface(appID);
+ System.out.println("********** updated application name ************* : " + ainterface.getApplicationName());
+ }
+
+ wrfModule.setAppModuleVersion("1.0.1");
+ appInterface.updateApplicationModule(wrfModuleId, wrfModule);
+ wrfModule = appInterface.getApplicationModule(wrfModuleId);
+ System.out.println("********** Updated WRF module version ************* : " + wrfModule.getAppModuleVersion());
+ Map<String, String> filters = new HashMap<String, String>();
+ filters.put(AbstractResource.ApplicationInterfaceConstants.APPLICATION_NAME, "testApplication2");
+ List<ApplicationInterfaceDescription> apps = appInterface.getApplicationInterfaces(filters);
+ System.out.println("********** Size og app interfaces ************* : " + apps.size());
+
+ assertTrue("App interface saved successfully", ainterface != null);
}catch (AppCatalogException e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab566e1b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
index 4638159..e658eaa 100644
--- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
+++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java
@@ -26,6 +26,7 @@ import org.airavata.appcatalog.cpi.AppCatalog;
import org.airavata.appcatalog.cpi.AppCatalogException;
import org.airavata.appcatalog.cpi.ComputeResource;
import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
+import org.apache.aiaravata.application.catalog.data.resources.AbstractResource;
import org.apache.airavata.app.catalog.test.util.Initialize;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.model.computehost.*;
@@ -120,6 +121,44 @@ public class ComputeResourceTest {
GridFTPDataMovement gridFTPDataMovement = computeResource.getGridFTPDataMovement(gridFTPDataMoveId);
System.out.println("**********GRID FTP Data Move Security protocol ************* : " + gridFTPDataMovement.getSecurityProtocol().toString());
+
+ description.setHostName("localhost2");
+ computeResource.updateComputeResource(resourceId, description);
+ if (computeResource.isComputeResourceExists(resourceId)){
+ host = computeResource.getComputeResource(resourceId);
+ System.out.println("**********Updated Resource name ************* : " + host.getHostName());
+ }
+
+ Map<String, String> cfilters = new HashMap<String, String>();
+ cfilters.put(AbstractResource.ComputeResourceConstants.HOST_NAME, "localhost2");
+ List<ComputeResourceDescription> computeResourceList = computeResource.getComputeResourceList(cfilters);
+ System.out.println("**********Size of compute resources ************* : " + computeResourceList.size());
+
+ Map<String, String> globusfilters = new HashMap<String, String>();
+ globusfilters.put(AbstractResource.GlobusJobSubmissionConstants.RESOURCE_JOB_MANAGER, ResourceJobManager.PBS.toString());
+ List<GlobusJobSubmission> gList = computeResource.getGlobusJobSubmissionList(globusfilters);
+ System.out.println("**********Size of globus jobs ************* : " + gList.size());
+
+ Map<String, String> sshfilters = new HashMap<String, String>();
+ sshfilters.put(AbstractResource.SSHSubmissionConstants.RESOURCE_JOB_MANAGER, ResourceJobManager.PBS.toString());
+ List<SSHJobSubmission> sshList = computeResource.getSSHJobSubmissionList(sshfilters);
+ System.out.println("**********Size of SSH jobs ************* : " + sshList.size());
+
+ Map<String, String> gsishfilters = new HashMap<String, String>();
+ gsishfilters.put(AbstractResource.GSISSHSubmissionConstants.RESOURCE_JOB_MANAGER, ResourceJobManager.PBS.toString());
+ List<GSISSHJobSubmission> gsisshList = computeResource.getGSISSHJobSubmissionList(gsishfilters);
+ System.out.println("**********Size of GSISSH jobs ************* : " + gsisshList.size());
+
+ Map<String, String> scpfilters = new HashMap<String, String>();
+ scpfilters.put(AbstractResource.SCPDataMovementConstants.SECURITY_PROTOCOL, SecurityProtocol.SSH_KEYS.toString());
+ List<SCPDataMovement> scpDataMovementList = computeResource.getSCPDataMovementList(scpfilters);
+ System.out.println("**********Size of SCP DM list ************* : " + scpDataMovementList.size());
+
+ Map<String, String> ftpfilters = new HashMap<String, String>();
+ ftpfilters.put(AbstractResource.GridFTPDataMovementConstants.SECURITY_PROTOCOL, SecurityProtocol.SSH_KEYS.toString());
+ List<GridFTPDataMovement> ftpDataMovementList = computeResource.getGridFTPDataMovementList(ftpfilters);
+ System.out.println("**********Size of FTP DM list ************* : " + ftpDataMovementList.size());
+
assertTrue("Compute resource save successfully", host != null);
} catch (AppCatalogException e) {
e.printStackTrace();