airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [1/6] airavata git commit: adding data storage interface
Date Mon, 23 Nov 2015 15:58:14 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 77841a4ea -> 4c0978b61


http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index 9299020..90b7242 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
  * EnvironmentSetupTaskModel: A structure holding the environment creation task details
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
 public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel,
EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index 282fef8..c5c84bc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
 public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel,
JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index d1afb7c..5f5740a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
 public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>,
java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index edf65d3..a1e14ab 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
  * subTaskModel:
  *   A generic byte object for the Task developer to store internal serialized data into
registry catalogs.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
 public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>,
java.io.Serializable, Cloneable, Comparable<TaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index c1433ee..8a752c9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
 public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>,
java.io.Serializable, Cloneable, Comparable<Gateway> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index b67a07a..6b51643 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
 public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable,
Cloneable, Comparable<Group> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 146453d..c57eadd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
 public class Project implements org.apache.thrift.TBase<Project, Project._Fields>,
java.io.Serializable, Cloneable, Comparable<Project> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index 992b95f..150d8c3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
 public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable,
Cloneable, Comparable<User> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
index 554a4c5..0bd3ad0 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
@@ -367,15 +367,27 @@ public class ComputeResourceImpl implements ComputeResource {
     }
 
     @Override
-    public String addDataMovementProtocol(String computeResourceId, DataMovementInterface
dataMovementInterface) throws AppCatalogException {
+    public String addDataMovementProtocol(String resourceId, DMType dmType, DataMovementInterface
dataMovementInterface) throws AppCatalogException {
         try {
-        	DataMovementInterfaceResource dmi = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface);
-        	dmi.setComputeResourceId(computeResourceId);
-        	ComputeResourceResource computeResourceResource = new ComputeResourceResource();
-        	computeResourceResource=(ComputeResourceResource)computeResourceResource.get(computeResourceId);
-        	dmi.setComputeHostResource(computeResourceResource);
-        	dmi.save();
-            return dmi.getDataMovementInterfaceId();
+            String dmId = null;
+            if (dmType.equals(DMType.COMPUTE_RESOURCE)){
+                DataMovementInterfaceResource dmi = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface);
+                dmi.setComputeResourceId(resourceId);
+                ComputeResourceResource computeResourceResource = new ComputeResourceResource();
+                computeResourceResource=(ComputeResourceResource)computeResourceResource.get(resourceId);
+                dmi.setComputeHostResource(computeResourceResource);
+                dmi.save();
+                dmId = dmi.getDataMovementInterfaceId();
+            }else if (dmType.equals(DMType.STORAGE_RESOURCE)){
+                StorageInterfaceResource storageInterface = AppCatalogThriftConversion.getStorageInterface(dataMovementInterface);
+                storageInterface.setStorageResourceId(resourceId);
+                StorageResourceResource storageResourceResource = new StorageResourceResource();
+                storageResourceResource=(StorageResourceResource)storageResourceResource.get(resourceId);
+                storageInterface.setStorageResourceResource(storageResourceResource);
+                storageInterface.save();
+                dmId = storageInterface.getDataMovementInterfaceId();
+            }
+            return dmId;
         }catch (Exception e){
             logger.error("Error while saving "+dataMovementInterface.getDataMovementProtocol().toString()+"
data movement Protocol...", e);
             throw new AppCatalogException(e);

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
index 0c3a6be..bc0bcc7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
@@ -175,7 +175,7 @@ public class StorageResourceImpl implements StorageResource {
             List<AppCatalogResource> allStorageResources = resource.getAll();
             if (allStorageResources != null && !allStorageResources.isEmpty()){
                 for (AppCatalogResource sr : allStorageResources){
-                    StorageResourceResource srr = (StorageResourceResource)allStorageResources;
+                    StorageResourceResource srr = (StorageResourceResource)sr;
                     storageResourceMap.put(srr.getStorageResourceId(), srr.getHostName());
                 }
             }

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index e096a0d..5f0cfa2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -185,6 +185,13 @@ public class AppCatalogThriftConversion {
     	dmi.setPriorityOrder(resource.getPriorityOrder());
         return dmi;
     }
+
+    public static StorageInterfaceResource getStorageInterface(DataMovementInterface resource){
+        StorageInterfaceResource storageInterfaceResource = new StorageInterfaceResource();
+        storageInterfaceResource.setDataMovementInterfaceId(resource.getDataMovementInterfaceId());
+        storageInterfaceResource.setDataMovementProtocol(resource.getDataMovementProtocol().toString());
+        return storageInterfaceResource;
+    }
     
     public static List<JobSubmissionInterface> getJobSubmissionInterfaces(List<AppCatalogResource>
resources){
     	List<JobSubmissionInterface> jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>();

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
index 85525d8..d140c61 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
@@ -99,9 +99,9 @@ public interface ComputeResource {
 
     /**
      * This will add a SCPDataMovement protocol to the database
-     * @param computeResourceId compute resource id
+     * @param resourceId compute resource id
      */
-    String addDataMovementProtocol (String computeResourceId, DataMovementInterface dataMovementInterface)
throws AppCatalogException;
+    String addDataMovementProtocol (String resourceId, DMType dmType, DataMovementInterface
dataMovementInterface) throws AppCatalogException;
 
     /**
      * This method will add a GridFTP Data movement to the database

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
index 33db776..a2e8e87 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ComputeResourceRegister.java
@@ -152,7 +152,7 @@ public class ComputeResourceRegister {
         SCPDataMovement scpDataMovement = new SCPDataMovement();
         scpDataMovement.setSecurityProtocol(securityProtocol);
         scpDataMovement.setSshPort(portNumber);
-        airavata.addSCPDataMovementDetails(authzToken, computeResourceId, 1, scpDataMovement);
+        airavata.addSCPDataMovementDetails(authzToken, computeResourceId, DMType.COMPUTE_RESOURCE,
1, scpDataMovement);
 
         return computeResourceId;
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
index 1129d1d..d17f455 100644
--- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
@@ -1717,9 +1717,10 @@ service Airavata {
    *
   */
   string addLocalDataMovementDetails(1: required security_model.AuthzToken authzToken,
-            2: required string computeResourceId,
-            3: required i32 priorityOrder,
-            4: required compute_resource_model.LOCALDataMovement localDataMovement)
+            2: required string resourceId,
+            3: required compute_resource_model.DMType dataMoveType,
+            4: required i32 priorityOrder,
+            5: required compute_resource_model.LOCALDataMovement localDataMovement)
   	throws (1: airavata_errors.InvalidRequestException ire,
             2: airavata_errors.AiravataClientException ace,
             3: airavata_errors.AiravataSystemException ase,
@@ -1777,9 +1778,11 @@ service Airavata {
    *   Returns the unique job submission id.
    *
   */
-  string addSCPDataMovementDetails(1: required security_model.AuthzToken authzToken, 2: required
string computeResourceId,
-            3: required i32 priorityOrder,
-            4: required compute_resource_model.SCPDataMovement scpDataMovement)
+  string addSCPDataMovementDetails(1: required security_model.AuthzToken authzToken,
+            2: required string resourceId,
+            3: required compute_resource_model.DMType dataMoveType,
+            4: required i32 priorityOrder,
+            5: required compute_resource_model.SCPDataMovement scpDataMovement)
   	throws (1: airavata_errors.InvalidRequestException ire,
             2: airavata_errors.AiravataClientException ace,
             3: airavata_errors.AiravataSystemException ase,
@@ -1799,7 +1802,8 @@ service Airavata {
    *   Returns a success/failure of the update.
    *
   */
-  bool updateSCPDataMovementDetails(1: required security_model.AuthzToken authzToken, 2:
required string dataMovementInterfaceId,
+  bool updateSCPDataMovementDetails(1: required security_model.AuthzToken authzToken,
+            2: required string dataMovementInterfaceId,
             3: required compute_resource_model.SCPDataMovement scpDataMovement)
   	throws (1: airavata_errors.InvalidRequestException ire,
             2: airavata_errors.AiravataClientException ace,
@@ -1819,9 +1823,11 @@ service Airavata {
                             4: airavata_errors.AuthorizationException ae)
 
 
- string addUnicoreDataMovementDetails(1: required security_model.AuthzToken authzToken, 2:
required string computeResourceId,
-              3: required i32 priorityOrder,
-              4: required compute_resource_model.UnicoreDataMovement unicoreDataMovement)
+ string addUnicoreDataMovementDetails(1: required security_model.AuthzToken authzToken,
+              2: required string resourceId,
+              3: required compute_resource_model.DMType dataMoveType,
+              4: required i32 priorityOrder,
+              5: required compute_resource_model.UnicoreDataMovement unicoreDataMovement)
     	throws (1: airavata_errors.InvalidRequestException ire,
               2: airavata_errors.AiravataClientException ace,
               3: airavata_errors.AiravataSystemException ase,
@@ -1858,9 +1864,11 @@ service Airavata {
    *   Returns the unique job submission id.
    *
   */
-  string addGridFTPDataMovementDetails(1: required security_model.AuthzToken authzToken,
2: required string computeResourceId,
-            3: required i32 priorityOrder,
-            4: required compute_resource_model.GridFTPDataMovement gridFTPDataMovement)
+  string addGridFTPDataMovementDetails(1: required security_model.AuthzToken authzToken,
+            2: required string resourceId,
+            3: required compute_resource_model.DMType dataMoveType,
+            4: required i32 priorityOrder,
+            5: required compute_resource_model.GridFTPDataMovement gridFTPDataMovement)
   	throws (1: airavata_errors.InvalidRequestException ire,
             2: airavata_errors.AiravataClientException ace,
             3: airavata_errors.AiravataSystemException ase,

http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift b/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift
index b3d8f3f..434200b 100644
--- a/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift
@@ -217,6 +217,11 @@ enum MonitorMode {
    FORK
 }
 
+enum DMType {
+    COMPUTE_RESOURCE,
+    STORAGE_RESOURCE
+}
+
 /**
  * Enumeration of data movement supported by Airavata
  *


Mime
View raw message