airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [1/6] Updating the thrift files documenttaion - AIRAVATA-1228
Date Sun, 06 Jul 2014 03:04:21 GMT
Repository: airavata
Updated Branches:
  refs/heads/master fd5288a7b -> 08245f259


http://git-wip-us.apache.org/repos/asf/airavata/blob/08245f25/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
index b36c6a9..9fe5687 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,10 +68,11 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("all") public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager,
ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager");
 
-  private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_TYPE_FIELD_DESC
= new org.apache.thrift.protocol.TField("resourceJobManagerType", org.apache.thrift.protocol.TType.I32,
(short)1);
-  private static final org.apache.thrift.protocol.TField PUSH_MONITORING_ENDPOINT_FIELD_DESC
= new org.apache.thrift.protocol.TField("pushMonitoringEndpoint", org.apache.thrift.protocol.TType.STRING,
(short)2);
-  private static final org.apache.thrift.protocol.TField JOB_MANAGER_BIN_PATH_FIELD_DESC
= new org.apache.thrift.protocol.TField("jobManagerBinPath", org.apache.thrift.protocol.TType.STRING,
(short)3);
-  private static final org.apache.thrift.protocol.TField JOB_MANAGER_COMMANDS_FIELD_DESC
= new org.apache.thrift.protocol.TField("jobManagerCommands", org.apache.thrift.protocol.TType.MAP,
(short)4);
+  private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_ID_FIELD_DESC
= new org.apache.thrift.protocol.TField("resourceJobManagerId", org.apache.thrift.protocol.TType.STRING,
(short)1);
+  private static final org.apache.thrift.protocol.TField RESOURCE_JOB_MANAGER_TYPE_FIELD_DESC
= new org.apache.thrift.protocol.TField("resourceJobManagerType", org.apache.thrift.protocol.TType.I32,
(short)2);
+  private static final org.apache.thrift.protocol.TField PUSH_MONITORING_ENDPOINT_FIELD_DESC
= new org.apache.thrift.protocol.TField("pushMonitoringEndpoint", org.apache.thrift.protocol.TType.STRING,
(short)3);
+  private static final org.apache.thrift.protocol.TField JOB_MANAGER_BIN_PATH_FIELD_DESC
= new org.apache.thrift.protocol.TField("jobManagerBinPath", org.apache.thrift.protocol.TType.STRING,
(short)4);
+  private static final org.apache.thrift.protocol.TField JOB_MANAGER_COMMANDS_FIELD_DESC
= new org.apache.thrift.protocol.TField("jobManagerCommands", org.apache.thrift.protocol.TType.MAP,
(short)5);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes =
new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -79,6 +80,7 @@ import org.slf4j.LoggerFactory;
     schemes.put(TupleScheme.class, new ResourceJobManagerTupleSchemeFactory());
   }
 
+  private String resourceJobManagerId; // required
   private ResourceJobManagerType resourceJobManagerType; // required
   private String pushMonitoringEndpoint; // optional
   private String jobManagerBinPath; // optional
