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 2017/04/03 16:49:52 UTC
[19/50] airavata git commit: AIRAVATA-2339 Use default key of user
resource profile
AIRAVATA-2339 Use default key of user resource profile
When the user hasn't set a resource specific key for compute or storage
preference, use the default one on the user resource profile
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/58c3d52b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/58c3d52b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/58c3d52b
Branch: refs/heads/master
Commit: 58c3d52b443e1cf9d5bf517ef8ccfdff6f25be57
Parents: 0c8c2ae
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Mar 16 17:01:41 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Mar 16 17:03:13 2017 -0400
----------------------------------------------------------------------
.../gfac/core/context/ProcessContext.java | 38 ++++++++++++--------
1 file changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/58c3d52b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
index e057b71..153f0ee 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/ProcessContext.java
@@ -447,26 +447,36 @@ public class ProcessContext {
}
public String getComputeResourceCredentialToken(){
- if (isUseUserCRPref() &&
- userComputeResourcePreference != null &&
- isValid(userComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
- return userComputeResourcePreference.getResourceSpecificCredentialStoreToken();
- } else if (isValid(gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
- return gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken();
+ if (isUseUserCRPref()) {
+ if (userComputeResourcePreference != null &&
+ isValid(userComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
+ return userComputeResourcePreference.getResourceSpecificCredentialStoreToken();
+ } else {
+ return userResourceProfile.getCredentialStoreToken();
+ }
} else {
- return gatewayResourceProfile.getCredentialStoreToken();
+ if (isValid(gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken())) {
+ return gatewayComputeResourcePreference.getResourceSpecificCredentialStoreToken();
+ } else {
+ return gatewayResourceProfile.getCredentialStoreToken();
+ }
}
}
public String getStorageResourceCredentialToken(){
- if (isUseUserCRPref() &&
- userStoragePreference != null &&
- isValid(userStoragePreference.getResourceSpecificCredentialStoreToken())) {
- return userStoragePreference.getResourceSpecificCredentialStoreToken();
- } else if (isValid(gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken())) {
- return gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken();
+ if (isUseUserCRPref()) {
+ if (userStoragePreference != null &&
+ isValid(userStoragePreference.getResourceSpecificCredentialStoreToken())) {
+ return userStoragePreference.getResourceSpecificCredentialStoreToken();
+ } else {
+ return userResourceProfile.getCredentialStoreToken();
+ }
} else {
- return gatewayResourceProfile.getCredentialStoreToken();
+ if (isValid(gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken())) {
+ return gatewayStorageResourcePreference.getResourceSpecificCredentialStoreToken();
+ } else {
+ return gatewayResourceProfile.getCredentialStoreToken();
+ }
}
}