You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/03 19:15:11 UTC
[01/14] airavata git commit: commenting out mysql jar
Repository: airavata
Updated Branches:
refs/heads/master e6d682711 -> 630c75116
commenting out mysql jar
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/91ef607c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/91ef607c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/91ef607c
Branch: refs/heads/master
Commit: 91ef607cfc1f27323e36722ef24b940212abb89a
Parents: 55f190c
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Feb 24 15:46:14 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Feb 24 15:46:14 2016 -0500
----------------------------------------------------------------------
modules/test-suite/multi-tenanted-airavata/pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/91ef607c/modules/test-suite/multi-tenanted-airavata/pom.xml
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/pom.xml b/modules/test-suite/multi-tenanted-airavata/pom.xml
index 58a3b53..5853205 100644
--- a/modules/test-suite/multi-tenanted-airavata/pom.xml
+++ b/modules/test-suite/multi-tenanted-airavata/pom.xml
@@ -78,11 +78,11 @@
<artifactId>gson</artifactId>
<version>2.3.1</version>
</dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.35</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>mysql</groupId>-->
+ <!--<artifactId>mysql-connector-java</artifactId>-->
+ <!--<version>5.1.35</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
[03/14] airavata git commit: adding parallelism as a seperate enum
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index 011bef2..2430c4a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index be56ed5..b25742d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 2e3efe2..a847756 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index 8a2d800..f664949 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift b/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift
index f96fd7a..ab105ae 100644
--- a/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift
+++ b/thrift-interface-descriptions/data-models/app-catalog-models/application_deployment_model.thrift
@@ -25,13 +25,13 @@
*/
include "../../airavata-apis/airavata_commons.thrift"
+include "parallelism_model.thrift"
namespace java org.apache.airavata.model.appcatalog.appdeployment
namespace php Airavata.Model.AppCatalog.AppDeployment
namespace cpp apache.airavata.model.appcatalog.appdeployment
namespace py apache.airavata.model.appcatalog.appdeployment
-
/**
* Key Value pairs to be used to set environments
*
@@ -87,30 +87,6 @@ struct ApplicationModule {
}
/**
- * Enumeration of application parallelism supported by Airavata
- *
- * SERIAL:
- * Single processor applications without any parallelization.
- *
- * MPI:
- * Messaging Passing Interface.
- *
- * OPENMP:
- * Shared Memory Implementtaion.
- *
- * OPENMP_MPI:
- * Hybrid Applications.
- *
-*/
-enum ApplicationParallelismType {
- SERIAL,
- MPI,
- OPENMP,
- OPENMP_MPI,
- CCM,
- CRAY_MPI
-}
-/**
* Application Deployment Description
*
* appDeploymentId: Airavata Internal Unique Job ID. This is set by the registry.
@@ -142,7 +118,7 @@ struct ApplicationDeploymentDescription {
2: required string appModuleId,
3: required string computeHostId,
4: required string executablePath,
- 5: required ApplicationParallelismType parallelism = ApplicationParallelismType.SERIAL,
+ 5: required parallelism_model.ApplicationParallelismType parallelism = parallelism_model.ApplicationParallelismType.SERIAL,
6: optional string appDeploymentDescription,
7: optional list<CommandObject> moduleLoadCmds,
8: optional list<SetEnvPaths> libPrependPaths,
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/thrift-interface-descriptions/data-models/app-catalog-models/parallelism_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/app-catalog-models/parallelism_model.thrift b/thrift-interface-descriptions/data-models/app-catalog-models/parallelism_model.thrift
new file mode 100644
index 0000000..31141f3
--- /dev/null
+++ b/thrift-interface-descriptions/data-models/app-catalog-models/parallelism_model.thrift
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+/**
+ * Application Parallelism Enumerations.
+ *
+*/
+
+namespace java org.apache.airavata.model.parallelism
+namespace php Airavata.Model.AppCatalog.Parallelism
+namespace cpp apache.airavata.model.appcatalog.parallelism
+namespace py apache.airavata.model.appcatalog.parallelism
+
+/**
+ * Enumeration of application parallelism supported by Airavata
+ *
+ * SERIAL:
+ * Single processor applications without any parallelization.
+ *
+ * MPI:
+ * Messaging Passing Interface.
+ *
+ * OPENMP:
+ * Shared Memory Implementtaion.
+ *
+ * OPENMP_MPI:
+ * Hybrid Applications.
+ *
+*/
+enum ApplicationParallelismType {
+ SERIAL,
+ MPI,
+ OPENMP,
+ OPENMP_MPI,
+ CCM,
+ CRAY_MPI
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/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 66b6528..35072fe 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
@@ -19,6 +19,7 @@
*/
include "../../airavata-apis/airavata_commons.thrift"
+include "../app-catalog-models/parallelism_model.thrift"
include "data_movement_models.thrift"
namespace java org.apache.airavata.model.appcatalog.computeresource
@@ -112,7 +113,8 @@ struct ResourceJobManager {
2: required ResourceJobManagerType resourceJobManagerType,
3: optional string pushMonitoringEndpoint,
4: optional string jobManagerBinPath,
- 5: optional map<JobManagerCommand, string> jobManagerCommands
+ 5: optional map<JobManagerCommand, string> jobManagerCommands,
+ 6: optional map<parallelism_model.ApplicationParallelismType, string> parallalisimPrefix
}
/**
[07/14] airavata git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata into develop
Posted by sm...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/55d2fe92
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/55d2fe92
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/55d2fe92
Branch: refs/heads/master
Commit: 55d2fe92c9e760c8619259dbf588b1d32fb6ba15
Parents: 4363669 d9a1075
Author: smarru <sm...@apache.org>
Authored: Fri Feb 26 10:27:24 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Feb 26 10:27:24 2016 -0500
----------------------------------------------------------------------
.../apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[12/14] airavata git commit: adding parallelism types
Posted by sm...@apache.org.
adding parallelism types
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/833de75a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/833de75a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/833de75a
Branch: refs/heads/master
Commit: 833de75a3e27621bc151f6cc6bae39b47e101c7a
Parents: d66d169
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Fri Feb 26 17:00:25 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Fri Feb 26 17:00:25 2016 -0500
----------------------------------------------------------------------
.../client/samples/RegisterSampleData.java | 2 +-
.../tools/RegisterOGCEUS3Application.java | 2 +-
.../tools/RegisterSampleApplications.java | 2 +-
.../tools/RegisterSampleApplicationsUtils.java | 2 +-
.../client/tools/RegisterUS3Application.java | 2 +-
.../apache/airavata/gfac/core/GFacUtils.java | 28 +++++---------------
.../task/utils/bes/ApplicationProcessor.java | 2 +-
.../catalog/impl/ApplicationDeploymentImpl.java | 2 +-
.../ApplicationRegister.java | 2 +-
9 files changed, 14 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
index 557b208..c737695 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
@@ -24,7 +24,6 @@ package org.apache.airavata.client.samples;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
import org.apache.airavata.client.tools.RegisterSampleApplicationsUtils;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
@@ -39,6 +38,7 @@ import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.model.data.movement.DataMovementInterface;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
import org.apache.airavata.model.error.AiravataClientException;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.airavata.model.workspace.Gateway;
import org.apache.thrift.TException;
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
index 6ed6a78..b95cdd7 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
@@ -23,7 +23,6 @@ package org.apache.airavata.client.tools;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
@@ -34,6 +33,7 @@ import org.apache.airavata.model.data.movement.DMType;
import org.apache.airavata.model.data.movement.SCPDataMovement;
import org.apache.airavata.model.data.movement.SecurityProtocol;
import org.apache.airavata.model.error.AiravataClientException;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.thrift.TException;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index 836c88d..7c2a648 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -24,7 +24,6 @@ import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
import org.apache.airavata.client.samples.CreateLaunchExperiment;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.appdeployment.CommandObject;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
@@ -37,6 +36,7 @@ import org.apache.airavata.model.data.movement.DataMovementProtocol;
import org.apache.airavata.model.data.movement.SCPDataMovement;
import org.apache.airavata.model.data.movement.SecurityProtocol;
import org.apache.airavata.model.error.AiravataClientException;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.thrift.TException;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
index dfe6b80..202b9a0 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java
@@ -23,7 +23,6 @@ package org.apache.airavata.client.tools;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.appdeployment.CommandObject;
import org.apache.airavata.model.appcatalog.appinterface.*;
import org.apache.airavata.model.appcatalog.computeresource.*;
@@ -33,6 +32,7 @@ import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.model.data.movement.DataMovementInterface;
import org.apache.airavata.model.data.movement.DataMovementProtocol;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import java.util.List;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
index 9523389..20c5474 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
@@ -23,7 +23,6 @@ package org.apache.airavata.client.tools;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
@@ -34,6 +33,7 @@ import org.apache.airavata.model.data.movement.DMType;
import org.apache.airavata.model.data.movement.SCPDataMovement;
import org.apache.airavata.model.data.movement.SecurityProtocol;
import org.apache.airavata.model.error.AiravataClientException;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.thrift.TException;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 1325659..aa44fc6 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -596,33 +596,17 @@ public class GFacUtils {
}
ApplicationParallelismType parallelism = appDepDescription.getParallelism();
+ Map<ApplicationParallelismType, String> parallelismPrefix = processContext.getResourceJobManager().getParallelismPrefix();
if (parallelism != null) {
if (parallelism != ApplicationParallelismType.SERIAL) {
- // FIXME this needs to be fixed once parallaliasation retrieved by app catalog
- if (appDepDescription.getComputeHostId().contains("stampede")){
- jobDescriptor.setJobSubmitter("ibrun");
- }else if (appDepDescription.getComputeHostId().contains("bigred2")){
- if (parallelism == ApplicationParallelismType.CRAY_MPI){
- if (processModel.getApplicationInterfaceId().contains("Lammps")){
- jobDescriptor.setJobSubmitter("aprun -N 1 -n");
- }else {
- jobDescriptor.setJobSubmitter("aprun -n");
- }
- }else if (parallelism == ApplicationParallelismType.CCM){
- jobDescriptor.setJobSubmitter("ccmrun");
+ if (parallelismPrefix != null){
+ String parallelismCommand = parallelismPrefix.get(parallelism);
+ if (parallelismCommand != null){
+ jobDescriptor.setJobSubmitter(parallelismCommand);
}else {
- jobDescriptor.setJobSubmitter("aprun -n");
+ throw new GFacException("Parallelism prefix is not defined for given parallelism type " + parallelism + ".. Please define the parallelism prefix at App Catalog");
}
- }else if (appDepDescription.getComputeHostId().contains("comet")){
- jobDescriptor.setJobSubmitter("mpiexec");
- }else if (appDepDescription.getComputeHostId().contains("gordon")){
- jobDescriptor.setJobSubmitter(" mpirun_rsh -hostfile $PBS_NODEFILE -np");
- }else if (appDepDescription.getComputeHostId().contains("alamo")){
- jobDescriptor.setJobSubmitter("mpirun -np");
- }else {
- jobDescriptor.setJobSubmitter("ibrun");
}
-
}
}
return jobDescriptor;
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java
index b17b92e..d9ef7e2 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/utils/bes/ApplicationProcessor.java
@@ -23,8 +23,8 @@ package org.apache.airavata.gfac.impl.task.utils.bes;
import org.apache.airavata.gfac.core.context.ProcessContext;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.application.io.InputDataObjectType;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.ApplicationType;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionType;
import org.ggf.schemas.jsdl.x2005.x11.jsdlPosix.FileNameType;
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
index 3cb219e..9d49f0a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ApplicationDeploymentImpl.java
@@ -22,9 +22,9 @@
package org.apache.airavata.registry.core.app.catalog.impl;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.appdeployment.CommandObject;
import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import org.apache.airavata.registry.core.app.catalog.resources.*;
import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion;
import org.apache.airavata.registry.cpi.AppCatalogException;
http://git-wip-us.apache.org/repos/asf/airavata/blob/833de75a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
index 76a9db0..5fa6ad3 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/java/org/apache/airavata/testsuite/multitenantedairavata/ApplicationRegister.java
@@ -24,12 +24,12 @@ package org.apache.airavata.testsuite.multitenantedairavata;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.appdeployment.CommandObject;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import org.apache.airavata.model.security.AuthzToken;
import org.apache.airavata.model.workspace.Gateway;
import org.apache.airavata.testsuite.multitenantedairavata.utils.FrameworkUtils;
[08/14] airavata git commit: correcting parallelism typo
Posted by sm...@apache.org.
correcting parallelism typo
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4772b99e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4772b99e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4772b99e
Branch: refs/heads/master
Commit: 4772b99e344aa3055c409992de8158ae356f863e
Parents: 55d2fe9
Author: smarru <sm...@apache.org>
Authored: Fri Feb 26 12:44:36 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Feb 26 12:44:36 2016 -0500
----------------------------------------------------------------------
.../airavata/compute_resource_model_types.cpp | 28 ++--
.../lib/airavata/compute_resource_model_types.h | 12 +-
.../Model/AppCatalog/ComputeResource/Types.php | 22 +--
.../model/appcatalog/computeresource/ttypes.py | 22 +--
.../computeresource/ResourceJobManager.java | 142 +++++++++----------
.../compute_resource_model.thrift | 2 +-
6 files changed, 114 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/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 0b81761..7756b6c 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
@@ -166,9 +166,9 @@ void ResourceJobManager::__set_jobManagerCommands(const std::map<JobManagerComma
__isset.jobManagerCommands = true;
}
-void ResourceJobManager::__set_parallalisimPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val) {
- this->parallalisimPrefix = val;
-__isset.parallalisimPrefix = true;
+void ResourceJobManager::__set_parallelismPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val) {
+ this->parallelismPrefix = val;
+__isset.parallelismPrefix = true;
}
uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -256,7 +256,7 @@ uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot)
case 6:
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
- this->parallalisimPrefix.clear();
+ this->parallelismPrefix.clear();
uint32_t _size9;
::apache::thrift::protocol::TType _ktype10;
::apache::thrift::protocol::TType _vtype11;
@@ -268,12 +268,12 @@ uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot)
int32_t ecast16;
xfer += iprot->readI32(ecast16);
_key14 = ( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)ecast16;
- std::string& _val15 = this->parallalisimPrefix[_key14];
+ std::string& _val15 = this->parallelismPrefix[_key14];
xfer += iprot->readString(_val15);
}
xfer += iprot->readMapEnd();
}
- this->__isset.parallalisimPrefix = true;
+ this->__isset.parallelismPrefix = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -331,12 +331,12 @@ uint32_t ResourceJobManager::write(::apache::thrift::protocol::TProtocol* oprot)
}
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.parallalisimPrefix) {
- xfer += oprot->writeFieldBegin("parallalisimPrefix", ::apache::thrift::protocol::T_MAP, 6);
+ if (this->__isset.parallelismPrefix) {
+ xfer += oprot->writeFieldBegin("parallelismPrefix", ::apache::thrift::protocol::T_MAP, 6);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->parallalisimPrefix.size()));
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->parallelismPrefix.size()));
std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> ::const_iterator _iter18;
- for (_iter18 = this->parallalisimPrefix.begin(); _iter18 != this->parallalisimPrefix.end(); ++_iter18)
+ for (_iter18 = this->parallelismPrefix.begin(); _iter18 != this->parallelismPrefix.end(); ++_iter18)
{
xfer += oprot->writeI32((int32_t)_iter18->first);
xfer += oprot->writeString(_iter18->second);
@@ -357,7 +357,7 @@ void swap(ResourceJobManager &a, ResourceJobManager &b) {
swap(a.pushMonitoringEndpoint, b.pushMonitoringEndpoint);
swap(a.jobManagerBinPath, b.jobManagerBinPath);
swap(a.jobManagerCommands, b.jobManagerCommands);
- swap(a.parallalisimPrefix, b.parallalisimPrefix);
+ swap(a.parallelismPrefix, b.parallelismPrefix);
swap(a.__isset, b.__isset);
}
@@ -367,7 +367,7 @@ ResourceJobManager::ResourceJobManager(const ResourceJobManager& other19) {
pushMonitoringEndpoint = other19.pushMonitoringEndpoint;
jobManagerBinPath = other19.jobManagerBinPath;
jobManagerCommands = other19.jobManagerCommands;
- parallalisimPrefix = other19.parallalisimPrefix;
+ parallelismPrefix = other19.parallelismPrefix;
__isset = other19.__isset;
}
ResourceJobManager& ResourceJobManager::operator=(const ResourceJobManager& other20) {
@@ -376,7 +376,7 @@ ResourceJobManager& ResourceJobManager::operator=(const ResourceJobManager& othe
pushMonitoringEndpoint = other20.pushMonitoringEndpoint;
jobManagerBinPath = other20.jobManagerBinPath;
jobManagerCommands = other20.jobManagerCommands;
- parallalisimPrefix = other20.parallalisimPrefix;
+ parallelismPrefix = other20.parallelismPrefix;
__isset = other20.__isset;
return *this;
}
@@ -388,7 +388,7 @@ void ResourceJobManager::printTo(std::ostream& out) const {
out << ", " << "pushMonitoringEndpoint="; (__isset.pushMonitoringEndpoint ? (out << to_string(pushMonitoringEndpoint)) : (out << "<null>"));
out << ", " << "jobManagerBinPath="; (__isset.jobManagerBinPath ? (out << to_string(jobManagerBinPath)) : (out << "<null>"));
out << ", " << "jobManagerCommands="; (__isset.jobManagerCommands ? (out << to_string(jobManagerCommands)) : (out << "<null>"));
- out << ", " << "parallalisimPrefix="; (__isset.parallalisimPrefix ? (out << to_string(parallalisimPrefix)) : (out << "<null>"));
+ out << ", " << "parallelismPrefix="; (__isset.parallelismPrefix ? (out << to_string(parallelismPrefix)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/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 3a1b23a..ff02515 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
@@ -140,11 +140,11 @@ class JobSubmissionInterface;
class ComputeResourceDescription;
typedef struct _ResourceJobManager__isset {
- _ResourceJobManager__isset() : pushMonitoringEndpoint(false), jobManagerBinPath(false), jobManagerCommands(false), parallalisimPrefix(false) {}
+ _ResourceJobManager__isset() : pushMonitoringEndpoint(false), jobManagerBinPath(false), jobManagerCommands(false), parallelismPrefix(false) {}
bool pushMonitoringEndpoint :1;
bool jobManagerBinPath :1;
bool jobManagerCommands :1;
- bool parallalisimPrefix :1;
+ bool parallelismPrefix :1;
} _ResourceJobManager__isset;
class ResourceJobManager {
@@ -161,7 +161,7 @@ class ResourceJobManager {
std::string pushMonitoringEndpoint;
std::string jobManagerBinPath;
std::map<JobManagerCommand::type, std::string> jobManagerCommands;
- std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> parallalisimPrefix;
+ std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> parallelismPrefix;
_ResourceJobManager__isset __isset;
@@ -175,7 +175,7 @@ class ResourceJobManager {
void __set_jobManagerCommands(const std::map<JobManagerCommand::type, std::string> & val);
- void __set_parallalisimPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val);
+ void __set_parallelismPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val);
bool operator == (const ResourceJobManager & rhs) const
{
@@ -195,9 +195,9 @@ class ResourceJobManager {
return false;
else if (__isset.jobManagerCommands && !(jobManagerCommands == rhs.jobManagerCommands))
return false;
- if (__isset.parallalisimPrefix != rhs.__isset.parallalisimPrefix)
+ if (__isset.parallelismPrefix != rhs.__isset.parallelismPrefix)
return false;
- else if (__isset.parallalisimPrefix && !(parallalisimPrefix == rhs.parallalisimPrefix))
+ else if (__isset.parallelismPrefix && !(parallelismPrefix == rhs.parallelismPrefix))
return false;
return true;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/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 f99923d..64a406c 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
@@ -249,7 +249,7 @@ class ResourceJobManager {
/**
* @var array
*/
- public $parallalisimPrefix = null;
+ public $parallelismPrefix = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -283,7 +283,7 @@ class ResourceJobManager {
),
),
6 => array(
- 'var' => 'parallalisimPrefix',
+ 'var' => 'parallelismPrefix',
'type' => TType::MAP,
'ktype' => TType::I32,
'vtype' => TType::STRING,
@@ -312,8 +312,8 @@ class ResourceJobManager {
if (isset($vals['jobManagerCommands'])) {
$this->jobManagerCommands = $vals['jobManagerCommands'];
}
- if (isset($vals['parallalisimPrefix'])) {
- $this->parallalisimPrefix = $vals['parallalisimPrefix'];
+ if (isset($vals['parallelismPrefix'])) {
+ $this->parallelismPrefix = $vals['parallelismPrefix'];
}
}
}
@@ -387,7 +387,7 @@ class ResourceJobManager {
break;
case 6:
if ($ftype == TType::MAP) {
- $this->parallalisimPrefix = array();
+ $this->parallelismPrefix = array();
$_size7 = 0;
$_ktype8 = 0;
$_vtype9 = 0;
@@ -398,7 +398,7 @@ class ResourceJobManager {
$val13 = '';
$xfer += $input->readI32($key12);
$xfer += $input->readString($val13);
- $this->parallalisimPrefix[$key12] = $val13;
+ $this->parallelismPrefix[$key12] = $val13;
}
$xfer += $input->readMapEnd();
} else {
@@ -456,15 +456,15 @@ class ResourceJobManager {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->parallalisimPrefix !== null) {
- if (!is_array($this->parallalisimPrefix)) {
+ if ($this->parallelismPrefix !== null) {
+ if (!is_array($this->parallelismPrefix)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('parallalisimPrefix', TType::MAP, 6);
+ $xfer += $output->writeFieldBegin('parallelismPrefix', TType::MAP, 6);
{
- $output->writeMapBegin(TType::I32, TType::STRING, count($this->parallalisimPrefix));
+ $output->writeMapBegin(TType::I32, TType::STRING, count($this->parallelismPrefix));
{
- foreach ($this->parallalisimPrefix as $kiter16 => $viter17)
+ foreach ($this->parallelismPrefix as $kiter16 => $viter17)
{
$xfer += $output->writeI32($kiter16);
$xfer += $output->writeString($viter17);
http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/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 2a17da1..07cda34 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
@@ -288,7 +288,7 @@ class ResourceJobManager:
- pushMonitoringEndpoint
- jobManagerBinPath
- jobManagerCommands
- - parallalisimPrefix
+ - parallelismPrefix
"""
thrift_spec = (
@@ -298,16 +298,16 @@ class ResourceJobManager:
(3, TType.STRING, 'pushMonitoringEndpoint', None, None, ), # 3
(4, TType.STRING, 'jobManagerBinPath', None, None, ), # 4
(5, TType.MAP, 'jobManagerCommands', (TType.I32,None,TType.STRING,None), None, ), # 5
- (6, TType.MAP, 'parallalisimPrefix', (TType.I32,None,TType.STRING,None), None, ), # 6
+ (6, TType.MAP, 'parallelismPrefix', (TType.I32,None,TType.STRING,None), None, ), # 6
)
- def __init__(self, resourceJobManagerId=thrift_spec[1][4], resourceJobManagerType=None, pushMonitoringEndpoint=None, jobManagerBinPath=None, jobManagerCommands=None, parallalisimPrefix=None,):
+ def __init__(self, resourceJobManagerId=thrift_spec[1][4], resourceJobManagerType=None, pushMonitoringEndpoint=None, jobManagerBinPath=None, jobManagerCommands=None, parallelismPrefix=None,):
self.resourceJobManagerId = resourceJobManagerId
self.resourceJobManagerType = resourceJobManagerType
self.pushMonitoringEndpoint = pushMonitoringEndpoint
self.jobManagerBinPath = jobManagerBinPath
self.jobManagerCommands = jobManagerCommands
- self.parallalisimPrefix = parallalisimPrefix
+ self.parallelismPrefix = parallelismPrefix
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -351,12 +351,12 @@ class ResourceJobManager:
iprot.skip(ftype)
elif fid == 6:
if ftype == TType.MAP:
- self.parallalisimPrefix = {}
+ self.parallelismPrefix = {}
(_ktype8, _vtype9, _size7 ) = iprot.readMapBegin()
for _i11 in xrange(_size7):
_key12 = iprot.readI32()
_val13 = iprot.readString()
- self.parallalisimPrefix[_key12] = _val13
+ self.parallelismPrefix[_key12] = _val13
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -394,10 +394,10 @@ class ResourceJobManager:
oprot.writeString(viter15)
oprot.writeMapEnd()
oprot.writeFieldEnd()
- if self.parallalisimPrefix is not None:
- oprot.writeFieldBegin('parallalisimPrefix', TType.MAP, 6)
- oprot.writeMapBegin(TType.I32, TType.STRING, len(self.parallalisimPrefix))
- for kiter16,viter17 in self.parallalisimPrefix.items():
+ if self.parallelismPrefix is not None:
+ oprot.writeFieldBegin('parallelismPrefix', TType.MAP, 6)
+ oprot.writeMapBegin(TType.I32, TType.STRING, len(self.parallelismPrefix))
+ for kiter16,viter17 in self.parallelismPrefix.items():
oprot.writeI32(kiter16)
oprot.writeString(viter17)
oprot.writeMapEnd()
@@ -420,7 +420,7 @@ class ResourceJobManager:
value = (value * 31) ^ hash(self.pushMonitoringEndpoint)
value = (value * 31) ^ hash(self.jobManagerBinPath)
value = (value * 31) ^ hash(self.jobManagerCommands)
- value = (value * 31) ^ hash(self.parallalisimPrefix)
+ value = (value * 31) ^ hash(self.parallelismPrefix)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
index 7f2fa4b..4e925db 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -77,7 +77,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
private static final org.apache.thrift.protocol.TField PUSH_MONITORING_ENDPOINT_FIELD_DESC = new org.apache.thrift.protocol.TField("pushMonitoringEndpoint", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField JOB_MANAGER_BIN_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("jobManagerBinPath", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final org.apache.thrift.protocol.TField JOB_MANAGER_COMMANDS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobManagerCommands", org.apache.thrift.protocol.TType.MAP, (short)5);
- private static final org.apache.thrift.protocol.TField PARALLALISIM_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("parallalisimPrefix", org.apache.thrift.protocol.TType.MAP, (short)6);
+ private static final org.apache.thrift.protocol.TField PARALLELISM_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelismPrefix", org.apache.thrift.protocol.TType.MAP, (short)6);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -90,7 +90,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
private String pushMonitoringEndpoint; // optional
private String jobManagerBinPath; // optional
private Map<JobManagerCommand,String> jobManagerCommands; // optional
- private Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallalisimPrefix; // optional
+ private Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallelismPrefix; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -103,7 +103,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
PUSH_MONITORING_ENDPOINT((short)3, "pushMonitoringEndpoint"),
JOB_MANAGER_BIN_PATH((short)4, "jobManagerBinPath"),
JOB_MANAGER_COMMANDS((short)5, "jobManagerCommands"),
- PARALLALISIM_PREFIX((short)6, "parallalisimPrefix");
+ PARALLELISM_PREFIX((short)6, "parallelismPrefix");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -128,8 +128,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
return JOB_MANAGER_BIN_PATH;
case 5: // JOB_MANAGER_COMMANDS
return JOB_MANAGER_COMMANDS;
- case 6: // PARALLALISIM_PREFIX
- return PARALLALISIM_PREFIX;
+ case 6: // PARALLELISM_PREFIX
+ return PARALLELISM_PREFIX;
default:
return null;
}
@@ -170,7 +170,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS,_Fields.PARALLALISIM_PREFIX};
+ private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS,_Fields.PARALLELISM_PREFIX};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -186,7 +186,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, JobManagerCommand.class),
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
- tmpMap.put(_Fields.PARALLALISIM_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("parallalisimPrefix", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.PARALLELISM_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("parallelismPrefix", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.parallelism.ApplicationParallelismType.class),
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
@@ -239,20 +239,20 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
this.jobManagerCommands = __this__jobManagerCommands;
}
- if (other.isSetParallalisimPrefix()) {
- Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> __this__parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(other.parallalisimPrefix.size());
- for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> other_element : other.parallalisimPrefix.entrySet()) {
+ if (other.isSetParallelismPrefix()) {
+ Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> __this__parallelismPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(other.parallelismPrefix.size());
+ for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> other_element : other.parallelismPrefix.entrySet()) {
org.apache.airavata.model.parallelism.ApplicationParallelismType other_element_key = other_element.getKey();
String other_element_value = other_element.getValue();
- org.apache.airavata.model.parallelism.ApplicationParallelismType __this__parallalisimPrefix_copy_key = other_element_key;
+ org.apache.airavata.model.parallelism.ApplicationParallelismType __this__parallelismPrefix_copy_key = other_element_key;
- String __this__parallalisimPrefix_copy_value = other_element_value;
+ String __this__parallelismPrefix_copy_value = other_element_value;
- __this__parallalisimPrefix.put(__this__parallalisimPrefix_copy_key, __this__parallalisimPrefix_copy_value);
+ __this__parallelismPrefix.put(__this__parallelismPrefix_copy_key, __this__parallelismPrefix_copy_value);
}
- this.parallalisimPrefix = __this__parallalisimPrefix;
+ this.parallelismPrefix = __this__parallelismPrefix;
}
}
@@ -268,7 +268,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
this.pushMonitoringEndpoint = null;
this.jobManagerBinPath = null;
this.jobManagerCommands = null;
- this.parallalisimPrefix = null;
+ this.parallelismPrefix = null;
}
public String getResourceJobManagerId() {
@@ -405,37 +405,37 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
}
- public int getParallalisimPrefixSize() {
- return (this.parallalisimPrefix == null) ? 0 : this.parallalisimPrefix.size();
+ public int getParallelismPrefixSize() {
+ return (this.parallelismPrefix == null) ? 0 : this.parallelismPrefix.size();
}
- public void putToParallalisimPrefix(org.apache.airavata.model.parallelism.ApplicationParallelismType key, String val) {
- if (this.parallalisimPrefix == null) {
- this.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>();
+ public void putToParallelismPrefix(org.apache.airavata.model.parallelism.ApplicationParallelismType key, String val) {
+ if (this.parallelismPrefix == null) {
+ this.parallelismPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>();
}
- this.parallalisimPrefix.put(key, val);
+ this.parallelismPrefix.put(key, val);
}
- public Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> getParallalisimPrefix() {
- return this.parallalisimPrefix;
+ public Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> getParallelismPrefix() {
+ return this.parallelismPrefix;
}
- public void setParallalisimPrefix(Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallalisimPrefix) {
- this.parallalisimPrefix = parallalisimPrefix;
+ public void setParallelismPrefix(Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallelismPrefix) {
+ this.parallelismPrefix = parallelismPrefix;
}
- public void unsetParallalisimPrefix() {
- this.parallalisimPrefix = null;
+ public void unsetParallelismPrefix() {
+ this.parallelismPrefix = null;
}
- /** Returns true if field parallalisimPrefix is set (has been assigned a value) and false otherwise */
- public boolean isSetParallalisimPrefix() {
- return this.parallalisimPrefix != null;
+ /** Returns true if field parallelismPrefix is set (has been assigned a value) and false otherwise */
+ public boolean isSetParallelismPrefix() {
+ return this.parallelismPrefix != null;
}
- public void setParallalisimPrefixIsSet(boolean value) {
+ public void setParallelismPrefixIsSet(boolean value) {
if (!value) {
- this.parallalisimPrefix = null;
+ this.parallelismPrefix = null;
}
}
@@ -481,11 +481,11 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
break;
- case PARALLALISIM_PREFIX:
+ case PARALLELISM_PREFIX:
if (value == null) {
- unsetParallalisimPrefix();
+ unsetParallelismPrefix();
} else {
- setParallalisimPrefix((Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>)value);
+ setParallelismPrefix((Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>)value);
}
break;
@@ -509,8 +509,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
case JOB_MANAGER_COMMANDS:
return getJobManagerCommands();
- case PARALLALISIM_PREFIX:
- return getParallalisimPrefix();
+ case PARALLELISM_PREFIX:
+ return getParallelismPrefix();
}
throw new IllegalStateException();
@@ -533,8 +533,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
return isSetJobManagerBinPath();
case JOB_MANAGER_COMMANDS:
return isSetJobManagerCommands();
- case PARALLALISIM_PREFIX:
- return isSetParallalisimPrefix();
+ case PARALLELISM_PREFIX:
+ return isSetParallelismPrefix();
}
throw new IllegalStateException();
}
@@ -597,12 +597,12 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
return false;
}
- boolean this_present_parallalisimPrefix = true && this.isSetParallalisimPrefix();
- boolean that_present_parallalisimPrefix = true && that.isSetParallalisimPrefix();
- if (this_present_parallalisimPrefix || that_present_parallalisimPrefix) {
- if (!(this_present_parallalisimPrefix && that_present_parallalisimPrefix))
+ boolean this_present_parallelismPrefix = true && this.isSetParallelismPrefix();
+ boolean that_present_parallelismPrefix = true && that.isSetParallelismPrefix();
+ if (this_present_parallelismPrefix || that_present_parallelismPrefix) {
+ if (!(this_present_parallelismPrefix && that_present_parallelismPrefix))
return false;
- if (!this.parallalisimPrefix.equals(that.parallalisimPrefix))
+ if (!this.parallelismPrefix.equals(that.parallelismPrefix))
return false;
}
@@ -638,10 +638,10 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
if (present_jobManagerCommands)
list.add(jobManagerCommands);
- boolean present_parallalisimPrefix = true && (isSetParallalisimPrefix());
- list.add(present_parallalisimPrefix);
- if (present_parallalisimPrefix)
- list.add(parallalisimPrefix);
+ boolean present_parallelismPrefix = true && (isSetParallelismPrefix());
+ list.add(present_parallelismPrefix);
+ if (present_parallelismPrefix)
+ list.add(parallelismPrefix);
return list.hashCode();
}
@@ -704,12 +704,12 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetParallalisimPrefix()).compareTo(other.isSetParallalisimPrefix());
+ lastComparison = Boolean.valueOf(isSetParallelismPrefix()).compareTo(other.isSetParallelismPrefix());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetParallalisimPrefix()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallalisimPrefix, other.parallalisimPrefix);
+ if (isSetParallelismPrefix()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallelismPrefix, other.parallelismPrefix);
if (lastComparison != 0) {
return lastComparison;
}
@@ -779,13 +779,13 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
first = false;
}
- if (isSetParallalisimPrefix()) {
+ if (isSetParallelismPrefix()) {
if (!first) sb.append(", ");
- sb.append("parallalisimPrefix:");
- if (this.parallalisimPrefix == null) {
+ sb.append("parallelismPrefix:");
+ if (this.parallelismPrefix == null) {
sb.append("null");
} else {
- sb.append(this.parallalisimPrefix);
+ sb.append(this.parallelismPrefix);
}
first = false;
}
@@ -892,22 +892,22 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // PARALLALISIM_PREFIX
+ case 6: // PARALLELISM_PREFIX
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin();
- struct.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map4.size);
+ struct.parallelismPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map4.size);
org.apache.airavata.model.parallelism.ApplicationParallelismType _key5;
String _val6;
for (int _i7 = 0; _i7 < _map4.size; ++_i7)
{
_key5 = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
_val6 = iprot.readString();
- struct.parallalisimPrefix.put(_key5, _val6);
+ struct.parallelismPrefix.put(_key5, _val6);
}
iprot.readMapEnd();
}
- struct.setParallalisimPrefixIsSet(true);
+ struct.setParallelismPrefixIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -964,12 +964,12 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
oprot.writeFieldEnd();
}
}
- if (struct.parallalisimPrefix != null) {
- if (struct.isSetParallalisimPrefix()) {
- oprot.writeFieldBegin(PARALLALISIM_PREFIX_FIELD_DESC);
+ if (struct.parallelismPrefix != null) {
+ if (struct.isSetParallelismPrefix()) {
+ oprot.writeFieldBegin(PARALLELISM_PREFIX_FIELD_DESC);
{
- oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.parallalisimPrefix.size()));
- for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter9 : struct.parallalisimPrefix.entrySet())
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.parallelismPrefix.size()));
+ for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter9 : struct.parallelismPrefix.entrySet())
{
oprot.writeI32(_iter9.getKey().getValue());
oprot.writeString(_iter9.getValue());
@@ -1008,7 +1008,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
if (struct.isSetJobManagerCommands()) {
optionals.set(2);
}
- if (struct.isSetParallalisimPrefix()) {
+ if (struct.isSetParallelismPrefix()) {
optionals.set(3);
}
oprot.writeBitSet(optionals, 4);
@@ -1028,10 +1028,10 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
}
}
- if (struct.isSetParallalisimPrefix()) {
+ if (struct.isSetParallelismPrefix()) {
{
- oprot.writeI32(struct.parallalisimPrefix.size());
- for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter11 : struct.parallalisimPrefix.entrySet())
+ oprot.writeI32(struct.parallelismPrefix.size());
+ for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter11 : struct.parallelismPrefix.entrySet())
{
oprot.writeI32(_iter11.getKey().getValue());
oprot.writeString(_iter11.getValue());
@@ -1074,17 +1074,17 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
if (incoming.get(3)) {
{
org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map16.size);
+ struct.parallelismPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map16.size);
org.apache.airavata.model.parallelism.ApplicationParallelismType _key17;
String _val18;
for (int _i19 = 0; _i19 < _map16.size; ++_i19)
{
_key17 = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
_val18 = iprot.readString();
- struct.parallalisimPrefix.put(_key17, _val18);
+ struct.parallelismPrefix.put(_key17, _val18);
}
}
- struct.setParallalisimPrefixIsSet(true);
+ struct.setParallelismPrefixIsSet(true);
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/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 35072fe..4bbbecf 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
@@ -114,7 +114,7 @@ struct ResourceJobManager {
3: optional string pushMonitoringEndpoint,
4: optional string jobManagerBinPath,
5: optional map<JobManagerCommand, string> jobManagerCommands,
- 6: optional map<parallelism_model.ApplicationParallelismType, string> parallalisimPrefix
+ 6: optional map<parallelism_model.ApplicationParallelismType, string> parallelismPrefix
}
/**
[06/14] airavata git commit: adding parallelism as a seperate enum
Posted by sm...@apache.org.
adding parallelism as a seperate enum
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4363669c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4363669c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4363669c
Branch: refs/heads/master
Commit: 4363669c1fa170d175e185ad3576c23f382c2db7
Parents: 91ef607
Author: smarru <sm...@apache.org>
Authored: Fri Feb 26 10:27:04 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Feb 26 10:27:04 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../application_deployment_model_types.cpp | 22 +-
.../application_deployment_model_types.h | 22 +-
.../airavata/compute_resource_model_types.cpp | 546 ++++++++++---------
.../lib/airavata/compute_resource_model_types.h | 11 +-
.../airavata/parallelism_model_constants.cpp | 34 ++
.../lib/airavata/parallelism_model_constants.h | 41 ++
.../lib/airavata/parallelism_model_types.cpp | 51 ++
.../lib/airavata/parallelism_model_types.h | 54 ++
.../Model/AppCatalog/AppDeployment/Types.php | 33 --
.../Model/AppCatalog/ComputeResource/Types.php | 221 +++++---
.../Model/AppCatalog/Parallelism/Types.php | 53 ++
.../model/appcatalog/appdeployment/ttypes.py | 43 +-
.../model/appcatalog/computeresource/ttypes.py | 138 +++--
.../model/appcatalog/parallelism/__init__.py | 1 +
.../model/appcatalog/parallelism/constants.py | 11 +
.../model/appcatalog/parallelism/ttypes.py | 60 ++
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 28 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 218 ++++----
.../computeresource/GlobusJobSubmission.java | 34 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 207 ++++++-
.../computeresource/SSHJobSubmission.java | 34 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 2 +-
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../parallelism/ApplicationParallelismType.java | 90 +++
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../application_deployment_model.thrift | 28 +-
.../app-catalog-models/parallelism_model.thrift | 54 ++
.../compute_resource_model.thrift | 4 +-
103 files changed, 1412 insertions(+), 782 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index 9f1ebc4..efdd315 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class Airavata {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
index 07ba64f..d465140 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.cpp
@@ -30,24 +30,6 @@
namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appdeployment {
-int _kApplicationParallelismTypeValues[] = {
- ApplicationParallelismType::SERIAL,
- ApplicationParallelismType::MPI,
- ApplicationParallelismType::OPENMP,
- ApplicationParallelismType::OPENMP_MPI,
- ApplicationParallelismType::CCM,
- ApplicationParallelismType::CRAY_MPI
-};
-const char* _kApplicationParallelismTypeNames[] = {
- "SERIAL",
- "MPI",
- "OPENMP",
- "OPENMP_MPI",
- "CCM",
- "CRAY_MPI"
-};
-const std::map<int, const char*> _ApplicationParallelismType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kApplicationParallelismTypeValues, _kApplicationParallelismTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
-
SetEnvPaths::~SetEnvPaths() throw() {
}
@@ -470,7 +452,7 @@ void ApplicationDeploymentDescription::__set_executablePath(const std::string& v
this->executablePath = val;
}
-void ApplicationDeploymentDescription::__set_parallelism(const ApplicationParallelismType::type val) {
+void ApplicationDeploymentDescription::__set_parallelism(const ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type val) {
this->parallelism = val;
}
@@ -571,7 +553,7 @@ uint32_t ApplicationDeploymentDescription::read(::apache::thrift::protocol::TPro
if (ftype == ::apache::thrift::protocol::T_I32) {
int32_t ecast6;
xfer += iprot->readI32(ecast6);
- this->parallelism = (ApplicationParallelismType::type)ecast6;
+ this->parallelism = ( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)ecast6;
isset_parallelism = true;
} else {
xfer += iprot->skip(ftype);
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
index 7723122..5409805 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/application_deployment_model_types.h
@@ -33,23 +33,11 @@
#include <thrift/cxxfunctional.h>
#include "airavata_commons_types.h"
+#include "parallelism_model_types.h"
namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace appdeployment {
-struct ApplicationParallelismType {
- enum type {
- SERIAL = 0,
- MPI = 1,
- OPENMP = 2,
- OPENMP_MPI = 3,
- CCM = 4,
- CRAY_MPI = 5
- };
-};
-
-extern const std::map<int, const char*> _ApplicationParallelismType_VALUES_TO_NAMES;
-
class SetEnvPaths;
class CommandObject;
@@ -251,8 +239,8 @@ class ApplicationDeploymentDescription {
ApplicationDeploymentDescription(const ApplicationDeploymentDescription&);
ApplicationDeploymentDescription& operator=(const ApplicationDeploymentDescription&);
- ApplicationDeploymentDescription() : appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), executablePath(), parallelism((ApplicationParallelismType::type)0), appDeploymentDescription() {
- parallelism = (ApplicationParallelismType::type)0;
+ ApplicationDeploymentDescription() : appDeploymentId("DO_NOT_SET_AT_CLIENTS"), appModuleId(), computeHostId(), executablePath(), parallelism(( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)0), appDeploymentDescription() {
+ parallelism = ( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)0;
}
@@ -261,7 +249,7 @@ class ApplicationDeploymentDescription {
std::string appModuleId;
std::string computeHostId;
std::string executablePath;
- ApplicationParallelismType::type parallelism;
+ ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type parallelism;
std::string appDeploymentDescription;
std::vector<CommandObject> moduleLoadCmds;
std::vector<SetEnvPaths> libPrependPaths;
@@ -280,7 +268,7 @@ class ApplicationDeploymentDescription {
void __set_executablePath(const std::string& val);
- void __set_parallelism(const ApplicationParallelismType::type val);
+ void __set_parallelism(const ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type val);
void __set_appDeploymentDescription(const std::string& val);
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/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 506bfa0..0b81761 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
@@ -166,6 +166,11 @@ void ResourceJobManager::__set_jobManagerCommands(const std::map<JobManagerComma
__isset.jobManagerCommands = true;
}
+void ResourceJobManager::__set_parallalisimPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val) {
+ this->parallalisimPrefix = val;
+__isset.parallalisimPrefix = true;
+}
+
uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -248,6 +253,31 @@ uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->skip(ftype);
}
break;
+ case 6:
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
+ {
+ this->parallalisimPrefix.clear();
+ uint32_t _size9;
+ ::apache::thrift::protocol::TType _ktype10;
+ ::apache::thrift::protocol::TType _vtype11;
+ xfer += iprot->readMapBegin(_ktype10, _vtype11, _size9);
+ uint32_t _i13;
+ for (_i13 = 0; _i13 < _size9; ++_i13)
+ {
+ ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type _key14;
+ int32_t ecast16;
+ xfer += iprot->readI32(ecast16);
+ _key14 = ( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)ecast16;
+ std::string& _val15 = this->parallalisimPrefix[_key14];
+ xfer += iprot->readString(_val15);
+ }
+ xfer += iprot->readMapEnd();
+ }
+ this->__isset.parallalisimPrefix = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -291,11 +321,25 @@ uint32_t ResourceJobManager::write(::apache::thrift::protocol::TProtocol* oprot)
xfer += oprot->writeFieldBegin("jobManagerCommands", ::apache::thrift::protocol::T_MAP, 5);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->jobManagerCommands.size()));
- std::map<JobManagerCommand::type, std::string> ::const_iterator _iter9;
- for (_iter9 = this->jobManagerCommands.begin(); _iter9 != this->jobManagerCommands.end(); ++_iter9)
+ std::map<JobManagerCommand::type, std::string> ::const_iterator _iter17;
+ for (_iter17 = this->jobManagerCommands.begin(); _iter17 != this->jobManagerCommands.end(); ++_iter17)
{
- xfer += oprot->writeI32((int32_t)_iter9->first);
- xfer += oprot->writeString(_iter9->second);
+ xfer += oprot->writeI32((int32_t)_iter17->first);
+ xfer += oprot->writeString(_iter17->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.parallalisimPrefix) {
+ xfer += oprot->writeFieldBegin("parallalisimPrefix", ::apache::thrift::protocol::T_MAP, 6);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->parallalisimPrefix.size()));
+ std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> ::const_iterator _iter18;
+ for (_iter18 = this->parallalisimPrefix.begin(); _iter18 != this->parallalisimPrefix.end(); ++_iter18)
+ {
+ xfer += oprot->writeI32((int32_t)_iter18->first);
+ xfer += oprot->writeString(_iter18->second);
}
xfer += oprot->writeMapEnd();
}
@@ -313,24 +357,27 @@ void swap(ResourceJobManager &a, ResourceJobManager &b) {
swap(a.pushMonitoringEndpoint, b.pushMonitoringEndpoint);
swap(a.jobManagerBinPath, b.jobManagerBinPath);
swap(a.jobManagerCommands, b.jobManagerCommands);
+ swap(a.parallalisimPrefix, b.parallalisimPrefix);
swap(a.__isset, b.__isset);
}
-ResourceJobManager::ResourceJobManager(const ResourceJobManager& other10) {
- resourceJobManagerId = other10.resourceJobManagerId;
- resourceJobManagerType = other10.resourceJobManagerType;
- pushMonitoringEndpoint = other10.pushMonitoringEndpoint;
- jobManagerBinPath = other10.jobManagerBinPath;
- jobManagerCommands = other10.jobManagerCommands;
- __isset = other10.__isset;
-}
-ResourceJobManager& ResourceJobManager::operator=(const ResourceJobManager& other11) {
- resourceJobManagerId = other11.resourceJobManagerId;
- resourceJobManagerType = other11.resourceJobManagerType;
- pushMonitoringEndpoint = other11.pushMonitoringEndpoint;
- jobManagerBinPath = other11.jobManagerBinPath;
- jobManagerCommands = other11.jobManagerCommands;
- __isset = other11.__isset;
+ResourceJobManager::ResourceJobManager(const ResourceJobManager& other19) {
+ resourceJobManagerId = other19.resourceJobManagerId;
+ resourceJobManagerType = other19.resourceJobManagerType;
+ pushMonitoringEndpoint = other19.pushMonitoringEndpoint;
+ jobManagerBinPath = other19.jobManagerBinPath;
+ jobManagerCommands = other19.jobManagerCommands;
+ parallalisimPrefix = other19.parallalisimPrefix;
+ __isset = other19.__isset;
+}
+ResourceJobManager& ResourceJobManager::operator=(const ResourceJobManager& other20) {
+ resourceJobManagerId = other20.resourceJobManagerId;
+ resourceJobManagerType = other20.resourceJobManagerType;
+ pushMonitoringEndpoint = other20.pushMonitoringEndpoint;
+ jobManagerBinPath = other20.jobManagerBinPath;
+ jobManagerCommands = other20.jobManagerCommands;
+ parallalisimPrefix = other20.parallalisimPrefix;
+ __isset = other20.__isset;
return *this;
}
void ResourceJobManager::printTo(std::ostream& out) const {
@@ -341,6 +388,7 @@ void ResourceJobManager::printTo(std::ostream& out) const {
out << ", " << "pushMonitoringEndpoint="; (__isset.pushMonitoringEndpoint ? (out << to_string(pushMonitoringEndpoint)) : (out << "<null>"));
out << ", " << "jobManagerBinPath="; (__isset.jobManagerBinPath ? (out << to_string(jobManagerBinPath)) : (out << "<null>"));
out << ", " << "jobManagerCommands="; (__isset.jobManagerCommands ? (out << to_string(jobManagerCommands)) : (out << "<null>"));
+ out << ", " << "parallalisimPrefix="; (__isset.parallalisimPrefix ? (out << to_string(parallalisimPrefix)) : (out << "<null>"));
out << ")";
}
@@ -531,25 +579,25 @@ void swap(BatchQueue &a, BatchQueue &b) {
swap(a.__isset, b.__isset);
}
-BatchQueue::BatchQueue(const BatchQueue& other12) {
- queueName = other12.queueName;
- queueDescription = other12.queueDescription;
- maxRunTime = other12.maxRunTime;
- maxNodes = other12.maxNodes;
- maxProcessors = other12.maxProcessors;
- maxJobsInQueue = other12.maxJobsInQueue;
- maxMemory = other12.maxMemory;
- __isset = other12.__isset;
-}
-BatchQueue& BatchQueue::operator=(const BatchQueue& other13) {
- queueName = other13.queueName;
- queueDescription = other13.queueDescription;
- maxRunTime = other13.maxRunTime;
- maxNodes = other13.maxNodes;
- maxProcessors = other13.maxProcessors;
- maxJobsInQueue = other13.maxJobsInQueue;
- maxMemory = other13.maxMemory;
- __isset = other13.__isset;
+BatchQueue::BatchQueue(const BatchQueue& other21) {
+ queueName = other21.queueName;
+ queueDescription = other21.queueDescription;
+ maxRunTime = other21.maxRunTime;
+ maxNodes = other21.maxNodes;
+ maxProcessors = other21.maxProcessors;
+ maxJobsInQueue = other21.maxJobsInQueue;
+ maxMemory = other21.maxMemory;
+ __isset = other21.__isset;
+}
+BatchQueue& BatchQueue::operator=(const BatchQueue& other22) {
+ queueName = other22.queueName;
+ queueDescription = other22.queueDescription;
+ maxRunTime = other22.maxRunTime;
+ maxNodes = other22.maxNodes;
+ maxProcessors = other22.maxProcessors;
+ maxJobsInQueue = other22.maxJobsInQueue;
+ maxMemory = other22.maxMemory;
+ __isset = other22.__isset;
return *this;
}
void BatchQueue::printTo(std::ostream& out) const {
@@ -616,9 +664,9 @@ uint32_t LOCALSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast14;
- xfer += iprot->readI32(ecast14);
- this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast14;
+ int32_t ecast23;
+ xfer += iprot->readI32(ecast23);
+ this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast23;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -679,15 +727,15 @@ void swap(LOCALSubmission &a, LOCALSubmission &b) {
swap(a.resourceJobManager, b.resourceJobManager);
}
-LOCALSubmission::LOCALSubmission(const LOCALSubmission& other15) {
- jobSubmissionInterfaceId = other15.jobSubmissionInterfaceId;
- securityProtocol = other15.securityProtocol;
- resourceJobManager = other15.resourceJobManager;
+LOCALSubmission::LOCALSubmission(const LOCALSubmission& other24) {
+ jobSubmissionInterfaceId = other24.jobSubmissionInterfaceId;
+ securityProtocol = other24.securityProtocol;
+ resourceJobManager = other24.resourceJobManager;
}
-LOCALSubmission& LOCALSubmission::operator=(const LOCALSubmission& other16) {
- jobSubmissionInterfaceId = other16.jobSubmissionInterfaceId;
- securityProtocol = other16.securityProtocol;
- resourceJobManager = other16.resourceJobManager;
+LOCALSubmission& LOCALSubmission::operator=(const LOCALSubmission& other25) {
+ jobSubmissionInterfaceId = other25.jobSubmissionInterfaceId;
+ securityProtocol = other25.securityProtocol;
+ resourceJobManager = other25.resourceJobManager;
return *this;
}
void LOCALSubmission::printTo(std::ostream& out) const {
@@ -770,9 +818,9 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast17;
- xfer += iprot->readI32(ecast17);
- this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast17;
+ int32_t ecast26;
+ xfer += iprot->readI32(ecast26);
+ this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast26;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -804,9 +852,9 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
break;
case 6:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast18;
- xfer += iprot->readI32(ecast18);
- this->monitorMode = (MonitorMode::type)ecast18;
+ int32_t ecast27;
+ xfer += iprot->readI32(ecast27);
+ this->monitorMode = (MonitorMode::type)ecast27;
this->__isset.monitorMode = true;
} else {
xfer += iprot->skip(ftype);
@@ -816,14 +864,14 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->batchQueueEmailSenders.clear();
- uint32_t _size19;
- ::apache::thrift::protocol::TType _etype22;
- xfer += iprot->readListBegin(_etype22, _size19);
- this->batchQueueEmailSenders.resize(_size19);
- uint32_t _i23;
- for (_i23 = 0; _i23 < _size19; ++_i23)
+ uint32_t _size28;
+ ::apache::thrift::protocol::TType _etype31;
+ xfer += iprot->readListBegin(_etype31, _size28);
+ this->batchQueueEmailSenders.resize(_size28);
+ uint32_t _i32;
+ for (_i32 = 0; _i32 < _size28; ++_i32)
{
- xfer += iprot->readString(this->batchQueueEmailSenders[_i23]);
+ xfer += iprot->readString(this->batchQueueEmailSenders[_i32]);
}
xfer += iprot->readListEnd();
}
@@ -886,10 +934,10 @@ uint32_t SSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot) c
xfer += oprot->writeFieldBegin("batchQueueEmailSenders", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->batchQueueEmailSenders.size()));
- std::vector<std::string> ::const_iterator _iter24;
- for (_iter24 = this->batchQueueEmailSenders.begin(); _iter24 != this->batchQueueEmailSenders.end(); ++_iter24)
+ std::vector<std::string> ::const_iterator _iter33;
+ for (_iter33 = this->batchQueueEmailSenders.begin(); _iter33 != this->batchQueueEmailSenders.end(); ++_iter33)
{
- xfer += oprot->writeString((*_iter24));
+ xfer += oprot->writeString((*_iter33));
}
xfer += oprot->writeListEnd();
}
@@ -912,25 +960,25 @@ void swap(SSHJobSubmission &a, SSHJobSubmission &b) {
swap(a.__isset, b.__isset);
}
-SSHJobSubmission::SSHJobSubmission(const SSHJobSubmission& other25) {
- jobSubmissionInterfaceId = other25.jobSubmissionInterfaceId;
- securityProtocol = other25.securityProtocol;
- resourceJobManager = other25.resourceJobManager;
- alternativeSSHHostName = other25.alternativeSSHHostName;
- sshPort = other25.sshPort;
- monitorMode = other25.monitorMode;
- batchQueueEmailSenders = other25.batchQueueEmailSenders;
- __isset = other25.__isset;
-}
-SSHJobSubmission& SSHJobSubmission::operator=(const SSHJobSubmission& other26) {
- jobSubmissionInterfaceId = other26.jobSubmissionInterfaceId;
- securityProtocol = other26.securityProtocol;
- resourceJobManager = other26.resourceJobManager;
- alternativeSSHHostName = other26.alternativeSSHHostName;
- sshPort = other26.sshPort;
- monitorMode = other26.monitorMode;
- batchQueueEmailSenders = other26.batchQueueEmailSenders;
- __isset = other26.__isset;
+SSHJobSubmission::SSHJobSubmission(const SSHJobSubmission& other34) {
+ jobSubmissionInterfaceId = other34.jobSubmissionInterfaceId;
+ securityProtocol = other34.securityProtocol;
+ resourceJobManager = other34.resourceJobManager;
+ alternativeSSHHostName = other34.alternativeSSHHostName;
+ sshPort = other34.sshPort;
+ monitorMode = other34.monitorMode;
+ batchQueueEmailSenders = other34.batchQueueEmailSenders;
+ __isset = other34.__isset;
+}
+SSHJobSubmission& SSHJobSubmission::operator=(const SSHJobSubmission& other35) {
+ jobSubmissionInterfaceId = other35.jobSubmissionInterfaceId;
+ securityProtocol = other35.securityProtocol;
+ resourceJobManager = other35.resourceJobManager;
+ alternativeSSHHostName = other35.alternativeSSHHostName;
+ sshPort = other35.sshPort;
+ monitorMode = other35.monitorMode;
+ batchQueueEmailSenders = other35.batchQueueEmailSenders;
+ __isset = other35.__isset;
return *this;
}
void SSHJobSubmission::printTo(std::ostream& out) const {
@@ -997,9 +1045,9 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast27;
- xfer += iprot->readI32(ecast27);
- this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast27;
+ int32_t ecast36;
+ xfer += iprot->readI32(ecast36);
+ this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast36;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -1009,14 +1057,14 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->globusGateKeeperEndPoint.clear();
- uint32_t _size28;
- ::apache::thrift::protocol::TType _etype31;
- xfer += iprot->readListBegin(_etype31, _size28);
- this->globusGateKeeperEndPoint.resize(_size28);
- uint32_t _i32;
- for (_i32 = 0; _i32 < _size28; ++_i32)
+ uint32_t _size37;
+ ::apache::thrift::protocol::TType _etype40;
+ xfer += iprot->readListBegin(_etype40, _size37);
+ this->globusGateKeeperEndPoint.resize(_size37);
+ uint32_t _i41;
+ for (_i41 = 0; _i41 < _size37; ++_i41)
{
- xfer += iprot->readString(this->globusGateKeeperEndPoint[_i32]);
+ xfer += iprot->readString(this->globusGateKeeperEndPoint[_i41]);
}
xfer += iprot->readListEnd();
}
@@ -1058,10 +1106,10 @@ uint32_t GlobusJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldBegin("globusGateKeeperEndPoint", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->globusGateKeeperEndPoint.size()));
- std::vector<std::string> ::const_iterator _iter33;
- for (_iter33 = this->globusGateKeeperEndPoint.begin(); _iter33 != this->globusGateKeeperEndPoint.end(); ++_iter33)
+ std::vector<std::string> ::const_iterator _iter42;
+ for (_iter42 = this->globusGateKeeperEndPoint.begin(); _iter42 != this->globusGateKeeperEndPoint.end(); ++_iter42)
{
- xfer += oprot->writeString((*_iter33));
+ xfer += oprot->writeString((*_iter42));
}
xfer += oprot->writeListEnd();
}
@@ -1080,17 +1128,17 @@ void swap(GlobusJobSubmission &a, GlobusJobSubmission &b) {
swap(a.__isset, b.__isset);
}
-GlobusJobSubmission::GlobusJobSubmission(const GlobusJobSubmission& other34) {
- jobSubmissionInterfaceId = other34.jobSubmissionInterfaceId;
- securityProtocol = other34.securityProtocol;
- globusGateKeeperEndPoint = other34.globusGateKeeperEndPoint;
- __isset = other34.__isset;
+GlobusJobSubmission::GlobusJobSubmission(const GlobusJobSubmission& other43) {
+ jobSubmissionInterfaceId = other43.jobSubmissionInterfaceId;
+ securityProtocol = other43.securityProtocol;
+ globusGateKeeperEndPoint = other43.globusGateKeeperEndPoint;
+ __isset = other43.__isset;
}
-GlobusJobSubmission& GlobusJobSubmission::operator=(const GlobusJobSubmission& other35) {
- jobSubmissionInterfaceId = other35.jobSubmissionInterfaceId;
- securityProtocol = other35.securityProtocol;
- globusGateKeeperEndPoint = other35.globusGateKeeperEndPoint;
- __isset = other35.__isset;
+GlobusJobSubmission& GlobusJobSubmission::operator=(const GlobusJobSubmission& other44) {
+ jobSubmissionInterfaceId = other44.jobSubmissionInterfaceId;
+ securityProtocol = other44.securityProtocol;
+ globusGateKeeperEndPoint = other44.globusGateKeeperEndPoint;
+ __isset = other44.__isset;
return *this;
}
void GlobusJobSubmission::printTo(std::ostream& out) const {
@@ -1153,9 +1201,9 @@ uint32_t UnicoreJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast36;
- xfer += iprot->readI32(ecast36);
- this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast36;
+ int32_t ecast45;
+ xfer += iprot->readI32(ecast45);
+ this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast45;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -1216,15 +1264,15 @@ void swap(UnicoreJobSubmission &a, UnicoreJobSubmission &b) {
swap(a.unicoreEndPointURL, b.unicoreEndPointURL);
}
-UnicoreJobSubmission::UnicoreJobSubmission(const UnicoreJobSubmission& other37) {
- jobSubmissionInterfaceId = other37.jobSubmissionInterfaceId;
- securityProtocol = other37.securityProtocol;
- unicoreEndPointURL = other37.unicoreEndPointURL;
+UnicoreJobSubmission::UnicoreJobSubmission(const UnicoreJobSubmission& other46) {
+ jobSubmissionInterfaceId = other46.jobSubmissionInterfaceId;
+ securityProtocol = other46.securityProtocol;
+ unicoreEndPointURL = other46.unicoreEndPointURL;
}
-UnicoreJobSubmission& UnicoreJobSubmission::operator=(const UnicoreJobSubmission& other38) {
- jobSubmissionInterfaceId = other38.jobSubmissionInterfaceId;
- securityProtocol = other38.securityProtocol;
- unicoreEndPointURL = other38.unicoreEndPointURL;
+UnicoreJobSubmission& UnicoreJobSubmission::operator=(const UnicoreJobSubmission& other47) {
+ jobSubmissionInterfaceId = other47.jobSubmissionInterfaceId;
+ securityProtocol = other47.securityProtocol;
+ unicoreEndPointURL = other47.unicoreEndPointURL;
return *this;
}
void UnicoreJobSubmission::printTo(std::ostream& out) const {
@@ -1302,9 +1350,9 @@ uint32_t CloudJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast39;
- xfer += iprot->readI32(ecast39);
- this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast39;
+ int32_t ecast48;
+ xfer += iprot->readI32(ecast48);
+ this->securityProtocol = ( ::apache::airavata::model::data::movement::SecurityProtocol::type)ecast48;
isset_securityProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -1328,9 +1376,9 @@ uint32_t CloudJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
break;
case 5:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast40;
- xfer += iprot->readI32(ecast40);
- this->providerName = (ProviderName::type)ecast40;
+ int32_t ecast49;
+ xfer += iprot->readI32(ecast49);
+ this->providerName = (ProviderName::type)ecast49;
isset_providerName = true;
} else {
xfer += iprot->skip(ftype);
@@ -1412,21 +1460,21 @@ void swap(CloudJobSubmission &a, CloudJobSubmission &b) {
swap(a.userAccountName, b.userAccountName);
}
-CloudJobSubmission::CloudJobSubmission(const CloudJobSubmission& other41) {
- jobSubmissionInterfaceId = other41.jobSubmissionInterfaceId;
- securityProtocol = other41.securityProtocol;
- nodeId = other41.nodeId;
- executableType = other41.executableType;
- providerName = other41.providerName;
- userAccountName = other41.userAccountName;
-}
-CloudJobSubmission& CloudJobSubmission::operator=(const CloudJobSubmission& other42) {
- jobSubmissionInterfaceId = other42.jobSubmissionInterfaceId;
- securityProtocol = other42.securityProtocol;
- nodeId = other42.nodeId;
- executableType = other42.executableType;
- providerName = other42.providerName;
- userAccountName = other42.userAccountName;
+CloudJobSubmission::CloudJobSubmission(const CloudJobSubmission& other50) {
+ jobSubmissionInterfaceId = other50.jobSubmissionInterfaceId;
+ securityProtocol = other50.securityProtocol;
+ nodeId = other50.nodeId;
+ executableType = other50.executableType;
+ providerName = other50.providerName;
+ userAccountName = other50.userAccountName;
+}
+CloudJobSubmission& CloudJobSubmission::operator=(const CloudJobSubmission& other51) {
+ jobSubmissionInterfaceId = other51.jobSubmissionInterfaceId;
+ securityProtocol = other51.securityProtocol;
+ nodeId = other51.nodeId;
+ executableType = other51.executableType;
+ providerName = other51.providerName;
+ userAccountName = other51.userAccountName;
return *this;
}
void CloudJobSubmission::printTo(std::ostream& out) const {
@@ -1492,9 +1540,9 @@ uint32_t JobSubmissionInterface::read(::apache::thrift::protocol::TProtocol* ipr
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast43;
- xfer += iprot->readI32(ecast43);
- this->jobSubmissionProtocol = (JobSubmissionProtocol::type)ecast43;
+ int32_t ecast52;
+ xfer += iprot->readI32(ecast52);
+ this->jobSubmissionProtocol = (JobSubmissionProtocol::type)ecast52;
isset_jobSubmissionProtocol = true;
} else {
xfer += iprot->skip(ftype);
@@ -1555,15 +1603,15 @@ void swap(JobSubmissionInterface &a, JobSubmissionInterface &b) {
swap(a.priorityOrder, b.priorityOrder);
}
-JobSubmissionInterface::JobSubmissionInterface(const JobSubmissionInterface& other44) {
- jobSubmissionInterfaceId = other44.jobSubmissionInterfaceId;
- jobSubmissionProtocol = other44.jobSubmissionProtocol;
- priorityOrder = other44.priorityOrder;
+JobSubmissionInterface::JobSubmissionInterface(const JobSubmissionInterface& other53) {
+ jobSubmissionInterfaceId = other53.jobSubmissionInterfaceId;
+ jobSubmissionProtocol = other53.jobSubmissionProtocol;
+ priorityOrder = other53.priorityOrder;
}
-JobSubmissionInterface& JobSubmissionInterface::operator=(const JobSubmissionInterface& other45) {
- jobSubmissionInterfaceId = other45.jobSubmissionInterfaceId;
- jobSubmissionProtocol = other45.jobSubmissionProtocol;
- priorityOrder = other45.priorityOrder;
+JobSubmissionInterface& JobSubmissionInterface::operator=(const JobSubmissionInterface& other54) {
+ jobSubmissionInterfaceId = other54.jobSubmissionInterfaceId;
+ jobSubmissionProtocol = other54.jobSubmissionProtocol;
+ priorityOrder = other54.priorityOrder;
return *this;
}
void JobSubmissionInterface::printTo(std::ostream& out) const {
@@ -1691,14 +1739,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->hostAliases.clear();
- uint32_t _size46;
- ::apache::thrift::protocol::TType _etype49;
- xfer += iprot->readListBegin(_etype49, _size46);
- this->hostAliases.resize(_size46);
- uint32_t _i50;
- for (_i50 = 0; _i50 < _size46; ++_i50)
+ uint32_t _size55;
+ ::apache::thrift::protocol::TType _etype58;
+ xfer += iprot->readListBegin(_etype58, _size55);
+ this->hostAliases.resize(_size55);
+ uint32_t _i59;
+ for (_i59 = 0; _i59 < _size55; ++_i59)
{
- xfer += iprot->readString(this->hostAliases[_i50]);
+ xfer += iprot->readString(this->hostAliases[_i59]);
}
xfer += iprot->readListEnd();
}
@@ -1711,14 +1759,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->ipAddresses.clear();
- uint32_t _size51;
- ::apache::thrift::protocol::TType _etype54;
- xfer += iprot->readListBegin(_etype54, _size51);
- this->ipAddresses.resize(_size51);
- uint32_t _i55;
- for (_i55 = 0; _i55 < _size51; ++_i55)
+ uint32_t _size60;
+ ::apache::thrift::protocol::TType _etype63;
+ xfer += iprot->readListBegin(_etype63, _size60);
+ this->ipAddresses.resize(_size60);
+ uint32_t _i64;
+ for (_i64 = 0; _i64 < _size60; ++_i64)
{
- xfer += iprot->readString(this->ipAddresses[_i55]);
+ xfer += iprot->readString(this->ipAddresses[_i64]);
}
xfer += iprot->readListEnd();
}
@@ -1747,14 +1795,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->batchQueues.clear();
- uint32_t _size56;
- ::apache::thrift::protocol::TType _etype59;
- xfer += iprot->readListBegin(_etype59, _size56);
- this->batchQueues.resize(_size56);
- uint32_t _i60;
- for (_i60 = 0; _i60 < _size56; ++_i60)
+ uint32_t _size65;
+ ::apache::thrift::protocol::TType _etype68;
+ xfer += iprot->readListBegin(_etype68, _size65);
+ this->batchQueues.resize(_size65);
+ uint32_t _i69;
+ for (_i69 = 0; _i69 < _size65; ++_i69)
{
- xfer += this->batchQueues[_i60].read(iprot);
+ xfer += this->batchQueues[_i69].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1767,19 +1815,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->fileSystems.clear();
- uint32_t _size61;
- ::apache::thrift::protocol::TType _ktype62;
- ::apache::thrift::protocol::TType _vtype63;
- xfer += iprot->readMapBegin(_ktype62, _vtype63, _size61);
- uint32_t _i65;
- for (_i65 = 0; _i65 < _size61; ++_i65)
+ uint32_t _size70;
+ ::apache::thrift::protocol::TType _ktype71;
+ ::apache::thrift::protocol::TType _vtype72;
+ xfer += iprot->readMapBegin(_ktype71, _vtype72, _size70);
+ uint32_t _i74;
+ for (_i74 = 0; _i74 < _size70; ++_i74)
{
- FileSystems::type _key66;
- int32_t ecast68;
- xfer += iprot->readI32(ecast68);
- _key66 = (FileSystems::type)ecast68;
- std::string& _val67 = this->fileSystems[_key66];
- xfer += iprot->readString(_val67);
+ FileSystems::type _key75;
+ int32_t ecast77;
+ xfer += iprot->readI32(ecast77);
+ _key75 = (FileSystems::type)ecast77;
+ std::string& _val76 = this->fileSystems[_key75];
+ xfer += iprot->readString(_val76);
}
xfer += iprot->readMapEnd();
}
@@ -1792,14 +1840,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->jobSubmissionInterfaces.clear();
- uint32_t _size69;
- ::apache::thrift::protocol::TType _etype72;
- xfer += iprot->readListBegin(_etype72, _size69);
- this->jobSubmissionInterfaces.resize(_size69);
- uint32_t _i73;
- for (_i73 = 0; _i73 < _size69; ++_i73)
+ uint32_t _size78;
+ ::apache::thrift::protocol::TType _etype81;
+ xfer += iprot->readListBegin(_etype81, _size78);
+ this->jobSubmissionInterfaces.resize(_size78);
+ uint32_t _i82;
+ for (_i82 = 0; _i82 < _size78; ++_i82)
{
- xfer += this->jobSubmissionInterfaces[_i73].read(iprot);
+ xfer += this->jobSubmissionInterfaces[_i82].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1812,14 +1860,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->dataMovementInterfaces.clear();
- uint32_t _size74;
- ::apache::thrift::protocol::TType _etype77;
- xfer += iprot->readListBegin(_etype77, _size74);
- this->dataMovementInterfaces.resize(_size74);
- uint32_t _i78;
- for (_i78 = 0; _i78 < _size74; ++_i78)
+ uint32_t _size83;
+ ::apache::thrift::protocol::TType _etype86;
+ xfer += iprot->readListBegin(_etype86, _size83);
+ this->dataMovementInterfaces.resize(_size83);
+ uint32_t _i87;
+ for (_i87 = 0; _i87 < _size83; ++_i87)
{
- xfer += this->dataMovementInterfaces[_i78].read(iprot);
+ xfer += this->dataMovementInterfaces[_i87].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1893,10 +1941,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("hostAliases", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->hostAliases.size()));
- std::vector<std::string> ::const_iterator _iter79;
- for (_iter79 = this->hostAliases.begin(); _iter79 != this->hostAliases.end(); ++_iter79)
+ std::vector<std::string> ::const_iterator _iter88;
+ for (_iter88 = this->hostAliases.begin(); _iter88 != this->hostAliases.end(); ++_iter88)
{
- xfer += oprot->writeString((*_iter79));
+ xfer += oprot->writeString((*_iter88));
}
xfer += oprot->writeListEnd();
}
@@ -1906,10 +1954,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("ipAddresses", ::apache::thrift::protocol::T_LIST, 4);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->ipAddresses.size()));
- std::vector<std::string> ::const_iterator _iter80;
- for (_iter80 = this->ipAddresses.begin(); _iter80 != this->ipAddresses.end(); ++_iter80)
+ std::vector<std::string> ::const_iterator _iter89;
+ for (_iter89 = this->ipAddresses.begin(); _iter89 != this->ipAddresses.end(); ++_iter89)
{
- xfer += oprot->writeString((*_iter80));
+ xfer += oprot->writeString((*_iter89));
}
xfer += oprot->writeListEnd();
}
@@ -1929,10 +1977,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("batchQueues", ::apache::thrift::protocol::T_LIST, 7);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->batchQueues.size()));
- std::vector<BatchQueue> ::const_iterator _iter81;
- for (_iter81 = this->batchQueues.begin(); _iter81 != this->batchQueues.end(); ++_iter81)
+ std::vector<BatchQueue> ::const_iterator _iter90;
+ for (_iter90 = this->batchQueues.begin(); _iter90 != this->batchQueues.end(); ++_iter90)
{
- xfer += (*_iter81).write(oprot);
+ xfer += (*_iter90).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1942,11 +1990,11 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("fileSystems", ::apache::thrift::protocol::T_MAP, 8);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->fileSystems.size()));
- std::map<FileSystems::type, std::string> ::const_iterator _iter82;
- for (_iter82 = this->fileSystems.begin(); _iter82 != this->fileSystems.end(); ++_iter82)
+ std::map<FileSystems::type, std::string> ::const_iterator _iter91;
+ for (_iter91 = this->fileSystems.begin(); _iter91 != this->fileSystems.end(); ++_iter91)
{
- xfer += oprot->writeI32((int32_t)_iter82->first);
- xfer += oprot->writeString(_iter82->second);
+ xfer += oprot->writeI32((int32_t)_iter91->first);
+ xfer += oprot->writeString(_iter91->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1956,10 +2004,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("jobSubmissionInterfaces", ::apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->jobSubmissionInterfaces.size()));
- std::vector<JobSubmissionInterface> ::const_iterator _iter83;
- for (_iter83 = this->jobSubmissionInterfaces.begin(); _iter83 != this->jobSubmissionInterfaces.end(); ++_iter83)
+ std::vector<JobSubmissionInterface> ::const_iterator _iter92;
+ for (_iter92 = this->jobSubmissionInterfaces.begin(); _iter92 != this->jobSubmissionInterfaces.end(); ++_iter92)
{
- xfer += (*_iter83).write(oprot);
+ xfer += (*_iter92).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1969,10 +2017,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("dataMovementInterfaces", ::apache::thrift::protocol::T_LIST, 10);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataMovementInterfaces.size()));
- std::vector< ::apache::airavata::model::data::movement::DataMovementInterface> ::const_iterator _iter84;
- for (_iter84 = this->dataMovementInterfaces.begin(); _iter84 != this->dataMovementInterfaces.end(); ++_iter84)
+ std::vector< ::apache::airavata::model::data::movement::DataMovementInterface> ::const_iterator _iter93;
+ for (_iter93 = this->dataMovementInterfaces.begin(); _iter93 != this->dataMovementInterfaces.end(); ++_iter93)
{
- xfer += (*_iter84).write(oprot);
+ xfer += (*_iter93).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -2022,39 +2070,39 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) {
swap(a.__isset, b.__isset);
}
-ComputeResourceDescription::ComputeResourceDescription(const ComputeResourceDescription& other85) {
- computeResourceId = other85.computeResourceId;
- hostName = other85.hostName;
- hostAliases = other85.hostAliases;
- ipAddresses = other85.ipAddresses;
- resourceDescription = other85.resourceDescription;
- enabled = other85.enabled;
- batchQueues = other85.batchQueues;
- fileSystems = other85.fileSystems;
- jobSubmissionInterfaces = other85.jobSubmissionInterfaces;
- dataMovementInterfaces = other85.dataMovementInterfaces;
- maxMemoryPerNode = other85.maxMemoryPerNode;
- gatewayUsageReporting = other85.gatewayUsageReporting;
- gatewayUsageModuleLoadCommand = other85.gatewayUsageModuleLoadCommand;
- gatewayUsageExecutable = other85.gatewayUsageExecutable;
- __isset = other85.__isset;
-}
-ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeResourceDescription& other86) {
- computeResourceId = other86.computeResourceId;
- hostName = other86.hostName;
- hostAliases = other86.hostAliases;
- ipAddresses = other86.ipAddresses;
- resourceDescription = other86.resourceDescription;
- enabled = other86.enabled;
- batchQueues = other86.batchQueues;
- fileSystems = other86.fileSystems;
- jobSubmissionInterfaces = other86.jobSubmissionInterfaces;
- dataMovementInterfaces = other86.dataMovementInterfaces;
- maxMemoryPerNode = other86.maxMemoryPerNode;
- gatewayUsageReporting = other86.gatewayUsageReporting;
- gatewayUsageModuleLoadCommand = other86.gatewayUsageModuleLoadCommand;
- gatewayUsageExecutable = other86.gatewayUsageExecutable;
- __isset = other86.__isset;
+ComputeResourceDescription::ComputeResourceDescription(const ComputeResourceDescription& other94) {
+ computeResourceId = other94.computeResourceId;
+ hostName = other94.hostName;
+ hostAliases = other94.hostAliases;
+ ipAddresses = other94.ipAddresses;
+ resourceDescription = other94.resourceDescription;
+ enabled = other94.enabled;
+ batchQueues = other94.batchQueues;
+ fileSystems = other94.fileSystems;
+ jobSubmissionInterfaces = other94.jobSubmissionInterfaces;
+ dataMovementInterfaces = other94.dataMovementInterfaces;
+ maxMemoryPerNode = other94.maxMemoryPerNode;
+ gatewayUsageReporting = other94.gatewayUsageReporting;
+ gatewayUsageModuleLoadCommand = other94.gatewayUsageModuleLoadCommand;
+ gatewayUsageExecutable = other94.gatewayUsageExecutable;
+ __isset = other94.__isset;
+}
+ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeResourceDescription& other95) {
+ computeResourceId = other95.computeResourceId;
+ hostName = other95.hostName;
+ hostAliases = other95.hostAliases;
+ ipAddresses = other95.ipAddresses;
+ resourceDescription = other95.resourceDescription;
+ enabled = other95.enabled;
+ batchQueues = other95.batchQueues;
+ fileSystems = other95.fileSystems;
+ jobSubmissionInterfaces = other95.jobSubmissionInterfaces;
+ dataMovementInterfaces = other95.dataMovementInterfaces;
+ maxMemoryPerNode = other95.maxMemoryPerNode;
+ gatewayUsageReporting = other95.gatewayUsageReporting;
+ gatewayUsageModuleLoadCommand = other95.gatewayUsageModuleLoadCommand;
+ gatewayUsageExecutable = other95.gatewayUsageExecutable;
+ __isset = other95.__isset;
return *this;
}
void ComputeResourceDescription::printTo(std::ostream& out) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/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 2d64916..3a1b23a 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
@@ -33,6 +33,7 @@
#include <thrift/cxxfunctional.h>
#include "airavata_commons_types.h"
+#include "parallelism_model_types.h"
#include "data_movement_models_types.h"
@@ -139,10 +140,11 @@ class JobSubmissionInterface;
class ComputeResourceDescription;
typedef struct _ResourceJobManager__isset {
- _ResourceJobManager__isset() : pushMonitoringEndpoint(false), jobManagerBinPath(false), jobManagerCommands(false) {}
+ _ResourceJobManager__isset() : pushMonitoringEndpoint(false), jobManagerBinPath(false), jobManagerCommands(false), parallalisimPrefix(false) {}
bool pushMonitoringEndpoint :1;
bool jobManagerBinPath :1;
bool jobManagerCommands :1;
+ bool parallalisimPrefix :1;
} _ResourceJobManager__isset;
class ResourceJobManager {
@@ -159,6 +161,7 @@ class ResourceJobManager {
std::string pushMonitoringEndpoint;
std::string jobManagerBinPath;
std::map<JobManagerCommand::type, std::string> jobManagerCommands;
+ std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> parallalisimPrefix;
_ResourceJobManager__isset __isset;
@@ -172,6 +175,8 @@ class ResourceJobManager {
void __set_jobManagerCommands(const std::map<JobManagerCommand::type, std::string> & val);
+ void __set_parallalisimPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val);
+
bool operator == (const ResourceJobManager & rhs) const
{
if (!(resourceJobManagerId == rhs.resourceJobManagerId))
@@ -190,6 +195,10 @@ class ResourceJobManager {
return false;
else if (__isset.jobManagerCommands && !(jobManagerCommands == rhs.jobManagerCommands))
return false;
+ if (__isset.parallalisimPrefix != rhs.__isset.parallalisimPrefix)
+ return false;
+ else if (__isset.parallalisimPrefix && !(parallalisimPrefix == rhs.parallalisimPrefix))
+ return false;
return true;
}
bool operator != (const ResourceJobManager &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_constants.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_constants.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_constants.cpp
new file mode 100644
index 0000000..d87ebe0
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_constants.cpp
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+#include "parallelism_model_constants.h"
+
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace parallelism {
+
+const parallelism_modelConstants g_parallelism_model_constants;
+
+parallelism_modelConstants::parallelism_modelConstants() {
+}
+
+}}}}} // namespace
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_constants.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_constants.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_constants.h
new file mode 100644
index 0000000..7069c90
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_constants.h
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+#ifndef parallelism_model_CONSTANTS_H
+#define parallelism_model_CONSTANTS_H
+
+#include "parallelism_model_types.h"
+
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace parallelism {
+
+class parallelism_modelConstants {
+ public:
+ parallelism_modelConstants();
+
+};
+
+extern const parallelism_modelConstants g_parallelism_model_constants;
+
+}}}}} // namespace
+
+#endif
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_types.cpp
new file mode 100644
index 0000000..554914e
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_types.cpp
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+#include "parallelism_model_types.h"
+
+#include <algorithm>
+#include <ostream>
+
+#include <thrift/TToString.h>
+
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace parallelism {
+
+int _kApplicationParallelismTypeValues[] = {
+ ApplicationParallelismType::SERIAL,
+ ApplicationParallelismType::MPI,
+ ApplicationParallelismType::OPENMP,
+ ApplicationParallelismType::OPENMP_MPI,
+ ApplicationParallelismType::CCM,
+ ApplicationParallelismType::CRAY_MPI
+};
+const char* _kApplicationParallelismTypeNames[] = {
+ "SERIAL",
+ "MPI",
+ "OPENMP",
+ "OPENMP_MPI",
+ "CCM",
+ "CRAY_MPI"
+};
+const std::map<int, const char*> _ApplicationParallelismType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kApplicationParallelismTypeValues, _kApplicationParallelismTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+}}}}} // namespace
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_types.h
new file mode 100644
index 0000000..c123c08
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/parallelism_model_types.h
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+#ifndef parallelism_model_TYPES_H
+#define parallelism_model_TYPES_H
+
+#include <iosfwd>
+
+#include <thrift/Thrift.h>
+#include <thrift/TApplicationException.h>
+#include <thrift/protocol/TProtocol.h>
+#include <thrift/transport/TTransport.h>
+
+#include <thrift/cxxfunctional.h>
+
+
+namespace apache { namespace airavata { namespace model { namespace appcatalog { namespace parallelism {
+
+struct ApplicationParallelismType {
+ enum type {
+ SERIAL = 0,
+ MPI = 1,
+ OPENMP = 2,
+ OPENMP_MPI = 3,
+ CCM = 4,
+ CRAY_MPI = 5
+ };
+};
+
+extern const std::map<int, const char*> _ApplicationParallelismType_VALUES_TO_NAMES;
+
+}}}}} // namespace
+
+#endif
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
index ab599e6..29965e7 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppDeployment/Types.php
@@ -18,39 +18,6 @@ use Thrift\Exception\TApplicationException;
/**
- * Enumeration of application parallelism supported by Airavata
- *
- * SERIAL:
- * Single processor applications without any parallelization.
- *
- * MPI:
- * Messaging Passing Interface.
- *
- * OPENMP:
- * Shared Memory Implementtaion.
- *
- * OPENMP_MPI:
- * Hybrid Applications.
- *
- */
-final class ApplicationParallelismType {
- const SERIAL = 0;
- const MPI = 1;
- const OPENMP = 2;
- const OPENMP_MPI = 3;
- const CCM = 4;
- const CRAY_MPI = 5;
- static public $__names = array(
- 0 => 'SERIAL',
- 1 => 'MPI',
- 2 => 'OPENMP',
- 3 => 'OPENMP_MPI',
- 4 => 'CCM',
- 5 => 'CRAY_MPI',
- );
-}
-
-/**
* Key Value pairs to be used to set environments
*
* name:
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/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 5b79870..f99923d 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
@@ -246,6 +246,10 @@ class ResourceJobManager {
* @var array
*/
public $jobManagerCommands = null;
+ /**
+ * @var array
+ */
+ public $parallalisimPrefix = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -278,6 +282,18 @@ class ResourceJobManager {
'type' => TType::STRING,
),
),
+ 6 => array(
+ 'var' => 'parallalisimPrefix',
+ 'type' => TType::MAP,
+ 'ktype' => TType::I32,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::I32,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -296,6 +312,9 @@ class ResourceJobManager {
if (isset($vals['jobManagerCommands'])) {
$this->jobManagerCommands = $vals['jobManagerCommands'];
}
+ if (isset($vals['parallalisimPrefix'])) {
+ $this->parallalisimPrefix = $vals['parallalisimPrefix'];
+ }
}
}
@@ -366,6 +385,26 @@ class ResourceJobManager {
$xfer += $input->skip($ftype);
}
break;
+ case 6:
+ if ($ftype == TType::MAP) {
+ $this->parallalisimPrefix = array();
+ $_size7 = 0;
+ $_ktype8 = 0;
+ $_vtype9 = 0;
+ $xfer += $input->readMapBegin($_ktype8, $_vtype9, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ {
+ $key12 = 0;
+ $val13 = '';
+ $xfer += $input->readI32($key12);
+ $xfer += $input->readString($val13);
+ $this->parallalisimPrefix[$key12] = $val13;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -407,10 +446,28 @@ class ResourceJobManager {
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->jobManagerCommands));
{
- foreach ($this->jobManagerCommands as $kiter7 => $viter8)
+ foreach ($this->jobManagerCommands as $kiter14 => $viter15)
+ {
+ $xfer += $output->writeI32($kiter14);
+ $xfer += $output->writeString($viter15);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->parallalisimPrefix !== null) {
+ if (!is_array($this->parallalisimPrefix)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('parallalisimPrefix', TType::MAP, 6);
+ {
+ $output->writeMapBegin(TType::I32, TType::STRING, count($this->parallalisimPrefix));
+ {
+ foreach ($this->parallalisimPrefix as $kiter16 => $viter17)
{
- $xfer += $output->writeI32($kiter7);
- $xfer += $output->writeString($viter8);
+ $xfer += $output->writeI32($kiter16);
+ $xfer += $output->writeString($viter17);
}
}
$output->writeMapEnd();
@@ -954,14 +1011,14 @@ class SSHJobSubmission {
case 7:
if ($ftype == TType::LST) {
$this->batchQueueEmailSenders = array();
- $_size9 = 0;
- $_etype12 = 0;
- $xfer += $input->readListBegin($_etype12, $_size9);
- for ($_i13 = 0; $_i13 < $_size9; ++$_i13)
+ $_size18 = 0;
+ $_etype21 = 0;
+ $xfer += $input->readListBegin($_etype21, $_size18);
+ for ($_i22 = 0; $_i22 < $_size18; ++$_i22)
{
- $elem14 = null;
- $xfer += $input->readString($elem14);
- $this->batchQueueEmailSenders []= $elem14;
+ $elem23 = null;
+ $xfer += $input->readString($elem23);
+ $this->batchQueueEmailSenders []= $elem23;
}
$xfer += $input->readListEnd();
} else {
@@ -1022,9 +1079,9 @@ class SSHJobSubmission {
{
$output->writeListBegin(TType::STRING, count($this->batchQueueEmailSenders));
{
- foreach ($this->batchQueueEmailSenders as $iter15)
+ foreach ($this->batchQueueEmailSenders as $iter24)
{
- $xfer += $output->writeString($iter15);
+ $xfer += $output->writeString($iter24);
}
}
$output->writeListEnd();
@@ -1124,14 +1181,14 @@ class GlobusJobSubmission {
case 3:
if ($ftype == TType::LST) {
$this->globusGateKeeperEndPoint = array();
- $_size16 = 0;
- $_etype19 = 0;
- $xfer += $input->readListBegin($_etype19, $_size16);
- for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+ $_size25 = 0;
+ $_etype28 = 0;
+ $xfer += $input->readListBegin($_etype28, $_size25);
+ for ($_i29 = 0; $_i29 < $_size25; ++$_i29)
{
- $elem21 = null;
- $xfer += $input->readString($elem21);
- $this->globusGateKeeperEndPoint []= $elem21;
+ $elem30 = null;
+ $xfer += $input->readString($elem30);
+ $this->globusGateKeeperEndPoint []= $elem30;
}
$xfer += $input->readListEnd();
} else {
@@ -1169,9 +1226,9 @@ class GlobusJobSubmission {
{
$output->writeListBegin(TType::STRING, count($this->globusGateKeeperEndPoint));
{
- foreach ($this->globusGateKeeperEndPoint as $iter22)
+ foreach ($this->globusGateKeeperEndPoint as $iter31)
{
- $xfer += $output->writeString($iter22);
+ $xfer += $output->writeString($iter31);
}
}
$output->writeListEnd();
@@ -1903,14 +1960,14 @@ class ComputeResourceDescription {
case 3:
if ($ftype == TType::LST) {
$this->hostAliases = array();
- $_size23 = 0;
- $_etype26 = 0;
- $xfer += $input->readListBegin($_etype26, $_size23);
- for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+ $_size32 = 0;
+ $_etype35 = 0;
+ $xfer += $input->readListBegin($_etype35, $_size32);
+ for ($_i36 = 0; $_i36 < $_size32; ++$_i36)
{
- $elem28 = null;
- $xfer += $input->readString($elem28);
- $this->hostAliases []= $elem28;
+ $elem37 = null;
+ $xfer += $input->readString($elem37);
+ $this->hostAliases []= $elem37;
}
$xfer += $input->readListEnd();
} else {
@@ -1920,14 +1977,14 @@ class ComputeResourceDescription {
case 4:
if ($ftype == TType::LST) {
$this->ipAddresses = array();
- $_size29 = 0;
- $_etype32 = 0;
- $xfer += $input->readListBegin($_etype32, $_size29);
- for ($_i33 = 0; $_i33 < $_size29; ++$_i33)
+ $_size38 = 0;
+ $_etype41 = 0;
+ $xfer += $input->readListBegin($_etype41, $_size38);
+ for ($_i42 = 0; $_i42 < $_size38; ++$_i42)
{
- $elem34 = null;
- $xfer += $input->readString($elem34);
- $this->ipAddresses []= $elem34;
+ $elem43 = null;
+ $xfer += $input->readString($elem43);
+ $this->ipAddresses []= $elem43;
}
$xfer += $input->readListEnd();
} else {
@@ -1951,15 +2008,15 @@ class ComputeResourceDescription {
case 7:
if ($ftype == TType::LST) {
$this->batchQueues = array();
- $_size35 = 0;
- $_etype38 = 0;
- $xfer += $input->readListBegin($_etype38, $_size35);
- for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
+ $_size44 = 0;
+ $_etype47 = 0;
+ $xfer += $input->readListBegin($_etype47, $_size44);
+ for ($_i48 = 0; $_i48 < $_size44; ++$_i48)
{
- $elem40 = null;
- $elem40 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
- $xfer += $elem40->read($input);
- $this->batchQueues []= $elem40;
+ $elem49 = null;
+ $elem49 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
+ $xfer += $elem49->read($input);
+ $this->batchQueues []= $elem49;
}
$xfer += $input->readListEnd();
} else {
@@ -1969,17 +2026,17 @@ class ComputeResourceDescription {
case 8:
if ($ftype == TType::MAP) {
$this->fileSystems = array();
- $_size41 = 0;
- $_ktype42 = 0;
- $_vtype43 = 0;
- $xfer += $input->readMapBegin($_ktype42, $_vtype43, $_size41);
- for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
+ $_size50 = 0;
+ $_ktype51 = 0;
+ $_vtype52 = 0;
+ $xfer += $input->readMapBegin($_ktype51, $_vtype52, $_size50);
+ for ($_i54 = 0; $_i54 < $_size50; ++$_i54)
{
- $key46 = 0;
- $val47 = '';
- $xfer += $input->readI32($key46);
- $xfer += $input->readString($val47);
- $this->fileSystems[$key46] = $val47;
+ $key55 = 0;
+ $val56 = '';
+ $xfer += $input->readI32($key55);
+ $xfer += $input->readString($val56);
+ $this->fileSystems[$key55] = $val56;
}
$xfer += $input->readMapEnd();
} else {
@@ -1989,15 +2046,15 @@ class ComputeResourceDescription {
case 9:
if ($ftype == TType::LST) {
$this->jobSubmissionInterfaces = array();
- $_size48 = 0;
- $_etype51 = 0;
- $xfer += $input->readListBegin($_etype51, $_size48);
- for ($_i52 = 0; $_i52 < $_size48; ++$_i52)
+ $_size57 = 0;
+ $_etype60 = 0;
+ $xfer += $input->readListBegin($_etype60, $_size57);
+ for ($_i61 = 0; $_i61 < $_size57; ++$_i61)
{
- $elem53 = null;
- $elem53 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
- $xfer += $elem53->read($input);
- $this->jobSubmissionInterfaces []= $elem53;
+ $elem62 = null;
+ $elem62 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
+ $xfer += $elem62->read($input);
+ $this->jobSubmissionInterfaces []= $elem62;
}
$xfer += $input->readListEnd();
} else {
@@ -2007,15 +2064,15 @@ class ComputeResourceDescription {
case 10:
if ($ftype == TType::LST) {
$this->dataMovementInterfaces = array();
- $_size54 = 0;
- $_etype57 = 0;
- $xfer += $input->readListBegin($_etype57, $_size54);
- for ($_i58 = 0; $_i58 < $_size54; ++$_i58)
+ $_size63 = 0;
+ $_etype66 = 0;
+ $xfer += $input->readListBegin($_etype66, $_size63);
+ for ($_i67 = 0; $_i67 < $_size63; ++$_i67)
{
- $elem59 = null;
- $elem59 = new \Airavata\Model\Data\Movement\DataMovementInterface();
- $xfer += $elem59->read($input);
- $this->dataMovementInterfaces []= $elem59;
+ $elem68 = null;
+ $elem68 = new \Airavata\Model\Data\Movement\DataMovementInterface();
+ $xfer += $elem68->read($input);
+ $this->dataMovementInterfaces []= $elem68;
}
$xfer += $input->readListEnd();
} else {
@@ -2081,9 +2138,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRING, count($this->hostAliases));
{
- foreach ($this->hostAliases as $iter60)
+ foreach ($this->hostAliases as $iter69)
{
- $xfer += $output->writeString($iter60);
+ $xfer += $output->writeString($iter69);
}
}
$output->writeListEnd();
@@ -2098,9 +2155,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRING, count($this->ipAddresses));
{
- foreach ($this->ipAddresses as $iter61)
+ foreach ($this->ipAddresses as $iter70)
{
- $xfer += $output->writeString($iter61);
+ $xfer += $output->writeString($iter70);
}
}
$output->writeListEnd();
@@ -2125,9 +2182,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->batchQueues));
{
- foreach ($this->batchQueues as $iter62)
+ foreach ($this->batchQueues as $iter71)
{
- $xfer += $iter62->write($output);
+ $xfer += $iter71->write($output);
}
}
$output->writeListEnd();
@@ -2142,10 +2199,10 @@ class ComputeResourceDescription {
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->fileSystems));
{
- foreach ($this->fileSystems as $kiter63 => $viter64)
+ foreach ($this->fileSystems as $kiter72 => $viter73)
{
- $xfer += $output->writeI32($kiter63);
- $xfer += $output->writeString($viter64);
+ $xfer += $output->writeI32($kiter72);
+ $xfer += $output->writeString($viter73);
}
}
$output->writeMapEnd();
@@ -2160,9 +2217,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->jobSubmissionInterfaces));
{
- foreach ($this->jobSubmissionInterfaces as $iter65)
+ foreach ($this->jobSubmissionInterfaces as $iter74)
{
- $xfer += $iter65->write($output);
+ $xfer += $iter74->write($output);
}
}
$output->writeListEnd();
@@ -2177,9 +2234,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->dataMovementInterfaces));
{
- foreach ($this->dataMovementInterfaces as $iter66)
+ foreach ($this->dataMovementInterfaces as $iter75)
{
- $xfer += $iter66->write($output);
+ $xfer += $iter75->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/Parallelism/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/Parallelism/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/Parallelism/Types.php
new file mode 100644
index 0000000..e633a53
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/Parallelism/Types.php
@@ -0,0 +1,53 @@
+<?php
+namespace Airavata\Model\AppCatalog\Parallelism;
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+use Thrift\Base\TBase;
+use Thrift\Type\TType;
+use Thrift\Type\TMessageType;
+use Thrift\Exception\TException;
+use Thrift\Exception\TProtocolException;
+use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
+use Thrift\Exception\TApplicationException;
+
+
+/**
+ * Enumeration of application parallelism supported by Airavata
+ *
+ * SERIAL:
+ * Single processor applications without any parallelization.
+ *
+ * MPI:
+ * Messaging Passing Interface.
+ *
+ * OPENMP:
+ * Shared Memory Implementtaion.
+ *
+ * OPENMP_MPI:
+ * Hybrid Applications.
+ *
+ */
+final class ApplicationParallelismType {
+ const SERIAL = 0;
+ const MPI = 1;
+ const OPENMP = 2;
+ const OPENMP_MPI = 3;
+ const CCM = 4;
+ const CRAY_MPI = 5;
+ static public $__names = array(
+ 0 => 'SERIAL',
+ 1 => 'MPI',
+ 2 => 'OPENMP',
+ 3 => 'OPENMP_MPI',
+ 4 => 'CCM',
+ 5 => 'CRAY_MPI',
+ );
+}
+
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
index aca79ea..14fdbfa 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/appdeployment/ttypes.py
@@ -8,6 +8,7 @@
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
import apache.airavata.model.commons.ttypes
+import apache.airavata.model.appcatalog.parallelism.ttypes
from thrift.transport import TTransport
@@ -18,48 +19,6 @@ except:
fastbinary = None
-class ApplicationParallelismType:
- """
- Enumeration of application parallelism supported by Airavata
-
- SERIAL:
- Single processor applications without any parallelization.
-
- MPI:
- Messaging Passing Interface.
-
- OPENMP:
- Shared Memory Implementtaion.
-
- OPENMP_MPI:
- Hybrid Applications.
-
- """
- SERIAL = 0
- MPI = 1
- OPENMP = 2
- OPENMP_MPI = 3
- CCM = 4
- CRAY_MPI = 5
-
- _VALUES_TO_NAMES = {
- 0: "SERIAL",
- 1: "MPI",
- 2: "OPENMP",
- 3: "OPENMP_MPI",
- 4: "CCM",
- 5: "CRAY_MPI",
- }
-
- _NAMES_TO_VALUES = {
- "SERIAL": 0,
- "MPI": 1,
- "OPENMP": 2,
- "OPENMP_MPI": 3,
- "CCM": 4,
- "CRAY_MPI": 5,
- }
-
class SetEnvPaths:
"""
[02/14] airavata git commit: adding correct username for gateway usage
Posted by sm...@apache.org.
adding correct username for gateway usage
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d9a10755
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d9a10755
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d9a10755
Branch: refs/heads/master
Commit: d9a1075599030001cd3b9df6b06840dc2b6c9eae
Parents: 91ef607
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Feb 25 16:54:37 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Feb 25 16:54:37 2016 -0500
----------------------------------------------------------------------
.../apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d9a10755/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
index fd2af7f..975602f 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
@@ -160,7 +160,8 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
String loadCommand = computeResourceDescription.getGatewayUsageModuleLoadCommand();
String usageExecutable = computeResourceDescription.getGatewayUsageExecutable();
ExperimentModel experiment = (ExperimentModel)taskContext.getParentProcessContext().getExperimentCatalog().get(ExperimentCatalogModelType.EXPERIMENT, experimentId);
- RawCommandInfo rawCommandInfo = new RawCommandInfo(loadCommand + " && " + usageExecutable + " -gateway_user " + experiment.getUserName() +
+ String username = experiment.getUserName() + "@" + taskContext.getParentProcessContext().getComputeResourcePreference().getUsageReportingGatewayId();
+ RawCommandInfo rawCommandInfo = new RawCommandInfo(loadCommand + " && " + usageExecutable + " -gateway_user " + username +
" -submit_time \"`date '+%F %T %:z'`\" -jobid " + jobId );
remoteCluster.execute(rawCommandInfo);
}
[09/14] airavata git commit: adding gateway instance id to allow
gateways to specify group id's
Posted by sm...@apache.org.
adding gateway instance id to allow gateways to specify group id's
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b537f358
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b537f358
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b537f358
Branch: refs/heads/master
Commit: b537f358de8c303af81ade7b0f42d7e58d3e61b3
Parents: 4772b99
Author: smarru <sm...@apache.org>
Authored: Fri Feb 26 15:14:25 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Feb 26 15:14:25 2016 -0500
----------------------------------------------------------------------
.../lib/airavata/experiment_model_types.cpp | 52 +++--
.../lib/airavata/experiment_model_types.h | 12 +-
.../lib/Airavata/Model/Experiment/Types.php | 67 ++++--
.../apache/airavata/model/experiment/ttypes.py | 61 +++---
.../model/experiment/ExperimentModel.java | 206 ++++++++++++++-----
.../src/main/resources/expcatalog-derby.sql | 1 +
.../src/main/resources/expcatalog-mysql.sql | 1 +
.../experiment_model.thrift | 17 +-
8 files changed, 296 insertions(+), 121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b537f358/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
index f27b08b..d63d93a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.cpp
@@ -375,6 +375,11 @@ void ExperimentModel::__set_gatewayExecutionId(const std::string& val) {
__isset.gatewayExecutionId = true;
}
+void ExperimentModel::__set_gatewayInstanceId(const std::string& val) {
+ this->gatewayInstanceId = val;
+__isset.gatewayInstanceId = true;
+}
+
void ExperimentModel::__set_enableEmailNotification(const bool val) {
this->enableEmailNotification = val;
__isset.enableEmailNotification = true;
@@ -525,6 +530,14 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
}
break;
case 11:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayInstanceId);
+ this->__isset.gatewayInstanceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 12:
if (ftype == ::apache::thrift::protocol::T_BOOL) {
xfer += iprot->readBool(this->enableEmailNotification);
this->__isset.enableEmailNotification = true;
@@ -532,7 +545,7 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 12:
+ case 13:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->emailAddresses.clear();
@@ -552,7 +565,7 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 13:
+ case 14:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->userConfigurationData.read(iprot);
this->__isset.userConfigurationData = true;
@@ -560,7 +573,7 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 14:
+ case 15:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->experimentInputs.clear();
@@ -580,7 +593,7 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 15:
+ case 16:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->experimentOutputs.clear();
@@ -600,7 +613,7 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 16:
+ case 17:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->experimentStatus.read(iprot);
this->__isset.experimentStatus = true;
@@ -608,7 +621,7 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 17:
+ case 18:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->errors.clear();
@@ -628,7 +641,7 @@ uint32_t ExperimentModel::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->skip(ftype);
}
break;
- case 18:
+ case 19:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->processes.clear();
@@ -721,13 +734,18 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeString(this->gatewayExecutionId);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.gatewayInstanceId) {
+ xfer += oprot->writeFieldBegin("gatewayInstanceId", ::apache::thrift::protocol::T_STRING, 11);
+ xfer += oprot->writeString(this->gatewayInstanceId);
+ xfer += oprot->writeFieldEnd();
+ }
if (this->__isset.enableEmailNotification) {
- xfer += oprot->writeFieldBegin("enableEmailNotification", ::apache::thrift::protocol::T_BOOL, 11);
+ xfer += oprot->writeFieldBegin("enableEmailNotification", ::apache::thrift::protocol::T_BOOL, 12);
xfer += oprot->writeBool(this->enableEmailNotification);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.emailAddresses) {
- xfer += oprot->writeFieldBegin("emailAddresses", ::apache::thrift::protocol::T_LIST, 12);
+ xfer += oprot->writeFieldBegin("emailAddresses", ::apache::thrift::protocol::T_LIST, 13);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->emailAddresses.size()));
std::vector<std::string> ::const_iterator _iter28;
@@ -740,12 +758,12 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeFieldEnd();
}
if (this->__isset.userConfigurationData) {
- xfer += oprot->writeFieldBegin("userConfigurationData", ::apache::thrift::protocol::T_STRUCT, 13);
+ xfer += oprot->writeFieldBegin("userConfigurationData", ::apache::thrift::protocol::T_STRUCT, 14);
xfer += this->userConfigurationData.write(oprot);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.experimentInputs) {
- xfer += oprot->writeFieldBegin("experimentInputs", ::apache::thrift::protocol::T_LIST, 14);
+ xfer += oprot->writeFieldBegin("experimentInputs", ::apache::thrift::protocol::T_LIST, 15);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->experimentInputs.size()));
std::vector< ::apache::airavata::model::application::io::InputDataObjectType> ::const_iterator _iter29;
@@ -758,7 +776,7 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeFieldEnd();
}
if (this->__isset.experimentOutputs) {
- xfer += oprot->writeFieldBegin("experimentOutputs", ::apache::thrift::protocol::T_LIST, 15);
+ xfer += oprot->writeFieldBegin("experimentOutputs", ::apache::thrift::protocol::T_LIST, 16);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->experimentOutputs.size()));
std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> ::const_iterator _iter30;
@@ -771,12 +789,12 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeFieldEnd();
}
if (this->__isset.experimentStatus) {
- xfer += oprot->writeFieldBegin("experimentStatus", ::apache::thrift::protocol::T_STRUCT, 16);
+ xfer += oprot->writeFieldBegin("experimentStatus", ::apache::thrift::protocol::T_STRUCT, 17);
xfer += this->experimentStatus.write(oprot);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.errors) {
- xfer += oprot->writeFieldBegin("errors", ::apache::thrift::protocol::T_LIST, 17);
+ xfer += oprot->writeFieldBegin("errors", ::apache::thrift::protocol::T_LIST, 18);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->errors.size()));
std::vector< ::apache::airavata::model::commons::ErrorModel> ::const_iterator _iter31;
@@ -789,7 +807,7 @@ uint32_t ExperimentModel::write(::apache::thrift::protocol::TProtocol* oprot) co
xfer += oprot->writeFieldEnd();
}
if (this->__isset.processes) {
- xfer += oprot->writeFieldBegin("processes", ::apache::thrift::protocol::T_LIST, 18);
+ xfer += oprot->writeFieldBegin("processes", ::apache::thrift::protocol::T_LIST, 19);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->processes.size()));
std::vector< ::apache::airavata::model::process::ProcessModel> ::const_iterator _iter32;
@@ -818,6 +836,7 @@ void swap(ExperimentModel &a, ExperimentModel &b) {
swap(a.description, b.description);
swap(a.executionId, b.executionId);
swap(a.gatewayExecutionId, b.gatewayExecutionId);
+ swap(a.gatewayInstanceId, b.gatewayInstanceId);
swap(a.enableEmailNotification, b.enableEmailNotification);
swap(a.emailAddresses, b.emailAddresses);
swap(a.userConfigurationData, b.userConfigurationData);
@@ -840,6 +859,7 @@ ExperimentModel::ExperimentModel(const ExperimentModel& other33) {
description = other33.description;
executionId = other33.executionId;
gatewayExecutionId = other33.gatewayExecutionId;
+ gatewayInstanceId = other33.gatewayInstanceId;
enableEmailNotification = other33.enableEmailNotification;
emailAddresses = other33.emailAddresses;
userConfigurationData = other33.userConfigurationData;
@@ -861,6 +881,7 @@ ExperimentModel& ExperimentModel::operator=(const ExperimentModel& other34) {
description = other34.description;
executionId = other34.executionId;
gatewayExecutionId = other34.gatewayExecutionId;
+ gatewayInstanceId = other34.gatewayInstanceId;
enableEmailNotification = other34.enableEmailNotification;
emailAddresses = other34.emailAddresses;
userConfigurationData = other34.userConfigurationData;
@@ -885,6 +906,7 @@ void ExperimentModel::printTo(std::ostream& out) const {
out << ", " << "description="; (__isset.description ? (out << to_string(description)) : (out << "<null>"));
out << ", " << "executionId="; (__isset.executionId ? (out << to_string(executionId)) : (out << "<null>"));
out << ", " << "gatewayExecutionId="; (__isset.gatewayExecutionId ? (out << to_string(gatewayExecutionId)) : (out << "<null>"));
+ out << ", " << "gatewayInstanceId="; (__isset.gatewayInstanceId ? (out << to_string(gatewayInstanceId)) : (out << "<null>"));
out << ", " << "enableEmailNotification="; (__isset.enableEmailNotification ? (out << to_string(enableEmailNotification)) : (out << "<null>"));
out << ", " << "emailAddresses="; (__isset.emailAddresses ? (out << to_string(emailAddresses)) : (out << "<null>"));
out << ", " << "userConfigurationData="; (__isset.userConfigurationData ? (out << to_string(userConfigurationData)) : (out << "<null>"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/b537f358/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
index aaaf20b..a283fc6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/experiment_model_types.h
@@ -179,11 +179,12 @@ inline std::ostream& operator<<(std::ostream& out, const UserConfigurationDataMo
}
typedef struct _ExperimentModel__isset {
- _ExperimentModel__isset() : creationTime(false), description(false), executionId(false), gatewayExecutionId(false), enableEmailNotification(false), emailAddresses(false), userConfigurationData(false), experimentInputs(false), experimentOutputs(false), experimentStatus(false), errors(false), processes(false) {}
+ _ExperimentModel__isset() : creationTime(false), description(false), executionId(false), gatewayExecutionId(false), gatewayInstanceId(false), enableEmailNotification(false), emailAddresses(false), userConfigurationData(false), experimentInputs(false), experimentOutputs(false), experimentStatus(false), errors(false), processes(false) {}
bool creationTime :1;
bool description :1;
bool executionId :1;
bool gatewayExecutionId :1;
+ bool gatewayInstanceId :1;
bool enableEmailNotification :1;
bool emailAddresses :1;
bool userConfigurationData :1;
@@ -199,7 +200,7 @@ class ExperimentModel {
ExperimentModel(const ExperimentModel&);
ExperimentModel& operator=(const ExperimentModel&);
- ExperimentModel() : experimentId("DO_NOT_SET_AT_CLIENTS"), projectId(), gatewayId(), experimentType((ExperimentType::type)0), userName(), experimentName(), creationTime(0), description(), executionId(), gatewayExecutionId(), enableEmailNotification(0) {
+ ExperimentModel() : experimentId("DO_NOT_SET_AT_CLIENTS"), projectId(), gatewayId(), experimentType((ExperimentType::type)0), userName(), experimentName(), creationTime(0), description(), executionId(), gatewayExecutionId(), gatewayInstanceId(), enableEmailNotification(0) {
experimentType = (ExperimentType::type)0;
}
@@ -215,6 +216,7 @@ class ExperimentModel {
std::string description;
std::string executionId;
std::string gatewayExecutionId;
+ std::string gatewayInstanceId;
bool enableEmailNotification;
std::vector<std::string> emailAddresses;
UserConfigurationDataModel userConfigurationData;
@@ -246,6 +248,8 @@ class ExperimentModel {
void __set_gatewayExecutionId(const std::string& val);
+ void __set_gatewayInstanceId(const std::string& val);
+
void __set_enableEmailNotification(const bool val);
void __set_emailAddresses(const std::vector<std::string> & val);
@@ -292,6 +296,10 @@ class ExperimentModel {
return false;
else if (__isset.gatewayExecutionId && !(gatewayExecutionId == rhs.gatewayExecutionId))
return false;
+ if (__isset.gatewayInstanceId != rhs.__isset.gatewayInstanceId)
+ return false;
+ else if (__isset.gatewayInstanceId && !(gatewayInstanceId == rhs.gatewayInstanceId))
+ return false;
if (__isset.enableEmailNotification != rhs.__isset.enableEmailNotification)
return false;
else if (__isset.enableEmailNotification && !(enableEmailNotification == rhs.enableEmailNotification))
http://git-wip-us.apache.org/repos/asf/airavata/blob/b537f358/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
index 7180c44..20587b6 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Experiment/Types.php
@@ -374,6 +374,10 @@ class ExperimentModel {
*/
public $gatewayExecutionId = null;
/**
+ * @var string
+ */
+ public $gatewayInstanceId = null;
+ /**
* @var bool
*/
public $enableEmailNotification = null;
@@ -450,10 +454,14 @@ class ExperimentModel {
'type' => TType::STRING,
),
11 => array(
+ 'var' => 'gatewayInstanceId',
+ 'type' => TType::STRING,
+ ),
+ 12 => array(
'var' => 'enableEmailNotification',
'type' => TType::BOOL,
),
- 12 => array(
+ 13 => array(
'var' => 'emailAddresses',
'type' => TType::LST,
'etype' => TType::STRING,
@@ -461,12 +469,12 @@ class ExperimentModel {
'type' => TType::STRING,
),
),
- 13 => array(
+ 14 => array(
'var' => 'userConfigurationData',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Experiment\UserConfigurationDataModel',
),
- 14 => array(
+ 15 => array(
'var' => 'experimentInputs',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -475,7 +483,7 @@ class ExperimentModel {
'class' => '\Airavata\Model\Application\Io\InputDataObjectType',
),
),
- 15 => array(
+ 16 => array(
'var' => 'experimentOutputs',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -484,12 +492,12 @@ class ExperimentModel {
'class' => '\Airavata\Model\Application\Io\OutputDataObjectType',
),
),
- 16 => array(
+ 17 => array(
'var' => 'experimentStatus',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\Status\ExperimentStatus',
),
- 17 => array(
+ 18 => array(
'var' => 'errors',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -498,7 +506,7 @@ class ExperimentModel {
'class' => '\Airavata\Model\Commons\ErrorModel',
),
),
- 18 => array(
+ 19 => array(
'var' => 'processes',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -540,6 +548,9 @@ class ExperimentModel {
if (isset($vals['gatewayExecutionId'])) {
$this->gatewayExecutionId = $vals['gatewayExecutionId'];
}
+ if (isset($vals['gatewayInstanceId'])) {
+ $this->gatewayInstanceId = $vals['gatewayInstanceId'];
+ }
if (isset($vals['enableEmailNotification'])) {
$this->enableEmailNotification = $vals['enableEmailNotification'];
}
@@ -657,13 +668,20 @@ class ExperimentModel {
}
break;
case 11:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayInstanceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 12:
if ($ftype == TType::BOOL) {
$xfer += $input->readBool($this->enableEmailNotification);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 13:
if ($ftype == TType::LST) {
$this->emailAddresses = array();
$_size0 = 0;
@@ -680,7 +698,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 14:
if ($ftype == TType::STRUCT) {
$this->userConfigurationData = new \Airavata\Model\Experiment\UserConfigurationDataModel();
$xfer += $this->userConfigurationData->read($input);
@@ -688,7 +706,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 14:
+ case 15:
if ($ftype == TType::LST) {
$this->experimentInputs = array();
$_size6 = 0;
@@ -706,7 +724,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 15:
+ case 16:
if ($ftype == TType::LST) {
$this->experimentOutputs = array();
$_size12 = 0;
@@ -724,7 +742,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 16:
+ case 17:
if ($ftype == TType::STRUCT) {
$this->experimentStatus = new \Airavata\Model\Status\ExperimentStatus();
$xfer += $this->experimentStatus->read($input);
@@ -732,7 +750,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 17:
+ case 18:
if ($ftype == TType::LST) {
$this->errors = array();
$_size18 = 0;
@@ -750,7 +768,7 @@ class ExperimentModel {
$xfer += $input->skip($ftype);
}
break;
- case 18:
+ case 19:
if ($ftype == TType::LST) {
$this->processes = array();
$_size24 = 0;
@@ -831,8 +849,13 @@ class ExperimentModel {
$xfer += $output->writeString($this->gatewayExecutionId);
$xfer += $output->writeFieldEnd();
}
+ if ($this->gatewayInstanceId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayInstanceId', TType::STRING, 11);
+ $xfer += $output->writeString($this->gatewayInstanceId);
+ $xfer += $output->writeFieldEnd();
+ }
if ($this->enableEmailNotification !== null) {
- $xfer += $output->writeFieldBegin('enableEmailNotification', TType::BOOL, 11);
+ $xfer += $output->writeFieldBegin('enableEmailNotification', TType::BOOL, 12);
$xfer += $output->writeBool($this->enableEmailNotification);
$xfer += $output->writeFieldEnd();
}
@@ -840,7 +863,7 @@ class ExperimentModel {
if (!is_array($this->emailAddresses)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('emailAddresses', TType::LST, 12);
+ $xfer += $output->writeFieldBegin('emailAddresses', TType::LST, 13);
{
$output->writeListBegin(TType::STRING, count($this->emailAddresses));
{
@@ -857,7 +880,7 @@ class ExperimentModel {
if (!is_object($this->userConfigurationData)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('userConfigurationData', TType::STRUCT, 13);
+ $xfer += $output->writeFieldBegin('userConfigurationData', TType::STRUCT, 14);
$xfer += $this->userConfigurationData->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -865,7 +888,7 @@ class ExperimentModel {
if (!is_array($this->experimentInputs)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('experimentInputs', TType::LST, 14);
+ $xfer += $output->writeFieldBegin('experimentInputs', TType::LST, 15);
{
$output->writeListBegin(TType::STRUCT, count($this->experimentInputs));
{
@@ -882,7 +905,7 @@ class ExperimentModel {
if (!is_array($this->experimentOutputs)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('experimentOutputs', TType::LST, 15);
+ $xfer += $output->writeFieldBegin('experimentOutputs', TType::LST, 16);
{
$output->writeListBegin(TType::STRUCT, count($this->experimentOutputs));
{
@@ -899,7 +922,7 @@ class ExperimentModel {
if (!is_object($this->experimentStatus)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('experimentStatus', TType::STRUCT, 16);
+ $xfer += $output->writeFieldBegin('experimentStatus', TType::STRUCT, 17);
$xfer += $this->experimentStatus->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -907,7 +930,7 @@ class ExperimentModel {
if (!is_array($this->errors)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('errors', TType::LST, 17);
+ $xfer += $output->writeFieldBegin('errors', TType::LST, 18);
{
$output->writeListBegin(TType::STRUCT, count($this->errors));
{
@@ -924,7 +947,7 @@ class ExperimentModel {
if (!is_array($this->processes)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('processes', TType::LST, 18);
+ $xfer += $output->writeFieldBegin('processes', TType::LST, 19);
{
$output->writeListBegin(TType::STRUCT, count($this->processes));
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/b537f358/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
index 158aa70..afc6510 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/experiment/ttypes.py
@@ -272,6 +272,7 @@ class ExperimentModel:
- description
- executionId
- gatewayExecutionId
+ - gatewayInstanceId
- enableEmailNotification
- emailAddresses
- userConfigurationData
@@ -294,17 +295,18 @@ class ExperimentModel:
(8, TType.STRING, 'description', None, None, ), # 8
(9, TType.STRING, 'executionId', None, None, ), # 9
(10, TType.STRING, 'gatewayExecutionId', None, None, ), # 10
- (11, TType.BOOL, 'enableEmailNotification', None, None, ), # 11
- (12, TType.LIST, 'emailAddresses', (TType.STRING,None), None, ), # 12
- (13, TType.STRUCT, 'userConfigurationData', (UserConfigurationDataModel, UserConfigurationDataModel.thrift_spec), None, ), # 13
- (14, TType.LIST, 'experimentInputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 14
- (15, TType.LIST, 'experimentOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 15
- (16, TType.STRUCT, 'experimentStatus', (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ), # 16
- (17, TType.LIST, 'errors', (TType.STRUCT,(apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec)), None, ), # 17
- (18, TType.LIST, 'processes', (TType.STRUCT,(apache.airavata.model.process.ttypes.ProcessModel, apache.airavata.model.process.ttypes.ProcessModel.thrift_spec)), None, ), # 18
+ (11, TType.STRING, 'gatewayInstanceId', None, None, ), # 11
+ (12, TType.BOOL, 'enableEmailNotification', None, None, ), # 12
+ (13, TType.LIST, 'emailAddresses', (TType.STRING,None), None, ), # 13
+ (14, TType.STRUCT, 'userConfigurationData', (UserConfigurationDataModel, UserConfigurationDataModel.thrift_spec), None, ), # 14
+ (15, TType.LIST, 'experimentInputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.InputDataObjectType, apache.airavata.model.application.io.ttypes.InputDataObjectType.thrift_spec)), None, ), # 15
+ (16, TType.LIST, 'experimentOutputs', (TType.STRUCT,(apache.airavata.model.application.io.ttypes.OutputDataObjectType, apache.airavata.model.application.io.ttypes.OutputDataObjectType.thrift_spec)), None, ), # 16
+ (17, TType.STRUCT, 'experimentStatus', (apache.airavata.model.status.ttypes.ExperimentStatus, apache.airavata.model.status.ttypes.ExperimentStatus.thrift_spec), None, ), # 17
+ (18, TType.LIST, 'errors', (TType.STRUCT,(apache.airavata.model.commons.ttypes.ErrorModel, apache.airavata.model.commons.ttypes.ErrorModel.thrift_spec)), None, ), # 18
+ (19, TType.LIST, 'processes', (TType.STRUCT,(apache.airavata.model.process.ttypes.ProcessModel, apache.airavata.model.process.ttypes.ProcessModel.thrift_spec)), None, ), # 19
)
- def __init__(self, experimentId=thrift_spec[1][4], projectId=None, gatewayId=None, experimentType=thrift_spec[4][4], userName=None, experimentName=None, creationTime=None, description=None, executionId=None, gatewayExecutionId=None, enableEmailNotification=None, emailAddresses=None, userConfigurationData=None, experimentInputs=None, experimentOutputs=None, experimentStatus=None, errors=None, processes=None,):
+ def __init__(self, experimentId=thrift_spec[1][4], projectId=None, gatewayId=None, experimentType=thrift_spec[4][4], userName=None, experimentName=None, creationTime=None, description=None, executionId=None, gatewayExecutionId=None, gatewayInstanceId=None, enableEmailNotification=None, emailAddresses=None, userConfigurationData=None, experimentInputs=None, experimentOutputs=None, experimentStatus=None, errors=None, processes=None,):
self.experimentId = experimentId
self.projectId = projectId
self.gatewayId = gatewayId
@@ -315,6 +317,7 @@ class ExperimentModel:
self.description = description
self.executionId = executionId
self.gatewayExecutionId = gatewayExecutionId
+ self.gatewayInstanceId = gatewayInstanceId
self.enableEmailNotification = enableEmailNotification
self.emailAddresses = emailAddresses
self.userConfigurationData = userConfigurationData
@@ -384,11 +387,16 @@ class ExperimentModel:
else:
iprot.skip(ftype)
elif fid == 11:
+ if ftype == TType.STRING:
+ self.gatewayInstanceId = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 12:
if ftype == TType.BOOL:
self.enableEmailNotification = iprot.readBool()
else:
iprot.skip(ftype)
- elif fid == 12:
+ elif fid == 13:
if ftype == TType.LIST:
self.emailAddresses = []
(_etype3, _size0) = iprot.readListBegin()
@@ -398,13 +406,13 @@ class ExperimentModel:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 13:
+ elif fid == 14:
if ftype == TType.STRUCT:
self.userConfigurationData = UserConfigurationDataModel()
self.userConfigurationData.read(iprot)
else:
iprot.skip(ftype)
- elif fid == 14:
+ elif fid == 15:
if ftype == TType.LIST:
self.experimentInputs = []
(_etype9, _size6) = iprot.readListBegin()
@@ -415,7 +423,7 @@ class ExperimentModel:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 15:
+ elif fid == 16:
if ftype == TType.LIST:
self.experimentOutputs = []
(_etype15, _size12) = iprot.readListBegin()
@@ -426,13 +434,13 @@ class ExperimentModel:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 16:
+ elif fid == 17:
if ftype == TType.STRUCT:
self.experimentStatus = apache.airavata.model.status.ttypes.ExperimentStatus()
self.experimentStatus.read(iprot)
else:
iprot.skip(ftype)
- elif fid == 17:
+ elif fid == 18:
if ftype == TType.LIST:
self.errors = []
(_etype21, _size18) = iprot.readListBegin()
@@ -443,7 +451,7 @@ class ExperimentModel:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 18:
+ elif fid == 19:
if ftype == TType.LIST:
self.processes = []
(_etype27, _size24) = iprot.readListBegin()
@@ -504,48 +512,52 @@ class ExperimentModel:
oprot.writeFieldBegin('gatewayExecutionId', TType.STRING, 10)
oprot.writeString(self.gatewayExecutionId)
oprot.writeFieldEnd()
+ if self.gatewayInstanceId is not None:
+ oprot.writeFieldBegin('gatewayInstanceId', TType.STRING, 11)
+ oprot.writeString(self.gatewayInstanceId)
+ oprot.writeFieldEnd()
if self.enableEmailNotification is not None:
- oprot.writeFieldBegin('enableEmailNotification', TType.BOOL, 11)
+ oprot.writeFieldBegin('enableEmailNotification', TType.BOOL, 12)
oprot.writeBool(self.enableEmailNotification)
oprot.writeFieldEnd()
if self.emailAddresses is not None:
- oprot.writeFieldBegin('emailAddresses', TType.LIST, 12)
+ oprot.writeFieldBegin('emailAddresses', TType.LIST, 13)
oprot.writeListBegin(TType.STRING, len(self.emailAddresses))
for iter30 in self.emailAddresses:
oprot.writeString(iter30)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.userConfigurationData is not None:
- oprot.writeFieldBegin('userConfigurationData', TType.STRUCT, 13)
+ oprot.writeFieldBegin('userConfigurationData', TType.STRUCT, 14)
self.userConfigurationData.write(oprot)
oprot.writeFieldEnd()
if self.experimentInputs is not None:
- oprot.writeFieldBegin('experimentInputs', TType.LIST, 14)
+ oprot.writeFieldBegin('experimentInputs', TType.LIST, 15)
oprot.writeListBegin(TType.STRUCT, len(self.experimentInputs))
for iter31 in self.experimentInputs:
iter31.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.experimentOutputs is not None:
- oprot.writeFieldBegin('experimentOutputs', TType.LIST, 15)
+ oprot.writeFieldBegin('experimentOutputs', TType.LIST, 16)
oprot.writeListBegin(TType.STRUCT, len(self.experimentOutputs))
for iter32 in self.experimentOutputs:
iter32.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.experimentStatus is not None:
- oprot.writeFieldBegin('experimentStatus', TType.STRUCT, 16)
+ oprot.writeFieldBegin('experimentStatus', TType.STRUCT, 17)
self.experimentStatus.write(oprot)
oprot.writeFieldEnd()
if self.errors is not None:
- oprot.writeFieldBegin('errors', TType.LIST, 17)
+ oprot.writeFieldBegin('errors', TType.LIST, 18)
oprot.writeListBegin(TType.STRUCT, len(self.errors))
for iter33 in self.errors:
iter33.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.processes is not None:
- oprot.writeFieldBegin('processes', TType.LIST, 18)
+ oprot.writeFieldBegin('processes', TType.LIST, 19)
oprot.writeListBegin(TType.STRUCT, len(self.processes))
for iter34 in self.processes:
iter34.write(oprot)
@@ -582,6 +594,7 @@ class ExperimentModel:
value = (value * 31) ^ hash(self.description)
value = (value * 31) ^ hash(self.executionId)
value = (value * 31) ^ hash(self.gatewayExecutionId)
+ value = (value * 31) ^ hash(self.gatewayInstanceId)
value = (value * 31) ^ hash(self.enableEmailNotification)
value = (value * 31) ^ hash(self.emailAddresses)
value = (value * 31) ^ hash(self.userConfigurationData)
http://git-wip-us.apache.org/repos/asf/airavata/blob/b537f358/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index 1c665f6..acaaaf6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -81,14 +81,15 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField EXECUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("executionId", org.apache.thrift.protocol.TType.STRING, (short)9);
private static final org.apache.thrift.protocol.TField GATEWAY_EXECUTION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayExecutionId", org.apache.thrift.protocol.TType.STRING, (short)10);
- private static final org.apache.thrift.protocol.TField ENABLE_EMAIL_NOTIFICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("enableEmailNotification", org.apache.thrift.protocol.TType.BOOL, (short)11);
- private static final org.apache.thrift.protocol.TField EMAIL_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddresses", org.apache.thrift.protocol.TType.LIST, (short)12);
- private static final org.apache.thrift.protocol.TField USER_CONFIGURATION_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("userConfigurationData", org.apache.thrift.protocol.TType.STRUCT, (short)13);
- private static final org.apache.thrift.protocol.TField EXPERIMENT_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentInputs", org.apache.thrift.protocol.TType.LIST, (short)14);
- private static final org.apache.thrift.protocol.TField EXPERIMENT_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentOutputs", org.apache.thrift.protocol.TType.LIST, (short)15);
- private static final org.apache.thrift.protocol.TField EXPERIMENT_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentStatus", org.apache.thrift.protocol.TType.STRUCT, (short)16);
- private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)17);
- private static final org.apache.thrift.protocol.TField PROCESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("processes", org.apache.thrift.protocol.TType.LIST, (short)18);
+ private static final org.apache.thrift.protocol.TField GATEWAY_INSTANCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayInstanceId", org.apache.thrift.protocol.TType.STRING, (short)11);
+ private static final org.apache.thrift.protocol.TField ENABLE_EMAIL_NOTIFICATION_FIELD_DESC = new org.apache.thrift.protocol.TField("enableEmailNotification", org.apache.thrift.protocol.TType.BOOL, (short)12);
+ private static final org.apache.thrift.protocol.TField EMAIL_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("emailAddresses", org.apache.thrift.protocol.TType.LIST, (short)13);
+ private static final org.apache.thrift.protocol.TField USER_CONFIGURATION_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("userConfigurationData", org.apache.thrift.protocol.TType.STRUCT, (short)14);
+ private static final org.apache.thrift.protocol.TField EXPERIMENT_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentInputs", org.apache.thrift.protocol.TType.LIST, (short)15);
+ private static final org.apache.thrift.protocol.TField EXPERIMENT_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentOutputs", org.apache.thrift.protocol.TType.LIST, (short)16);
+ private static final org.apache.thrift.protocol.TField EXPERIMENT_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentStatus", org.apache.thrift.protocol.TType.STRUCT, (short)17);
+ private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)18);
+ private static final org.apache.thrift.protocol.TField PROCESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("processes", org.apache.thrift.protocol.TType.LIST, (short)19);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -106,6 +107,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private String description; // optional
private String executionId; // optional
private String gatewayExecutionId; // optional
+ private String gatewayInstanceId; // optional
private boolean enableEmailNotification; // optional
private List<String> emailAddresses; // optional
private UserConfigurationDataModel userConfigurationData; // optional
@@ -131,14 +133,15 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
DESCRIPTION((short)8, "description"),
EXECUTION_ID((short)9, "executionId"),
GATEWAY_EXECUTION_ID((short)10, "gatewayExecutionId"),
- ENABLE_EMAIL_NOTIFICATION((short)11, "enableEmailNotification"),
- EMAIL_ADDRESSES((short)12, "emailAddresses"),
- USER_CONFIGURATION_DATA((short)13, "userConfigurationData"),
- EXPERIMENT_INPUTS((short)14, "experimentInputs"),
- EXPERIMENT_OUTPUTS((short)15, "experimentOutputs"),
- EXPERIMENT_STATUS((short)16, "experimentStatus"),
- ERRORS((short)17, "errors"),
- PROCESSES((short)18, "processes");
+ GATEWAY_INSTANCE_ID((short)11, "gatewayInstanceId"),
+ ENABLE_EMAIL_NOTIFICATION((short)12, "enableEmailNotification"),
+ EMAIL_ADDRESSES((short)13, "emailAddresses"),
+ USER_CONFIGURATION_DATA((short)14, "userConfigurationData"),
+ EXPERIMENT_INPUTS((short)15, "experimentInputs"),
+ EXPERIMENT_OUTPUTS((short)16, "experimentOutputs"),
+ EXPERIMENT_STATUS((short)17, "experimentStatus"),
+ ERRORS((short)18, "errors"),
+ PROCESSES((short)19, "processes");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -173,21 +176,23 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return EXECUTION_ID;
case 10: // GATEWAY_EXECUTION_ID
return GATEWAY_EXECUTION_ID;
- case 11: // ENABLE_EMAIL_NOTIFICATION
+ case 11: // GATEWAY_INSTANCE_ID
+ return GATEWAY_INSTANCE_ID;
+ case 12: // ENABLE_EMAIL_NOTIFICATION
return ENABLE_EMAIL_NOTIFICATION;
- case 12: // EMAIL_ADDRESSES
+ case 13: // EMAIL_ADDRESSES
return EMAIL_ADDRESSES;
- case 13: // USER_CONFIGURATION_DATA
+ case 14: // USER_CONFIGURATION_DATA
return USER_CONFIGURATION_DATA;
- case 14: // EXPERIMENT_INPUTS
+ case 15: // EXPERIMENT_INPUTS
return EXPERIMENT_INPUTS;
- case 15: // EXPERIMENT_OUTPUTS
+ case 16: // EXPERIMENT_OUTPUTS
return EXPERIMENT_OUTPUTS;
- case 16: // EXPERIMENT_STATUS
+ case 17: // EXPERIMENT_STATUS
return EXPERIMENT_STATUS;
- case 17: // ERRORS
+ case 18: // ERRORS
return ERRORS;
- case 18: // PROCESSES
+ case 19: // PROCESSES
return PROCESSES;
default:
return null;
@@ -232,7 +237,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
private static final int __CREATIONTIME_ISSET_ID = 0;
private static final int __ENABLEEMAILNOTIFICATION_ISSET_ID = 1;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.EXECUTION_ID,_Fields.GATEWAY_EXECUTION_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.USER_CONFIGURATION_DATA,_Fields.EXPERIMENT_INPUTS,_Fields.EXPERIMENT_OUTPUTS,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS,_Fields.PROCESSES};
+ private static final _Fields optionals[] = {_Fields.CREATION_TIME,_Fields.DESCRIPTION,_Fields.EXECUTION_ID,_Fields.GATEWAY_EXECUTION_ID,_Fields.GATEWAY_INSTANCE_ID,_Fields.ENABLE_EMAIL_NOTIFICATION,_Fields.EMAIL_ADDRESSES,_Fields.USER_CONFIGURATION_DATA,_Fields.EXPERIMENT_INPUTS,_Fields.EXPERIMENT_OUTPUTS,_Fields.EXPERIMENT_STATUS,_Fields.ERRORS,_Fields.PROCESSES};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -256,6 +261,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.GATEWAY_EXECUTION_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayExecutionId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_INSTANCE_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayInstanceId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.ENABLE_EMAIL_NOTIFICATION, new org.apache.thrift.meta_data.FieldMetaData("enableEmailNotification", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.EMAIL_ADDRESSES, new org.apache.thrift.meta_data.FieldMetaData("emailAddresses", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -338,6 +345,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (other.isSetGatewayExecutionId()) {
this.gatewayExecutionId = other.gatewayExecutionId;
}
+ if (other.isSetGatewayInstanceId()) {
+ this.gatewayInstanceId = other.gatewayInstanceId;
+ }
this.enableEmailNotification = other.enableEmailNotification;
if (other.isSetEmailAddresses()) {
List<String> __this__emailAddresses = new ArrayList<String>(other.emailAddresses);
@@ -398,6 +408,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
this.description = null;
this.executionId = null;
this.gatewayExecutionId = null;
+ this.gatewayInstanceId = null;
setEnableEmailNotificationIsSet(false);
this.enableEmailNotification = false;
this.emailAddresses = null;
@@ -646,6 +657,29 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
}
+ public String getGatewayInstanceId() {
+ return this.gatewayInstanceId;
+ }
+
+ public void setGatewayInstanceId(String gatewayInstanceId) {
+ this.gatewayInstanceId = gatewayInstanceId;
+ }
+
+ public void unsetGatewayInstanceId() {
+ this.gatewayInstanceId = null;
+ }
+
+ /** Returns true if field gatewayInstanceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayInstanceId() {
+ return this.gatewayInstanceId != null;
+ }
+
+ public void setGatewayInstanceIdIsSet(boolean value) {
+ if (!value) {
+ this.gatewayInstanceId = null;
+ }
+ }
+
public boolean isEnableEmailNotification() {
return this.enableEmailNotification;
}
@@ -986,6 +1020,14 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
break;
+ case GATEWAY_INSTANCE_ID:
+ if (value == null) {
+ unsetGatewayInstanceId();
+ } else {
+ setGatewayInstanceId((String)value);
+ }
+ break;
+
case ENABLE_EMAIL_NOTIFICATION:
if (value == null) {
unsetEnableEmailNotification();
@@ -1085,6 +1127,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
case GATEWAY_EXECUTION_ID:
return getGatewayExecutionId();
+ case GATEWAY_INSTANCE_ID:
+ return getGatewayInstanceId();
+
case ENABLE_EMAIL_NOTIFICATION:
return isEnableEmailNotification();
@@ -1140,6 +1185,8 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return isSetExecutionId();
case GATEWAY_EXECUTION_ID:
return isSetGatewayExecutionId();
+ case GATEWAY_INSTANCE_ID:
+ return isSetGatewayInstanceId();
case ENABLE_EMAIL_NOTIFICATION:
return isSetEnableEmailNotification();
case EMAIL_ADDRESSES:
@@ -1263,6 +1310,15 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return false;
}
+ boolean this_present_gatewayInstanceId = true && this.isSetGatewayInstanceId();
+ boolean that_present_gatewayInstanceId = true && that.isSetGatewayInstanceId();
+ if (this_present_gatewayInstanceId || that_present_gatewayInstanceId) {
+ if (!(this_present_gatewayInstanceId && that_present_gatewayInstanceId))
+ return false;
+ if (!this.gatewayInstanceId.equals(that.gatewayInstanceId))
+ return false;
+ }
+
boolean this_present_enableEmailNotification = true && this.isSetEnableEmailNotification();
boolean that_present_enableEmailNotification = true && that.isSetEnableEmailNotification();
if (this_present_enableEmailNotification || that_present_enableEmailNotification) {
@@ -1392,6 +1448,11 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (present_gatewayExecutionId)
list.add(gatewayExecutionId);
+ boolean present_gatewayInstanceId = true && (isSetGatewayInstanceId());
+ list.add(present_gatewayInstanceId);
+ if (present_gatewayInstanceId)
+ list.add(gatewayInstanceId);
+
boolean present_enableEmailNotification = true && (isSetEnableEmailNotification());
list.add(present_enableEmailNotification);
if (present_enableEmailNotification)
@@ -1543,6 +1604,16 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetGatewayInstanceId()).compareTo(other.isSetGatewayInstanceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayInstanceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayInstanceId, other.gatewayInstanceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetEnableEmailNotification()).compareTo(other.isSetEnableEmailNotification());
if (lastComparison != 0) {
return lastComparison;
@@ -1726,6 +1797,16 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
first = false;
}
+ if (isSetGatewayInstanceId()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayInstanceId:");
+ if (this.gatewayInstanceId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayInstanceId);
+ }
+ first = false;
+ }
if (isSetEnableEmailNotification()) {
if (!first) sb.append(", ");
sb.append("enableEmailNotification:");
@@ -1957,7 +2038,15 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 11: // ENABLE_EMAIL_NOTIFICATION
+ case 11: // GATEWAY_INSTANCE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayInstanceId = iprot.readString();
+ struct.setGatewayInstanceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 12: // ENABLE_EMAIL_NOTIFICATION
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.enableEmailNotification = iprot.readBool();
struct.setEnableEmailNotificationIsSet(true);
@@ -1965,7 +2054,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // EMAIL_ADDRESSES
+ case 13: // EMAIL_ADDRESSES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -1983,7 +2072,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 13: // USER_CONFIGURATION_DATA
+ case 14: // USER_CONFIGURATION_DATA
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.userConfigurationData = new UserConfigurationDataModel();
struct.userConfigurationData.read(iprot);
@@ -1992,7 +2081,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 14: // EXPERIMENT_INPUTS
+ case 15: // EXPERIMENT_INPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
@@ -2011,7 +2100,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 15: // EXPERIMENT_OUTPUTS
+ case 16: // EXPERIMENT_OUTPUTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
@@ -2030,7 +2119,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 16: // EXPERIMENT_STATUS
+ case 17: // EXPERIMENT_STATUS
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
struct.experimentStatus = new org.apache.airavata.model.status.ExperimentStatus();
struct.experimentStatus.read(iprot);
@@ -2039,7 +2128,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 17: // ERRORS
+ case 18: // ERRORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list9 = iprot.readListBegin();
@@ -2058,7 +2147,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 18: // PROCESSES
+ case 19: // PROCESSES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list12 = iprot.readListBegin();
@@ -2146,6 +2235,13 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
oprot.writeFieldEnd();
}
}
+ if (struct.gatewayInstanceId != null) {
+ if (struct.isSetGatewayInstanceId()) {
+ oprot.writeFieldBegin(GATEWAY_INSTANCE_ID_FIELD_DESC);
+ oprot.writeString(struct.gatewayInstanceId);
+ oprot.writeFieldEnd();
+ }
+ }
if (struct.isSetEnableEmailNotification()) {
oprot.writeFieldBegin(ENABLE_EMAIL_NOTIFICATION_FIELD_DESC);
oprot.writeBool(struct.enableEmailNotification);
@@ -2271,31 +2367,34 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (struct.isSetGatewayExecutionId()) {
optionals.set(3);
}
- if (struct.isSetEnableEmailNotification()) {
+ if (struct.isSetGatewayInstanceId()) {
optionals.set(4);
}
- if (struct.isSetEmailAddresses()) {
+ if (struct.isSetEnableEmailNotification()) {
optionals.set(5);
}
- if (struct.isSetUserConfigurationData()) {
+ if (struct.isSetEmailAddresses()) {
optionals.set(6);
}
- if (struct.isSetExperimentInputs()) {
+ if (struct.isSetUserConfigurationData()) {
optionals.set(7);
}
- if (struct.isSetExperimentOutputs()) {
+ if (struct.isSetExperimentInputs()) {
optionals.set(8);
}
- if (struct.isSetExperimentStatus()) {
+ if (struct.isSetExperimentOutputs()) {
optionals.set(9);
}
- if (struct.isSetErrors()) {
+ if (struct.isSetExperimentStatus()) {
optionals.set(10);
}
- if (struct.isSetProcesses()) {
+ if (struct.isSetErrors()) {
optionals.set(11);
}
- oprot.writeBitSet(optionals, 12);
+ if (struct.isSetProcesses()) {
+ optionals.set(12);
+ }
+ oprot.writeBitSet(optionals, 13);
if (struct.isSetCreationTime()) {
oprot.writeI64(struct.creationTime);
}
@@ -2308,6 +2407,9 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
if (struct.isSetGatewayExecutionId()) {
oprot.writeString(struct.gatewayExecutionId);
}
+ if (struct.isSetGatewayInstanceId()) {
+ oprot.writeString(struct.gatewayInstanceId);
+ }
if (struct.isSetEnableEmailNotification()) {
oprot.writeBool(struct.enableEmailNotification);
}
@@ -2379,7 +2481,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
struct.setUserNameIsSet(true);
struct.experimentName = iprot.readString();
struct.setExperimentNameIsSet(true);
- BitSet incoming = iprot.readBitSet(12);
+ BitSet incoming = iprot.readBitSet(13);
if (incoming.get(0)) {
struct.creationTime = iprot.readI64();
struct.setCreationTimeIsSet(true);
@@ -2397,10 +2499,14 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
struct.setGatewayExecutionIdIsSet(true);
}
if (incoming.get(4)) {
+ struct.gatewayInstanceId = iprot.readString();
+ struct.setGatewayInstanceIdIsSet(true);
+ }
+ if (incoming.get(5)) {
struct.enableEmailNotification = iprot.readBool();
struct.setEnableEmailNotificationIsSet(true);
}
- if (incoming.get(5)) {
+ if (incoming.get(6)) {
{
org.apache.thrift.protocol.TList _list25 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
struct.emailAddresses = new ArrayList<String>(_list25.size);
@@ -2413,12 +2519,12 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
struct.setEmailAddressesIsSet(true);
}
- if (incoming.get(6)) {
+ if (incoming.get(7)) {
struct.userConfigurationData = new UserConfigurationDataModel();
struct.userConfigurationData.read(iprot);
struct.setUserConfigurationDataIsSet(true);
}
- if (incoming.get(7)) {
+ if (incoming.get(8)) {
{
org.apache.thrift.protocol.TList _list28 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.experimentInputs = new ArrayList<org.apache.airavata.model.application.io.InputDataObjectType>(_list28.size);
@@ -2432,7 +2538,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
struct.setExperimentInputsIsSet(true);
}
- if (incoming.get(8)) {
+ if (incoming.get(9)) {
{
org.apache.thrift.protocol.TList _list31 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.experimentOutputs = new ArrayList<org.apache.airavata.model.application.io.OutputDataObjectType>(_list31.size);
@@ -2446,12 +2552,12 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
struct.setExperimentOutputsIsSet(true);
}
- if (incoming.get(9)) {
+ if (incoming.get(10)) {
struct.experimentStatus = new org.apache.airavata.model.status.ExperimentStatus();
struct.experimentStatus.read(iprot);
struct.setExperimentStatusIsSet(true);
}
- if (incoming.get(10)) {
+ if (incoming.get(11)) {
{
org.apache.thrift.protocol.TList _list34 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.errors = new ArrayList<org.apache.airavata.model.commons.ErrorModel>(_list34.size);
@@ -2465,7 +2571,7 @@ public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel,
}
struct.setErrorsIsSet(true);
}
- if (incoming.get(11)) {
+ if (incoming.get(12)) {
{
org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
struct.processes = new ArrayList<org.apache.airavata.model.process.ProcessModel>(_list37.size);
http://git-wip-us.apache.org/repos/asf/airavata/blob/b537f358/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
index 3d47071..904d37a 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
@@ -75,6 +75,7 @@ CREATE TABLE EXPERIMENT (
DESCRIPTION varchar(255),
EXECUTION_ID varchar(255),
GATEWAY_EXECUTION_ID varchar(255),
+ GATEWAY_INSTANCE_ID varchar(255),
ENABLE_EMAIL_NOTIFICATION SMALLINT,
EMAIL_ADDRESSES CLOB,
PRIMARY KEY (EXPERIMENT_ID),
http://git-wip-us.apache.org/repos/asf/airavata/blob/b537f358/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index ce409ae..2a2ba01 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -191,6 +191,7 @@ CREATE TABLE PROCESS (
APPLICATION_DEPLOYMENT_ID varchar(255),
COMPUTE_RESOURCE_ID varchar(255),
GATEWAY_EXECUTION_ID varchar(255),
+ GATEWAY_INSTANCE_ID varchar(255),
ENABLE_EMAIL_NOTIFICATION BOOLEAN,
EMAIL_ADDRESSES TEXT,
STORAGE_RESOURCE_ID varchar(255),
http://git-wip-us.apache.org/repos/asf/airavata/blob/b537f358/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift b/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
index 5caf7e9..357d92d 100644
--- a/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
+++ b/thrift-interface-descriptions/data-models/experiment-catalog-models/experiment_model.thrift
@@ -88,14 +88,15 @@ struct ExperimentModel {
8: optional string description,
9: optional string executionId,
10: optional string gatewayExecutionId,
- 11: optional bool enableEmailNotification,
- 12: optional list<string> emailAddresses,
- 13: optional UserConfigurationDataModel userConfigurationData,
- 14: optional list<application_io_models.InputDataObjectType> experimentInputs,
- 15: optional list<application_io_models.OutputDataObjectType> experimentOutputs,
- 16: optional status_models.ExperimentStatus experimentStatus,
- 17: optional list<airavata_commons.ErrorModel> errors,
- 18: optional list<process_model.ProcessModel> processes
+ 11: optional string gatewayInstanceId,
+ 12: optional bool enableEmailNotification,
+ 13: optional list<string> emailAddresses,
+ 14: optional UserConfigurationDataModel userConfigurationData,
+ 15: optional list<application_io_models.InputDataObjectType> experimentInputs,
+ 16: optional list<application_io_models.OutputDataObjectType> experimentOutputs,
+ 17: optional status_models.ExperimentStatus experimentStatus,
+ 18: optional list<airavata_commons.ErrorModel> errors,
+ 19: optional list<process_model.ProcessModel> processes
}
struct ExperimentSummaryModel {
[04/14] airavata git commit: adding parallelism as a seperate enum
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
index 9cf626e..2d453ae 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* the same. Example: *@*.example.com or *@example.com
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission");
@@ -959,13 +959,13 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
case 7: // BATCH_QUEUE_EMAIL_SENDERS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list10 = iprot.readListBegin();
- struct.batchQueueEmailSenders = new ArrayList<String>(_list10.size);
- String _elem11;
- for (int _i12 = 0; _i12 < _list10.size; ++_i12)
+ org.apache.thrift.protocol.TList _list20 = iprot.readListBegin();
+ struct.batchQueueEmailSenders = new ArrayList<String>(_list20.size);
+ String _elem21;
+ for (int _i22 = 0; _i22 < _list20.size; ++_i22)
{
- _elem11 = iprot.readString();
- struct.batchQueueEmailSenders.add(_elem11);
+ _elem21 = iprot.readString();
+ struct.batchQueueEmailSenders.add(_elem21);
}
iprot.readListEnd();
}
@@ -1026,9 +1026,9 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
oprot.writeFieldBegin(BATCH_QUEUE_EMAIL_SENDERS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.batchQueueEmailSenders.size()));
- for (String _iter13 : struct.batchQueueEmailSenders)
+ for (String _iter23 : struct.batchQueueEmailSenders)
{
- oprot.writeString(_iter13);
+ oprot.writeString(_iter23);
}
oprot.writeListEnd();
}
@@ -1081,9 +1081,9 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
if (struct.isSetBatchQueueEmailSenders()) {
{
oprot.writeI32(struct.batchQueueEmailSenders.size());
- for (String _iter14 : struct.batchQueueEmailSenders)
+ for (String _iter24 : struct.batchQueueEmailSenders)
{
- oprot.writeString(_iter14);
+ oprot.writeString(_iter24);
}
}
}
@@ -1114,13 +1114,13 @@ public class SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmissio
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TList _list15 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.batchQueueEmailSenders = new ArrayList<String>(_list15.size);
- String _elem16;
- for (int _i17 = 0; _i17 < _list15.size; ++_i17)
+ org.apache.thrift.protocol.TList _list25 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.batchQueueEmailSenders = new ArrayList<String>(_list25.size);
+ String _elem26;
+ for (int _i27 = 0; _i27 < _list25.size; ++_i27)
{
- _elem16 = iprot.readString();
- struct.batchQueueEmailSenders.add(_elem16);
+ _elem26 = iprot.readString();
+ struct.batchQueueEmailSenders.add(_elem26);
}
}
struct.setBatchQueueEmailSendersIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
index 81574f5..d6efb06 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index 3d9d990..509248e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
* default credential store.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
index faefdf4..2368226 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* List of resource preferences for each of the registered compute resources.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
index 6cd68e6..ef94fe4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index e80a19b..e751cbc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/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 6c9b643..b974f21 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
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
index fe6e020..eccf555 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
index e2f0ee4..9f6bad6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ErrorModel implements org.apache.thrift.TBase<ErrorModel, ErrorModel._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
index a9f7080..75eb271 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
index e5134a4..682746a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* during the experiment launch operation
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index 02e9050..c807e1d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
index 48f473f..71a6f2d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
index f53a2cd..e1f8784 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
index b5b5659..85e7ab6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
index 7804763..38a6e1a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
index 8248043..0713295 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
index 1668a4e..104d6f4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class DataResourceModel implements org.apache.thrift.TBase<DataResourceModel, DataResourceModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataResourceModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataResourceModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
index 1592f83..e254390 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class AiravataClientException extends TException implements org.apache.thrift.TBase<AiravataClientException, AiravataClientException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataClientException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataClientException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
index ad5affd..7aaedcf 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class AiravataSystemException extends TException implements org.apache.thrift.TBase<AiravataSystemException, AiravataSystemException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataSystemException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataSystemException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
index 7406863..0b13a15 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the cause of the authorization failure.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
index 6cbc61e..8024121 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the authorization failure message
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
index 83df334..2abc1de 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
* key: The value passed from the client in the identifier, which was not found.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ExperimentNotFoundException extends TException implements org.apache.thrift.TBase<ExperimentNotFoundException, ExperimentNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
index dc728d3..f7202ab 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the associated error message.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class InvalidRequestException extends TException implements org.apache.thrift.TBase<InvalidRequestException, InvalidRequestException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidRequestException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidRequestException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
index 40760fc..d5b8bac 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class LaunchValidationException extends TException implements org.apache.thrift.TBase<LaunchValidationException, LaunchValidationException._Fields>, java.io.Serializable, Cloneable, Comparable<LaunchValidationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LaunchValidationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
index ac118dc..189764c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ProjectNotFoundException extends TException implements org.apache.thrift.TBase<ProjectNotFoundException, ProjectNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ProjectNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProjectNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
index 014b4d0..198cdc0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class TimedOutException extends TException implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimedOutException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
index c0012a1..31e31cc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
index 87cd3c5..b7caad0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index b2fb925..1c665f6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ExperimentModel implements org.apache.thrift.TBase<ExperimentModel, ExperimentModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
index 9036e17..bb3e658 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
index 3574ac9..34bad64 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ExperimentSummaryModel implements org.apache.thrift.TBase<ExperimentSummaryModel, ExperimentSummaryModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentSummaryModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentSummaryModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
index 9e8d61f..2fe4000 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class UserConfigurationDataModel implements org.apache.thrift.TBase<UserConfigurationDataModel, UserConfigurationDataModel._Fields>, java.io.Serializable, Cloneable, Comparable<UserConfigurationDataModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserConfigurationDataModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
index 3274b03..9ecb447 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
index dfbd50c..d9b11ae 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ExperimentStatusChangeEvent implements org.apache.thrift.TBase<ExperimentStatusChangeEvent, ExperimentStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
index fa17462..8604e21 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class JobIdentifier implements org.apache.thrift.TBase<JobIdentifier, JobIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<JobIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
index 06b892c..a307197 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusChangeEvent, JobStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
index 0e53da0..7ae6d54 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobStatusChangeRequestEvent, JobStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
index abfdea1..0df4955 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class Message implements org.apache.thrift.TBase<Message, Message._Fields>, java.io.Serializable, Cloneable, Comparable<Message> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Message");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
index 00187b7..0ab0a07 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ProcessIdentifier implements org.apache.thrift.TBase<ProcessIdentifier, ProcessIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
index 2001d26..bf0984a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ProcessStatusChangeEvent implements org.apache.thrift.TBase<ProcessStatusChangeEvent, ProcessStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
index 6609d4d..39cbdbf 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ProcessStatusChangeRequestEvent implements org.apache.thrift.TBase<ProcessStatusChangeRequestEvent, ProcessStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
index 565f4bd..5013698 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ProcessSubmitEvent implements org.apache.thrift.TBase<ProcessSubmitEvent, ProcessSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessSubmitEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessSubmitEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
index 9552ed7..4d46b87 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ProcessTerminateEvent implements org.apache.thrift.TBase<ProcessTerminateEvent, ProcessTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessTerminateEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessTerminateEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
index 72cbadb..9554ba5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, TaskIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TaskIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
index 9c164f3..a4986de 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutputChangeEvent, TaskOutputChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskOutputChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskOutputChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
index 48a699c..0676f58 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
index 09cfed5..fd6a108 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<TaskStatusChangeRequestEvent, TaskStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/parallelism/ApplicationParallelismType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/parallelism/ApplicationParallelismType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/parallelism/ApplicationParallelismType.java
new file mode 100644
index 0000000..dcd30d3
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/parallelism/ApplicationParallelismType.java
@@ -0,0 +1,90 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.airavata.model.parallelism;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
+/**
+ * Enumeration of application parallelism supported by Airavata
+ *
+ * SERIAL:
+ * Single processor applications without any parallelization.
+ *
+ * MPI:
+ * Messaging Passing Interface.
+ *
+ * OPENMP:
+ * Shared Memory Implementtaion.
+ *
+ * OPENMP_MPI:
+ * Hybrid Applications.
+ *
+ */
+public enum ApplicationParallelismType implements org.apache.thrift.TEnum {
+ SERIAL(0),
+ MPI(1),
+ OPENMP(2),
+ OPENMP_MPI(3),
+ CCM(4),
+ CRAY_MPI(5);
+
+ private final int value;
+
+ private ApplicationParallelismType(int value) {
+ this.value = value;
+ }
+
+ /**
+ * Get the integer value of this enum value, as defined in the Thrift IDL.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * Find a the enum type by its integer value, as defined in the Thrift IDL.
+ * @return null if the value is not found.
+ */
+ public static ApplicationParallelismType findByValue(int value) {
+ switch (value) {
+ case 0:
+ return SERIAL;
+ case 1:
+ return MPI;
+ case 2:
+ return OPENMP;
+ case 3:
+ return OPENMP_MPI;
+ case 4:
+ return CCM;
+ case 5:
+ return CRAY_MPI;
+ default:
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
index 068f96a..1a7ee73 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
index a5d5af2..ffb3148 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ComputationalResourceSchedulingModel implements org.apache.thrift.TBase<ComputationalResourceSchedulingModel, ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, Comparable<ComputationalResourceSchedulingModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
index 25d960c..46212e5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class AuthzToken implements org.apache.thrift.TBase<AuthzToken, AuthzToken._Fields>, java.io.Serializable, Cloneable, Comparable<AuthzToken> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthzToken");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
index 7170bdf..f08e506 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* User friendly reason on how the state is inferred.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
index d3d73b5..ae03ad8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index 62d452b..89996fa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
index 6af906c..5a8322f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
index 8ac8b94..dd0c370 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index 12f1f9f..3da5078 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* EnvironmentSetupTaskModel: A structure holding the environment creation task details
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index fd00815..7aa3b32 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index 1142363..20f9ca3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index c84f70d..b8adfab 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* subTaskModel:
* A generic byte object for the Task developer to store internal serialized data into registry catalogs.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
[13/14] airavata git commit: adding parallelism table in manifest
Posted by sm...@apache.org.
adding parallelism table in manifest
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/851117fa
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/851117fa
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/851117fa
Branch: refs/heads/master
Commit: 851117fa0a89fa8d7ef111f244b56aa98040b950
Parents: 833de75
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Mar 1 16:35:04 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Mar 1 16:35:04 2016 -0500
----------------------------------------------------------------------
.../registry-core/src/main/resources/META-INF/persistence.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/851117fa/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
index 7d2a15a..cb7c6b1 100644
--- a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
+++ b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
@@ -59,6 +59,7 @@
<class>org.apache.airavata.registry.core.app.catalog.model.StorageInterface</class>
<class>org.apache.airavata.registry.core.app.catalog.model.ResourceJobManager</class>
<class>org.apache.airavata.registry.core.app.catalog.model.JobManagerCommand</class>
+ <class>org.apache.airavata.registry.core.app.catalog.model.ParallelismPrefixCommand</class>
<class>org.apache.airavata.registry.core.app.catalog.model.LocalSubmission</class>
<class>org.apache.airavata.registry.core.app.catalog.model.LocalDataMovement</class>
<class>org.apache.airavata.registry.core.app.catalog.model.Configuration</class>
[05/14] airavata git commit: adding parallelism as a seperate enum
Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/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 7b319f6..2a17da1 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
@@ -8,6 +8,7 @@
from thrift.Thrift import TType, TMessageType, TException, TApplicationException
import apache.airavata.model.commons.ttypes
+import apache.airavata.model.appcatalog.parallelism.ttypes
import apache.airavata.model.data.movement.ttypes
@@ -287,6 +288,7 @@ class ResourceJobManager:
- pushMonitoringEndpoint
- jobManagerBinPath
- jobManagerCommands
+ - parallalisimPrefix
"""
thrift_spec = (
@@ -296,14 +298,16 @@ class ResourceJobManager:
(3, TType.STRING, 'pushMonitoringEndpoint', None, None, ), # 3
(4, TType.STRING, 'jobManagerBinPath', None, None, ), # 4
(5, TType.MAP, 'jobManagerCommands', (TType.I32,None,TType.STRING,None), None, ), # 5
+ (6, TType.MAP, 'parallalisimPrefix', (TType.I32,None,TType.STRING,None), None, ), # 6
)
- def __init__(self, resourceJobManagerId=thrift_spec[1][4], resourceJobManagerType=None, pushMonitoringEndpoint=None, jobManagerBinPath=None, jobManagerCommands=None,):
+ def __init__(self, resourceJobManagerId=thrift_spec[1][4], resourceJobManagerType=None, pushMonitoringEndpoint=None, jobManagerBinPath=None, jobManagerCommands=None, parallalisimPrefix=None,):
self.resourceJobManagerId = resourceJobManagerId
self.resourceJobManagerType = resourceJobManagerType
self.pushMonitoringEndpoint = pushMonitoringEndpoint
self.jobManagerBinPath = jobManagerBinPath
self.jobManagerCommands = jobManagerCommands
+ self.parallalisimPrefix = parallalisimPrefix
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -345,6 +349,17 @@ class ResourceJobManager:
iprot.readMapEnd()
else:
iprot.skip(ftype)
+ elif fid == 6:
+ if ftype == TType.MAP:
+ self.parallalisimPrefix = {}
+ (_ktype8, _vtype9, _size7 ) = iprot.readMapBegin()
+ for _i11 in xrange(_size7):
+ _key12 = iprot.readI32()
+ _val13 = iprot.readString()
+ self.parallalisimPrefix[_key12] = _val13
+ iprot.readMapEnd()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -374,9 +389,17 @@ class ResourceJobManager:
if self.jobManagerCommands is not None:
oprot.writeFieldBegin('jobManagerCommands', TType.MAP, 5)
oprot.writeMapBegin(TType.I32, TType.STRING, len(self.jobManagerCommands))
- for kiter7,viter8 in self.jobManagerCommands.items():
- oprot.writeI32(kiter7)
- oprot.writeString(viter8)
+ for kiter14,viter15 in self.jobManagerCommands.items():
+ oprot.writeI32(kiter14)
+ oprot.writeString(viter15)
+ oprot.writeMapEnd()
+ oprot.writeFieldEnd()
+ if self.parallalisimPrefix is not None:
+ oprot.writeFieldBegin('parallalisimPrefix', TType.MAP, 6)
+ oprot.writeMapBegin(TType.I32, TType.STRING, len(self.parallalisimPrefix))
+ for kiter16,viter17 in self.parallalisimPrefix.items():
+ oprot.writeI32(kiter16)
+ oprot.writeString(viter17)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -397,6 +420,7 @@ class ResourceJobManager:
value = (value * 31) ^ hash(self.pushMonitoringEndpoint)
value = (value * 31) ^ hash(self.jobManagerBinPath)
value = (value * 31) ^ hash(self.jobManagerCommands)
+ value = (value * 31) ^ hash(self.parallalisimPrefix)
return value
def __repr__(self):
@@ -756,10 +780,10 @@ class SSHJobSubmission:
elif fid == 7:
if ftype == TType.LIST:
self.batchQueueEmailSenders = []
- (_etype12, _size9) = iprot.readListBegin()
- for _i13 in xrange(_size9):
- _elem14 = iprot.readString()
- self.batchQueueEmailSenders.append(_elem14)
+ (_etype21, _size18) = iprot.readListBegin()
+ for _i22 in xrange(_size18):
+ _elem23 = iprot.readString()
+ self.batchQueueEmailSenders.append(_elem23)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -800,8 +824,8 @@ class SSHJobSubmission:
if self.batchQueueEmailSenders is not None:
oprot.writeFieldBegin('batchQueueEmailSenders', TType.LIST, 7)
oprot.writeListBegin(TType.STRING, len(self.batchQueueEmailSenders))
- for iter15 in self.batchQueueEmailSenders:
- oprot.writeString(iter15)
+ for iter24 in self.batchQueueEmailSenders:
+ oprot.writeString(iter24)
oprot.writeListEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -881,10 +905,10 @@ class GlobusJobSubmission:
elif fid == 3:
if ftype == TType.LIST:
self.globusGateKeeperEndPoint = []
- (_etype19, _size16) = iprot.readListBegin()
- for _i20 in xrange(_size16):
- _elem21 = iprot.readString()
- self.globusGateKeeperEndPoint.append(_elem21)
+ (_etype28, _size25) = iprot.readListBegin()
+ for _i29 in xrange(_size25):
+ _elem30 = iprot.readString()
+ self.globusGateKeeperEndPoint.append(_elem30)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -909,8 +933,8 @@ class GlobusJobSubmission:
if self.globusGateKeeperEndPoint is not None:
oprot.writeFieldBegin('globusGateKeeperEndPoint', TType.LIST, 3)
oprot.writeListBegin(TType.STRING, len(self.globusGateKeeperEndPoint))
- for iter22 in self.globusGateKeeperEndPoint:
- oprot.writeString(iter22)
+ for iter31 in self.globusGateKeeperEndPoint:
+ oprot.writeString(iter31)
oprot.writeListEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -1401,20 +1425,20 @@ class ComputeResourceDescription:
elif fid == 3:
if ftype == TType.LIST:
self.hostAliases = []
- (_etype26, _size23) = iprot.readListBegin()
- for _i27 in xrange(_size23):
- _elem28 = iprot.readString()
- self.hostAliases.append(_elem28)
+ (_etype35, _size32) = iprot.readListBegin()
+ for _i36 in xrange(_size32):
+ _elem37 = iprot.readString()
+ self.hostAliases.append(_elem37)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.LIST:
self.ipAddresses = []
- (_etype32, _size29) = iprot.readListBegin()
- for _i33 in xrange(_size29):
- _elem34 = iprot.readString()
- self.ipAddresses.append(_elem34)
+ (_etype41, _size38) = iprot.readListBegin()
+ for _i42 in xrange(_size38):
+ _elem43 = iprot.readString()
+ self.ipAddresses.append(_elem43)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -1431,44 +1455,44 @@ class ComputeResourceDescription:
elif fid == 7:
if ftype == TType.LIST:
self.batchQueues = []
- (_etype38, _size35) = iprot.readListBegin()
- for _i39 in xrange(_size35):
- _elem40 = BatchQueue()
- _elem40.read(iprot)
- self.batchQueues.append(_elem40)
+ (_etype47, _size44) = iprot.readListBegin()
+ for _i48 in xrange(_size44):
+ _elem49 = BatchQueue()
+ _elem49.read(iprot)
+ self.batchQueues.append(_elem49)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 8:
if ftype == TType.MAP:
self.fileSystems = {}
- (_ktype42, _vtype43, _size41 ) = iprot.readMapBegin()
- for _i45 in xrange(_size41):
- _key46 = iprot.readI32()
- _val47 = iprot.readString()
- self.fileSystems[_key46] = _val47
+ (_ktype51, _vtype52, _size50 ) = iprot.readMapBegin()
+ for _i54 in xrange(_size50):
+ _key55 = iprot.readI32()
+ _val56 = iprot.readString()
+ self.fileSystems[_key55] = _val56
iprot.readMapEnd()
else:
iprot.skip(ftype)
elif fid == 9:
if ftype == TType.LIST:
self.jobSubmissionInterfaces = []
- (_etype51, _size48) = iprot.readListBegin()
- for _i52 in xrange(_size48):
- _elem53 = JobSubmissionInterface()
- _elem53.read(iprot)
- self.jobSubmissionInterfaces.append(_elem53)
+ (_etype60, _size57) = iprot.readListBegin()
+ for _i61 in xrange(_size57):
+ _elem62 = JobSubmissionInterface()
+ _elem62.read(iprot)
+ self.jobSubmissionInterfaces.append(_elem62)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 10:
if ftype == TType.LIST:
self.dataMovementInterfaces = []
- (_etype57, _size54) = iprot.readListBegin()
- for _i58 in xrange(_size54):
- _elem59 = apache.airavata.model.data.movement.ttypes.DataMovementInterface()
- _elem59.read(iprot)
- self.dataMovementInterfaces.append(_elem59)
+ (_etype66, _size63) = iprot.readListBegin()
+ for _i67 in xrange(_size63):
+ _elem68 = apache.airavata.model.data.movement.ttypes.DataMovementInterface()
+ _elem68.read(iprot)
+ self.dataMovementInterfaces.append(_elem68)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -1513,15 +1537,15 @@ class ComputeResourceDescription:
if self.hostAliases is not None:
oprot.writeFieldBegin('hostAliases', TType.LIST, 3)
oprot.writeListBegin(TType.STRING, len(self.hostAliases))
- for iter60 in self.hostAliases:
- oprot.writeString(iter60)
+ for iter69 in self.hostAliases:
+ oprot.writeString(iter69)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.ipAddresses is not None:
oprot.writeFieldBegin('ipAddresses', TType.LIST, 4)
oprot.writeListBegin(TType.STRING, len(self.ipAddresses))
- for iter61 in self.ipAddresses:
- oprot.writeString(iter61)
+ for iter70 in self.ipAddresses:
+ oprot.writeString(iter70)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.resourceDescription is not None:
@@ -1535,30 +1559,30 @@ class ComputeResourceDescription:
if self.batchQueues is not None:
oprot.writeFieldBegin('batchQueues', TType.LIST, 7)
oprot.writeListBegin(TType.STRUCT, len(self.batchQueues))
- for iter62 in self.batchQueues:
- iter62.write(oprot)
+ for iter71 in self.batchQueues:
+ iter71.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.fileSystems is not None:
oprot.writeFieldBegin('fileSystems', TType.MAP, 8)
oprot.writeMapBegin(TType.I32, TType.STRING, len(self.fileSystems))
- for kiter63,viter64 in self.fileSystems.items():
- oprot.writeI32(kiter63)
- oprot.writeString(viter64)
+ for kiter72,viter73 in self.fileSystems.items():
+ oprot.writeI32(kiter72)
+ oprot.writeString(viter73)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.jobSubmissionInterfaces is not None:
oprot.writeFieldBegin('jobSubmissionInterfaces', TType.LIST, 9)
oprot.writeListBegin(TType.STRUCT, len(self.jobSubmissionInterfaces))
- for iter65 in self.jobSubmissionInterfaces:
- iter65.write(oprot)
+ for iter74 in self.jobSubmissionInterfaces:
+ iter74.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.dataMovementInterfaces is not None:
oprot.writeFieldBegin('dataMovementInterfaces', TType.LIST, 10)
oprot.writeListBegin(TType.STRUCT, len(self.dataMovementInterfaces))
- for iter66 in self.dataMovementInterfaces:
- iter66.write(oprot)
+ for iter75 in self.dataMovementInterfaces:
+ iter75.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.maxMemoryPerNode is not None:
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/__init__.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/__init__.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/__init__.py
new file mode 100644
index 0000000..adefd8e
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/__init__.py
@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants']
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/constants.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/constants.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/constants.py
new file mode 100644
index 0000000..4a6492b
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/constants.py
@@ -0,0 +1,11 @@
+#
+# Autogenerated by Thrift Compiler (0.9.3)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+# options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+from ttypes import *
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/ttypes.py
new file mode 100644
index 0000000..485d97e
--- /dev/null
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/parallelism/ttypes.py
@@ -0,0 +1,60 @@
+#
+# Autogenerated by Thrift Compiler (0.9.3)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+# options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TException, TApplicationException
+
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol, TProtocol
+try:
+ from thrift.protocol import fastbinary
+except:
+ fastbinary = None
+
+
+class ApplicationParallelismType:
+ """
+ Enumeration of application parallelism supported by Airavata
+
+ SERIAL:
+ Single processor applications without any parallelization.
+
+ MPI:
+ Messaging Passing Interface.
+
+ OPENMP:
+ Shared Memory Implementtaion.
+
+ OPENMP_MPI:
+ Hybrid Applications.
+
+ """
+ SERIAL = 0
+ MPI = 1
+ OPENMP = 2
+ OPENMP_MPI = 3
+ CCM = 4
+ CRAY_MPI = 5
+
+ _VALUES_TO_NAMES = {
+ 0: "SERIAL",
+ 1: "MPI",
+ 2: "OPENMP",
+ 3: "OPENMP_MPI",
+ 4: "CCM",
+ 5: "CRAY_MPI",
+ }
+
+ _NAMES_TO_VALUES = {
+ "SERIAL": 0,
+ "MPI": 1,
+ "OPENMP": 2,
+ "OPENMP_MPI": 3,
+ "CCM": 4,
+ "CRAY_MPI": 5,
+ }
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
index f3d6395..bbaa688 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index 681e161..73572af 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index 30a7001..f05059a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index 586b3f9..634024e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
index 180ed8a..3418efb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
index 4cbb384..951c083 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
index 8ad556e..ac05cc6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription");
@@ -104,7 +104,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
private String appModuleId; // required
private String computeHostId; // required
private String executablePath; // required
- private ApplicationParallelismType parallelism; // required
+ private org.apache.airavata.model.parallelism.ApplicationParallelismType parallelism; // required
private String appDeploymentDescription; // optional
private List<CommandObject> moduleLoadCmds; // optional
private List<SetEnvPaths> libPrependPaths; // optional
@@ -121,7 +121,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
EXECUTABLE_PATH((short)4, "executablePath"),
/**
*
- * @see ApplicationParallelismType
+ * @see org.apache.airavata.model.parallelism.ApplicationParallelismType
*/
PARALLELISM((short)5, "parallelism"),
APP_DEPLOYMENT_DESCRIPTION((short)6, "appDeploymentDescription"),
@@ -222,7 +222,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
tmpMap.put(_Fields.EXECUTABLE_PATH, new org.apache.thrift.meta_data.FieldMetaData("executablePath", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.PARALLELISM, new org.apache.thrift.meta_data.FieldMetaData("parallelism", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ApplicationParallelismType.class)));
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.parallelism.ApplicationParallelismType.class)));
tmpMap.put(_Fields.APP_DEPLOYMENT_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("appDeploymentDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.MODULE_LOAD_CMDS, new org.apache.thrift.meta_data.FieldMetaData("moduleLoadCmds", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -250,7 +250,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
public ApplicationDeploymentDescription() {
this.appDeploymentId = "DO_NOT_SET_AT_CLIENTS";
- this.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.SERIAL;
+ this.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.SERIAL;
}
@@ -259,7 +259,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
String appModuleId,
String computeHostId,
String executablePath,
- ApplicationParallelismType parallelism)
+ org.apache.airavata.model.parallelism.ApplicationParallelismType parallelism)
{
this();
this.appDeploymentId = appDeploymentId;
@@ -346,7 +346,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
this.appModuleId = null;
this.computeHostId = null;
this.executablePath = null;
- this.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.SERIAL;
+ this.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.SERIAL;
this.appDeploymentDescription = null;
this.moduleLoadCmds = null;
@@ -451,17 +451,17 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
/**
*
- * @see ApplicationParallelismType
+ * @see org.apache.airavata.model.parallelism.ApplicationParallelismType
*/
- public ApplicationParallelismType getParallelism() {
+ public org.apache.airavata.model.parallelism.ApplicationParallelismType getParallelism() {
return this.parallelism;
}
/**
*
- * @see ApplicationParallelismType
+ * @see org.apache.airavata.model.parallelism.ApplicationParallelismType
*/
- public void setParallelism(ApplicationParallelismType parallelism) {
+ public void setParallelism(org.apache.airavata.model.parallelism.ApplicationParallelismType parallelism) {
this.parallelism = parallelism;
}
@@ -769,7 +769,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
if (value == null) {
unsetParallelism();
} else {
- setParallelism((ApplicationParallelismType)value);
+ setParallelism((org.apache.airavata.model.parallelism.ApplicationParallelismType)value);
}
break;
@@ -1454,7 +1454,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
break;
case 5: // PARALLELISM
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.findByValue(iprot.readI32());
+ struct.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
struct.setParallelismIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1826,7 +1826,7 @@ public class ApplicationDeploymentDescription implements org.apache.thrift.TBase
struct.setComputeHostIdIsSet(true);
struct.executablePath = iprot.readString();
struct.setExecutablePathIsSet(true);
- struct.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.findByValue(iprot.readI32());
+ struct.parallelism = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
struct.setParallelismIsSet(true);
BitSet incoming = iprot.readBitSet(7);
if (incoming.get(0)) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
index 22e4a62..9107fdf 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index 27185f4..0c11f03 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
index 90abf0b..fa826f8 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
index a968715..f74db79 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
index 43e2084..d3361e6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
index ffb8e4b..430fb96 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
index 91fc6ef..49bee61 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription");
@@ -1565,13 +1565,13 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case 3: // HOST_ALIASES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list26 = iprot.readListBegin();
- struct.hostAliases = new ArrayList<String>(_list26.size);
- String _elem27;
- for (int _i28 = 0; _i28 < _list26.size; ++_i28)
+ org.apache.thrift.protocol.TList _list36 = iprot.readListBegin();
+ struct.hostAliases = new ArrayList<String>(_list36.size);
+ String _elem37;
+ for (int _i38 = 0; _i38 < _list36.size; ++_i38)
{
- _elem27 = iprot.readString();
- struct.hostAliases.add(_elem27);
+ _elem37 = iprot.readString();
+ struct.hostAliases.add(_elem37);
}
iprot.readListEnd();
}
@@ -1583,13 +1583,13 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case 4: // IP_ADDRESSES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list29 = iprot.readListBegin();
- struct.ipAddresses = new ArrayList<String>(_list29.size);
- String _elem30;
- for (int _i31 = 0; _i31 < _list29.size; ++_i31)
+ org.apache.thrift.protocol.TList _list39 = iprot.readListBegin();
+ struct.ipAddresses = new ArrayList<String>(_list39.size);
+ String _elem40;
+ for (int _i41 = 0; _i41 < _list39.size; ++_i41)
{
- _elem30 = iprot.readString();
- struct.ipAddresses.add(_elem30);
+ _elem40 = iprot.readString();
+ struct.ipAddresses.add(_elem40);
}
iprot.readListEnd();
}
@@ -1617,14 +1617,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case 7: // BATCH_QUEUES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
- struct.batchQueues = new ArrayList<BatchQueue>(_list32.size);
- BatchQueue _elem33;
- for (int _i34 = 0; _i34 < _list32.size; ++_i34)
+ org.apache.thrift.protocol.TList _list42 = iprot.readListBegin();
+ struct.batchQueues = new ArrayList<BatchQueue>(_list42.size);
+ BatchQueue _elem43;
+ for (int _i44 = 0; _i44 < _list42.size; ++_i44)
{
- _elem33 = new BatchQueue();
- _elem33.read(iprot);
- struct.batchQueues.add(_elem33);
+ _elem43 = new BatchQueue();
+ _elem43.read(iprot);
+ struct.batchQueues.add(_elem43);
}
iprot.readListEnd();
}
@@ -1636,15 +1636,15 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case 8: // FILE_SYSTEMS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin();
- struct.fileSystems = new HashMap<FileSystems,String>(2*_map35.size);
- FileSystems _key36;
- String _val37;
- for (int _i38 = 0; _i38 < _map35.size; ++_i38)
+ org.apache.thrift.protocol.TMap _map45 = iprot.readMapBegin();
+ struct.fileSystems = new HashMap<FileSystems,String>(2*_map45.size);
+ FileSystems _key46;
+ String _val47;
+ for (int _i48 = 0; _i48 < _map45.size; ++_i48)
{
- _key36 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32());
- _val37 = iprot.readString();
- struct.fileSystems.put(_key36, _val37);
+ _key46 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32());
+ _val47 = iprot.readString();
+ struct.fileSystems.put(_key46, _val47);
}
iprot.readMapEnd();
}
@@ -1656,14 +1656,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case 9: // JOB_SUBMISSION_INTERFACES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list39 = iprot.readListBegin();
- struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list39.size);
- JobSubmissionInterface _elem40;
- for (int _i41 = 0; _i41 < _list39.size; ++_i41)
+ org.apache.thrift.protocol.TList _list49 = iprot.readListBegin();
+ struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list49.size);
+ JobSubmissionInterface _elem50;
+ for (int _i51 = 0; _i51 < _list49.size; ++_i51)
{
- _elem40 = new JobSubmissionInterface();
- _elem40.read(iprot);
- struct.jobSubmissionInterfaces.add(_elem40);
+ _elem50 = new JobSubmissionInterface();
+ _elem50.read(iprot);
+ struct.jobSubmissionInterfaces.add(_elem50);
}
iprot.readListEnd();
}
@@ -1675,14 +1675,14 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case 10: // DATA_MOVEMENT_INTERFACES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list42 = iprot.readListBegin();
- struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list42.size);
- org.apache.airavata.model.data.movement.DataMovementInterface _elem43;
- for (int _i44 = 0; _i44 < _list42.size; ++_i44)
+ org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
+ struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list52.size);
+ org.apache.airavata.model.data.movement.DataMovementInterface _elem53;
+ for (int _i54 = 0; _i54 < _list52.size; ++_i54)
{
- _elem43 = new org.apache.airavata.model.data.movement.DataMovementInterface();
- _elem43.read(iprot);
- struct.dataMovementInterfaces.add(_elem43);
+ _elem53 = new org.apache.airavata.model.data.movement.DataMovementInterface();
+ _elem53.read(iprot);
+ struct.dataMovementInterfaces.add(_elem53);
}
iprot.readListEnd();
}
@@ -1751,9 +1751,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeFieldBegin(HOST_ALIASES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.hostAliases.size()));
- for (String _iter45 : struct.hostAliases)
+ for (String _iter55 : struct.hostAliases)
{
- oprot.writeString(_iter45);
+ oprot.writeString(_iter55);
}
oprot.writeListEnd();
}
@@ -1765,9 +1765,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeFieldBegin(IP_ADDRESSES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.ipAddresses.size()));
- for (String _iter46 : struct.ipAddresses)
+ for (String _iter56 : struct.ipAddresses)
{
- oprot.writeString(_iter46);
+ oprot.writeString(_iter56);
}
oprot.writeListEnd();
}
@@ -1791,9 +1791,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeFieldBegin(BATCH_QUEUES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.batchQueues.size()));
- for (BatchQueue _iter47 : struct.batchQueues)
+ for (BatchQueue _iter57 : struct.batchQueues)
{
- _iter47.write(oprot);
+ _iter57.write(oprot);
}
oprot.writeListEnd();
}
@@ -1805,10 +1805,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeFieldBegin(FILE_SYSTEMS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.fileSystems.size()));
- for (Map.Entry<FileSystems, String> _iter48 : struct.fileSystems.entrySet())
+ for (Map.Entry<FileSystems, String> _iter58 : struct.fileSystems.entrySet())
{
- oprot.writeI32(_iter48.getKey().getValue());
- oprot.writeString(_iter48.getValue());
+ oprot.writeI32(_iter58.getKey().getValue());
+ oprot.writeString(_iter58.getValue());
}
oprot.writeMapEnd();
}
@@ -1820,9 +1820,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.jobSubmissionInterfaces.size()));
- for (JobSubmissionInterface _iter49 : struct.jobSubmissionInterfaces)
+ for (JobSubmissionInterface _iter59 : struct.jobSubmissionInterfaces)
{
- _iter49.write(oprot);
+ _iter59.write(oprot);
}
oprot.writeListEnd();
}
@@ -1834,9 +1834,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeFieldBegin(DATA_MOVEMENT_INTERFACES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.dataMovementInterfaces.size()));
- for (org.apache.airavata.model.data.movement.DataMovementInterface _iter50 : struct.dataMovementInterfaces)
+ for (org.apache.airavata.model.data.movement.DataMovementInterface _iter60 : struct.dataMovementInterfaces)
{
- _iter50.write(oprot);
+ _iter60.write(oprot);
}
oprot.writeListEnd();
}
@@ -1927,18 +1927,18 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (struct.isSetHostAliases()) {
{
oprot.writeI32(struct.hostAliases.size());
- for (String _iter51 : struct.hostAliases)
+ for (String _iter61 : struct.hostAliases)
{
- oprot.writeString(_iter51);
+ oprot.writeString(_iter61);
}
}
}
if (struct.isSetIpAddresses()) {
{
oprot.writeI32(struct.ipAddresses.size());
- for (String _iter52 : struct.ipAddresses)
+ for (String _iter62 : struct.ipAddresses)
{
- oprot.writeString(_iter52);
+ oprot.writeString(_iter62);
}
}
}
@@ -1951,37 +1951,37 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (struct.isSetBatchQueues()) {
{
oprot.writeI32(struct.batchQueues.size());
- for (BatchQueue _iter53 : struct.batchQueues)
+ for (BatchQueue _iter63 : struct.batchQueues)
{
- _iter53.write(oprot);
+ _iter63.write(oprot);
}
}
}
if (struct.isSetFileSystems()) {
{
oprot.writeI32(struct.fileSystems.size());
- for (Map.Entry<FileSystems, String> _iter54 : struct.fileSystems.entrySet())
+ for (Map.Entry<FileSystems, String> _iter64 : struct.fileSystems.entrySet())
{
- oprot.writeI32(_iter54.getKey().getValue());
- oprot.writeString(_iter54.getValue());
+ oprot.writeI32(_iter64.getKey().getValue());
+ oprot.writeString(_iter64.getValue());
}
}
}
if (struct.isSetJobSubmissionInterfaces()) {
{
oprot.writeI32(struct.jobSubmissionInterfaces.size());
- for (JobSubmissionInterface _iter55 : struct.jobSubmissionInterfaces)
+ for (JobSubmissionInterface _iter65 : struct.jobSubmissionInterfaces)
{
- _iter55.write(oprot);
+ _iter65.write(oprot);
}
}
}
if (struct.isSetDataMovementInterfaces()) {
{
oprot.writeI32(struct.dataMovementInterfaces.size());
- for (org.apache.airavata.model.data.movement.DataMovementInterface _iter56 : struct.dataMovementInterfaces)
+ for (org.apache.airavata.model.data.movement.DataMovementInterface _iter66 : struct.dataMovementInterfaces)
{
- _iter56.write(oprot);
+ _iter66.write(oprot);
}
}
}
@@ -2009,26 +2009,26 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
BitSet incoming = iprot.readBitSet(12);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list57 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.hostAliases = new ArrayList<String>(_list57.size);
- String _elem58;
- for (int _i59 = 0; _i59 < _list57.size; ++_i59)
+ org.apache.thrift.protocol.TList _list67 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.hostAliases = new ArrayList<String>(_list67.size);
+ String _elem68;
+ for (int _i69 = 0; _i69 < _list67.size; ++_i69)
{
- _elem58 = iprot.readString();
- struct.hostAliases.add(_elem58);
+ _elem68 = iprot.readString();
+ struct.hostAliases.add(_elem68);
}
}
struct.setHostAliasesIsSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list60 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.ipAddresses = new ArrayList<String>(_list60.size);
- String _elem61;
- for (int _i62 = 0; _i62 < _list60.size; ++_i62)
+ org.apache.thrift.protocol.TList _list70 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.ipAddresses = new ArrayList<String>(_list70.size);
+ String _elem71;
+ for (int _i72 = 0; _i72 < _list70.size; ++_i72)
{
- _elem61 = iprot.readString();
- struct.ipAddresses.add(_elem61);
+ _elem71 = iprot.readString();
+ struct.ipAddresses.add(_elem71);
}
}
struct.setIpAddressesIsSet(true);
@@ -2043,57 +2043,57 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
}
if (incoming.get(4)) {
{
- org.apache.thrift.protocol.TList _list63 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.batchQueues = new ArrayList<BatchQueue>(_list63.size);
- BatchQueue _elem64;
- for (int _i65 = 0; _i65 < _list63.size; ++_i65)
+ org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.batchQueues = new ArrayList<BatchQueue>(_list73.size);
+ BatchQueue _elem74;
+ for (int _i75 = 0; _i75 < _list73.size; ++_i75)
{
- _elem64 = new BatchQueue();
- _elem64.read(iprot);
- struct.batchQueues.add(_elem64);
+ _elem74 = new BatchQueue();
+ _elem74.read(iprot);
+ struct.batchQueues.add(_elem74);
}
}
struct.setBatchQueuesIsSet(true);
}
if (incoming.get(5)) {
{
- org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.fileSystems = new HashMap<FileSystems,String>(2*_map66.size);
- FileSystems _key67;
- String _val68;
- for (int _i69 = 0; _i69 < _map66.size; ++_i69)
+ org.apache.thrift.protocol.TMap _map76 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.fileSystems = new HashMap<FileSystems,String>(2*_map76.size);
+ FileSystems _key77;
+ String _val78;
+ for (int _i79 = 0; _i79 < _map76.size; ++_i79)
{
- _key67 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32());
- _val68 = iprot.readString();
- struct.fileSystems.put(_key67, _val68);
+ _key77 = org.apache.airavata.model.appcatalog.computeresource.FileSystems.findByValue(iprot.readI32());
+ _val78 = iprot.readString();
+ struct.fileSystems.put(_key77, _val78);
}
}
struct.setFileSystemsIsSet(true);
}
if (incoming.get(6)) {
{
- org.apache.thrift.protocol.TList _list70 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list70.size);
- JobSubmissionInterface _elem71;
- for (int _i72 = 0; _i72 < _list70.size; ++_i72)
+ org.apache.thrift.protocol.TList _list80 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.jobSubmissionInterfaces = new ArrayList<JobSubmissionInterface>(_list80.size);
+ JobSubmissionInterface _elem81;
+ for (int _i82 = 0; _i82 < _list80.size; ++_i82)
{
- _elem71 = new JobSubmissionInterface();
- _elem71.read(iprot);
- struct.jobSubmissionInterfaces.add(_elem71);
+ _elem81 = new JobSubmissionInterface();
+ _elem81.read(iprot);
+ struct.jobSubmissionInterfaces.add(_elem81);
}
}
struct.setJobSubmissionInterfacesIsSet(true);
}
if (incoming.get(7)) {
{
- org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list73.size);
- org.apache.airavata.model.data.movement.DataMovementInterface _elem74;
- for (int _i75 = 0; _i75 < _list73.size; ++_i75)
+ org.apache.thrift.protocol.TList _list83 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.dataMovementInterfaces = new ArrayList<org.apache.airavata.model.data.movement.DataMovementInterface>(_list83.size);
+ org.apache.airavata.model.data.movement.DataMovementInterface _elem84;
+ for (int _i85 = 0; _i85 < _list83.size; ++_i85)
{
- _elem74 = new org.apache.airavata.model.data.movement.DataMovementInterface();
- _elem74.read(iprot);
- struct.dataMovementInterfaces.add(_elem74);
+ _elem84 = new org.apache.airavata.model.data.movement.DataMovementInterface();
+ _elem84.read(iprot);
+ struct.dataMovementInterfaces.add(_elem84);
}
}
struct.setDataMovementInterfacesIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
index 5d1f786..482c1b3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
@@ -51,7 +51,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-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
@@ -566,13 +566,13 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
case 3: // GLOBUS_GATE_KEEPER_END_POINT
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list18 = iprot.readListBegin();
- struct.globusGateKeeperEndPoint = new ArrayList<String>(_list18.size);
- String _elem19;
- for (int _i20 = 0; _i20 < _list18.size; ++_i20)
+ org.apache.thrift.protocol.TList _list28 = iprot.readListBegin();
+ struct.globusGateKeeperEndPoint = new ArrayList<String>(_list28.size);
+ String _elem29;
+ for (int _i30 = 0; _i30 < _list28.size; ++_i30)
{
- _elem19 = iprot.readString();
- struct.globusGateKeeperEndPoint.add(_elem19);
+ _elem29 = iprot.readString();
+ struct.globusGateKeeperEndPoint.add(_elem29);
}
iprot.readListEnd();
}
@@ -609,9 +609,9 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
oprot.writeFieldBegin(GLOBUS_GATE_KEEPER_END_POINT_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.globusGateKeeperEndPoint.size()));
- for (String _iter21 : struct.globusGateKeeperEndPoint)
+ for (String _iter31 : struct.globusGateKeeperEndPoint)
{
- oprot.writeString(_iter21);
+ oprot.writeString(_iter31);
}
oprot.writeListEnd();
}
@@ -645,9 +645,9 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
if (struct.isSetGlobusGateKeeperEndPoint()) {
{
oprot.writeI32(struct.globusGateKeeperEndPoint.size());
- for (String _iter22 : struct.globusGateKeeperEndPoint)
+ for (String _iter32 : struct.globusGateKeeperEndPoint)
{
- oprot.writeString(_iter22);
+ oprot.writeString(_iter32);
}
}
}
@@ -663,13 +663,13 @@ public class GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSub
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.globusGateKeeperEndPoint = new ArrayList<String>(_list23.size);
- String _elem24;
- for (int _i25 = 0; _i25 < _list23.size; ++_i25)
+ org.apache.thrift.protocol.TList _list33 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.globusGateKeeperEndPoint = new ArrayList<String>(_list33.size);
+ String _elem34;
+ for (int _i35 = 0; _i35 < _list33.size; ++_i35)
{
- _elem24 = iprot.readString();
- struct.globusGateKeeperEndPoint.add(_elem24);
+ _elem34 = iprot.readString();
+ struct.globusGateKeeperEndPoint.add(_elem34);
}
}
struct.setGlobusGateKeeperEndPointIsSet(true);
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
index 9ee2d14..6cb0d20 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
index a320fd6..0df794f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4363669c/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
index 4b4c67c..7f2fa4b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-26")
public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager");
@@ -77,6 +77,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
private static final org.apache.thrift.protocol.TField PUSH_MONITORING_ENDPOINT_FIELD_DESC = new org.apache.thrift.protocol.TField("pushMonitoringEndpoint", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField JOB_MANAGER_BIN_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("jobManagerBinPath", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final org.apache.thrift.protocol.TField JOB_MANAGER_COMMANDS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobManagerCommands", org.apache.thrift.protocol.TType.MAP, (short)5);
+ private static final org.apache.thrift.protocol.TField PARALLALISIM_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("parallalisimPrefix", org.apache.thrift.protocol.TType.MAP, (short)6);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -89,6 +90,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
private String pushMonitoringEndpoint; // optional
private String jobManagerBinPath; // optional
private Map<JobManagerCommand,String> jobManagerCommands; // optional
+ private Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallalisimPrefix; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -100,7 +102,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
RESOURCE_JOB_MANAGER_TYPE((short)2, "resourceJobManagerType"),
PUSH_MONITORING_ENDPOINT((short)3, "pushMonitoringEndpoint"),
JOB_MANAGER_BIN_PATH((short)4, "jobManagerBinPath"),
- JOB_MANAGER_COMMANDS((short)5, "jobManagerCommands");
+ JOB_MANAGER_COMMANDS((short)5, "jobManagerCommands"),
+ PARALLALISIM_PREFIX((short)6, "parallalisimPrefix");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -125,6 +128,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
return JOB_MANAGER_BIN_PATH;
case 5: // JOB_MANAGER_COMMANDS
return JOB_MANAGER_COMMANDS;
+ case 6: // PARALLALISIM_PREFIX
+ return PARALLALISIM_PREFIX;
default:
return null;
}
@@ -165,7 +170,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS};
+ private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS,_Fields.PARALLALISIM_PREFIX};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -181,6 +186,10 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, JobManagerCommand.class),
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.PARALLALISIM_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("parallalisimPrefix", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.parallelism.ApplicationParallelismType.class),
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ResourceJobManager.class, metaDataMap);
}
@@ -230,6 +239,21 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
this.jobManagerCommands = __this__jobManagerCommands;
}
+ if (other.isSetParallalisimPrefix()) {
+ Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> __this__parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(other.parallalisimPrefix.size());
+ for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> other_element : other.parallalisimPrefix.entrySet()) {
+
+ org.apache.airavata.model.parallelism.ApplicationParallelismType other_element_key = other_element.getKey();
+ String other_element_value = other_element.getValue();
+
+ org.apache.airavata.model.parallelism.ApplicationParallelismType __this__parallalisimPrefix_copy_key = other_element_key;
+
+ String __this__parallalisimPrefix_copy_value = other_element_value;
+
+ __this__parallalisimPrefix.put(__this__parallalisimPrefix_copy_key, __this__parallalisimPrefix_copy_value);
+ }
+ this.parallalisimPrefix = __this__parallalisimPrefix;
+ }
}
public ResourceJobManager deepCopy() {
@@ -244,6 +268,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
this.pushMonitoringEndpoint = null;
this.jobManagerBinPath = null;
this.jobManagerCommands = null;
+ this.parallalisimPrefix = null;
}
public String getResourceJobManagerId() {
@@ -380,6 +405,40 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
}
+ public int getParallalisimPrefixSize() {
+ return (this.parallalisimPrefix == null) ? 0 : this.parallalisimPrefix.size();
+ }
+
+ public void putToParallalisimPrefix(org.apache.airavata.model.parallelism.ApplicationParallelismType key, String val) {
+ if (this.parallalisimPrefix == null) {
+ this.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>();
+ }
+ this.parallalisimPrefix.put(key, val);
+ }
+
+ public Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> getParallalisimPrefix() {
+ return this.parallalisimPrefix;
+ }
+
+ public void setParallalisimPrefix(Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallalisimPrefix) {
+ this.parallalisimPrefix = parallalisimPrefix;
+ }
+
+ public void unsetParallalisimPrefix() {
+ this.parallalisimPrefix = null;
+ }
+
+ /** Returns true if field parallalisimPrefix is set (has been assigned a value) and false otherwise */
+ public boolean isSetParallalisimPrefix() {
+ return this.parallalisimPrefix != null;
+ }
+
+ public void setParallalisimPrefixIsSet(boolean value) {
+ if (!value) {
+ this.parallalisimPrefix = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case RESOURCE_JOB_MANAGER_ID:
@@ -422,6 +481,14 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
break;
+ case PARALLALISIM_PREFIX:
+ if (value == null) {
+ unsetParallalisimPrefix();
+ } else {
+ setParallalisimPrefix((Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>)value);
+ }
+ break;
+
}
}
@@ -442,6 +509,9 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
case JOB_MANAGER_COMMANDS:
return getJobManagerCommands();
+ case PARALLALISIM_PREFIX:
+ return getParallalisimPrefix();
+
}
throw new IllegalStateException();
}
@@ -463,6 +533,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
return isSetJobManagerBinPath();
case JOB_MANAGER_COMMANDS:
return isSetJobManagerCommands();
+ case PARALLALISIM_PREFIX:
+ return isSetParallalisimPrefix();
}
throw new IllegalStateException();
}
@@ -525,6 +597,15 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
return false;
}
+ boolean this_present_parallalisimPrefix = true && this.isSetParallalisimPrefix();
+ boolean that_present_parallalisimPrefix = true && that.isSetParallalisimPrefix();
+ if (this_present_parallalisimPrefix || that_present_parallalisimPrefix) {
+ if (!(this_present_parallalisimPrefix && that_present_parallalisimPrefix))
+ return false;
+ if (!this.parallalisimPrefix.equals(that.parallalisimPrefix))
+ return false;
+ }
+
return true;
}
@@ -557,6 +638,11 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
if (present_jobManagerCommands)
list.add(jobManagerCommands);
+ boolean present_parallalisimPrefix = true && (isSetParallalisimPrefix());
+ list.add(present_parallalisimPrefix);
+ if (present_parallalisimPrefix)
+ list.add(parallalisimPrefix);
+
return list.hashCode();
}
@@ -618,6 +704,16 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetParallalisimPrefix()).compareTo(other.isSetParallalisimPrefix());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetParallalisimPrefix()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallalisimPrefix, other.parallalisimPrefix);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -683,6 +779,16 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
first = false;
}
+ if (isSetParallalisimPrefix()) {
+ if (!first) sb.append(", ");
+ sb.append("parallalisimPrefix:");
+ if (this.parallalisimPrefix == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.parallalisimPrefix);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -786,6 +892,26 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 6: // PARALLALISIM_PREFIX
+ if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+ {
+ org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin();
+ struct.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map4.size);
+ org.apache.airavata.model.parallelism.ApplicationParallelismType _key5;
+ String _val6;
+ for (int _i7 = 0; _i7 < _map4.size; ++_i7)
+ {
+ _key5 = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
+ _val6 = iprot.readString();
+ struct.parallalisimPrefix.put(_key5, _val6);
+ }
+ iprot.readMapEnd();
+ }
+ struct.setParallalisimPrefixIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -828,10 +954,25 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
oprot.writeFieldBegin(JOB_MANAGER_COMMANDS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.jobManagerCommands.size()));
- for (Map.Entry<JobManagerCommand, String> _iter4 : struct.jobManagerCommands.entrySet())
+ for (Map.Entry<JobManagerCommand, String> _iter8 : struct.jobManagerCommands.entrySet())
{
- oprot.writeI32(_iter4.getKey().getValue());
- oprot.writeString(_iter4.getValue());
+ oprot.writeI32(_iter8.getKey().getValue());
+ oprot.writeString(_iter8.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.parallalisimPrefix != null) {
+ if (struct.isSetParallalisimPrefix()) {
+ oprot.writeFieldBegin(PARALLALISIM_PREFIX_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.parallalisimPrefix.size()));
+ for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter9 : struct.parallalisimPrefix.entrySet())
+ {
+ oprot.writeI32(_iter9.getKey().getValue());
+ oprot.writeString(_iter9.getValue());
}
oprot.writeMapEnd();
}
@@ -867,7 +1008,10 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
if (struct.isSetJobManagerCommands()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetParallalisimPrefix()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetPushMonitoringEndpoint()) {
oprot.writeString(struct.pushMonitoringEndpoint);
}
@@ -877,10 +1021,20 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
if (struct.isSetJobManagerCommands()) {
{
oprot.writeI32(struct.jobManagerCommands.size());
- for (Map.Entry<JobManagerCommand, String> _iter5 : struct.jobManagerCommands.entrySet())
+ for (Map.Entry<JobManagerCommand, String> _iter10 : struct.jobManagerCommands.entrySet())
{
- oprot.writeI32(_iter5.getKey().getValue());
- oprot.writeString(_iter5.getValue());
+ oprot.writeI32(_iter10.getKey().getValue());
+ oprot.writeString(_iter10.getValue());
+ }
+ }
+ }
+ if (struct.isSetParallalisimPrefix()) {
+ {
+ oprot.writeI32(struct.parallalisimPrefix.size());
+ for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter11 : struct.parallalisimPrefix.entrySet())
+ {
+ oprot.writeI32(_iter11.getKey().getValue());
+ oprot.writeString(_iter11.getValue());
}
}
}
@@ -893,7 +1047,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
struct.setResourceJobManagerIdIsSet(true);
struct.resourceJobManagerType = org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType.findByValue(iprot.readI32());
struct.setResourceJobManagerTypeIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
+ BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
struct.pushMonitoringEndpoint = iprot.readString();
struct.setPushMonitoringEndpointIsSet(true);
@@ -904,19 +1058,34 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.jobManagerCommands = new HashMap<JobManagerCommand,String>(2*_map6.size);
- JobManagerCommand _key7;
- String _val8;
- for (int _i9 = 0; _i9 < _map6.size; ++_i9)
+ org.apache.thrift.protocol.TMap _map12 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.jobManagerCommands = new HashMap<JobManagerCommand,String>(2*_map12.size);
+ JobManagerCommand _key13;
+ String _val14;
+ for (int _i15 = 0; _i15 < _map12.size; ++_i15)
{
- _key7 = org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand.findByValue(iprot.readI32());
- _val8 = iprot.readString();
- struct.jobManagerCommands.put(_key7, _val8);
+ _key13 = org.apache.airavata.model.appcatalog.computeresource.JobManagerCommand.findByValue(iprot.readI32());
+ _val14 = iprot.readString();
+ struct.jobManagerCommands.put(_key13, _val14);
}
}
struct.setJobManagerCommandsIsSet(true);
}
+ if (incoming.get(3)) {
+ {
+ org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map16.size);
+ org.apache.airavata.model.parallelism.ApplicationParallelismType _key17;
+ String _val18;
+ for (int _i19 = 0; _i19 < _map16.size; ++_i19)
+ {
+ _key17 = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32());
+ _val18 = iprot.readString();
+ struct.parallalisimPrefix.put(_key17, _val18);
+ }
+ }
+ struct.setParallalisimPrefixIsSet(true);
+ }
}
}
[14/14] airavata git commit: Merge remote-tracking branch
'origin/develop'
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/develop'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/630c7511
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/630c7511
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/630c7511
Branch: refs/heads/master
Commit: 630c75116925e86a49b5e78f0e962c6ea567ead0
Parents: e6d6827 851117f
Author: smarru <sm...@apache.org>
Authored: Thu Mar 3 13:14:47 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Thu Mar 3 13:14:47 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../application_deployment_model_types.cpp | 22 +-
.../application_deployment_model_types.h | 22 +-
.../airavata/compute_resource_model_types.cpp | 546 ++++++++++---------
.../lib/airavata/compute_resource_model_types.h | 11 +-
.../lib/airavata/experiment_model_types.cpp | 52 +-
.../lib/airavata/experiment_model_types.h | 12 +-
.../airavata/parallelism_model_constants.cpp | 34 ++
.../lib/airavata/parallelism_model_constants.h | 41 ++
.../lib/airavata/parallelism_model_types.cpp | 51 ++
.../lib/airavata/parallelism_model_types.h | 54 ++
.../Model/AppCatalog/AppDeployment/Types.php | 33 --
.../Model/AppCatalog/ComputeResource/Types.php | 221 +++++---
.../Model/AppCatalog/Parallelism/Types.php | 53 ++
.../lib/Airavata/Model/Experiment/Types.php | 67 ++-
.../model/appcatalog/appdeployment/ttypes.py | 43 +-
.../model/appcatalog/computeresource/ttypes.py | 138 +++--
.../model/appcatalog/parallelism/__init__.py | 1 +
.../model/appcatalog/parallelism/constants.py | 11 +
.../model/appcatalog/parallelism/ttypes.py | 60 ++
.../apache/airavata/model/experiment/ttypes.py | 61 ++-
.../client/samples/RegisterSampleData.java | 2 +-
.../tools/RegisterOGCEUS3Application.java | 2 +-
.../tools/RegisterSampleApplications.java | 2 +-
.../tools/RegisterSampleApplicationsUtils.java | 2 +-
.../client/tools/RegisterUS3Application.java | 2 +-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 28 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../ApplicationParallelismType.java | 90 ---
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 218 ++++----
.../computeresource/GlobusJobSubmission.java | 34 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 207 ++++++-
.../computeresource/SSHJobSubmission.java | 34 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 2 +-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.java | 2 +-
.../application/io/InputDataObjectType.java | 2 +-
.../application/io/OutputDataObjectType.java | 2 +-
.../airavata/model/commons/ErrorModel.java | 2 +-
.../model/commons/ValidationResults.java | 2 +-
.../airavata/model/commons/ValidatorResult.java | 2 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.java | 2 +-
.../model/error/AiravataClientException.java | 2 +-
.../model/error/AiravataSystemException.java | 2 +-
.../model/error/AuthenticationException.java | 2 +-
.../model/error/AuthorizationException.java | 2 +-
.../error/ExperimentNotFoundException.java | 2 +-
.../model/error/InvalidRequestException.java | 2 +-
.../model/error/LaunchValidationException.java | 2 +-
.../model/error/ProjectNotFoundException.java | 2 +-
.../airavata/model/error/TimedOutException.java | 2 +-
.../airavata/model/error/ValidationResults.java | 2 +-
.../airavata/model/error/ValidatorResult.java | 2 +-
.../model/experiment/ExperimentModel.java | 208 +++++--
.../model/experiment/ExperimentStatistics.java | 2 +-
.../experiment/ExperimentSummaryModel.java | 2 +-
.../experiment/UserConfigurationDataModel.java | 2 +-
.../org/apache/airavata/model/job/JobModel.java | 2 +-
.../event/ExperimentStatusChangeEvent.java | 2 +-
.../model/messaging/event/JobIdentifier.java | 2 +-
.../messaging/event/JobStatusChangeEvent.java | 2 +-
.../event/JobStatusChangeRequestEvent.java | 2 +-
.../airavata/model/messaging/event/Message.java | 2 +-
.../messaging/event/ProcessIdentifier.java | 2 +-
.../event/ProcessStatusChangeEvent.java | 2 +-
.../event/ProcessStatusChangeRequestEvent.java | 2 +-
.../messaging/event/ProcessSubmitEvent.java | 2 +-
.../messaging/event/ProcessTerminateEvent.java | 2 +-
.../model/messaging/event/TaskIdentifier.java | 2 +-
.../messaging/event/TaskOutputChangeEvent.java | 2 +-
.../messaging/event/TaskStatusChangeEvent.java | 2 +-
.../event/TaskStatusChangeRequestEvent.java | 2 +-
.../parallelism/ApplicationParallelismType.java | 90 +++
.../airavata/model/process/ProcessModel.java | 2 +-
.../ComputationalResourceSchedulingModel.java | 2 +-
.../airavata/model/security/AuthzToken.java | 2 +-
.../airavata/model/status/ExperimentStatus.java | 2 +-
.../apache/airavata/model/status/JobStatus.java | 2 +-
.../airavata/model/status/ProcessStatus.java | 2 +-
.../airavata/model/status/TaskStatus.java | 2 +-
.../model/task/DataStagingTaskModel.java | 2 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.java | 2 +-
.../apache/airavata/model/task/TaskModel.java | 2 +-
.../airavata/model/workspace/Gateway.java | 2 +-
.../apache/airavata/model/workspace/Group.java | 2 +-
.../airavata/model/workspace/Project.java | 2 +-
.../apache/airavata/model/workspace/User.java | 2 +-
.../apache/airavata/gfac/core/GFacUtils.java | 30 +-
.../impl/task/DefaultJobSubmissionTask.java | 3 +-
.../task/utils/bes/ApplicationProcessor.java | 2 +-
.../catalog/impl/ApplicationDeploymentImpl.java | 2 +-
.../app/catalog/impl/ComputeResourceImpl.java | 33 ++
.../catalog/model/ParallelismPrefixCommand.java | 78 +++
.../model/ParallelismPrefixCommand_PK.java | 62 +++
.../resources/AppCatAbstractResource.java | 7 +
.../ParallelismPrefixCommandResource.java | 350 ++++++++++++
.../app/catalog/util/AppCatalogJPAUtils.java | 18 +
.../catalog/util/AppCatalogResourceType.java | 1 +
.../util/AppCatalogThriftConversion.java | 12 +
.../catalog/impl/ExperimentRegistry.java | 2 +
.../experiment/catalog/model/Experiment.java | 11 +
.../catalog/resources/ExperimentResource.java | 11 +
.../experiment/catalog/resources/Utils.java | 1 +
.../utils/ThriftDataModelConversion.java | 1 +
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/appcatalog-derby.sql | 9 +
.../src/main/resources/appcatalog-mysql.sql | 9 +
.../src/main/resources/expcatalog-derby.sql | 1 +
.../src/main/resources/expcatalog-mysql.sql | 1 +
.../test-suite/multi-tenanted-airavata/pom.xml | 10 +-
.../ApplicationRegister.java | 2 +-
.../application_deployment_model.thrift | 28 +-
.../app-catalog-models/parallelism_model.thrift | 54 ++
.../experiment_model.thrift | 17 +-
.../compute_resource_model.thrift | 4 +-
138 files changed, 2336 insertions(+), 1030 deletions(-)
----------------------------------------------------------------------
[11/14] airavata git commit: adding parallelism type
Posted by sm...@apache.org.
adding parallelism type
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d66d1698
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d66d1698
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d66d1698
Branch: refs/heads/master
Commit: d66d16980be161817dd9c24048a99bc50183605c
Parents: f0c730c
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Fri Feb 26 16:38:47 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Fri Feb 26 16:38:47 2016 -0500
----------------------------------------------------------------------
.../ApplicationParallelismType.java | 90 -----
.../apache/airavata/gfac/core/GFacUtils.java | 2 +-
.../app/catalog/impl/ComputeResourceImpl.java | 33 ++
.../catalog/model/ParallelismPrefixCommand.java | 78 +++++
.../model/ParallelismPrefixCommand_PK.java | 62 ++++
.../resources/AppCatAbstractResource.java | 7 +
.../ParallelismPrefixCommandResource.java | 350 +++++++++++++++++++
.../app/catalog/util/AppCatalogJPAUtils.java | 18 +
.../catalog/util/AppCatalogResourceType.java | 1 +
.../util/AppCatalogThriftConversion.java | 12 +
.../src/main/resources/appcatalog-derby.sql | 9 +
.../src/main/resources/appcatalog-mysql.sql | 9 +
12 files changed, 580 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
deleted file mode 100644
index 11323d2..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationParallelismType.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.airavata.model.appcatalog.appdeployment;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-/**
- * Enumeration of application parallelism supported by Airavata
- *
- * SERIAL:
- * Single processor applications without any parallelization.
- *
- * MPI:
- * Messaging Passing Interface.
- *
- * OPENMP:
- * Shared Memory Implementtaion.
- *
- * OPENMP_MPI:
- * Hybrid Applications.
- *
- */
-public enum ApplicationParallelismType implements org.apache.thrift.TEnum {
- SERIAL(0),
- MPI(1),
- OPENMP(2),
- OPENMP_MPI(3),
- CCM(4),
- CRAY_MPI(5);
-
- private final int value;
-
- private ApplicationParallelismType(int value) {
- this.value = value;
- }
-
- /**
- * Get the integer value of this enum value, as defined in the Thrift IDL.
- */
- public int getValue() {
- return value;
- }
-
- /**
- * Find a the enum type by its integer value, as defined in the Thrift IDL.
- * @return null if the value is not found.
- */
- public static ApplicationParallelismType findByValue(int value) {
- switch (value) {
- case 0:
- return SERIAL;
- case 1:
- return MPI;
- case 2:
- return OPENMP;
- case 3:
- return OPENMP_MPI;
- case 4:
- return CCM;
- case 5:
- return CRAY_MPI;
- default:
- return null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 54f3715..1325659 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -28,7 +28,6 @@ import org.apache.airavata.gfac.core.context.ProcessContext;
import org.apache.airavata.gfac.core.context.TaskContext;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType;
import org.apache.airavata.model.appcatalog.appdeployment.CommandObject;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
@@ -39,6 +38,7 @@ import org.apache.airavata.model.commons.ErrorModel;
import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.messaging.event.*;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.status.*;
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
index 3dbf671..e0e260c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
@@ -24,6 +24,8 @@ package org.apache.airavata.registry.core.app.catalog.impl;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.data.movement.*;
import org.apache.airavata.model.data.movement.DMType;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
+import org.apache.airavata.registry.core.app.catalog.model.ParallelismPrefixCommand;
import org.apache.airavata.registry.core.app.catalog.resources.*;
import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion;
import org.apache.airavata.registry.core.app.catalog.util.AppCatalogUtils;
@@ -829,6 +831,17 @@ public class ComputeResourceImpl implements ComputeResource {
r.save();
}
}
+
+ Map<ApplicationParallelismType, String> parallelismPrefix = resourceJobManager.getParallelismPrefix();
+ if (parallelismPrefix!=null && parallelismPrefix.size() != 0) {
+ for (ApplicationParallelismType commandType : parallelismPrefix.keySet()) {
+ ParallelismPrefixCommandResource r = new ParallelismPrefixCommandResource();
+ r.setCommandType(commandType.toString());
+ r.setCommand(parallelismPrefix.get(commandType));
+ r.setResourceJobManagerId(resource.getResourceJobManagerId());
+ r.save();
+ }
+ }
return resource.getResourceJobManagerId();
}
@@ -857,6 +870,26 @@ public class ComputeResourceImpl implements ComputeResource {
existingCommand.save();
}
}
+
+ Map<ApplicationParallelismType, String> parallelismPrefix = updatedResourceJobManager.getParallelismPrefix();
+ if (parallelismPrefix!=null && parallelismPrefix.size() != 0) {
+ for (ApplicationParallelismType commandType : parallelismPrefix.keySet()) {
+ ParallelismPrefixCommandResource r = new ParallelismPrefixCommandResource();
+ Map<String, String> ids = new HashMap<String, String>();
+ ids.put(AppCatAbstractResource.ParallelismCommandConstants.RESOURCE_JOB_MANAGER_ID, resourceJobManagerId);
+ ids.put(AppCatAbstractResource.ParallelismCommandConstants.COMMAND_TYPE, commandType.toString());
+ ParallelismPrefixCommandResource existingCommand;
+ if (r.isExists(ids)){
+ existingCommand = (ParallelismPrefixCommandResource)r.get(ids);
+ }else {
+ existingCommand = new ParallelismPrefixCommandResource();
+ }
+ existingCommand.setCommandType(commandType.toString());
+ existingCommand.setCommand(parallelismPrefix.get(commandType));
+ existingCommand.setResourceJobManagerId(resource.getResourceJobManagerId());
+ existingCommand.save();
+ }
+ }
}catch (Exception e){
logger.error("Error while updating resource job manager..", e);
throw new AppCatalogException(e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ParallelismPrefixCommand.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ParallelismPrefixCommand.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ParallelismPrefixCommand.java
new file mode 100644
index 0000000..17409bd
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ParallelismPrefixCommand.java
@@ -0,0 +1,78 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.core.app.catalog.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PARALLELISM_COMMAND")
+@IdClass(ParallelismPrefixCommand_PK.class)
+public class ParallelismPrefixCommand implements Serializable {
+
+ @Id
+ @Column(name = "RESOURCE_JOB_MANAGER_ID")
+ private String resourceJobManagerId;
+
+ @ManyToOne(cascade= CascadeType.MERGE)
+ @JoinColumn(name = "RESOURCE_JOB_MANAGER_ID")
+ private ResourceJobManager resourceJobManager;
+
+ @Id
+ @Column(name = "COMMAND_TYPE")
+ private String commandType;
+
+ @Column(name = "COMMAND")
+ private String command;
+
+ public String getResourceJobManagerId() {
+ return resourceJobManagerId;
+ }
+
+ public ResourceJobManager getResourceJobManager() {
+ return resourceJobManager;
+ }
+
+ public String getCommandType() {
+ return commandType;
+ }
+
+ public String getCommand() {
+ return command;
+ }
+
+ public void setResourceJobManagerId(String resourceJobManagerId) {
+ this.resourceJobManagerId=resourceJobManagerId;
+ }
+
+ public void setResourceJobManager(ResourceJobManager resourceJobManager) {
+ this.resourceJobManager=resourceJobManager;
+ }
+
+ public void setCommandType(String commandType) {
+ this.commandType=commandType;
+ }
+
+ public void setCommand(String command) {
+ this.command=command;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ParallelismPrefixCommand_PK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ParallelismPrefixCommand_PK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ParallelismPrefixCommand_PK.java
new file mode 100644
index 0000000..cea91f0
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ParallelismPrefixCommand_PK.java
@@ -0,0 +1,62 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.core.app.catalog.model;
+
+import java.io.Serializable;
+
+public class ParallelismPrefixCommand_PK implements Serializable {
+ private String resourceJobManagerId;
+ private String commandType;
+ public ParallelismPrefixCommand_PK(String resourceJobManagerId, String commandType){
+ this.resourceJobManagerId = resourceJobManagerId;
+ this.commandType = commandType;
+ }
+
+ public ParallelismPrefixCommand_PK() {
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return 1;
+ }
+
+ public String getResourceJobManagerId() {
+ return resourceJobManagerId;
+ }
+
+ public String getCommandType() {
+ return commandType;
+ }
+
+ public void setResourceJobManagerId(String resourceJobManagerId) {
+ this.resourceJobManagerId=resourceJobManagerId;
+ }
+
+ public void setCommandType(String commandType) {
+ this.commandType=commandType;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
index 1766f00..2fb4a77 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
@@ -62,6 +62,7 @@ public abstract class AppCatAbstractResource implements AppCatalogResource {
public static final String DATA_MOVEMENT_INTERFACE = "DataMovementInterface";
public static final String RESOURCE_JOB_MANAGER = "ResourceJobManager";
public static final String JOB_MANAGER_COMMAND = "JobManagerCommand";
+ public static final String PARALLELISM_PREFIX_COMMAND = "ParallelismPrefixCommand";
public static final String LOCAL_SUBMISSION = "LocalSubmission";
public static final String LOCAL_DATA_MOVEMENT = "LocalDataMovement";
public static final String SSH_JOB_SUBMISSION = "SshJobSubmission";
@@ -361,6 +362,12 @@ public abstract class AppCatAbstractResource implements AppCatalogResource {
public static final String COMMAND_TYPE = "commandType";
public static final String COMMAND = "command";
}
+
+ public final class ParallelismCommandConstants {
+ public static final String RESOURCE_JOB_MANAGER_ID = "resourceJobManagerId";
+ public static final String COMMAND_TYPE = "commandType";
+ public static final String COMMAND = "command";
+ }
// Gridftp Data Movement Table
public final class GridftpDataMovementConstants {
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ParallelismPrefixCommandResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ParallelismPrefixCommandResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ParallelismPrefixCommandResource.java
new file mode 100644
index 0000000..3a1a038
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ParallelismPrefixCommandResource.java
@@ -0,0 +1,350 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.registry.core.app.catalog.resources;
+
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.registry.core.app.catalog.model.*;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogJPAUtils;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogQueryGenerator;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogResourceType;
+import org.apache.airavata.registry.cpi.AppCatalogException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ParallelismPrefixCommandResource extends AppCatAbstractResource {
+ private final static Logger logger = LoggerFactory.getLogger(ParallelismPrefixCommandResource.class);
+ private String resourceJobManagerId;
+ private ResourceJobManagerResource resourceJobManagerResource;
+ private String commandType;
+ private String command;
+
+ @Override
+ public void remove(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap<String, String>) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(PARALLELISM_PREFIX_COMMAND);
+ generator.setParameter(ParallelismCommandConstants.RESOURCE_JOB_MANAGER_ID, ids.get(ParallelismCommandConstants.RESOURCE_JOB_MANAGER_ID));
+ generator.setParameter(ParallelismCommandConstants.COMMAND_TYPE, ids.get(ParallelismCommandConstants.COMMAND_TYPE));
+ Query q = generator.deleteQuery(em);
+ q.executeUpdate();
+ em.getTransaction().commit();
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+ @Override
+ public AppCatalogResource get(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap<String, String>) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(PARALLELISM_PREFIX_COMMAND);
+ generator.setParameter(ParallelismCommandConstants.RESOURCE_JOB_MANAGER_ID, ids.get(ParallelismCommandConstants.RESOURCE_JOB_MANAGER_ID));
+ generator.setParameter(ParallelismCommandConstants.COMMAND_TYPE, ids.get(ParallelismCommandConstants.COMMAND_TYPE));
+ Query q = generator.selectQuery(em);
+ ParallelismPrefixCommand parallelismPrefixCommand = (ParallelismPrefixCommand) q.getSingleResult();
+ ParallelismPrefixCommandResource prefixCommandResource = (ParallelismPrefixCommandResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.PARALLELISM_PREFIX_COMMAND, parallelismPrefixCommand);
+ em.getTransaction().commit();
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ return prefixCommandResource;
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+ @Override
+ public List<AppCatalogResource> get(String fieldName, Object value) throws AppCatalogException {
+ List<AppCatalogResource> parallelismCommandResources = new ArrayList<AppCatalogResource>();
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(PARALLELISM_PREFIX_COMMAND);
+ Query q;
+ if ((fieldName.equals(ParallelismCommandConstants.RESOURCE_JOB_MANAGER_ID)) || (fieldName.equals(ParallelismCommandConstants.COMMAND_TYPE)) || (fieldName.equals(ParallelismCommandConstants.COMMAND))) {
+ generator.setParameter(fieldName, value);
+ q = generator.selectQuery(em);
+ List<?> results = q.getResultList();
+ for (Object result : results) {
+ ParallelismPrefixCommand prefixCommand = (ParallelismPrefixCommand) result;
+ ParallelismPrefixCommandResource parallelismPrefixCommandResource = (ParallelismPrefixCommandResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.PARALLELISM_PREFIX_COMMAND, prefixCommand);
+ parallelismCommandResources.add(parallelismPrefixCommandResource);
+ }
+ } else {
+ em.getTransaction().commit();
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ logger.error("Unsupported field name for Parallelism Command Resource.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Unsupported field name for Parallelism Command Resource.");
+ }
+ em.getTransaction().commit();
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ return parallelismCommandResources;
+ }
+
+ @Override
+ public List<AppCatalogResource> getAll() throws AppCatalogException {
+ return null;
+ }
+
+ @Override
+ public List<String> getAllIds() throws AppCatalogException {
+ return null;
+ }
+
+ @Override
+ public List<String> getIds(String fieldName, Object value) throws AppCatalogException {
+ List<String> parallelismCommandResourceIDs = new ArrayList<String>();
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(PARALLELISM_PREFIX_COMMAND);
+ Query q;
+ if ((fieldName.equals(ParallelismCommandConstants.RESOURCE_JOB_MANAGER_ID)) || (fieldName.equals(ParallelismCommandConstants.COMMAND_TYPE)) || (fieldName.equals(ParallelismCommandConstants.COMMAND))) {
+ generator.setParameter(fieldName, value);
+ q = generator.selectQuery(em);
+ List<?> results = q.getResultList();
+ for (Object result : results) {
+ ParallelismPrefixCommand parallelismPrefixCommand = (ParallelismPrefixCommand) result;
+ ParallelismPrefixCommandResource parallelismPrefixCommandResource = (ParallelismPrefixCommandResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.PARALLELISM_PREFIX_COMMAND, parallelismPrefixCommand);
+ parallelismCommandResourceIDs.add(parallelismPrefixCommandResource.getResourceJobManagerId());
+ }
+ } else {
+ em.getTransaction().commit();
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ logger.error("Unsupported field name for Parallelism Command Resource.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Unsupported field name for Parallelism Command Resource.");
+ }
+ em.getTransaction().commit();
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ return parallelismCommandResourceIDs;
+ }
+
+ @Override
+ public void save() throws AppCatalogException {
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ ParallelismPrefixCommand existingParallelismCommand = em.find(ParallelismPrefixCommand.class, new ParallelismPrefixCommand_PK(resourceJobManagerId, commandType));
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+
+ ParallelismPrefixCommand prefixCommand;
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ if (existingParallelismCommand == null) {
+ prefixCommand = new ParallelismPrefixCommand();
+ } else {
+ prefixCommand = existingParallelismCommand;
+ }
+ prefixCommand.setResourceJobManagerId(getResourceJobManagerId());
+ ResourceJobManager resourceJobManager = em.find(ResourceJobManager.class, getResourceJobManagerId());
+ prefixCommand.setResourceJobManager(resourceJobManager);
+ prefixCommand.setCommandType(getCommandType());
+ prefixCommand.setCommand(getCommand());
+ if (existingParallelismCommand == null) {
+ em.persist(prefixCommand);
+ } else {
+ em.merge(prefixCommand);
+ }
+ em.getTransaction().commit();
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+ @Override
+ public boolean isExists(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap<String, String>) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ ParallelismPrefixCommand parallelismPrefixCommand = em.find(ParallelismPrefixCommand.class, new ParallelismPrefixCommand_PK(ids.get(ParallelismCommandConstants.RESOURCE_JOB_MANAGER_ID), ids.get(ParallelismCommandConstants.COMMAND_TYPE)));
+ if (em.isOpen()) {
+ if (em.getTransaction().isActive()){
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ return parallelismPrefixCommand != null;
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+ public String getResourceJobManagerId() {
+ return resourceJobManagerId;
+ }
+
+ public ResourceJobManagerResource getResourceJobManagerResource() {
+ return resourceJobManagerResource;
+ }
+
+ public String getCommandType() {
+ return commandType;
+ }
+
+ public String getCommand() {
+ return command;
+ }
+
+ public void setResourceJobManagerId(String resourceJobManagerId) {
+ this.resourceJobManagerId=resourceJobManagerId;
+ }
+
+ public void setResourceJobManagerResource(ResourceJobManagerResource resourceJobManagerResource) {
+ this.resourceJobManagerResource=resourceJobManagerResource;
+ }
+
+ public void setCommandType(String commandType) {
+ this.commandType=commandType;
+ }
+
+ public void setCommand(String command) {
+ this.command=command;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index d5e7549..6a16914 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -349,6 +349,13 @@ public class AppCatalogJPAUtils {
logger.error("Object should be a Job Manager Command.", new IllegalArgumentException());
throw new IllegalArgumentException("Object should be a Job Manager Command.");
}
+ case PARALLELISM_PREFIX_COMMAND:
+ if (o instanceof ParallelismPrefixCommand) {
+ return createParallelismCommand((ParallelismPrefixCommand) o);
+ } else {
+ logger.error("Object should be a Parallelism Prefix Command.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Object should be a Parallelism Prefix Command.");
+ }
case LOCAL_SUBMISSION:
if (o instanceof LocalSubmission) {
return createLocalSubmission((LocalSubmission) o);
@@ -416,6 +423,17 @@ public class AppCatalogJPAUtils {
return jobManagerCommandResource;
}
+ private static AppCatalogResource createParallelismCommand(ParallelismPrefixCommand o) {
+ ParallelismPrefixCommandResource parallelismPrefixCommandResource = new ParallelismPrefixCommandResource();
+ if (o != null) {
+ parallelismPrefixCommandResource.setResourceJobManagerId(o.getResourceJobManagerId());
+ parallelismPrefixCommandResource.setResourceJobManagerResource((ResourceJobManagerResource) createResourceJobManager(o.getResourceJobManager()));
+ parallelismPrefixCommandResource.setCommandType(o.getCommandType());
+ parallelismPrefixCommandResource.setCommand(o.getCommand());
+ }
+ return parallelismPrefixCommandResource;
+ }
+
private static AppCatalogResource createResourceJobManager(ResourceJobManager o) {
ResourceJobManagerResource resourceJobManagerResource = new ResourceJobManagerResource();
if (o != null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java
index e30ea06..df66757 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java
@@ -59,6 +59,7 @@ public enum AppCatalogResourceType {
DATA_MOVEMENT_INTERFACE,
RESOURCE_JOB_MANAGER,
JOB_MANAGER_COMMAND,
+ PARALLELISM_PREFIX_COMMAND,
LOCAL_SUBMISSION,
LOCAL_DATA_MOVEMENT,
MODULE_LOAD_CMD,
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index b788109..aa98a21 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -38,6 +38,8 @@ import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
import org.apache.airavata.model.data.movement.*;
+import org.apache.airavata.model.parallelism.ApplicationParallelismType;
+import org.apache.airavata.registry.core.app.catalog.model.ParallelismPrefixCommand;
import org.apache.airavata.registry.core.app.catalog.resources.*;
import org.apache.airavata.registry.cpi.AppCatalogException;
@@ -394,6 +396,16 @@ public class AppCatalogThriftConversion {
r.getJobManagerCommands().put(JobManagerCommand.valueOf(rr.getCommandType()), rr.getCommand());
}
}
+
+ r.setParallelismPrefix(new HashMap<ApplicationParallelismType, String>());
+ ParallelismPrefixCommandResource prefixCommandResource=new ParallelismPrefixCommandResource();
+ List<AppCatalogResource> resourceList = prefixCommandResource.get(AppCatAbstractResource.JobManagerCommandConstants.RESOURCE_JOB_MANAGER_ID, manager.getResourceJobManagerId());
+ if (resourceList != null && !resourceList.isEmpty()){
+ for (AppCatalogResource rrr : resourceList) {
+ ParallelismPrefixCommandResource rr=(ParallelismPrefixCommandResource)rrr;
+ r.getParallelismPrefix().put(ApplicationParallelismType.valueOf(rr.getCommandType()), rr.getCommand());
+ }
+ }
return r;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
index 078cd73..09cb6b2 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -423,6 +423,15 @@ CREATE TABLE JOB_MANAGER_COMMAND
FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
);
+CREATE TABLE PARALLELISM_COMMAND
+(
+ RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
+ COMMAND_TYPE VARCHAR (255) NOT NULL,
+ COMMAND VARCHAR (255),
+ PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
+ FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
+);
+
CREATE TABLE LOCAL_SUBMISSION
(
RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
http://git-wip-us.apache.org/repos/asf/airavata/blob/d66d1698/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
index 25024f5..b091c16 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
@@ -421,6 +421,15 @@ CREATE TABLE JOB_MANAGER_COMMAND
FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
);
+CREATE TABLE PARALLELISM_COMMAND
+(
+ RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
+ COMMAND_TYPE VARCHAR (255) NOT NULL,
+ COMMAND VARCHAR (255),
+ PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
+ FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID) ON DELETE CASCADE
+);
+
CREATE TABLE LOCAL_SUBMISSION
(
RESOURCE_JOB_MANAGER_ID VARCHAR (255) NOT NULL,
[10/14] airavata git commit: adding gateway instance id
implementtaions
Posted by sm...@apache.org.
adding gateway instance id implementtaions
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f0c730cd
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f0c730cd
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f0c730cd
Branch: refs/heads/master
Commit: f0c730cda531633e9c126bde248b3a9843edfe90
Parents: b537f35
Author: smarru <sm...@apache.org>
Authored: Fri Feb 26 16:23:57 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Fri Feb 26 16:23:57 2016 -0500
----------------------------------------------------------------------
.../core/experiment/catalog/impl/ExperimentRegistry.java | 2 ++
.../core/experiment/catalog/model/Experiment.java | 11 +++++++++++
.../experiment/catalog/resources/ExperimentResource.java | 11 +++++++++++
.../core/experiment/catalog/resources/Utils.java | 1 +
.../catalog/utils/ThriftDataModelConversion.java | 1 +
5 files changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index ee0f18a..98dfe91 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -90,6 +90,7 @@ public class ExperimentRegistry {
experimentResource.setDescription(experiment.getDescription());
experimentResource.setExecutionId(experiment.getExecutionId());
experimentResource.setGatewayExecutionId(experiment.getGatewayExecutionId());
+ experimentResource.setGatewayInstanceId(experiment.getGatewayInstanceId());
if(experiment.isEnableEmailNotification()){
experimentResource.setEnableEmailNotification(true);
if(experiment.getEmailAddresses() != null){
@@ -580,6 +581,7 @@ public class ExperimentRegistry {
existingExperiment.setUserName(experiment.getUserName());
existingExperiment.setGatewayId(experiment.getGatewayId());
existingExperiment.setGatewayExecutionId(experiment.getGatewayExecutionId());
+ existingExperiment.setGatewayInstanceId(experiment.getGatewayInstanceId());
existingExperiment.setProjectId(experiment.getProjectId());
existingExperiment.setCreationTime(AiravataUtils.getTime(experiment.getCreationTime()));
existingExperiment.setDescription(experiment.getDescription());
http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
index f896316..666d11c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Experiment.java
@@ -41,6 +41,8 @@ public class Experiment {
private String description;
private String executionId;
private String gatewayExecutionId;
+ private String gatewayInstanceId;
+
private Boolean enableEmailNotification;
private String emailAddresses;
private Users user;
@@ -143,6 +145,15 @@ public class Experiment {
this.gatewayExecutionId = gatewayExecutionId;
}
+ @Column(name = "GATEWAY_INSTANCE_ID")
+ public String getGatewayInstanceId() {
+ return gatewayInstanceId;
+ }
+
+ public void setGatewayInstanceId(String gatewayInstanceId) {
+ this.gatewayInstanceId = gatewayInstanceId;
+ }
+
@Column(name = "ENABLE_EMAIL_NOTIFICATION")
public Boolean getEnableEmailNotification() {
return enableEmailNotification;
http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
index 17dfd55..721ec05 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/ExperimentResource.java
@@ -50,6 +50,7 @@ public class ExperimentResource extends AbstractExpCatResource {
private String description;
private String executionId;
private String gatewayExecutionId;
+ private String gatewayInstanceId;
private boolean enableEmailNotification;
private String emailAddresses;
@@ -125,6 +126,14 @@ public class ExperimentResource extends AbstractExpCatResource {
this.executionId = executionId;
}
+ public String getGatewayInstanceId() {
+ return gatewayInstanceId;
+ }
+
+ public void setGatewayInstanceId(String gatewayInstanceId) {
+ this.gatewayInstanceId = gatewayInstanceId;
+ }
+
public String getGatewayExecutionId() {
return gatewayExecutionId;
}
@@ -149,6 +158,7 @@ public class ExperimentResource extends AbstractExpCatResource {
this.emailAddresses = emailAddresses;
}
+
public ExperimentCatResource create(ResourceType type) throws RegistryException{
switch (type){
case EXPERIMENT_ERROR:
@@ -506,6 +516,7 @@ public class ExperimentResource extends AbstractExpCatResource {
experiment.setCreationTime(creationTime);
experiment.setDescription(description);
experiment.setExecutionId(executionId);
+ experiment.setGatewayInstanceId(gatewayInstanceId);
experiment.setGatewayExecutionId(gatewayExecutionId);
experiment.setEnableEmailNotification(enableEmailNotification);
experiment.setEmailAddresses(emailAddresses);
http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
index c94fef9..d7b15b4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java
@@ -422,6 +422,7 @@ public class Utils {
experimentResource.setDescription(o.getDescription());
experimentResource.setExecutionId(o.getExecutionId());
experimentResource.setGatewayExecutionId(o.getGatewayExecutionId());
+ experimentResource.setGatewayInstanceId(o.getGatewayInstanceId());
experimentResource.setEnableEmailNotification(o.getEnableEmailNotification());
experimentResource.setEmailAddresses(o.getEmailAddresses());
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/f0c730cd/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
index 1ecc37b..1eea10d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/utils/ThriftDataModelConversion.java
@@ -123,6 +123,7 @@ public class ThriftDataModelConversion {
experiment.setDescription(experimentResource.getDescription());
experiment.setEnableEmailNotification(experimentResource.getEnableEmailNotification());
experiment.setGatewayExecutionId(experimentResource.getGatewayExecutionId());
+ experiment.setGatewayInstanceId(experimentResource.getGatewayInstanceId());
if (experiment.isEnableEmailNotification()){
String notificationEmails = experimentResource.getEmailAddresses();
experiment.setEmailAddresses(getEmailAddresses(notificationEmails.split(",")));