adding dummy AIRAVATA_CUSTOM resource manager type
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2d0796f8 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2d0796f8 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2d0796f8 Branch: refs/heads/ansible-testing-0.17 Commit: 2d0796f84c1db30892f47f49b2f9d3131500f00a Parents: af39d44 Author: scnakandala <[email protected]> Authored: Sat Mar 4 21:26:47 2017 -0500 Committer: scnakandala <[email protected]> Committed: Sat Mar 4 21:26:47 2017 -0500 ---------------------------------------------------------------------- .../resources/lib/airavata/compute_resource_model_types.cpp | 8 +++++--- .../resources/lib/airavata/compute_resource_model_types.h | 3 ++- .../lib/Airavata/Model/AppCatalog/ComputeResource/Types.php | 2 ++ .../airavata/model/appcatalog/computeresource/ttypes.py | 3 +++ .../appcatalog/computeresource/ResourceJobManagerType.java | 9 ++++----- .../airavata/model/application/io/InputDataObjectType.java | 2 +- .../server/src/main/resources/gfac-config.yaml | 2 +- .../resource-catalog-models/compute_resource_model.thrift | 3 ++- 8 files changed, 20 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/2d0796f8/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp index 8f88e12..1f6cb42 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp @@ -36,7 +36,8 @@ int _kResourceJobManagerTypeValues[] = { ResourceJobManagerType::SLURM, ResourceJobManagerType::LSF, ResourceJobManagerType::UGE, - ResourceJobManagerType::CLOUD + ResourceJobManagerType::CLOUD, + ResourceJobManagerType::AIRAVATA_CUSTOM }; const char* _kResourceJobManagerTypeNames[] = { "FORK", @@ -44,9 +45,10 @@ const char* _kResourceJobManagerTypeNames[] = { "SLURM", "LSF", "UGE", - "CLOUD" + "CLOUD", + "AIRAVATA_CUSTOM" }; -const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kResourceJobManagerTypeValues, _kResourceJobManagerTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); +const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kResourceJobManagerTypeValues, _kResourceJobManagerTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL)); int _kJobManagerCommandValues[] = { JobManagerCommand::SUBMISSION, http://git-wip-us.apache.org/repos/asf/airavata/blob/2d0796f8/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h index 95ab605..d611b52 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h @@ -46,7 +46,8 @@ struct ResourceJobManagerType { SLURM = 2, LSF = 3, UGE = 4, - CLOUD = 5 + CLOUD = 5, + AIRAVATA_CUSTOM = 6 }; }; http://git-wip-us.apache.org/repos/asf/airavata/blob/2d0796f8/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php index 696b064..03a2690 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -43,6 +43,7 @@ final class ResourceJobManagerType { const LSF = 3; const UGE = 4; const CLOUD = 5; + const AIRAVATA_CUSTOM = 6; static public $__names = array( 0 => 'FORK', 1 => 'PBS', @@ -50,6 +51,7 @@ final class ResourceJobManagerType { 3 => 'LSF', 4 => 'UGE', 5 => 'CLOUD', + 6 => 'AIRAVATA_CUSTOM', ); } http://git-wip-us.apache.org/repos/asf/airavata/blob/2d0796f8/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py index 300ba5b..dfc0cca 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py @@ -46,6 +46,7 @@ class ResourceJobManagerType: LSF = 3 UGE = 4 CLOUD = 5 + AIRAVATA_CUSTOM = 6 _VALUES_TO_NAMES = { 0: "FORK", @@ -54,6 +55,7 @@ class ResourceJobManagerType: 3: "LSF", 4: "UGE", 5: "CLOUD", + 6: "AIRAVATA_CUSTOM", } _NAMES_TO_VALUES = { @@ -63,6 +65,7 @@ class ResourceJobManagerType: "LSF": 3, "UGE": 4, "CLOUD": 5, + "AIRAVATA_CUSTOM": 6, } class JobManagerCommand: http://git-wip-us.apache.org/repos/asf/airavata/blob/2d0796f8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java index 2bc79c5..f8b5dbf 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManagerType.java @@ -24,10 +24,6 @@ package org.apache.airavata.model.appcatalog.computeresource; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; - /** * * Enumeration of local resource job manager types supported by Airavata * * @@ -53,7 +49,8 @@ public enum ResourceJobManagerType implements org.apache.thrift.TEnum { SLURM(2), LSF(3), UGE(4), - CLOUD(5); + CLOUD(5), + AIRAVATA_CUSTOM(6); private final int value; @@ -86,6 +83,8 @@ public enum ResourceJobManagerType implements org.apache.thrift.TEnum { return UGE; case 5: return CLOUD; + case 6: + return AIRAVATA_CUSTOM; default: return null; } http://git-wip-us.apache.org/repos/asf/airavata/blob/2d0796f8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java index dcb6f2f..a115c86 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java @@ -1418,7 +1418,7 @@ public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObj if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.isReadOnly = iprot.readBool(); struct.setIsReadOnlyIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; http://git-wip-us.apache.org/repos/asf/airavata/blob/2d0796f8/modules/configuration/server/src/main/resources/gfac-config.yaml ---------------------------------------------------------------------- diff --git a/modules/configuration/server/src/main/resources/gfac-config.yaml b/modules/configuration/server/src/main/resources/gfac-config.yaml index edb7922..38578af 100644 --- a/modules/configuration/server/src/main/resources/gfac-config.yaml +++ b/modules/configuration/server/src/main/resources/gfac-config.yaml @@ -114,7 +114,7 @@ resources: - jobManagerType: FORK commandOutputParser: org.apache.airavata.gfac.impl.job.ForkOutputParser - - jobManagerType: AIRAVATA + - jobManagerType: AIRAVATA_CUSTOM emailParser: org.apache.airavata.gfac.monitor.email.parser.AiravataCustomMailParser resourceEmailAddresses: - [email protected] http://git-wip-us.apache.org/repos/asf/airavata/blob/2d0796f8/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 7da3fce..076e5c1 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 @@ -53,7 +53,8 @@ enum ResourceJobManagerType { SLURM, LSF, UGE, - CLOUD + CLOUD, + AIRAVATA_CUSTOM } /**
