You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/05/31 16:02:27 UTC
[1/2] airavata git commit: adding new resource manager type to handle
SIU UGE.
Repository: airavata
Updated Branches:
refs/heads/master 0194c2cf0 -> 1454330eb
adding new resource manager type to handle SIU UGE.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b7793e51
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b7793e51
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b7793e51
Branch: refs/heads/master
Commit: b7793e5165be421a4b84c5443bebd9c757880219
Parents: 0194c2c
Author: scnakandala <su...@gmail.com>
Authored: Wed May 31 11:49:30 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed May 31 11:49:46 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 ++++++---
.../compute_resource_model.thrift | 1 +
6 files changed, 28 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b7793e51/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 711e304..ea9fdcc 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,6 +36,7 @@ int _kResourceJobManagerTypeValues[] = {
ResourceJobManagerType::SLURM,
ResourceJobManagerType::LSF,
ResourceJobManagerType::UGE,
+ ResourceJobManagerType::SIU_UGE,
ResourceJobManagerType::CLOUD,
ResourceJobManagerType::AIRAVATA_CUSTOM
};
@@ -45,10 +46,11 @@ const char* _kResourceJobManagerTypeNames[] = {
"SLURM",
"LSF",
"UGE",
+ "SIU_UGE",
"CLOUD",
"AIRAVATA_CUSTOM"
};
-const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(7, _kResourceJobManagerTypeValues, _kResourceJobManagerTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _ResourceJobManagerType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _kResourceJobManagerTypeValues, _kResourceJobManagerTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
int _kJobManagerCommandValues[] = {
JobManagerCommand::SUBMISSION,
http://git-wip-us.apache.org/repos/asf/airavata/blob/b7793e51/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 96debe9..c135afb 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,8 +46,9 @@ struct ResourceJobManagerType {
SLURM = 2,
LSF = 3,
UGE = 4,
- CLOUD = 5,
- AIRAVATA_CUSTOM = 6
+ SIU_UGE = 5,
+ CLOUD = 6,
+ AIRAVATA_CUSTOM = 7
};
};
http://git-wip-us.apache.org/repos/asf/airavata/blob/b7793e51/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 47e6e24..6408e13 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,16 +42,18 @@ final class ResourceJobManagerType {
const SLURM = 2;
const LSF = 3;
const UGE = 4;
- const CLOUD = 5;
- const AIRAVATA_CUSTOM = 6;
+ const SIU_UGE = 5;
+ const CLOUD = 6;
+ const AIRAVATA_CUSTOM = 7;
static public $__names = array(
0 => 'FORK',
1 => 'PBS',
2 => 'SLURM',
3 => 'LSF',
4 => 'UGE',
- 5 => 'CLOUD',
- 6 => 'AIRAVATA_CUSTOM',
+ 5 => 'SIU_UGE',
+ 6 => 'CLOUD',
+ 7 => 'AIRAVATA_CUSTOM',
);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b7793e51/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 9d9aa0d..87e1e0f 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,8 +45,9 @@ class ResourceJobManagerType:
SLURM = 2
LSF = 3
UGE = 4
- CLOUD = 5
- AIRAVATA_CUSTOM = 6
+ SIU_UGE = 5
+ CLOUD = 6
+ AIRAVATA_CUSTOM = 7
_VALUES_TO_NAMES = {
0: "FORK",
@@ -54,8 +55,9 @@ class ResourceJobManagerType:
2: "SLURM",
3: "LSF",
4: "UGE",
- 5: "CLOUD",
- 6: "AIRAVATA_CUSTOM",
+ 5: "SIU_UGE",
+ 6: "CLOUD",
+ 7: "AIRAVATA_CUSTOM",
}
_NAMES_TO_VALUES = {
@@ -64,8 +66,9 @@ class ResourceJobManagerType:
"SLURM": 2,
"LSF": 3,
"UGE": 4,
- "CLOUD": 5,
- "AIRAVATA_CUSTOM": 6,
+ "SIU_UGE": 5,
+ "CLOUD": 6,
+ "AIRAVATA_CUSTOM": 7,
}
class JobManagerCommand:
http://git-wip-us.apache.org/repos/asf/airavata/blob/b7793e51/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 04dfb74..3521d1b 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,8 +53,9 @@ public enum ResourceJobManagerType implements org.apache.thrift.TEnum {
SLURM(2),
LSF(3),
UGE(4),
- CLOUD(5),
- AIRAVATA_CUSTOM(6);
+ SIU_UGE(5),
+ CLOUD(6),
+ AIRAVATA_CUSTOM(7);
private final int value;
@@ -86,8 +87,10 @@ public enum ResourceJobManagerType implements org.apache.thrift.TEnum {
case 4:
return UGE;
case 5:
- return CLOUD;
+ return SIU_UGE;
case 6:
+ return CLOUD;
+ case 7:
return AIRAVATA_CUSTOM;
default:
return null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/b7793e51/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 87f2ff3..e92f8b1 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,6 +53,7 @@ enum ResourceJobManagerType {
SLURM,
LSF,
UGE,
+ SIU_UGE,
CLOUD,
AIRAVATA_CUSTOM
}
[2/2] airavata git commit: rename job manager type
Posted by sc...@apache.org.
rename job manager type
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1454330e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1454330e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1454330e
Branch: refs/heads/master
Commit: 1454330eb011333ebe7cc2bcba81520bf60848db
Parents: b7793e5
Author: scnakandala <su...@gmail.com>
Authored: Wed May 31 12:02:23 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed May 31 12:02:23 2017 -0400
----------------------------------------------------------------------
.../resources/lib/airavata/compute_resource_model_types.cpp | 4 ++--
.../main/resources/lib/airavata/compute_resource_model_types.h | 2 +-
.../lib/Airavata/Model/AppCatalog/ComputeResource/Types.php | 4 ++--
.../apache/airavata/model/appcatalog/computeresource/ttypes.py | 6 +++---
.../appcatalog/computeresource/ResourceJobManagerType.java | 4 ++--
.../resource-catalog-models/compute_resource_model.thrift | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1454330e/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 ea9fdcc..7d2610a 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,7 @@ int _kResourceJobManagerTypeValues[] = {
ResourceJobManagerType::SLURM,
ResourceJobManagerType::LSF,
ResourceJobManagerType::UGE,
- ResourceJobManagerType::SIU_UGE,
+ ResourceJobManagerType::LD_SIU,
ResourceJobManagerType::CLOUD,
ResourceJobManagerType::AIRAVATA_CUSTOM
};
@@ -46,7 +46,7 @@ const char* _kResourceJobManagerTypeNames[] = {
"SLURM",
"LSF",
"UGE",
- "SIU_UGE",
+ "LD_SIU",
"CLOUD",
"AIRAVATA_CUSTOM"
};
http://git-wip-us.apache.org/repos/asf/airavata/blob/1454330e/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 c135afb..f73fa17 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,7 @@ struct ResourceJobManagerType {
SLURM = 2,
LSF = 3,
UGE = 4,
- SIU_UGE = 5,
+ LD_SIU = 5,
CLOUD = 6,
AIRAVATA_CUSTOM = 7
};
http://git-wip-us.apache.org/repos/asf/airavata/blob/1454330e/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 6408e13..cc19b78 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,7 +42,7 @@ final class ResourceJobManagerType {
const SLURM = 2;
const LSF = 3;
const UGE = 4;
- const SIU_UGE = 5;
+ const LD_SIU = 5;
const CLOUD = 6;
const AIRAVATA_CUSTOM = 7;
static public $__names = array(
@@ -51,7 +51,7 @@ final class ResourceJobManagerType {
2 => 'SLURM',
3 => 'LSF',
4 => 'UGE',
- 5 => 'SIU_UGE',
+ 5 => 'LD_SIU',
6 => 'CLOUD',
7 => 'AIRAVATA_CUSTOM',
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/1454330e/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 87e1e0f..16991e7 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,7 +45,7 @@ class ResourceJobManagerType:
SLURM = 2
LSF = 3
UGE = 4
- SIU_UGE = 5
+ LD_SIU = 5
CLOUD = 6
AIRAVATA_CUSTOM = 7
@@ -55,7 +55,7 @@ class ResourceJobManagerType:
2: "SLURM",
3: "LSF",
4: "UGE",
- 5: "SIU_UGE",
+ 5: "LD_SIU",
6: "CLOUD",
7: "AIRAVATA_CUSTOM",
}
@@ -66,7 +66,7 @@ class ResourceJobManagerType:
"SLURM": 2,
"LSF": 3,
"UGE": 4,
- "SIU_UGE": 5,
+ "LD_SIU": 5,
"CLOUD": 6,
"AIRAVATA_CUSTOM": 7,
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/1454330e/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 3521d1b..3212ce5 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,7 +53,7 @@ public enum ResourceJobManagerType implements org.apache.thrift.TEnum {
SLURM(2),
LSF(3),
UGE(4),
- SIU_UGE(5),
+ LD_SIU(5),
CLOUD(6),
AIRAVATA_CUSTOM(7);
@@ -87,7 +87,7 @@ public enum ResourceJobManagerType implements org.apache.thrift.TEnum {
case 4:
return UGE;
case 5:
- return SIU_UGE;
+ return LD_SIU;
case 6:
return CLOUD;
case 7:
http://git-wip-us.apache.org/repos/asf/airavata/blob/1454330e/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 e92f8b1..8f02227 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,7 @@ enum ResourceJobManagerType {
SLURM,
LSF,
UGE,
- SIU_UGE,
+ LD_SIU,
CLOUD,
AIRAVATA_CUSTOM
}