hacky way to handle SIU Little Dog EMail issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/64ea7eeb Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/64ea7eeb Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/64ea7eeb Branch: refs/heads/develop Commit: 64ea7eebd7bded036937d1f932d365152ab6ee62 Parents: d8132b7 Author: scnakandala <[email protected]> Authored: Wed May 31 12:36:16 2017 -0400 Committer: scnakandala <[email protected]> Committed: Wed May 31 12:39:49 2017 -0400 ---------------------------------------------------------------------- .../lib/airavata/compute_resource_model_types.cpp | 4 +--- .../lib/airavata/compute_resource_model_types.h | 5 ++--- .../Model/AppCatalog/ComputeResource/Types.php | 10 ++++------ .../model/appcatalog/computeresource/ttypes.py | 15 ++++++--------- .../computeresource/ResourceJobManagerType.java | 9 +++------ 5 files changed, 16 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/64ea7eeb/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 7d2610a..711e304 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,6 @@ int _kResourceJobManagerTypeValues[] = { ResourceJobManagerType::SLURM, ResourceJobManagerType::LSF, ResourceJobManagerType::UGE, - ResourceJobManagerType::LD_SIU, ResourceJobManagerType::CLOUD, ResourceJobManagerType::AIRAVATA_CUSTOM }; @@ -46,11 +45,10 @@ const char* _kResourceJobManagerTypeNames[] = { "SLURM", "LSF", "UGE", - "LD_SIU", "CLOUD", "AIRAVATA_CUSTOM" }; -const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _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/64ea7eeb/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 f73fa17..96debe9 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,9 +46,8 @@ struct ResourceJobManagerType { SLURM = 2, LSF = 3, UGE = 4, - LD_SIU = 5, - CLOUD = 6, - AIRAVATA_CUSTOM = 7 + CLOUD = 5, + AIRAVATA_CUSTOM = 6 }; }; http://git-wip-us.apache.org/repos/asf/airavata/blob/64ea7eeb/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 cc19b78..47e6e24 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 @@ -42,18 +42,16 @@ final class ResourceJobManagerType { const SLURM = 2; const LSF = 3; const UGE = 4; - const LD_SIU = 5; - const CLOUD = 6; - const AIRAVATA_CUSTOM = 7; + const CLOUD = 5; + const AIRAVATA_CUSTOM = 6; static public $__names = array( 0 => 'FORK', 1 => 'PBS', 2 => 'SLURM', 3 => 'LSF', 4 => 'UGE', - 5 => 'LD_SIU', - 6 => 'CLOUD', - 7 => 'AIRAVATA_CUSTOM', + 5 => 'CLOUD', + 6 => 'AIRAVATA_CUSTOM', ); } http://git-wip-us.apache.org/repos/asf/airavata/blob/64ea7eeb/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 16991e7..9d9aa0d 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 @@ -45,9 +45,8 @@ class ResourceJobManagerType: SLURM = 2 LSF = 3 UGE = 4 - LD_SIU = 5 - CLOUD = 6 - AIRAVATA_CUSTOM = 7 + CLOUD = 5 + AIRAVATA_CUSTOM = 6 _VALUES_TO_NAMES = { 0: "FORK", @@ -55,9 +54,8 @@ class ResourceJobManagerType: 2: "SLURM", 3: "LSF", 4: "UGE", - 5: "LD_SIU", - 6: "CLOUD", - 7: "AIRAVATA_CUSTOM", + 5: "CLOUD", + 6: "AIRAVATA_CUSTOM", } _NAMES_TO_VALUES = { @@ -66,9 +64,8 @@ class ResourceJobManagerType: "SLURM": 2, "LSF": 3, "UGE": 4, - "LD_SIU": 5, - "CLOUD": 6, - "AIRAVATA_CUSTOM": 7, + "CLOUD": 5, + "AIRAVATA_CUSTOM": 6, } class JobManagerCommand: http://git-wip-us.apache.org/repos/asf/airavata/blob/64ea7eeb/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 3212ce5..04dfb74 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 @@ -53,9 +53,8 @@ public enum ResourceJobManagerType implements org.apache.thrift.TEnum { SLURM(2), LSF(3), UGE(4), - LD_SIU(5), - CLOUD(6), - AIRAVATA_CUSTOM(7); + CLOUD(5), + AIRAVATA_CUSTOM(6); private final int value; @@ -87,10 +86,8 @@ public enum ResourceJobManagerType implements org.apache.thrift.TEnum { case 4: return UGE; case 5: - return LD_SIU; - case 6: return CLOUD; - case 7: + case 6: return AIRAVATA_CUSTOM; default: return null;