@@ -86,14 +88,15 @@ import org.slf4j.LoggerFactory;
 
   /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
   @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum
{
+    RESOURCE_JOB_MANAGER_ID((short)1, "resourceJobManagerId"),
     /**
      * 
      * @see ResourceJobManagerType
      */
-    RESOURCE_JOB_MANAGER_TYPE((short)1, "resourceJobManagerType"),
-    PUSH_MONITORING_ENDPOINT((short)2, "pushMonitoringEndpoint"),
-    JOB_MANAGER_BIN_PATH((short)3, "jobManagerBinPath"),
-    JOB_MANAGER_COMMANDS((short)4, "jobManagerCommands");
+    RESOURCE_JOB_MANAGER_TYPE((short)2, "resourceJobManagerType"),
+    PUSH_MONITORING_ENDPOINT((short)3, "pushMonitoringEndpoint"),
+    JOB_MANAGER_BIN_PATH((short)4, "jobManagerBinPath"),
+    JOB_MANAGER_COMMANDS((short)5, "jobManagerCommands");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -108,13 +111,15 @@ import org.slf4j.LoggerFactory;
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // RESOURCE_JOB_MANAGER_TYPE
+        case 1: // RESOURCE_JOB_MANAGER_ID
+          return RESOURCE_JOB_MANAGER_ID;
+        case 2: // RESOURCE_JOB_MANAGER_TYPE
           return RESOURCE_JOB_MANAGER_TYPE;
-        case 2: // PUSH_MONITORING_ENDPOINT
+        case 3: // PUSH_MONITORING_ENDPOINT
           return PUSH_MONITORING_ENDPOINT;
-        case 3: // JOB_MANAGER_BIN_PATH
+        case 4: // JOB_MANAGER_BIN_PATH
           return JOB_MANAGER_BIN_PATH;
-        case 4: // JOB_MANAGER_COMMANDS
+        case 5: // JOB_MANAGER_COMMANDS
           return JOB_MANAGER_COMMANDS;
         default:
           return null;
@@ -160,6 +165,8 @@ import org.slf4j.LoggerFactory;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.RESOURCE_JOB_MANAGER_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceJobManagerId",
org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.RESOURCE_JOB_MANAGER_TYPE, new org.apache.thrift.meta_data.FieldMetaData("resourceJobManagerType",
org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM,
ResourceJobManagerType.class)));
     tmpMap.put(_Fields.PUSH_MONITORING_ENDPOINT, new org.apache.thrift.meta_data.FieldMetaData("pushMonitoringEndpoint",
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -175,12 +182,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ResourceJobManager() {
+    this.resourceJobManagerId = "DO_NOT_SET_AT_CLIENTS";
+
   }
 
   public ResourceJobManager(
+    String resourceJobManagerId,
     ResourceJobManagerType resourceJobManagerType)
   {
     this();
+    this.resourceJobManagerId = resourceJobManagerId;
     this.resourceJobManagerType = resourceJobManagerType;
   }
 
@@ -188,6 +199,9 @@ import org.slf4j.LoggerFactory;
    * Performs a deep copy on <i>other</i>.
    */
   public ResourceJobManager(ResourceJobManager other) {
+    if (other.isSetResourceJobManagerId()) {
+      this.resourceJobManagerId = other.resourceJobManagerId;
+    }
     if (other.isSetResourceJobManagerType()) {
       this.resourceJobManagerType = other.resourceJobManagerType;
     }
@@ -220,12 +234,37 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public void clear() {
+    this.resourceJobManagerId = "DO_NOT_SET_AT_CLIENTS";
+
     this.resourceJobManagerType = null;
     this.pushMonitoringEndpoint = null;
     this.jobManagerBinPath = null;
     this.jobManagerCommands = null;
   }
 
+  public String getResourceJobManagerId() {
+    return this.resourceJobManagerId;
+  }
+
+  public void setResourceJobManagerId(String resourceJobManagerId) {
+    this.resourceJobManagerId = resourceJobManagerId;
+  }
+
+  public void unsetResourceJobManagerId() {
+    this.resourceJobManagerId = null;
+  }
+
+  /** Returns true if field resourceJobManagerId is set (has been assigned a value) and false
otherwise */
+  public boolean isSetResourceJobManagerId() {
+    return this.resourceJobManagerId != null;
+  }
+
+  public void setResourceJobManagerIdIsSet(boolean value) {
+    if (!value) {
+      this.resourceJobManagerId = null;
+    }
+  }
+
   /**
    * 
    * @see ResourceJobManagerType
@@ -339,6 +378,14 @@ import org.slf4j.LoggerFactory;
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
+    case RESOURCE_JOB_MANAGER_ID:
+      if (value == null) {
+        unsetResourceJobManagerId();
+      } else {
+        setResourceJobManagerId((String)value);
+      }
+      break;
+
     case RESOURCE_JOB_MANAGER_TYPE:
       if (value == null) {
         unsetResourceJobManagerType();
@@ -376,6 +423,9 @@ import org.slf4j.LoggerFactory;
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
+    case RESOURCE_JOB_MANAGER_ID:
+      return getResourceJobManagerId();
+
     case RESOURCE_JOB_MANAGER_TYPE:
       return getResourceJobManagerType();
 
@@ -399,6 +449,8 @@ import org.slf4j.LoggerFactory;
     }
 
     switch (field) {
+    case RESOURCE_JOB_MANAGER_ID:
+      return isSetResourceJobManagerId();
     case RESOURCE_JOB_MANAGER_TYPE:
       return isSetResourceJobManagerType();
     case PUSH_MONITORING_ENDPOINT:
@@ -424,6 +476,15 @@ import org.slf4j.LoggerFactory;
     if (that == null)
       return false;
 
+    boolean this_present_resourceJobManagerId = true && this.isSetResourceJobManagerId();
+    boolean that_present_resourceJobManagerId = true && that.isSetResourceJobManagerId();
+    if (this_present_resourceJobManagerId || that_present_resourceJobManagerId) {
+      if (!(this_present_resourceJobManagerId && that_present_resourceJobManagerId))
+        return false;
+      if (!this.resourceJobManagerId.equals(that.resourceJobManagerId))
+        return false;
+    }
+
     boolean this_present_resourceJobManagerType = true && this.isSetResourceJobManagerType();
     boolean that_present_resourceJobManagerType = true && that.isSetResourceJobManagerType();
     if (this_present_resourceJobManagerType || that_present_resourceJobManagerType) {
@@ -476,6 +537,16 @@ import org.slf4j.LoggerFactory;
 
     int lastComparison = 0;
 
+    lastComparison = Boolean.valueOf(isSetResourceJobManagerId()).compareTo(other.isSetResourceJobManagerId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetResourceJobManagerId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceJobManagerId,
other.resourceJobManagerId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetResourceJobManagerType()).compareTo(other.isSetResourceJobManagerType());
     if (lastComparison != 0) {
       return lastComparison;
@@ -536,6 +607,14 @@ import org.slf4j.LoggerFactory;
     StringBuilder sb = new StringBuilder("ResourceJobManager(");
     boolean first = true;
 
+    sb.append("resourceJobManagerId:");
+    if (this.resourceJobManagerId == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.resourceJobManagerId);
+    }
+    first = false;
+    if (!first) sb.append(", ");
     sb.append("resourceJobManagerType:");
     if (this.resourceJobManagerType == null) {
       sb.append("null");
@@ -579,6 +658,10 @@ import org.slf4j.LoggerFactory;
 
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
+    if (!isSetResourceJobManagerId()) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceJobManagerId'
is unset! Struct:" + toString());
+    }
+
     if (!isSetResourceJobManagerType()) {
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceJobManagerType'
is unset! Struct:" + toString());
     }
@@ -620,7 +703,15 @@ import org.slf4j.LoggerFactory;
           break;
         }
         switch (schemeField.id) {
-          case 1: // RESOURCE_JOB_MANAGER_TYPE
+          case 1: // RESOURCE_JOB_MANAGER_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.resourceJobManagerId = iprot.readString();
+              struct.setResourceJobManagerIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // RESOURCE_JOB_MANAGER_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.resourceJobManagerType = ResourceJobManagerType.findByValue(iprot.readI32());
               struct.setResourceJobManagerTypeIsSet(true);
@@ -628,7 +719,7 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // PUSH_MONITORING_ENDPOINT
+          case 3: // PUSH_MONITORING_ENDPOINT
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.pushMonitoringEndpoint = iprot.readString();
               struct.setPushMonitoringEndpointIsSet(true);
@@ -636,7 +727,7 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // JOB_MANAGER_BIN_PATH
+          case 4: // JOB_MANAGER_BIN_PATH
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.jobManagerBinPath = iprot.readString();
               struct.setJobManagerBinPathIsSet(true);
@@ -644,7 +735,7 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // JOB_MANAGER_COMMANDS
+          case 5: // JOB_MANAGER_COMMANDS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
@@ -677,6 +768,11 @@ import org.slf4j.LoggerFactory;
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.resourceJobManagerId != null) {
+        oprot.writeFieldBegin(RESOURCE_JOB_MANAGER_ID_FIELD_DESC);
+        oprot.writeString(struct.resourceJobManagerId);
+        oprot.writeFieldEnd();
+      }
       if (struct.resourceJobManagerType != null) {
         oprot.writeFieldBegin(RESOURCE_JOB_MANAGER_TYPE_FIELD_DESC);
         oprot.writeI32(struct.resourceJobManagerType.getValue());
@@ -728,6 +824,7 @@ import org.slf4j.LoggerFactory;
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ResourceJobManager struct)
throws org.apache.thrift.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
+      oprot.writeString(struct.resourceJobManagerId);
       oprot.writeI32(struct.resourceJobManagerType.getValue());
       BitSet optionals = new BitSet();
       if (struct.isSetPushMonitoringEndpoint()) {
@@ -761,6 +858,8 @@ import org.slf4j.LoggerFactory;
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ResourceJobManager struct)
throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
+      struct.resourceJobManagerId = iprot.readString();
+      struct.setResourceJobManagerIdIsSet(true);
       struct.resourceJobManagerType = ResourceJobManagerType.findByValue(iprot.readI32());
       struct.setResourceJobManagerTypeIsSet(true);
       BitSet incoming = iprot.readBitSet(3);

http://git-wip-us.apache.org/repos/asf/airavata/blob/08245f25/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index 47375e3..31cab86 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -49,26 +49,30 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Resource Preferences for each of the gateway
+ * Gateway specific preferences for a Computer Resource
  * 
  * computeResourceId:
- *   Corelate the preference for compute resource to
+ *   Corelate the preference to a compute resource.
  * 
- * gatewayName:
- *   Name of the Gateway.
+ * overridebyAiravata:
+ *   If turned true, Airavata will override the preferences of better alternatives exist.
  * 
- * ipAddress:
- *   IP Addresse of the Hostname.
+ * preferredJobSubmissionProtocol:
+ *   For resources with multiple job submission protocols, the gateway can pick a preferred
option.
  * 
- * resourceDescription:
- *  A user friendly description of the hostname.
+ * preferredDataMovementProtocol:
+ *   For resources with multiple data movement protocols, the gateway can pick a preferred
option.
  * 
- * JobSubmissionProtocols:
- *  A computational resources may have one or more ways of submitting Jobs. This structure
- *  will hold all available mechanisms to interact with the resource.
+ * preferredBatchQueue:
+ *  Gateways can choose a defualt batch queue based on average job dimention, reservations
or other metrics.
  * 
- * DataMovementProtocol:
- *  Option to specify a prefered data movement mechanism of the available options.
+ * scratchLocation:
+ *  Path to the local scratch space on a HPC cluster. Typically used to create working directory
for job execution.
+ * 
+ * allocationProjectNumber:
+ *  Typically used on HPC machines to charge computing usage to a account number. For instance,
on XSEDE once an
+ *    allocation is approved, an allocation number is assigned. Before passing this number
with job submittions, the
+ *    account to be used has to be added to the allocation.
  * 
  */
 @SuppressWarnings("all") public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference,
ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference>
{

http://git-wip-us.apache.org/repos/asf/airavata/blob/08245f25/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayProfile.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayProfile.java
index 791403e..04e5ec8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayProfile.java
@@ -49,26 +49,20 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Gateway Profile
+ * Gateway Resource Profile
  * 
  * gatewayID:
- *   Unique identifier for the gateway assigned by Airavata
+ *   Unique identifier for the gateway assigned by Airavata. Corelate this to Airavata Admin
API Gateway Registration.
  * 
  * gatewayName:
  *   Name of the Gateway.
  * 
- * ipAddress:
- *   IP Addresse of the Hostname.
+ * gatewayDescription:
+ *  A user friendly description of the gateway.
  * 
- * resourceDescription:
- *  A user friendly description of the hostname.
+ * computeResourcePreferences:
+ *  List of resource preferences for each of the registered compute resources.
  * 
- * JobSubmissionProtocols:
- *  A computational resources may have one or more ways of submitting Jobs. This structure
- *  will hold all available mechanisms to interact with the resource.
- * 
- * DataMovementProtocol:
- *  Option to specify a prefered data movement mechanism of the available options.
  * 
  */
 @SuppressWarnings("all") public class GatewayProfile implements org.apache.thrift.TBase<GatewayProfile,
GatewayProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayProfile>
{

http://git-wip-us.apache.org/repos/asf/airavata/blob/08245f25/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index 7e6c5b5..fff9bc8 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  *
- */
+*/
 
-/*
+/**
  * Application Programming Interface definition for Apache Airavata Services.
  *   this parent thrift file is contains all service interfaces. The data models are 
  *   described in respective thrift files.
@@ -40,7 +40,7 @@ namespace perl AiravataAPI
 namespace py airavata.api
 namespace js AiravataAPI
 
-/*
+/**
  * Airavata Interface Versions depend upon this Thrift Interface File. When Making changes,
please edit the
  *  Version Constants according to Semantic Versioning Specification (SemVer) http://semver.org.
  *
@@ -52,16 +52,19 @@ namespace js AiravataAPI
  *  - Minor: Incremented for backward compatible changes. An example would be the addition
of a new optional methods.
  *  - Patch: Incremented for bug fixes. The patch level should be increased for every edit
that doesn't result
  *              in a change to major/minor version numbers.
+ *
 */
 const string AIRAVATA_API_VERSION = "0.12.0"
 
 service Airavata {
 
-/*
+/**
  * Apache Airavata API Service Methods. For data structures associated in the signatures,
please see included thrift files
 */
 
-  /** Query Airavata to fetch the API version */
+  /**
+   * Fetch Apache Airavata API version
+  */
   string getAPIVersion()
         throws (1: airavataErrors.InvalidRequestException ire,
                 2: airavataErrors.AiravataClientException ace,
@@ -76,7 +79,7 @@ service Airavata {
               2: airavataErrors.AiravataClientException ace,
               3: airavataErrors.AiravataSystemException ase)
 
-/**
+  /**
    * Update a Project
    *
   */
@@ -540,7 +543,6 @@ service Airavata {
    * @return appModuleId
    *   Returns a server-side generated airavata appModule globally unique identifier.
    *
-   *
   */
   string registerApplicationModule(1: required applicationDeploymentModel.ApplicationModule
applicationModule)
     	throws (1: airavataErrors.InvalidRequestException ire,
@@ -556,7 +558,6 @@ service Airavata {
    * @return applicationModule
    *   Returns a application Module Object.
    *
-   *
   */
   applicationDeploymentModel.ApplicationModule getApplicationModule(1: required string appModuleId)
       	throws (1: airavataErrors.InvalidRequestException ire,
@@ -575,7 +576,6 @@ service Airavata {
    * @return status
    *   Returns a success/failure of the update.
    *
-   *
   */
   bool updateApplicationModule(1: required string appModuleId,
             2: required applicationDeploymentModel.ApplicationModule applicationModule)
@@ -592,7 +592,6 @@ service Airavata {
    * @return status
    *   Returns a success/failure of the deletion.
    *
-   *
   */
   bool deleteApplicationModule(1: required string appModuleId)
          	throws (1: airavataErrors.InvalidRequestException ire,
@@ -613,7 +612,6 @@ service Airavata {
    * @return appDeploymentId
    *   Returns a server-side generated airavata appDeployment globally unique identifier.
    *
-   *
   */
   string registerApplicationDeployment(1: required applicationDeploymentModel.ApplicationDeploymentDescription
applicationDeployment)
     	throws (1: airavataErrors.InvalidRequestException ire,
@@ -629,7 +627,6 @@ service Airavata {
    * @return applicationDeployment
    *   Returns a application Deployment Object.
    *
-   *
   */
   applicationDeploymentModel.ApplicationDeploymentDescription getApplicationDeployment(1:
required string appDeploymentId)
       	throws (1: airavataErrors.InvalidRequestException ire,
@@ -648,7 +645,6 @@ service Airavata {
    * @return status
    *   Returns a success/failure of the update.
    *
-   *
   */
   bool updateApplicationDeployment(1: required string appDeploymentId,
             2: required applicationDeploymentModel.ApplicationDeploymentDescription applicationDeployment)
@@ -665,7 +661,6 @@ service Airavata {
    * @return status
    *   Returns a success/failure of the deletion.
    *
-   *
   */
   bool deleteApplicationDeployment(1: required string appDeploymentId)
          	throws (1: airavataErrors.InvalidRequestException ire,
@@ -701,7 +696,6 @@ service Airavata {
    * @return appInterfaceId
    *   Returns a server-side generated airavata application interface globally unique identifier.
    *
-   *
   */
   string registerApplicationInterface(1: required applicationInterfaceModel.ApplicationInterfaceDescription
                                             applicationInterface)
@@ -791,4 +785,77 @@ service Airavata {
                 2: airavataErrors.AiravataClientException ace,
                 3: airavataErrors.AiravataSystemException ase)
 
-}
\ No newline at end of file
+/*
+ * Compute Resource
+ *
+*/
+
+  /**
+   * Register a Compute Resource.
+   *
+   * @param computeResourceDescription
+   *    Compute Resource Object created from the datamodel.
+   *
+   * @return computeResourceId
+   *   Returns a server-side generated airavata compute resource globally unique identifier.
+   *
+  */
+  string registerComputeResource(1: required computeResourceModel.ComputeResourceDescription
+                                            computeResourceDescription)
+    	throws (1: airavataErrors.InvalidRequestException ire,
+              2: airavataErrors.AiravataClientException ace,
+              3: airavataErrors.AiravataSystemException ase)
+
+  /**
+   * Fetch the given Compute Resource.
+   *
+   * @param computeResourceId
+   *   The identifier for the requested compute resource
+   *
+   * @return computeResourceDescription
+   *    Compute Resource Object created from the datamodel..
+   *
+  */
+  computeResourceModel.ComputeResourceDescription getComputeResource(1: required string computeResourceId)
+      	throws (1: airavataErrors.InvalidRequestException ire,
+                2: airavataErrors.AiravataClientException ace,
+                3: airavataErrors.AiravataSystemException ase)
+
+  /**
+   * Update a Compute Resource.
+   *
+   * @param computeResourceId
+   *   The identifier for the requested compute resource to be updated.
+   *
+   * @param computeResourceDescription
+   *    Compute Resource Object created from the datamodel.
+   *
+   * @return status
+   *   Returns a success/failure of the update.
+   *
+  */
+  bool updateComputeResource(1: required string computeResourceId,
+            2: required computeResourceModel.ComputeResourceDescription computeResourceDescription)
+      	throws (1: airavataErrors.InvalidRequestException ire,
+                2: airavataErrors.AiravataClientException ace,
+                3: airavataErrors.AiravataSystemException ase)
+
+  /**
+   * Delete a Compute Resource.
+   *
+   * @param computeResourceId
+   *   The identifier for the requested compute resource to be deleted.
+   *
+   * @return status
+   *   Returns a success/failure of the deletion.
+   *
+  */
+  bool deleteComputeResource(1: required string computeResourceId)
+         	throws (1: airavataErrors.InvalidRequestException ire,
+                   2: airavataErrors.AiravataClientException ace,
+                   3: airavataErrors.AiravataSystemException ase)
+
+
+ //End of API
+ }
+


Mime
View raw message