airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata git commit: adding new resource manager type to handle SIU UGE.
Date Wed, 31 May 2017 15:49:34 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop fa7468a6c -> 1fab963d9


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/1fab963d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1fab963d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1fab963d

Branch: refs/heads/develop
Commit: 1fab963d940ab286fd6efa59dc12b4e0207fd529
Parents: fa7468a
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Wed May 31 11:49:30 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Wed May 31 11:49:30 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/1fab963d/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/1fab963d/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/1fab963d/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/1fab963d/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/1fab963d/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/1fab963d/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
 }


Mime
View raw message