airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject [1/2] git commit: Fixing a simple echo job on trestles
Date Wed, 09 Jul 2014 04:12:53 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 8318768fc -> 7661ac601


Fixing a simple echo job on trestles


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6d0d4f15
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6d0d4f15
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6d0d4f15

Branch: refs/heads/master
Commit: 6d0d4f15a40bdba91af4ef95821c36a94bdba020
Parents: 98f60f3
Author: lahiru <lahiru@apache.org>
Authored: Wed Jul 9 00:11:28 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Wed Jul 9 00:11:28 2014 -0400

----------------------------------------------------------------------
 .../client/samples/CreateLaunchExperiment.java  | 36 ++++++++++++--------
 .../client/tools/DocumentCreatorNew.java        | 21 ++++++------
 .../core/handler/AppDescriptorCheckHandler.java |  4 +--
 .../security/TokenizedMyProxyAuthInfo.java      | 12 ++++++-
 .../gfac/gsissh/util/GFACGSISSHUtils.java       |  5 +--
 .../GSISecurityContextTestWithMyProxyAuth.java  |  2 +-
 6 files changed, 49 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/6d0d4f15/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 c18103b..f6c86c7 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
@@ -60,7 +60,7 @@ public class CreateLaunchExperiment {
     private static Airavata.Client client;
     private static String localHostAppId;
     private static String sshHostAppId;
-    private static String pbsEchoAppId;
+    private static String pbsEchoAppId="trestles.sdsc.edu_9fcdcdc7-119a-434b-a5ef-8ed67544e855,SimpleEcho2_141c96db-46de-446e-9c39-8234a8bf9d5c";
     private static String pbsWRFAppId;
     private static String slurmAppId;
     private static String sgeAppId;
@@ -72,9 +72,9 @@ public class CreateLaunchExperiment {
             addDescriptors();
 
 //            final String expId = createExperimentForSSHHost(airavata);
-            final String expId = createExperimentForTrestles(client);
+//            final String expId = createExperimentForTrestles(client);
 //            final String expId = createExperimentForStampede(airavata);
-//            final String expId = createExperimentForLocalHost(client);
+            final String expId = createExperimentForLocalHost(client);
 //            final String expId = createExperimentForLonestar(airavata);
 //            final String expId = createExperimentWRFTrestles(airavata);
             System.out.println("Experiment ID : " + expId);
@@ -205,6 +205,12 @@ public class CreateLaunchExperiment {
             sgeAppId = documentCreator.createSGEDocs();
 //            documentCreator.createEchoHostDocs();
 //            documentCreator.createBigRedDocs();
+            System.out.printf(localHostAppId);
+            System.out.println(sshHostAppId);
+            System.out.println(pbsEchoAppId);
+            System.out.println(pbsWRFAppId);
+            System.out.println(slurmAppId);
+            System.out.println(sgeAppId);
         } catch (Exception e) {
             logger.error("Unable to create documents", e.getMessage());
             throw new ApplicationSettingsException(e.getMessage());
@@ -228,10 +234,10 @@ public class CreateLaunchExperiment {
             exOut.add(output);
 
             Experiment simpleExperiment =
-                    ExperimentModelUtil.createSimpleExperiment("default", "admin", "echoExperiment",
"SimpleEcho2", pbsEchoAppId, exInputs);
+                    ExperimentModelUtil.createSimpleExperiment("default", "admin", "echoExperiment",
"SimpleEcho2", pbsEchoAppId.split(",")[1], exInputs);
             simpleExperiment.setExperimentOutputs(exOut);
 
-            ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu",
1, 1, 1, "normal", 0, 0, 1, "sds128");
+            ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(pbsEchoAppId.split(",")[0],
1, 1, 1, "normal", 1, 0, 1, "sds128");
             UserConfigurationData userConfigurationData = new UserConfigurationData();
             userConfigurationData.setAiravataAutoSchedule(false);
             userConfigurationData.setOverrideManualScheduledParams(false);
@@ -293,10 +299,10 @@ public class CreateLaunchExperiment {
 
 
             Experiment simpleExperiment =
-                    ExperimentModelUtil.createSimpleExperiment("default", "admin", "WRFExperiment",
"Testing", pbsWRFAppId, exInputs);
+                    ExperimentModelUtil.createSimpleExperiment("default", "admin", "WRFExperiment",
"Testing", pbsWRFAppId.split(",")[1], exInputs);
             simpleExperiment.setExperimentOutputs(exOut);
 
-            ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu",
32, 2, 1, "normal", 0, 0, 1, "sds128");
+            ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(pbsWRFAppId.split(",")[0],
32, 2, 1, "normal", 0, 0, 1, "sds128");
             UserConfigurationData userConfigurationData = new UserConfigurationData();
             userConfigurationData.setAiravataAutoSchedule(false);
             userConfigurationData.setOverrideManualScheduledParams(false);
@@ -359,10 +365,10 @@ public class CreateLaunchExperiment {
             String projectId = client.createProject(project);
 
             Experiment simpleExperiment =
-                    ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "echoExperiment",
"Echo Test", localHostAppId, exInputs);
+                    ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "echoExperiment",
"Echo Test", localHostAppId.split(",")[1], exInputs);
             simpleExperiment.setExperimentOutputs(exOut);
 
-            ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("localhost",
1, 1, 1, "normal", 0, 0, 1, "");
+            ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(localHostAppId.split(",")[0],
1, 1, 1, "normal", 0, 0, 1, "");
             UserConfigurationData userConfigurationData = new UserConfigurationData();
             userConfigurationData.setAiravataAutoSchedule(false);
             userConfigurationData.setOverrideManualScheduledParams(false);
@@ -404,10 +410,10 @@ public class CreateLaunchExperiment {
             String projectId = client.createProject(project);
 
             Experiment simpleExperiment =
-                    ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "sshEchoExperiment",
"SSHEcho1", sshHostAppId, exInputs);
+                    ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "sshEchoExperiment",
"SSHEcho1", sshHostAppId.split(",")[1], exInputs);
             simpleExperiment.setExperimentOutputs(exOut);
 
-            ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("gw111.iu.xsede.org",
1, 1, 1, "normal", 0, 0, 1, "sds128");
+            ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(sshHostAppId.split(",")[0],
1, 1, 1, "normal", 0, 0, 1, "sds128");
             scheduling.setResourceHostId("gw111.iu.xsede.org");
             UserConfigurationData userConfigurationData = new UserConfigurationData();
             userConfigurationData.setAiravataAutoSchedule(false);
@@ -450,11 +456,11 @@ public class CreateLaunchExperiment {
             String projectId = client.createProject(project);
 
             Experiment simpleExperiment =
-                    ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "echoExperiment",
"SimpleEcho3", slurmAppId, exInputs);
+                    ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "echoExperiment",
"SimpleEcho3", slurmAppId.split(",")[1], exInputs);
             simpleExperiment.setExperimentOutputs(exOut);
 
             ComputationalResourceScheduling scheduling =
