airavata git commit: AIRAVATA-2500 Implement SSHAccountProvisionerFactory

[machristie]

Repository: airavata
Updated Branches:
  refs/heads/AIRAVATA-2500 f9da9425d -> 0e97713b0


AIRAVATA-2500 Implement SSHAccountProvisionerFactory


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

Branch: refs/heads/AIRAVATA-2500
Commit: 0e97713b0cb717c1e15219bc9acf36cfdcc3eb1f
Parents: f9da942
Author: Marcus Christie 
Authored: Thu Aug 10 15:24:26 2017 -0400
Committer: Marcus Christie 
Committed: Thu Aug 10 15:24:26 2017 -0400

--
 .../accountprovisioning/ConfigParam.java| 32 +++--
 .../accountprovisioning/SSHAccountManager.java  | 37 +-
 .../SSHAccountProvisioner.java  |  9 ---
 .../SSHAccountProvisionerFactory.java   | 28 +---
 .../SSHAccountProvisionerProvider.java  | 37 ++
 .../IULdapSSHAccountProvisioner.java|  7 --
 .../IULdapSSHAccountProvisionerProvider.java| 44 
 ...ta.accountprovisioning.SSHAccountProvisioner | 22 --
 ...ntprovisioning.SSHAccountProvisionerProvider | 22 ++
 .../SSHAccountProvisionerFactoryTest.java   | 75 
 .../provisioner/TestSSHAccountProvisioner.java  | 71 ++
 .../TestSSHAccountProvisionerProvider.java  | 66 +
 ...ntprovisioning.SSHAccountProvisionerProvider | 21 ++
 .../account_provisioning_model.thrift   |  2 +-
 .../gateway_resource_profile_model.thrift   |  2 +-
 15 files changed, 420 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/0e97713b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java
--
diff --git 
a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java
 
b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java
index beb8bbc..cf27b7f 100644
--- 
a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java
+++ 
b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/ConfigParam.java
@@ -24,7 +24,7 @@ public class ConfigParam {
 
 public enum ConfigParamType {
 STRING,
-CRED_TOKEN,
+CRED_STORE_PASSWORD_TOKEN,
 }
 
 private boolean optional = false;
@@ -32,36 +32,58 @@ public class ConfigParam {
 private String description;
 private ConfigParamType type = ConfigParamType.STRING;
 
+public ConfigParam(String name) {
+this.name = name;
+}
+
 public boolean isOptional() {
 return optional;
 }
 
-public void setOptional(boolean optional) {
+public ConfigParam setOptional(boolean optional) {
 this.optional = optional;
+return this;
 }
 
 public String getName() {
 return name;
 }
 
-public void setName(String name) {
+public ConfigParam setName(String name) {
 this.name = name;
+return this;
 }
 
 public String getDescription() {
 return description;
 }
 
-public void setDescription(String description) {
+public ConfigParam setDescription(String description) {
 this.description = description;
+return this;
 }
 
 public ConfigParamType getType() {
 return type;
 }
 
-public void setType(ConfigParamType type) {
+public ConfigParam setType(ConfigParamType type) {
 this.type = type;
+return this;
+}
+
+@Override
+public boolean equals(Object o) {
+if (this == o) return true;
+if (!(o instanceof ConfigParam)) return false;
+
+ConfigParam that = (ConfigParam) o;
+
+return name.equals(that.name);
 }
 
+@Override
+public int hashCode() {
+return name.hashCode();
+}
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/0e97713b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
--
diff --git 
a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
 
b/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
index 4e00e4e..dcb819b 100644
--- 
a/modules/compute-account-provisioning/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java
+++ 

airavata git commit: fixing bug in initializing user profile in the sharing db event handler

[scnakandala]

Repository: airavata
Updated Branches:
  refs/heads/develop b182ca18a -> efa619b78


fixing bug in initializing user profile in the sharing db event handler


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

Branch: refs/heads/develop
Commit: efa619b78020e0a66140b3636f7c3f6d1c5706a3
Parents: b182ca1
Author: scnakandala 
Authored: Thu Aug 10 14:16:42 2017 -0400
Committer: scnakandala 
Committed: Thu Aug 10 14:16:42 2017 -0400

--
 .../sharing/registry/messaging/SharingServiceDBEventHandler.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/efa619b7/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
index cb9819f..61dfe4e 100644
--- 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
+++ 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/messaging/SharingServiceDBEventHandler.java
@@ -80,12 +80,11 @@ public class SharingServiceDBEventHandler implements 
MessageHandler {
 log.info("User profile specific DB Event communicated 
by " + dbEventMessage.getPublisherService());
 
 UserProfile  userProfile = new UserProfile();
+
ThriftUtils.createThriftFromBytes(dBEventMessageContext.getPublisher().getPublisherContext().getEntityDataModel(),
 userProfile);
 //AIRAVATA-2506: Sharing Service treats 
airavataInternalUserId as the userId. AiravataAPIServerHandler
 //also treats airavataInternalUserId as the userId 
when creating entities, entityTypes using the sharing
 //service.
 
userProfile.setUserId(userProfile.getAiravataInternalUserId());
-
ThriftUtils.createThriftFromBytes(dBEventMessageContext.getPublisher().getPublisherContext().getEntityDataModel(),
 userProfile);
-
 User user = 
ThriftDataModelConversion.getUser(userProfile);
 
 switch 
(dBEventMessageContext.getPublisher().getPublisherContext().getCrudType()){