Repository: airavata Updated Branches: refs/heads/master 4c7dcc0a6 -> 4568832b3
http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java index c45ff38..1365d11 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; * User friendly reason on how the state is inferred. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java index b0017fc..943c732 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.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-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java index ef319c3..bc17859 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.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-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java index 88aa924..769a5cc 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.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-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java index ef46e60..f4fa752 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java @@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory; * A friendly description of the task, usally used to communicate information to users. * */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel"); http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/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 4cec9b7..03056bc 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-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") 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/4568832b/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 3d5c02a..99a1e16 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-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") 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/4568832b/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 5f44e4d..38af953 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-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") 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/4568832b/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 3c919a6..a837402 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-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") 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/4568832b/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 d465fe7..1a02195 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-7-6") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14") 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/4568832b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java index 5a95f97..00cf8c7 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ProcessResource.java @@ -21,7 +21,6 @@ package org.apache.airavata.registry.core.experiment.catalog.resources; -import org.apache.airavata.common.utils.AiravataUtils; import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils; import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource; import org.apache.airavata.registry.core.experiment.catalog.ResourceType; http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift b/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift index 349acc3..fb21dd1 100644 --- a/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift +++ b/thrift-interface-descriptions/airavata-api/airavata_data_models.thrift @@ -18,13 +18,17 @@ * */ +include "airavata_commons.thrift" include "workspace_model.thrift" include "airavata_errors.thrift" include "messaging_events.thrift" include "security_model.thrift" +include "experiment_model.thrift" include "job_model.thrift" include "task_model.thrift" include "process_model.thrift" +include "scheduling_model.thrift" +include "status_models.thrift" namespace java org.apache.airavata.model namespace php Airavata.Model http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift b/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift index a965e23..916cc6a 100644 --- a/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift +++ b/thrift-interface-descriptions/airavata-api/application_deployment_model.thrift @@ -24,12 +24,13 @@ * */ +include "airavata_commons.thrift" + namespace java org.apache.airavata.model.appcatalog.appdeployment namespace php Airavata.Model.AppCatalog.AppDeployment namespace cpp apache.airavata.model.appcatalog.appdeployment namespace py apache.airavata.model.appcatalog.appdeployment -const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" /** * Key Value pairs to be used to set environments @@ -61,7 +62,7 @@ struct SetEnvPaths { * */ struct ApplicationModule { - 1: required string appModuleId = DEFAULT_ID, + 1: required string appModuleId = airavata_commons.DEFAULT_ID, 2: required string appModuleName, 3: optional string appModuleVersion, 4: optional string appModuleDescription @@ -117,7 +118,7 @@ enum ApplicationParallelismType { */ struct ApplicationDeploymentDescription { // 1: required bool isEmpty = 0, - 1: required string appDeploymentId = DEFAULT_ID, + 1: required string appDeploymentId = airavata_commons.DEFAULT_ID, 2: required string appModuleId, 3: required string computeHostId, 4: required string executablePath, http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-api/application_interface_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/application_interface_model.thrift b/thrift-interface-descriptions/airavata-api/application_interface_model.thrift index c7ca231..9a57667 100644 --- a/thrift-interface-descriptions/airavata-api/application_interface_model.thrift +++ b/thrift-interface-descriptions/airavata-api/application_interface_model.thrift @@ -24,13 +24,13 @@ * */ include "application_io_models.thrift" +include "airavata_commons.thrift" namespace java org.apache.airavata.model.appcatalog.appinterface namespace php Airavata.Model.AppCatalog.AppInterface namespace cpp apache.airavata.model.appcatalog.appinterface namespace py apache.airavata.model.appcatalog.appinterface -const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" /** * Application Interface Description @@ -47,7 +47,7 @@ const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" */ struct ApplicationInterfaceDescription { // 1: required bool isEmpty = 0, - 1: required string applicationInterfaceId = DEFAULT_ID, + 1: required string applicationInterfaceId = airavata_commons.DEFAULT_ID, 2: required string applicationName, 3: optional string applicationDescription, 4: optional list<string> applicationModules, http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/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 6e8361c..c0ecd4c 100644 --- a/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift +++ b/thrift-interface-descriptions/airavata-api/compute_resource_model.thrift @@ -18,12 +18,13 @@ * */ +include "airavata_commons.thrift" + namespace java org.apache.airavata.model.appcatalog.computeresource namespace php Airavata.Model.AppCatalog.ComputeResource namespace cpp apache.airavata.model.appcatalog.computeresource namespace py apache.airavata.model.appcatalog.computeresource -const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" /** * Enumeration of local resource job manager types supported by Airavata @@ -106,7 +107,7 @@ enum JobManagerCommand { * */ struct ResourceJobManager { - 1: required string resourceJobManagerId = DEFAULT_ID, + 1: required string resourceJobManagerId = airavata_commons.DEFAULT_ID, 2: required ResourceJobManagerType resourceJobManagerType, 3: optional string pushMonitoringEndpoint, 4: optional string jobManagerBinPath, @@ -246,7 +247,7 @@ enum DataMovementProtocol { * If a non-default port needs to used, specify it. */ struct SCPDataMovement { - 1: required string dataMovementInterfaceId = DEFAULT_ID, + 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, 2: required SecurityProtocol securityProtocol, 3: optional string alternativeSCPHostName, 4: optional i32 sshPort = 22 @@ -262,7 +263,7 @@ struct SCPDataMovement { * If a non-default port needs to used, specify it. */ struct GridFTPDataMovement { - 1: required string dataMovementInterfaceId = DEFAULT_ID, + 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, 2: required SecurityProtocol securityProtocol, 3: required list<string> gridFTPEndPoints } @@ -274,7 +275,7 @@ struct GridFTPDataMovement { * unicoreGateway End Point. The provider will query this service to fetch required service end points. */ struct UnicoreDataMovement { - 1: required string dataMovementInterfaceId = DEFAULT_ID, + 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, 2: required SecurityProtocol securityProtocol, 3: required string unicoreEndPointURL } @@ -289,7 +290,7 @@ struct UnicoreDataMovement { * If a non-default port needs to used, specify it. */ struct LOCALSubmission { - 1: required string jobSubmissionInterfaceId = DEFAULT_ID, + 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, 2: required ResourceJobManager resourceJobManager } @@ -303,7 +304,7 @@ struct LOCALSubmission { * If a non-defualt port needs to used, specify it. */ struct LOCALDataMovement { - 1: required string dataMovementInterfaceId = DEFAULT_ID, + 1: required string dataMovementInterfaceId = airavata_commons.DEFAULT_ID, } /** @@ -316,7 +317,7 @@ struct LOCALDataMovement { * If a non-default port needs to used, specify it. */ struct SSHJobSubmission { - 1: required string jobSubmissionInterfaceId = DEFAULT_ID, + 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, 2: required SecurityProtocol securityProtocol, 3: required ResourceJobManager resourceJobManager, 4: optional string alternativeSSHHostName, @@ -325,7 +326,7 @@ struct SSHJobSubmission { } struct GlobusJobSubmission { - 1: required string jobSubmissionInterfaceId = DEFAULT_ID, + 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, 2: required SecurityProtocol securityProtocol, 3: optional list<string> globusGateKeeperEndPoint } @@ -339,7 +340,7 @@ struct GlobusJobSubmission { * The authenticationMode defines the way certificate is fetched. */ struct UnicoreJobSubmission { - 1: required string jobSubmissionInterfaceId = DEFAULT_ID, + 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, 2: required SecurityProtocol securityProtocol, 3: required string unicoreEndPointURL, } @@ -361,7 +362,7 @@ enum ProviderName { * */ struct CloudJobSubmission { - 1: required string jobSubmissionInterfaceId = DEFAULT_ID, + 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, 2: required SecurityProtocol securityProtocol, 3: required string nodeId, 4: required string executableType, @@ -432,7 +433,7 @@ struct DataMovementInterface { */ struct ComputeResourceDescription { // 1: required bool isEmpty = 0, - 1: required string computeResourceId = DEFAULT_ID, + 1: required string computeResourceId = airavata_commons.DEFAULT_ID, 2: required string hostName, 3: optional list<string> hostAliases, 4: optional list<string> ipAddresses, http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-api/messaging_events.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/messaging_events.thrift b/thrift-interface-descriptions/airavata-api/messaging_events.thrift index 1d2a537..599a2ee 100644 --- a/thrift-interface-descriptions/airavata-api/messaging_events.thrift +++ b/thrift-interface-descriptions/airavata-api/messaging_events.thrift @@ -20,14 +20,13 @@ include "status_models.thrift" include "application_io_models.thrift" +include "airavata_commons.thrift" namespace java org.apache.airavata.model.messaging.event namespace php Airavata.Model.Messaging.Event namespace cpp apache.airavata.model.messaging.event namespace py apache.airavata.model.messaging.event -const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" - enum MessageLevel { INFO, DEBUG, @@ -133,7 +132,7 @@ struct JobStatusChangeRequestEvent { struct Message { 1: required binary event; - 2: required string messageId = DEFAULT_ID; + 2: required string messageId = airavata_commons.DEFAULT_ID, 3: required MessageType messageType; 4: optional i64 updatedTime; 5: optional MessageLevel messageLevel; http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-api/workflow_data_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/workflow_data_model.thrift b/thrift-interface-descriptions/airavata-api/workflow_data_model.thrift index e35a951..146bbd0 100644 --- a/thrift-interface-descriptions/airavata-api/workflow_data_model.thrift +++ b/thrift-interface-descriptions/airavata-api/workflow_data_model.thrift @@ -24,6 +24,7 @@ namespace php Airavata.Model namespace py apache.airavata.model.workflow include "application_io_models.thrift" +include "airavata_commons.thrift" /* * This file describes the definitions of the Airavata Execution Data Structures. Each of the @@ -31,10 +32,9 @@ include "application_io_models.thrift" * appropriate form for passing to the Airavata Server Execution API Calls. */ -const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" struct Workflow { - 1: required string templateId = DEFAULT_ID, + 1: required string templateId = airavata_commons.DEFAULT_ID, 2: required string name, 3: optional string graph, 4: optional binary image, http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-api/workspace_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-api/workspace_model.thrift b/thrift-interface-descriptions/airavata-api/workspace_model.thrift index c11426b..b31f1fd 100644 --- a/thrift-interface-descriptions/airavata-api/workspace_model.thrift +++ b/thrift-interface-descriptions/airavata-api/workspace_model.thrift @@ -25,8 +25,6 @@ namespace php Airavata.Model.Workspace namespace cpp apache.airavata.model.workspace namespace py apache.airavata.model.workspace -include "airavata_commons.thrift" - /* * This file describes the definitions of the Airavata Workspace. The workspace is a container for all user data * organized as Projects and Experiment within them. http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-data-models/airavata_commons.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-data-models/airavata_commons.thrift b/thrift-interface-descriptions/airavata-data-models/airavata_commons.thrift deleted file mode 100644 index e49fe3f..0000000 --- a/thrift-interface-descriptions/airavata-data-models/airavata_commons.thrift +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -namespace java org.apache.airavata.model.commons -namespace php Airavata.Model.Commons -namespace cpp apache.airavata.model.commons -namespace py apache.airavata.model.commons - -const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS" - -struct ErrorModel { - 1: required string errorId = DEFAULT_ID, - 2: optional i64 creationTime, - 3: optional string actualErrorMessage, - 4: optional string userFriendlyMessage, - 5: optional bool transientOrPersistent = 0, - 6: optional list<string> rootCauseErrorIdList -} - - -/** -* This data structure can be used to store the validation results -* captured during validation step and during the launchExperiment -* operation it can be easilly checked to see the errors occured -* during the experiment launch operation -**/ - -struct ValidatorResult { - 1: required bool result, - 2: optional string errorDetails -} - - -struct ValidationResults { - 1: required bool validationState, - 2: required list<ValidatorResult> validationResultList -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-data-models/application_io_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-data-models/application_io_models.thrift b/thrift-interface-descriptions/airavata-data-models/application_io_models.thrift deleted file mode 100644 index 4a5b9ef..0000000 --- a/thrift-interface-descriptions/airavata-data-models/application_io_models.thrift +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -include "compute_resource_model.thrift" -include "application_interface_model.thrift" - -namespace java org.apache.airavata.model.application.io -namespace php Airavata.Model.Application.Io -namespace cpp apache.airavata.model.application.io -namespace py apache.airavata.model.application.io - -/** - * Data Types supported in Airavata. The primitive data types - * -*/ -enum DataType{ - STRING, - INTEGER, - FLOAT, - URI, - STDOUT, - STDERR -} - -/** - * Application Inputs. The paramters describe how inputs are passed to the application. - * - * name: - * Name of the parameter. - * - * value: - * Value of the parameter. A default value could be set during registration. - * - * type: - * Data type of the parameter - * - * applicationArguement: - * The argument flag sent to the application. Such as -p pressure. - * - * standardInput: - * When this value is set, the parameter is sent as standard input rather than a parameter. - * Typically this is passed using redirection operator ">". - * - * userFriendlyDescription: - * Description to be displayed at the user interface. - * - * metaData: - * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. - * -*/ -struct InputDataObjectType { - 1: required string name, - 2: optional string value, - 3: optional DataType type, - 4: optional string applicationArgument, - 5: optional bool standardInput = 0, - 6: optional string userFriendlyDescription, - 7: optional string metaData, - 8: optional i32 inputOrder, - 9: optional bool isRequired, - 10: optional bool requiredToAddedToCommandLine, - 11: optional bool dataStaged = 0 -} - -/** - * Application Outputs. The paramters describe how outputs generated by the application. - * - * name: - * Name of the parameter. - * - * value: - * Value of the parameter. - * - * type: - * Data type of the parameter - * - * applicationArguement: - * The argument flag sent to the application. Such as -p pressure. - * - * standardInput: - * When this value is set, the parameter is sent as standard input rather than a parameter. - * Typically this is passed using redirection operator ">". - * - * userFriendlyDescription: - * Description to be displayed at the user interface. - * - * metaData: - * Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration. - * -*/ -struct OutputDataObjectType { - 1: required string name, - 2: optional string value, - 3: optional DataType type, - 4: optional string applicationArgument, - 5: optional bool isRequired, - 6: optional bool requiredToAddedToCommandLine, - 7: optional bool dataMovement, - 8: optional string location, - 9: optional string searchQuery -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-data-models/experiment_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-data-models/experiment_model.thrift b/thrift-interface-descriptions/airavata-data-models/experiment_model.thrift deleted file mode 100644 index 6809ead..0000000 --- a/thrift-interface-descriptions/airavata-data-models/experiment_model.thrift +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - - include "application_io_models.thrift" - include "scheduling_model.thrift" - include "airavata_commons.thrift" - include "status_models.thrift" - - namespace java org.apache.airavata.model.experiment - namespace php Airavata.Model.Experiment - namespace cpp apache.airavata.model.experiment - namespace py apache.airavata.model.experiment - -enum ExperimentType { - SINGLE_APPLICATION, - WORKFLOW -} - -enum ExperimentSearchFields { - EXPERIMENT_NAME, - EXPERIMENT_DESC, - APPLICATION_ID, - FROM_DATE, - TO_DATE, - STATUS -} -/** - * A structure holding the experiment configuration. - * - * -*/ -struct UserConfigurationDataModel { - 1: required bool airavataAutoSchedule = 0, - 2: required bool overrideManualScheduledParams = 0, - 3: optional bool shareExperimentPublicly = 0, - 4: optional scheduling_model.ComputationalResourceSchedulingModel computationalResourceScheduling, - 5: optional bool throttleResources = 0, - 6: optional string userDN, - 7: optional bool generateCert = 0 -} - -/** - * A structure holding the experiment metadata and its child models. - * - * userName: - * The user name of the targeted gateway end user on whose behalf the experiment is being created. - * the associated gateway identity can only be inferred from the security hand-shake so as to avoid - * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with - * Airavata, an authorization exception is thrown. - * - * experimentName: - * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced - * by the generated experiment id. - * - * experimentDescription: - * The verbose description of the experiment. This is an optional parameter. -*/ - -struct ExperimentModel { - 1: required string experimentId = DEFAULT_ID, - 2: required string projectId = DEFAULT_PROJECT_NAME, - 3: required string gatewayId, - 4: required ExperimentType experimentType = ExperimentType.SINGLE_APPLICATION; - 5: required string userName, - 6: required string experimentName, - 7: optional i64 creationTime, - 8: optional string description, - 9: optional string executionId, - 10: optional string gatewayExecutionId, - 11: optional bool enableEmailNotification, - 12: optional list<string> emailAddresses, - 13: optional UserConfigurationDataModel userConfigurationData, - 14: optional list<application_io_models.InputDataObjectType> experimentInputs, - 15: optional list<application_io_models.OutputDataObjectType> experimentOutputs, - 16: optional status_models.ExperimentStatus experimentStatus, - 17: optional list<airavata_commons.ErrorModel> errors -} - -struct ExperimentSummaryModel { - 1: required string experimentId, - 2: required string projectId, - 3: required string gatewayId, - 4: optional i64 creationTime, - 5: required string userName, - 6: required string name, - 7: optional string description, - 8: optional string executionId, - 9: optional string experimentStatus, - 10: optional i64 statusUpdateTime -} - http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-data-models/process_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-data-models/process_model.thrift b/thrift-interface-descriptions/airavata-data-models/process_model.thrift deleted file mode 100644 index c3f8ba3..0000000 --- a/thrift-interface-descriptions/airavata-data-models/process_model.thrift +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -include "airavata_commons.thrift" -include "status_models.thrift" -include "task_model.thrift" -include "application_io_models.thrift" -include "scheduling_model.thrift" - -namespace java org.apache.airavata.model.process -namespace php Airavata.Model.Process -namespace cpp apache.airavata.model.process -namespace py apache.airavata.model.process - - -/** - * ProcessModel: A structure holding the process details. The infromation is derived based on user provided - * configuration data or system inferred information from scheduling and QoS parameters. - * - * processDetail: - * A friendly description of the process, usally used to communicate information to users. - * - * -*/ -struct ProcessModel { - 1: required string processId = airavata_commons.DEFAULT_ID, - 2: required string experimentId, - 3: optional i64 creationTime, - 4: optional i64 lastUpdateTime, - 5: optional status_models.ProcessStatus processStatus, - 6: optional string processDetail, - 7: optional string applicationInterfaceId, - 8: optional list<application_io_models.InputDataObjectType> processInputs, - 9: optional list<application_io_models.OutputDataObjectType> processOutputs, - 10: optional scheduling_model.ComputationalResourceSchedulingModel resourceSchedule, - 11: optional list<task_model.TaskModel> tasks, - 12: optional string taskDag, - 13: optional airavata_commons.ErrorModel processError -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-data-models/scheduling_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-data-models/scheduling_model.thrift b/thrift-interface-descriptions/airavata-data-models/scheduling_model.thrift deleted file mode 100644 index 59c6abd..0000000 --- a/thrift-interface-descriptions/airavata-data-models/scheduling_model.thrift +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -namespace java org.apache.airavata.model.scheduling -namespace php Airavata.Model.Scheduling -namespace cpp apache.airavata.model.scheduling -namespace py apache.airavata.model.scheduling - -/** - * ComputationalResourceSchedulingModel: - * - * -*/ -struct ComputationalResourceSchedulingModel { - 1: optional string resourceHostId, - 2: optional i32 totalCPUCount, - 3: optional i32 nodeCount, - 4: optional i32 numberOfThreads, - 5: optional string queueName, - 6: optional i32 wallTimeLimit, - 7: optional i32 totalPhysicalMemory, -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-data-models/status_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-data-models/status_models.thrift b/thrift-interface-descriptions/airavata-data-models/status_models.thrift deleted file mode 100644 index d361f95..0000000 --- a/thrift-interface-descriptions/airavata-data-models/status_models.thrift +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -namespace java org.apache.airavata.model.status -namespace php Airavata.Model.Status -namespace cpp apache.airavata.model.status -namespace py apache.airavata.model.status - -enum ExperimentState { - CREATED, - VALIDATED, - SCHEDULED, - LAUNCHED, - EXECUTING, - CANCELING, - CANCELED, - COMPLETED, - FAILED -} - -enum TaskState { - CREATED, - EXECUTING, - COMPLETED, - FAILED, - CANCELED -} - -enum ProcessState { - CREATED, - VALIDATED, - EXECUTING, - COMPLETED, - FAILED, - CANCELLING, - CANCELED -} - -enum JobState { - SUBMITTED, - QUEUED, - ACTIVE, - COMPLETE, - CANCELED, - FAILED, - SUSPENDED, - UNKNOWN -} - -/** - * Status: A generic status object. - * - * state: - * State . - * - * timeOfStateChange: - * time the status was last updated. - * - * reason: - * User friendly reason on how the state is inferred. - * -*/ -struct ExperimentStatus { - 1: required ExperimentState state, - 2: optional i64 timeOfStateChange, - 3: optional string reason -} - -struct ProcessStatus { - 1: required ProcessState state, - 2: optional i64 timeOfStateChange, - 3: optional string reason -} - -struct TaskStatus { - 1: required TaskState state, - 2: optional i64 timeOfStateChange, - 3: optional string reason -} - -struct JobStatus { - 1: required JobState jobState, - 2: optional i64 timeOfStateChange, - 3: optional string reason -} http://git-wip-us.apache.org/repos/asf/airavata/blob/4568832b/thrift-interface-descriptions/airavata-data-models/task_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-data-models/task_model.thrift b/thrift-interface-descriptions/airavata-data-models/task_model.thrift deleted file mode 100644 index 43f89e9..0000000 --- a/thrift-interface-descriptions/airavata-data-models/task_model.thrift +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -include "airavata_commons.thrift" -include "status_models.thrift" - -namespace java org.apache.airavata.model.task -namespace php Airavata.Model.Task -namespace cpp apache.airavata.model.task -namespace py apache.airavata.model.task - -/** - * TaskTypes: An enumerated list of TaskTypes. Task being generic, the task type will provide the concrete interpretation. - * -*/ -enum TaskTypes { - ENV_SETUP, - DATA_STAGING, - JOB_SUBMISSION, - ENV_CLEANUP, - MONITORING -} - -/** - * TaskModel: A structure holding the generic task details. - * - * taskDetail: - * A friendly description of the task, usally used to communicate information to users. - * - * taskInternalStore: - * A generic byte object for the Task developer to store internal serialized data into registry catalogs. -*/ -struct TaskModel { - 1: required string taskId = airavata_commons.DEFAULT_ID, - 2: required TaskTypes taskType, - 3: required string parentProcessId, - 4: required i64 creationTime, - 5: required i64 lastUpdateTime, - 6: required status_models.TaskStatus taskStatus, - 7: optional string taskDetail, - 8: optional byte taskInternalStore, - 9: optional airavata_commons.ErrorModel taskError -} - -/** - * DataStagingTaskModel: A structure holding the data staging task details. - * - * Source and Destination locations includes standard representation of protocol, host, port and path - * A friendly description of the task, usally used to communicate information to users. - * -*/ -struct DataStagingTaskModel { - 1: required string source, - 2: required string destination, - 3: optional i64 transferStartTime, - 4: optional i64 transferEndTime, - 5: optional string transferRate -} \ No newline at end of file