-                    ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org",
1, 1, 1, "normal", 0, 0, 1, "TG-STA110014S");
+                    ExperimentModelUtil.createComputationResourceScheduling(slurmAppId.split(",")[0],
1, 1, 1, "normal", 0, 0, 1, "TG-STA110014S");
             UserConfigurationData userConfigurationData = new UserConfigurationData();
             userConfigurationData.setAiravataAutoSchedule(false);
             userConfigurationData.setOverrideManualScheduledParams(false);
@@ -496,11 +502,11 @@ public class CreateLaunchExperiment {
             String projectId = client.createProject(project);
 
             Experiment simpleExperiment =
-                    ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "echoExperiment",
"SimpleEcho4", sgeAppId, exInputs);
+                    ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "echoExperiment",
"SimpleEcho4", sgeAppId.split(",")[1], exInputs);
             simpleExperiment.setExperimentOutputs(exOut);
 
             ComputationalResourceScheduling scheduling =
-                    ExperimentModelUtil.createComputationResourceScheduling("lonestar.tacc.utexas.edu",
1, 1, 1, "normal", 0, 0, 1, "TG-STA110014S");
+                    ExperimentModelUtil.createComputationResourceScheduling(sgeAppId.split(",")[0],
1, 1, 1, "normal", 0, 0, 1, "TG-STA110014S");
             UserConfigurationData userConfigurationData = new UserConfigurationData();
             userConfigurationData.setAiravataAutoSchedule(false);
             userConfigurationData.setOverrideManualScheduledParams(false);

