You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/08/17 21:02:47 UTC
[airavata-data-lake] branch master updated: fix search storage preference type
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 1212dbf fix search storage preference type
new 529a400 Merge pull request #145 from isururanawaka/mysql_conversion
1212dbf is described below
commit 1212dbf9d7c365b2cb009d514246f909d58aac4f
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Wed Aug 17 17:02:18 2022 -0400
fix search storage preference type
---
.../drms/api/persistance/mapper/StoragePreferenceMapper.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StoragePreferenceMapper.java b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StoragePreferenceMapper.java
index fea313c..b15cee2 100644
--- a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StoragePreferenceMapper.java
+++ b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/persistance/mapper/StoragePreferenceMapper.java
@@ -3,6 +3,7 @@ package org.apache.airavata.drms.api.persistance.mapper;
import org.apache.airavata.datalake.drms.storage.AnyStorage;
import org.apache.airavata.datalake.drms.storage.AnyStoragePreference;
import org.apache.airavata.datalake.drms.storage.preference.s3.S3StoragePreference;
+import org.apache.airavata.datalake.drms.storage.preference.sda.SDAStoragePreference;
import org.apache.airavata.datalake.drms.storage.preference.ssh.SSHStoragePreference;
import org.apache.airavata.drms.api.persistance.model.Resource;
import org.apache.airavata.drms.api.persistance.model.ResourceProperty;
@@ -46,6 +47,12 @@ public class StoragePreferenceMapper {
anyStoragePrefBuilder.setS3StoragePreference(s3Builder.build());
setObjectFieldsUsingMap(anyStoragePrefBuilder, resource);
break;
+ case StoragePreferenceConstants.SDA_STORAGE_PREFERENCE_TYPE_LABEL:
+ SDAStoragePreference.Builder sdaBuilder = SDAStoragePreference.newBuilder();
+ sdaBuilder.setStorage(anyStorage.getSshStorage());
+ anyStoragePrefBuilder.setSdaStoragePreference(sdaBuilder.build());
+ setObjectFieldsUsingMap(anyStoragePrefBuilder, resource);
+ break;
default:
throw new Exception("Unsupported storage type for deserializing : " + type);
}