Repository: airavata Updated Branches: refs/heads/master f5a7376ed -> f65c5a8a6
fixing saveComputeResource method Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f65c5a8a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f65c5a8a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f65c5a8a Branch: refs/heads/master Commit: f65c5a8a66b0dfc4a495b3a12125da3420a2a3a9 Parents: f5a7376 Author: Chathuri Wimalasena <[email protected]> Authored: Thu Jul 31 10:51:19 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Thu Jul 31 10:51:19 2014 -0400 ---------------------------------------------------------------------- .../catalog/data/impl/ComputeResourceImpl.java | 4 +- .../gfac/services/impl/CredentialStoreTest.java | 270 +++++++++---------- 2 files changed, 137 insertions(+), 137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/f65c5a8a/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 0f5794a..0b971c3 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 @@ -107,7 +107,7 @@ public class ComputeResourceImpl implements ComputeResource { DataMovementInterfaceResource dmir = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface); dmir.setComputeHostResource(computeHostResource); dmir.setComputeResourceId(computeHostResource.getResourceId()); - computeHostResource.save(); + dmir.save(); } } } @@ -122,7 +122,7 @@ public class ComputeResourceImpl implements ComputeResource { JobSubmissionInterfaceResource jsir = AppCatalogThriftConversion.getJobSubmissionInterface(jobSubmissionInterface); jsir.setComputeHostResource(computeHostResource); jsir.setComputeResourceId(computeHostResource.getResourceId()); - computeHostResource.save(); + jsir.save(); } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/f65c5a8a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java index 8b3653a..d42ea52 100644 --- a/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java +++ b/modules/gfac/gfac-ssh/src/test/java/org/apache/airavata/core/gfac/services/impl/CredentialStoreTest.java @@ -1,135 +1,135 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * -*/ -package org.apache.airavata.core.gfac.services.impl; - -import junit.framework.Assert; -import org.apache.airavata.client.AiravataAPIFactory; -import org.apache.airavata.client.api.AiravataAPI; -import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; -import org.apache.airavata.common.exception.AiravataConfigurationException; -import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.common.utils.ClientSettings; -import org.apache.airavata.common.utils.DBUtil; -import org.apache.airavata.common.utils.ServerSettings; -import org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential; -import org.apache.airavata.credential.store.store.CredentialReader; -import org.apache.airavata.credential.store.store.impl.CredentialReaderImpl; -import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.RequestData; -import org.apache.airavata.gfac.ssh.security.TokenizedSSHAuthInfo; -import org.apache.airavata.gsi.ssh.api.SSHApiException; -import org.apache.airavata.gsi.ssh.api.ServerInfo; -import org.apache.airavata.gsi.ssh.impl.PBSCluster; -import org.apache.airavata.gsi.ssh.util.CommonUtils; -import org.apache.airavata.registry.api.AiravataRegistry2; -import org.apache.airavata.registry.api.AiravataRegistryFactory; -import org.apache.airavata.registry.api.AiravataUser; -import org.apache.airavata.registry.api.Gateway; -import org.apache.airavata.registry.api.exception.RegAccessorInstantiateException; -import org.apache.airavata.registry.api.exception.RegAccessorInvalidException; -import org.apache.airavata.registry.api.exception.RegAccessorUndefinedException; -import org.apache.airavata.registry.api.exception.RegException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; - -import java.util.UUID; - -public class CredentialStoreTest { - private final static Logger logger = LoggerFactory.getLogger(CredentialStoreTest.class); - - @BeforeTest - public void testGSISSHProvider() throws GFacException, IllegalAccessException, ClassNotFoundException, InstantiationException, ApplicationSettingsException, SSHApiException { - System.setProperty("credential.store.keystore.url", "/Users/lahirugunathilake/Downloads/airavata_sym.jks"); - System.setProperty("credential.store.keystore.alias", "airavata"); - System.setProperty("credential.store.keystore.password", "airavata"); - System.setProperty("myproxy.username", "ogce"); - System.setProperty("myproxy.password", "OpenGwy14"); - System.setProperty("trusted.cert.location", "/Users/lahirugunathilake/Downloads/certificates"); - System.setProperty("credential.store.jdbc.url","jdbc:mysql://gw85.iu.xsede.org:3306/airavata_gta_prod"); - System.setProperty("credential.store.jdbc.user","gtaAiravataUser"); - System.setProperty("credential.store.jdbc.password","gtaAiravataPWD"); - System.setProperty("credential.store.jdbc.driver","com.mysql.jdbc.Driver"); - - - - UUID uuid = UUID.randomUUID(); - System.out.println("TokenId: " + uuid.toString()); -// String publicKey = registry.createCredential("default",uuid.toString(),"lginnali" ); -// System.out.println("Public-Key: " +publicKey); -// String tokenId = uuid.toString(); - String tokenId = "2c308fa9-99f8-4baa-92e4-d062e311483c"; - CredentialReader credentialReader = new CredentialReaderImpl(new DBUtil("jdbc:mysql://gw85.iu.xsede.org:3306/airavata_gta_prod", - "ptaAiravataUser", "ptaAiravataPWD", "com.mysql.jdbc.Driver")); - - - RequestData requestData = new RequestData(); - requestData.setMyProxyUserName("cgateway"); - requestData.setTokenId(tokenId); - requestData.setGatewayId("default"); - TokenizedSSHAuthInfo tokenizedSSHAuthInfo = new TokenizedSSHAuthInfo(credentialReader, requestData); - - SSHCredential credentials = tokenizedSSHAuthInfo.getCredentials(); - ServerInfo serverInfo = new ServerInfo("cgateway", "bigred2.uits.iu.edu"); - - PBSCluster pbsCluster = new PBSCluster(serverInfo, tokenizedSSHAuthInfo, CommonUtils.getPBSJobManager("/opt/torque/bin/")); - Assert.assertNotNull(pbsCluster); - return; - - } - - @Test - public static void main(String[] args) { - try { - new CredentialStoreTest().testGSISSHProvider(); - } catch (GFacException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (InstantiationException e) { - e.printStackTrace(); - } catch (ApplicationSettingsException e) { - e.printStackTrace(); - } catch (SSHApiException e) { - e.printStackTrace(); - } - } - - private static AiravataAPI getAiravataAPI() throws AiravataAPIInvocationException, ApplicationSettingsException { - AiravataAPI airavataAPI; - try { - String sysUser = ClientSettings.getSetting("admin"); - String gateway = ClientSettings.getSetting("default"); - airavataAPI = AiravataAPIFactory.getAPI(gateway, sysUser); - } catch (AiravataAPIInvocationException e) { - logger.error("Unable to create airavata API", e.getMessage()); - throw new AiravataAPIInvocationException(e); - } catch (ApplicationSettingsException e) { - logger.error("Unable to create airavata API", e.getMessage()); - throw new ApplicationSettingsException(e.getMessage()); - } - return airavataAPI; - } - -} +///* +// * +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, +// * software distributed under the License is distributed on an +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// * KIND, either express or implied. See the License for the +// * specific language governing permissions and limitations +// * under the License. +// * +//*/ +//package org.apache.airavata.core.gfac.services.impl; +// +//import junit.framework.Assert; +//import org.apache.airavata.client.AiravataAPIFactory; +//import org.apache.airavata.client.api.AiravataAPI; +//import org.apache.airavata.client.api.exception.AiravataAPIInvocationException; +//import org.apache.airavata.common.exception.AiravataConfigurationException; +//import org.apache.airavata.common.exception.ApplicationSettingsException; +//import org.apache.airavata.common.utils.ClientSettings; +//import org.apache.airavata.common.utils.DBUtil; +//import org.apache.airavata.common.utils.ServerSettings; +//import org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential; +//import org.apache.airavata.credential.store.store.CredentialReader; +//import org.apache.airavata.credential.store.store.impl.CredentialReaderImpl; +//import org.apache.airavata.gfac.GFacException; +//import org.apache.airavata.gfac.RequestData; +//import org.apache.airavata.gfac.ssh.security.TokenizedSSHAuthInfo; +//import org.apache.airavata.gsi.ssh.api.SSHApiException; +//import org.apache.airavata.gsi.ssh.api.ServerInfo; +//import org.apache.airavata.gsi.ssh.impl.PBSCluster; +//import org.apache.airavata.gsi.ssh.util.CommonUtils; +//import org.apache.airavata.registry.api.AiravataRegistry2; +//import org.apache.airavata.registry.api.AiravataRegistryFactory; +//import org.apache.airavata.registry.api.AiravataUser; +//import org.apache.airavata.registry.api.Gateway; +//import org.apache.airavata.registry.api.exception.RegAccessorInstantiateException; +//import org.apache.airavata.registry.api.exception.RegAccessorInvalidException; +//import org.apache.airavata.registry.api.exception.RegAccessorUndefinedException; +//import org.apache.airavata.registry.api.exception.RegException; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.testng.annotations.BeforeTest; +//import org.testng.annotations.Test; +// +//import java.util.UUID; +// +//public class CredentialStoreTest { +// private final static Logger logger = LoggerFactory.getLogger(CredentialStoreTest.class); +// +// @BeforeTest +// public void testGSISSHProvider() throws GFacException, IllegalAccessException, ClassNotFoundException, InstantiationException, ApplicationSettingsException, SSHApiException { +// System.setProperty("credential.store.keystore.url", "/Users/lahirugunathilake/Downloads/airavata_sym.jks"); +// System.setProperty("credential.store.keystore.alias", "airavata"); +// System.setProperty("credential.store.keystore.password", "airavata"); +// System.setProperty("myproxy.username", "ogce"); +// System.setProperty("myproxy.password", ""); +// System.setProperty("trusted.cert.location", "/Users/lahirugunathilake/Downloads/certificates"); +// System.setProperty("credential.store.jdbc.url","jdbc:mysql://gw85.iu.xsede.org:3306/airavata_gta_prod"); +// System.setProperty("credential.store.jdbc.user","gtaAiravataUser"); +// System.setProperty("credential.store.jdbc.password","gtaAiravataPWD"); +// System.setProperty("credential.store.jdbc.driver","com.mysql.jdbc.Driver"); +// +// +// +// UUID uuid = UUID.randomUUID(); +// System.out.println("TokenId: " + uuid.toString()); +//// String publicKey = registry.createCredential("default",uuid.toString(),"lginnali" ); +//// System.out.println("Public-Key: " +publicKey); +//// String tokenId = uuid.toString(); +// String tokenId = "2c308fa9-99f8-4baa-92e4-d062e311483c"; +// CredentialReader credentialReader = new CredentialReaderImpl(new DBUtil("jdbc:mysql://gw85.iu.xsede.org:3306/airavata_gta_prod", +// "ptaAiravataUser", "ptaAiravataPWD", "com.mysql.jdbc.Driver")); +// +// +// RequestData requestData = new RequestData(); +// requestData.setMyProxyUserName("cgateway"); +// requestData.setTokenId(tokenId); +// requestData.setGatewayId("default"); +// TokenizedSSHAuthInfo tokenizedSSHAuthInfo = new TokenizedSSHAuthInfo(credentialReader, requestData); +// +// SSHCredential credentials = tokenizedSSHAuthInfo.getCredentials(); +// ServerInfo serverInfo = new ServerInfo("cgateway", "bigred2.uits.iu.edu"); +// +// PBSCluster pbsCluster = new PBSCluster(serverInfo, tokenizedSSHAuthInfo, CommonUtils.getPBSJobManager("/opt/torque/bin/")); +// Assert.assertNotNull(pbsCluster); +// return; +// +// } +// +// @Test +// public static void main(String[] args) { +// try { +// new CredentialStoreTest().testGSISSHProvider(); +// } catch (GFacException e) { +// e.printStackTrace(); +// } catch (IllegalAccessException e) { +// e.printStackTrace(); +// } catch (ClassNotFoundException e) { +// e.printStackTrace(); +// } catch (InstantiationException e) { +// e.printStackTrace(); +// } catch (ApplicationSettingsException e) { +// e.printStackTrace(); +// } catch (SSHApiException e) { +// e.printStackTrace(); +// } +// } +// +// private static AiravataAPI getAiravataAPI() throws AiravataAPIInvocationException, ApplicationSettingsException { +// AiravataAPI airavataAPI; +// try { +// String sysUser = ClientSettings.getSetting("admin"); +// String gateway = ClientSettings.getSetting("default"); +// airavataAPI = AiravataAPIFactory.getAPI(gateway, sysUser); +// } catch (AiravataAPIInvocationException e) { +// logger.error("Unable to create airavata API", e.getMessage()); +// throw new AiravataAPIInvocationException(e); +// } catch (ApplicationSettingsException e) { +// logger.error("Unable to create airavata API", e.getMessage()); +// throw new ApplicationSettingsException(e.getMessage()); +// } +// return airavataAPI; +// } +// +//}