http://git-wip-us.apache.org/repos/asf/airavata/blob/6d0d4f15/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
index 564a800..7775dbf 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java
@@ -68,8 +68,8 @@ public class DocumentCreatorNew {
     			"localhost", new HashSet<String>(Arrays.asList(new String[]{"127.0.0.1"})),
new HashSet<String>(Arrays.asList(new String[]{"127.0.0.1"})));
 //    	host.setIsEmpty(true);
     	host.setComputeResourceId(client.registerComputeResource(host));
-    	
-    	LOCALSubmission localSubmission = new LOCALSubmission();
+
+        LOCALSubmission localSubmission = new LOCALSubmission();
     	ResourceJobManager resourceJobManager = DocumentCreatorUtils.createResourceJobManager(ResourceJobManagerType.FORK,
null, null,null);
 		localSubmission.setResourceJobManager(resourceJobManager);
 		client.addLocalSubmissionDetails(host.getComputeResourceId(), 1, localSubmission);
@@ -106,7 +106,7 @@ public class DocumentCreatorNew {
         String gatewayId = client.registerGatewayResourceProfile(gatewayResourceProfile);
         gatewayResourceProfile.setGatewayID(gatewayId);
         client.addGatewayComputeResourcePreference(gatewayResourceProfile.getGatewayID(),
host.getComputeResourceId(), computeResourcePreference);
-        return application.getApplicationInterfaceId();
+        return host.getComputeResourceId()+","+application.getApplicationInterfaceId();
     }
 
     private GatewayResourceProfile getGatewayResourceProfile() throws InvalidRequestException,
