[airavata-data-lake] branch master updated: DRMS connnector

[isjarana]

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git


The following commit(s) were added to refs/heads/master by this push:
     new 7e45302  DRMS connnector
     new cc1aa12  Merge pull request #27 from isururanawaka/workflow_invocation
7e45302 is described below

commit 7e45302fe0bde08d55a4ae9f31e948b93435921e
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Mon Jul 12 13:55:45 2021 -0400

    DRMS connnector
---
 .../airavata/datalake/orchestrator/connectors/DRMSConnector.java   | 2 +-
 .../datalake/orchestrator/processor/OutboundEventProcessor.java    | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/connectors/DRMSConnector.java
 
b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/connectors/DRMSConnector.java
index 4f9cbab..6e8f584 100644
--- 
a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/connectors/DRMSConnector.java
+++ 
b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/connectors/DRMSConnector.java
@@ -72,7 +72,7 @@ public class DRMSConnector implements 
AbstractConnector<Configuration> {
         if (!transferMappingList.isEmpty()) {
             transferMappingList.forEach(transferMapping -> {
                 if (transferMapping.getSourceStorage().getStorageCase()
-                        
.equals(AnyStoragePreference.StorageCase.SSH_STORAGE_PREFERENCE)) {
+                        .equals(AnyStorage.StorageCase.SSH_STORAGE)) {
                     if 
(transferMapping.getSourceStorage().getSshStorage().getHostName().equals(hostname))
 {
                             transferMappingOp.set(transferMapping);
                     }
diff --git 
a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/processor/OutboundEventProcessor.java
 
b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/processor/OutboundEventProcessor.java
index 522d8a7..13d4961 100644
--- 
a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/processor/OutboundEventProcessor.java
+++ 
b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/processor/OutboundEventProcessor.java
@@ -135,12 +135,7 @@ public class OutboundEventProcessor implements 
MessageProcessor<Configuration> {
                     destinationStorageId,
                     "FILE");
 
-            Optional<GenericResource> optionalGenericResourceDST =
-                    this.drmsConnector.createResource(repository, entity, 
messageId,
-                            collections[collections.length - 1], 
entity.getResourcePath(),
-                            destinationStorageId, "FILE");
-
-            if (optionalGenericResource.isPresent()) {
+            if (optionalGenericResource.isPresent() && 
destinationFile.isPresent()) {
                 this.workflowServiceConnector.invokeWorkflow(repository, 
entity, optionalGenericResource.get());
                 
entity.setEventStatus(EventStatus.DISPATCHED_TO_WORFLOW_ENGING.name());
                 repository.save(entity);