Repository: airavata Updated Branches: refs/heads/develop db8beb69e -> 2ea1e88eb
http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/exception/RegistryServiceException.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/exception/RegistryServiceException.java b/modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/exception/RegistryServiceException.java index c0a7495..206ffb8 100644 --- a/modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/exception/RegistryServiceException.java +++ b/modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/exception/RegistryServiceException.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-05") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-11-08") public class RegistryServiceException extends TException implements org.apache.thrift.TBase<RegistryServiceException, RegistryServiceException._Fields>, java.io.Serializable, Cloneable, Comparable<RegistryServiceException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RegistryServiceException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/modules/sharing-registry/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/pom.xml b/modules/sharing-registry/pom.xml index 55ae5a5..781a11d 100644 --- a/modules/sharing-registry/pom.xml +++ b/modules/sharing-registry/pom.xml @@ -2,6 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> <parent> <artifactId>airavata</artifactId> @@ -10,11 +11,16 @@ <version>0.17-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <properties> + <global.version>0.17-SNAPSHOT</global.version> + </properties> + + <groupId>org.apache.airavata</groupId> <artifactId>airavata-sharing-registry</artifactId> <packaging>pom</packaging> - <name>Airavata Sharing Registry</name> - <url>http://airavata.apache.org/</url> + <version>${global.version}</version> + + <modules> <module>sharing-registry-stubs</module> http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/modules/sharing-registry/sharing-data-migrator/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml index e8b2c35..3fb2035 100644 --- a/modules/sharing-registry/sharing-data-migrator/pom.xml +++ b/modules/sharing-registry/sharing-data-migrator/pom.xml @@ -5,19 +5,18 @@ <parent> <artifactId>airavata-sharing-registry</artifactId> <groupId>org.apache.airavata</groupId> - <version>0.17-SNAPSHOT</version> + <version>${global.version}</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>airavata-sharing-data-migrator</artifactId> <packaging>jar</packaging> - <name>Sharing Data Migrator</name> <dependencies> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-sharing-registry-server</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> </dependency> </dependencies> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/modules/sharing-registry/sharing-registry-distribution/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml b/modules/sharing-registry/sharing-registry-distribution/pom.xml index ddf2437..f9bff9a 100644 --- a/modules/sharing-registry/sharing-registry-distribution/pom.xml +++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml @@ -5,14 +5,11 @@ <parent> <artifactId>airavata-sharing-registry</artifactId> <groupId>org.apache.airavata</groupId> - <version>0.17-SNAPSHOT</version> + <version>${global.version}</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>airavata-sharing-registry-distribution</artifactId> - <packaging>jar</packaging> - <name>Sharing Registry Distribution</name> - <url>http://airavata.apache.org/</url> <dependencies> <dependency> @@ -23,12 +20,17 @@ <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-sharing-registry-stubs</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-server-configuration</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-commons</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>net.sf.dozer</groupId> http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/modules/sharing-registry/sharing-registry-server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml index 2822f35..1498575 100644 --- a/modules/sharing-registry/sharing-registry-server/pom.xml +++ b/modules/sharing-registry/sharing-registry-server/pom.xml @@ -6,15 +6,12 @@ <artifactId>airavata-sharing-registry</artifactId> <groupId>org.apache.airavata</groupId> <relativePath>../pom.xml</relativePath> - <version>0.17-SNAPSHOT</version> + <version>${global.version}</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>airavata-sharing-registry-server</artifactId> <packaging>jar</packaging> - <name>Sharing Registry Server</name> - <url>http://airavata.apache.org/</url> - <dependencies> <dependency> <groupId>org.slf4j</groupId> @@ -24,17 +21,17 @@ <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-sharing-registry-stubs</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-server-configuration</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-commons</artifactId> - <version>${project.parent.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>net.sf.dozer</groupId> http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/modules/sharing-registry/sharing-registry-stubs/pom.xml ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml b/modules/sharing-registry/sharing-registry-stubs/pom.xml index 87e80da..ce39e03 100644 --- a/modules/sharing-registry/sharing-registry-stubs/pom.xml +++ b/modules/sharing-registry/sharing-registry-stubs/pom.xml @@ -6,15 +6,12 @@ <artifactId>airavata-sharing-registry</artifactId> <groupId>org.apache.airavata</groupId> <relativePath>../pom.xml</relativePath> - <version>0.17-SNAPSHOT</version> + <version>${global.version}</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>airavata-sharing-registry-stubs</artifactId> <packaging>jar</packaging> - <name>Sharing Registry Stubs</name> - <url>http://airavata.apache.org/</url> - <dependencies> <dependency> <groupId>org.apache.thrift</groupId> http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/thrift-interface-descriptions/airavata-apis/airavata_api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index 0dfaa8f..c37bb7d 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -3230,6 +3230,11 @@ service Airavata { 3: airavata_errors.AiravataSystemException ase, 4: airavata_errors.AuthorizationException ae) + list<status_models.QueueStatusModel> getLatestQueueStatuses(1: required security_model.AuthzToken authzToken) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase, + 4: airavata_errors.AuthorizationException ae) /** * * API Methods Related for Work-Flow Submission Features. http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/thrift-interface-descriptions/component-cpis/registry-api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/component-cpis/registry-api.thrift b/thrift-interface-descriptions/component-cpis/registry-api.thrift index 3539ad5..a6cc2e1 100644 --- a/thrift-interface-descriptions/component-cpis/registry-api.thrift +++ b/thrift-interface-descriptions/component-cpis/registry-api.thrift @@ -2336,6 +2336,14 @@ service RegistryService { 3: required string userStorageId) throws (1: registry_api_errors.RegistryServiceException rse) + /** + * Get queue statuses of all compute resources + **/ + list<status_models.QueueStatusModel> getLatestQueueStatuses() + throws (1: registry_api_errors.RegistryServiceException rse) + + void registerQueueStatuses(1: required list<status_models.QueueStatusModel> queueStatuses) + throws (1: registry_api_errors.RegistryServiceException rse) http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift index b3838ee..2f3a4a6 100644 --- a/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift +++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/status_models.thrift @@ -107,3 +107,12 @@ struct JobStatus { 2: optional i64 timeOfStateChange, 3: optional string reason } + +struct QueueStatusModel { + 1: required string hostName; + 2: required string queueName; + 3: required bool queueUp; + 4: required i32 runningJobs; + 5: required i32 queuedJobs; + 6: required i64 time; +} http://git-wip-us.apache.org/repos/asf/airavata/blob/914799c1/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift index 5d15c19..5ca2728 100644 --- a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift +++ b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift @@ -52,8 +52,7 @@ enum ResourceJobManagerType { PBS, SLURM, LSF, - UGE, - CLOUD + UGE } /** @@ -288,11 +287,10 @@ enum ProviderName { struct CloudJobSubmission { 1: required string jobSubmissionInterfaceId = airavata_commons.DEFAULT_ID, 2: required data_movement_models.SecurityProtocol securityProtocol, - 3: required ResourceJobManagerType jobManagerType, - 4: required string nodeId, - 5: required string executableType, - 6: required ProviderName providerName, - 7: required string userAccountName + 3: required string nodeId, + 4: required string executableType, + 5: required ProviderName providerName, + 6: required string userAccountName } /**