AiravataClientException, AiravataSystemException, TException {
@@ -132,6 +132,7 @@ public class DocumentCreatorNew {
         host.addToHostAliases("gw111.iu.xsede.org");
         host.setResourceDescription("gw111 ssh access");
         host.setComputeResourceId(client.registerComputeResource(host));
+
         
         SSHJobSubmission jobSubmission = new SSHJobSubmission();
         jobSubmission.setSshPort(22);
@@ -159,7 +160,7 @@ public class DocumentCreatorNew {
         application.addToApplicationOutputs(DocumentCreatorUtils.createAppOutput("echo_output",
null, DataType.STRING));
         client.registerApplicationInterface(application);
         client.addGatewayComputeResourcePreference(getGatewayResourceProfile().getGatewayID(),
host.getComputeResourceId(), DocumentCreatorUtils.createComputeResourcePreference(host.getComputeResourceId(),
"/tmp", null, false, null, null, null));
-        return application.getApplicationInterfaceId();
+        return host.getComputeResourceId()+","+application.getApplicationInterfaceId();
     }
     
 //
@@ -260,7 +261,7 @@ public class DocumentCreatorNew {
     	host.addToIpAddresses(trestleshpcHostAddress);
     	host.addToHostAliases(trestleshpcHostAddress);
     	host.setComputeResourceId(client.registerComputeResource(host));
-    	
+
     	SSHJobSubmission sshJobSubmission = new SSHJobSubmission();
     	ResourceJobManager resourceJobManager = DocumentCreatorUtils.createResourceJobManager(ResourceJobManagerType.PBS,
"/opt/torque/bin/", null, null);
     	sshJobSubmission.setResourceJobManager(resourceJobManager);
@@ -290,7 +291,7 @@ public class DocumentCreatorNew {
         deployment.setAppDeploymentId(client.registerApplicationDeployment(deployment));
         
         client.addGatewayComputeResourcePreference(getGatewayResourceProfile().getGatewayID(),
host.getComputeResourceId(), DocumentCreatorUtils.createComputeResourcePreference(host.getComputeResourceId(),
"/oasis/scratch/trestles/ogce/temp_project/", "sds128", false, null, null, null));
-        return application.getApplicationInterfaceId();
+        return host.getComputeResourceId()+","+application.getApplicationInterfaceId();
     }
 
     public String createPBSDocsForOGCE_WRF() throws AppCatalogException, InvalidRequestException,
AiravataClientException, AiravataSystemException, TException {
@@ -331,7 +332,7 @@ public class DocumentCreatorNew {
 
         ApplicationDeploymentDescription deployment2 = DocumentCreatorUtils.createApplicationDeployment(host.getComputeResourceId(),
module2.getAppModuleId(), "/home/ogce/apps/wrf_wrapper.sh", ApplicationParallelismType.MPI,"WRF");
         deployment2.setAppDeploymentId(client.registerApplicationDeployment(deployment2));
-        return application2.getApplicationInterfaceId();
+        return host.getComputeResourceId()+","+application2.getApplicationInterfaceId();
     }
 
     public String createSlurmDocs() throws AppCatalogException, InvalidRequestException,
AiravataClientException, AiravataSystemException, TException {
@@ -367,7 +368,7 @@ public class DocumentCreatorNew {
         deployment.setAppDeploymentId(client.registerApplicationDeployment(deployment));
         
         client.addGatewayComputeResourcePreference(getGatewayResourceProfile().getGatewayID(),
host.getComputeResourceId(), DocumentCreatorUtils.createComputeResourcePreference(host.getComputeResourceId(),
"/home1/01437/ogce", "TG-STA110014S", false, null, null, null));
-        return application.getApplicationInterfaceId();
+        return host.getComputeResourceId()+","+application.getApplicationInterfaceId();
     }
 
     public String createSGEDocs() throws AppCatalogException, InvalidRequestException, AiravataClientException,
AiravataSystemException, TException {
@@ -375,7 +376,7 @@ public class DocumentCreatorNew {
     	host.addToHostAliases(lonestarHostAddress);
     	host.addToIpAddresses(lonestarHostAddress);
     	host.setComputeResourceId(client.registerComputeResource(host));
-    	
+
     	ResourceJobManager resourceJobManager = DocumentCreatorUtils.createResourceJobManager(ResourceJobManagerType.UGE,
"/opt/sge6.2/bin/lx24-amd64/", null, null);
     	SSHJobSubmission sshJobSubmission = new SSHJobSubmission();
     	sshJobSubmission.setResourceJobManager(resourceJobManager);
@@ -404,7 +405,7 @@ public class DocumentCreatorNew {
         deployment.setAppDeploymentId(client.registerApplicationDeployment(deployment));
         
         client.addGatewayComputeResourcePreference(getGatewayResourceProfile().getGatewayID(),
host.getComputeResourceId(), DocumentCreatorUtils.createComputeResourcePreference(host.getComputeResourceId(),
"/home1/01437/ogce", "TG-STA110014S", false, null, null, null));
-        return application.getApplicationInterfaceId();
+        return host.getComputeResourceId()+","+application.getApplicationInterfaceId();
     }
 
 //	public void createEchoHostDocs() {

http://git-wip-us.apache.org/repos/asf/airavata/blob/6d0d4f15/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
index 2237d2a..74b8d89 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
@@ -88,11 +88,11 @@ public class AppDescriptorCheckHandler implements GFacRecoverableHandler
{
         */
         if (appDesc.getStandardOutput() == null || "".equals(appDesc.getStandardOutput()))
{
             appDesc.setStandardOutput(appDesc.getStaticWorkingDirectory() + File.separator
-                    + appDesc.getApplicationName().getStringValue() + ".stdout");
+                    + appDesc.getApplicationName().getStringValue().replaceAll("\\s+","")
+ ".stdout");
         }
         if (appDesc.getStandardError() == null || "".equals(appDesc.getStandardError()))
{
             appDesc.setStandardError(appDesc.getStaticWorkingDirectory() + File.separator
-                    + appDesc.getApplicationName().getStringValue() + ".stderr");
+                    + appDesc.getApplicationName().getStringValue().replaceAll("\\s+","")
+ ".stderr");
         }
         data.append(",").append(appDesc.getStandardOutput()).append(",").append(appDesc.getStandardError());
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/6d0d4f15/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
index 59b7207..bb20a53 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/security/TokenizedMyProxyAuthInfo.java
@@ -28,6 +28,7 @@ import org.apache.airavata.credential.store.store.CredentialReader;
 import org.apache.airavata.gfac.Constants;
 import org.apache.airavata.gfac.GFacException;
 import org.apache.airavata.gfac.RequestData;
+import org.apache.airavata.gfac.core.utils.GFacUtils;
 import org.apache.airavata.gsi.ssh.api.authentication.AuthenticationInfo;
 import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo;
 import org.globus.gsi.X509Credential;
@@ -100,6 +101,15 @@ public class TokenizedMyProxyAuthInfo extends GSIAuthenticationInfo {
         };
     }
 
+    public TokenizedMyProxyAuthInfo(RequestData requestData) {
+           this.requestData = requestData;
+           try {
+               properties.setProperty(X509_CERT_DIR, ServerSettings.getSetting(Constants.TRUSTED_CERT_LOCATION));
+           } catch (ApplicationSettingsException e) {
+               e.printStackTrace();
+           };
+       }
+
     public GSSCredential getCredentials() throws SecurityException {
 
         if (gssCredentials == null) {
@@ -150,7 +160,7 @@ public class TokenizedMyProxyAuthInfo extends GSIAuthenticationInfo {
     public GSSCredential getCredentialsFromStore() throws Exception {
 
         if (getCredentialReader() == null) {
-            return null;
+            setCredentialReader(GFacUtils.getCredentialReader());
         }
 
         Credential credential = getCredentialReader().getCredential(getRequestData().getGatewayId(),

http://git-wip-us.apache.org/repos/asf/airavata/blob/6d0d4f15/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
index 7db98e4..9b856a0 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
@@ -26,6 +26,7 @@ import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.commons.gfac.type.ActualParameter;
 import org.apache.airavata.commons.gfac.type.HostDescription;
 import org.apache.airavata.commons.gfac.type.MappingFactory;
+import org.apache.airavata.credential.store.store.CredentialReader;
 import org.apache.airavata.gfac.Constants;
 import org.apache.airavata.gfac.GFacException;
 import org.apache.airavata.gfac.RequestData;
@@ -71,7 +72,7 @@ public class GFACGSISSHUtils {
             PBSCluster pbsCluster = null;
             GSISecurityContext context = null;
             try {
-                TokenizedMyProxyAuthInfo tokenizedMyProxyAuthInfo = new TokenizedMyProxyAuthInfo(GFacUtils.getCredentialReader(),
requestData);
+                TokenizedMyProxyAuthInfo tokenizedMyProxyAuthInfo = new TokenizedMyProxyAuthInfo(requestData);
                 GsisshHostType gsisshHostType = (GsisshHostType) registeredHost.getType();
                 ServerInfo serverInfo = new ServerInfo(requestData.getMyProxyUserName(),
registeredHost.getType().getHostAddress(),
                         gsisshHostType.getPort());
@@ -93,7 +94,7 @@ public class GFACGSISSHUtils {
                     }
                 }
                 pbsCluster = new PBSCluster(serverInfo, tokenizedMyProxyAuthInfo, jConfig);
-                context = new GSISecurityContext(GFacUtils.getCredentialReader(), requestData,pbsCluster);
+                context = new GSISecurityContext(tokenizedMyProxyAuthInfo.getCredentialReader(),
requestData,pbsCluster);
             } catch (Exception e) {
                 throw new GFacException("An error occurred while creating GSI security context",
e);
             }

http://git-wip-us.apache.org/repos/asf/airavata/blob/6d0d4f15/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
b/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
index 02479f3..44b7ae4 100644
--- a/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
+++ b/modules/gfac/gfac-gsissh/src/test/java/org/apache/airavata/core/gfac/services/impl/security/GSISecurityContextTestWithMyProxyAuth.java
@@ -116,7 +116,7 @@ public class GSISecurityContextTestWithMyProxyAuth extends DatabaseTestCases
{
         requestData.setMyProxyLifeTime(ServerSettings.getMyProxyLifetime());
         CredentialReader credentialReader = CredentialReaderFactory.createCredentialStoreReader(getDbUtil());
 
-        return new TokenizedMyProxyAuthInfo(credentialReader, requestData);
+        return new TokenizedMyProxyAuthInfo(requestData);
     }
 
     @Test


Mime
View raw message